From f393447ac9a7584d2a062d80567e2a2998daf16c Mon Sep 17 00:00:00 2001
From: likeon <i@likeon.name>
Date: Thu, 5 Mar 2015 19:43:02 +0300
Subject: [PATCH 0001/1265] Docs: yml link in getting started with django

Signed-off-by: Alexander Sterchov i@likeon.name
---
 docs/django.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/django.md b/docs/django.md
index 0605c86b..99724cd6 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -55,7 +55,7 @@ mounted inside the containers, and what ports they expose.
       links:
         - db
 
-See the [`docker-compose.yml` reference](yml.html) for more information on how
+See the [`docker-compose.yml` reference](yml.md) for more information on how
 this file works.
 
 ### Build the project

From b9c502531dbcde4e8e628fda260db08c3c908623 Mon Sep 17 00:00:00 2001
From: Todd Whiteman <todd.whiteman@joyent.com>
Date: Tue, 26 May 2015 12:25:52 -0700
Subject: [PATCH 0002/1265] Possible division by zero error when pulling an
 image - fixes #1463

Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
---
 compose/progress_stream.py         |  5 +++--
 tests/unit/progress_stream_test.py | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index 39aab5ff..317c6e81 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -74,8 +74,9 @@ def print_output_event(event, stream, is_terminal):
         stream.write("%s %s%s" % (status, event['progress'], terminator))
     elif 'progressDetail' in event:
         detail = event['progressDetail']
-        if 'current' in detail:
-            percentage = float(detail['current']) / float(detail['total']) * 100
+        total = detail.get('total')
+        if 'current' in detail and total:
+            percentage = float(detail['current']) / float(total) * 100
             stream.write('%s (%.1f%%)%s' % (status, percentage, terminator))
         else:
             stream.write('%s%s' % (status, terminator))
diff --git a/tests/unit/progress_stream_test.py b/tests/unit/progress_stream_test.py
index 14256068..317b77e9 100644
--- a/tests/unit/progress_stream_test.py
+++ b/tests/unit/progress_stream_test.py
@@ -17,3 +17,21 @@ class ProgressStreamTestCase(unittest.TestCase):
         ]
         events = progress_stream.stream_output(output, StringIO())
         self.assertEqual(len(events), 1)
+
+    def test_stream_output_div_zero(self):
+        output = [
+            '{"status": "Downloading", "progressDetail": {"current": '
+            '0, "start": 1413653874, "total": 0}, '
+            '"progress": "..."}',
+        ]
+        events = progress_stream.stream_output(output, StringIO())
+        self.assertEqual(len(events), 1)
+
+    def test_stream_output_null_total(self):
+        output = [
+            '{"status": "Downloading", "progressDetail": {"current": '
+            '0, "start": 1413653874, "total": null}, '
+            '"progress": "..."}',
+        ]
+        events = progress_stream.stream_output(output, StringIO())
+        self.assertEqual(len(events), 1)

From ae63d356604aeef6be965c46e625c277964f483e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Martins?= <martins@noironetworks.com>
Date: Tue, 26 May 2015 23:17:39 +0100
Subject: [PATCH 0003/1265] Modified scale awareness from exception to warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: André Martins <martins@noironetworks.com>
---
 compose/cli/main.py               | 12 ++----------
 compose/service.py                |  8 +++-----
 tests/integration/service_test.py |  5 -----
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index a558e835..f378f065 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -13,7 +13,7 @@ import dockerpty
 from .. import __version__
 from .. import legacy
 from ..project import NoSuchService, ConfigurationError
-from ..service import BuildError, CannotBeScaledError, NeedsBuildError
+from ..service import BuildError, NeedsBuildError
 from ..config import parse_environment
 from .command import Command
 from .docopt_command import NoSuchCommand
@@ -372,15 +372,7 @@ class TopLevelCommand(Command):
             except ValueError:
                 raise UserError('Number of containers for service "%s" is not a '
                                 'number' % service_name)
-            try:
-                project.get_service(service_name).scale(num)
-            except CannotBeScaledError:
-                raise UserError(
-                    'Service "%s" cannot be scaled because it specifies a port '
-                    'on the host. If multiple containers for this service were '
-                    'created, the port would clash.\n\nRemove the ":" from the '
-                    'port definition in docker-compose.yml so Docker can choose a random '
-                    'port for each container.' % service_name)
+            project.get_service(service_name).scale(num)
 
     def start(self, project, options):
         """
diff --git a/compose/service.py b/compose/service.py
index ccfb3851..48759827 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -55,10 +55,6 @@ class BuildError(Exception):
         self.reason = reason
 
 
-class CannotBeScaledError(Exception):
-    pass
-
-
 class ConfigError(ValueError):
     pass
 
@@ -154,7 +150,9 @@ class Service(object):
         - removes all stopped containers
         """
         if not self.can_be_scaled():
-            raise CannotBeScaledError()
+            log.warn('Service %s specifies a port on the host. If multiple containers '
+                     'for this service are created on a single host, the port will clash.'
+                     % self.name)
 
         # Create enough containers
         containers = self.containers(stopped=True)
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 8fd8212c..7e88557f 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -17,7 +17,6 @@ from compose.const import (
     LABEL_VERSION,
 )
 from compose.service import (
-    CannotBeScaledError,
     ConfigError,
     Service,
     build_extra_hosts,
@@ -526,10 +525,6 @@ class ServiceTest(DockerClientTestCase):
         service.scale(0)
         self.assertEqual(len(service.containers()), 0)
 
-    def test_scale_on_service_that_cannot_be_scaled(self):
-        service = self.create_service('web', ports=['8000:8000'])
-        self.assertRaises(CannotBeScaledError, lambda: service.scale(1))
-
     def test_scale_sets_ports(self):
         service = self.create_service('web', ports=['8000'])
         service.scale(2)

From 7d9aa8e0a9da9983b18a132d86ce9cdc377535e3 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 27 May 2015 15:13:12 +0100
Subject: [PATCH 0004/1265] Script to prepare OSX build environment

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 CONTRIBUTING.md    | 12 ++++++++----
 script/build-osx   |  2 +-
 script/prepare-osx | 22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100755 script/prepare-osx

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 373c8dc6..fddf888d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,16 +53,20 @@ you can specify a test directory, file, module, class or method:
 
 ## Building binaries
 
-Linux:
+`script/build-linux` will build the Linux binary inside a Docker container:
 
     $ script/build-linux
 
-OS X:
+`script/build-osx` will build the Mac OS X binary inside a virtualenv:
 
     $ script/build-osx
 
-Note that this only works on Mountain Lion, not Mavericks, due to a
-[bug in PyInstaller](http://www.pyinstaller.org/ticket/807).
+For official releases, you should build inside a Mountain Lion VM for proper
+compatibility. Run the this script first to prepare the environment before
+building - it will use Homebrew to make sure Python is installed and
+up-to-date.
+
+    $ script/prepare-osx
 
 ## Release process
 
diff --git a/script/build-osx b/script/build-osx
index 26309744..6ad00bcd 100755
--- a/script/build-osx
+++ b/script/build-osx
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ex
 rm -rf venv
-virtualenv venv
+virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
 venv/bin/pip install -r requirements-dev.txt
 venv/bin/pip install .
diff --git a/script/prepare-osx b/script/prepare-osx
new file mode 100755
index 00000000..69ac56f1
--- /dev/null
+++ b/script/prepare-osx
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -ex
+
+if !(which brew); then
+  ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+fi
+
+brew update
+
+if [ ! -f /usr/local/bin/python ]; then
+  brew install python
+fi
+
+if [ -n "$(brew outdated | grep python)" ]; then
+  brew upgrade python
+fi
+
+if !(which virtualenv); then
+  pip install virtualenv
+fi
+

From ae9d619d8643a093735171e054588525cec32972 Mon Sep 17 00:00:00 2001
From: funkyfuture <funkyfuture@riseup.net>
Date: Sun, 25 Jan 2015 00:16:37 +0100
Subject: [PATCH 0005/1265] Add command for Docker-style version information

This adds a command 'version' to show software versions information
like Docker does. In addition it includes:
- version of the docker-py-package
- Python-implementation and -version

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
---
 compose/cli/command.py |  2 +-
 compose/cli/main.py    | 22 ++++++++++++++++++----
 compose/cli/utils.py   | 17 ++++++++++++++++-
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index bd6b2dc8..7858dfbc 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -48,7 +48,7 @@ class Command(DocoptCommand):
                 raise errors.ConnectionErrorGeneric(self.get_client().base_url)
 
     def perform_command(self, options, handler, command_options):
-        if options['COMMAND'] == 'help':
+        if options['COMMAND'] in ('help', 'version'):
             # Skip looking up the compose file.
             handler(None, command_options)
             return
diff --git a/compose/cli/main.py b/compose/cli/main.py
index a558e835..c4b33ca1 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -10,8 +10,7 @@ import sys
 from docker.errors import APIError
 import dockerpty
 
-from .. import __version__
-from .. import legacy
+from .. import __version__, legacy
 from ..project import NoSuchService, ConfigurationError
 from ..service import BuildError, CannotBeScaledError, NeedsBuildError
 from ..config import parse_environment
@@ -20,7 +19,7 @@ from .docopt_command import NoSuchCommand
 from .errors import UserError
 from .formatter import Formatter
 from .log_printer import LogPrinter
-from .utils import yesno
+from .utils import yesno, get_version_info
 
 log = logging.getLogger(__name__)
 
@@ -100,11 +99,12 @@ class TopLevelCommand(Command):
       stop               Stop services
       up                 Create and start containers
       migrate-to-labels  Recreate containers to add labels
+      version            Show the Docker-Compose version information
 
     """
     def docopt_options(self):
         options = super(TopLevelCommand, self).docopt_options()
-        options['version'] = "docker-compose %s" % __version__
+        options['version'] = get_version_info('compose')
         return options
 
     def build(self, project, options):
@@ -497,6 +497,20 @@ class TopLevelCommand(Command):
         """
         legacy.migrate_project_to_labels(project)
 
+    def version(self, project, options):
+        """
+        Show version informations
+
+        Usage: version [--short]
+
+        Options:
+            --short     Shows only Compose's version number.
+        """
+        if options['--short']:
+            print(__version__)
+        else:
+            print(get_version_info('full'))
+
 
 def list_containers(containers):
     return ", ".join(c.name for c in containers)
diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index 5f5fed64..489b52e2 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -1,10 +1,13 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
 from __future__ import division
+
+from .. import __version__
 import datetime
+from docker import version as docker_py_version
 import os
-import subprocess
 import platform
+import subprocess
 
 
 def yesno(prompt, default=None):
@@ -120,3 +123,15 @@ def is_mac():
 
 def is_ubuntu():
     return platform.system() == 'Linux' and platform.linux_distribution()[0] == 'Ubuntu'
+
+
+def get_version_info(scope):
+    versioninfo = 'docker-compose version: %s' % __version__
+    if scope == 'compose':
+        return versioninfo
+    elif scope == 'full':
+        return versioninfo + '\n' \
+            + "docker-py version: %s\n" % docker_py_version \
+            + "%s version: %s" % (platform.python_implementation(), platform.python_version())
+    else:
+        raise RuntimeError('passed unallowed value to `cli.utils.get_version_info`')

From 5945db0fa8c230b8314354d5228a220899375a00 Mon Sep 17 00:00:00 2001
From: Ford Hurley <ford.hurley@gmail.com>
Date: Thu, 28 May 2015 15:44:16 -0400
Subject: [PATCH 0006/1265] Fix markdown formatting for `--service-ports`
 example

Signed-off-by: Ford Hurley <ford.hurley@gmail.com>
---
 docs/cli.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/cli.md b/docs/cli.md
index e5594871..9da12e69 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -95,7 +95,9 @@ specify the `--no-deps` flag:
 
 Similarly, if you do want the service's ports to be created and mapped to the
 host, specify the `--service-ports` flag:
-	$ docker-compose run --service-ports web python manage.py shell
+
+    $ docker-compose run --service-ports web python manage.py shell
+
 
 ### scale
 

From ec437313a7040fd970de328a655152c1be5f0c8e Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Fri, 29 May 2015 11:13:37 +0100
Subject: [PATCH 0007/1265] Change kill SIGINT test to use SIGSTOP

I think the original intention of the original test was the check that
different signals work, I think. This does this -- it sends a signal
that doesn't cause the container to stop.

Closes #759. Replaces #1467.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 tests/integration/cli_test.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 92789363..ae57e919 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -360,22 +360,22 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(service.containers(stopped=True)), 1)
         self.assertFalse(service.containers(stopped=True)[0].is_running)
 
-    def test_kill_signal_sigint(self):
+    def test_kill_signal_sigstop(self):
         self.command.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
         self.assertEqual(len(service.containers()), 1)
         self.assertTrue(service.containers()[0].is_running)
 
-        self.command.dispatch(['kill', '-s', 'SIGINT'], None)
+        self.command.dispatch(['kill', '-s', 'SIGSTOP'], None)
 
         self.assertEqual(len(service.containers()), 1)
-        # The container is still running. It has been only interrupted
+        # The container is still running. It has only been paused
         self.assertTrue(service.containers()[0].is_running)
 
-    def test_kill_interrupted_service(self):
+    def test_kill_stopped_service(self):
         self.command.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
-        self.command.dispatch(['kill', '-s', 'SIGINT'], None)
+        self.command.dispatch(['kill', '-s', 'SIGSTOP'], None)
         self.assertTrue(service.containers()[0].is_running)
 
         self.command.dispatch(['kill', '-s', 'SIGKILL'], None)

From b3c1c9c954415c97c7d70a8f7e7f26827f09a96e Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Fri, 29 May 2015 13:17:18 +0200
Subject: [PATCH 0008/1265] Support --x-smart-recreate and -v in bash
 completion

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index e62b1d8f..ba3dff35 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -104,7 +104,7 @@ _docker-compose_docker-compose() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--help -h --verbose --version --file -f --project-name -p" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help -h --verbose --version -v --file -f --project-name -p" -- "$cur" ) )
 			;;
 		*)
 			COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
@@ -293,7 +293,7 @@ _docker-compose_up() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--allow-insecure-ssl -d --no-build --no-color --no-deps --no-recreate -t --timeout" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--allow-insecure-ssl -d --no-build --no-color --no-deps --no-recreate -t --timeout --x-smart-recreate" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_all

From c128e881c16fd0ce1d6b99967754ca89d46d63a7 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Fri, 29 May 2015 13:07:19 +0100
Subject: [PATCH 0009/1265] Add build and dist to dockerignore

These are the bulk of what gets sent in the build. Makes builds
much faster, particularly remotely.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 .dockerignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.dockerignore b/.dockerignore
index f1b636b3..a03616e5 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,4 @@
 .git
+build
+dist
 venv

From a6bd1d22a0148481730c15b1f67f0ef1fb8dde4b Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Fri, 29 May 2015 13:23:42 +0100
Subject: [PATCH 0010/1265] Don't mount code in a volume when running tests

An image is built anyway, so this is unnecessary. This makes it
possible to run the tests on a remote Docker daemon.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 script/test | 1 -
 1 file changed, 1 deletion(-)

diff --git a/script/test b/script/test
index ab0645fd..f278023a 100755
--- a/script/test
+++ b/script/test
@@ -9,7 +9,6 @@ docker build -t "$TAG" .
 docker run \
   --rm \
   --volume="/var/run/docker.sock:/var/run/docker.sock" \
-  --volume="$(pwd):/code" \
   -e DOCKER_VERSIONS \
   -e "TAG=$TAG" \
   --entrypoint="script/test-versions" \

From bc8d5923e7f1ddb797b752c9e1edaa90d0c4d75e Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Wed, 22 Apr 2015 11:53:02 +0200
Subject: [PATCH 0011/1265] Zsh completion for docker-compose

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 CONTRIBUTING.md                        |   1 -
 contrib/completion/zsh/_docker-compose | 303 +++++++++++++++++++++++++
 docs/completion.md                     |  37 ++-
 3 files changed, 332 insertions(+), 9 deletions(-)
 create mode 100644 contrib/completion/zsh/_docker-compose

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fddf888d..6914e215 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -73,7 +73,6 @@ up-to-date.
 1. Open pull request that:
  - Updates the version in `compose/__init__.py`
  - Updates the binary URL in `docs/install.md`
- - Updates the script URL in `docs/completion.md`
  - Adds release notes to `CHANGES.md`
 2. Create unpublished GitHub release with release notes
 3. Build Linux version on any Docker host with `script/build-linux` and attach
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
new file mode 100644
index 00000000..9dc2789f
--- /dev/null
+++ b/contrib/completion/zsh/_docker-compose
@@ -0,0 +1,303 @@
+#compdef docker-compose
+
+# Description
+# -----------
+#  zsh completion for docker-compose
+#  https://github.com/sdurrheimer/docker-compose-zsh-completion
+# -------------------------------------------------------------------------
+# Version
+# -------
+#  0.1.0
+# -------------------------------------------------------------------------
+# Authors
+# -------
+#  * Steve Durrheimer <s.durrheimer@gmail.com>
+# -------------------------------------------------------------------------
+# Inspiration
+# -----------
+#  * @albers docker-compose bash completion script
+#  * @felixr docker zsh completion script : https://github.com/felixr/docker-zsh-completion
+# -------------------------------------------------------------------------
+
+# For compatibility reasons, Compose and therefore its completion supports several
+# stack compositon files as listed here, in descending priority.
+# Support for these filenames might be dropped in some future version.
+__docker-compose_compose_file() {
+    local file
+    for file in docker-compose.y{,a}ml fig.y{,a}ml ; do
+        [ -e $file ] && {
+            echo $file
+            return
+        }
+    done
+    echo docker-compose.yml
+}
+
+# Extracts all service names from docker-compose.yml.
+___docker-compose_all_services_in_compose_file() {
+    local already_selected
+    local -a services
+    already_selected=$(echo ${words[@]} | tr " " "|")
+    awk -F: '/^[a-zA-Z0-9]/{print $1}' "${compose_file:-$(__docker-compose_compose_file)}" 2>/dev/null | grep -Ev "$already_selected"
+}
+
+# All services, even those without an existing container
+__docker-compose_services_all() {
+    services=$(___docker-compose_all_services_in_compose_file)
+    _alternative "args:services:($services)"
+}
+
+# All services that have an entry with the given key in their docker-compose.yml section
+___docker-compose_services_with_key() {
+    local already_selected
+    local -a buildable
+    already_selected=$(echo ${words[@]} | tr " " "|")
+    # flatten sections to one line, then filter lines containing the key and return section name.
+    awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' "${compose_file:-$(__docker-compose_compose_file)}" 2>/dev/null | awk -F: -v key=": +$1:" '$0 ~ key {print $1}' 2>/dev/null | grep -Ev "$already_selected"
+}
+
+# All services that are defined by a Dockerfile reference
+__docker-compose_services_from_build() {
+    buildable=$(___docker-compose_services_with_key build)
+    _alternative "args:buildable services:($buildable)"
+}
+
+# All services that are defined by an image
+__docker-compose_services_from_image() {
+    pullable=$(___docker-compose_services_with_key image)
+    _alternative "args:pullable services:($pullable)"
+}
+
+__docker-compose_get_services() {
+    local kind expl
+    declare -a running stopped lines args services
+
+    docker_status=$(docker ps > /dev/null 2>&1)
+    if [ $? -ne 0 ]; then
+        _message "Error! Docker is not running."
+        return 1
+    fi
+
+    kind=$1
+    shift
+    [[ $kind = (stopped|all) ]] && args=($args -a)
+
+    lines=(${(f)"$(_call_program commands docker ps ${args})"})
+    services=(${(f)"$(_call_program commands docker-compose 2>/dev/null ${compose_file:+-f $compose_file} ${compose_project:+-p $compose_project} ps -q)"})
+
+    # Parse header line to find columns
+    local i=1 j=1 k header=${lines[1]}
+    declare -A begin end
+    while (( $j < ${#header} - 1 )) {
+        i=$(( $j + ${${header[$j,-1]}[(i)[^ ]]} - 1))
+        j=$(( $i + ${${header[$i,-1]}[(i)  ]} - 1))
+        k=$(( $j + ${${header[$j,-1]}[(i)[^ ]]} - 2))
+        begin[${header[$i,$(($j-1))]}]=$i
+        end[${header[$i,$(($j-1))]}]=$k
+    }
+    lines=(${lines[2,-1]})
+
+    # Container ID
+    local line s name
+    local -a names
+    for line in $lines; do
+        if [[ $services == *"${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}"* ]]; then
+            names=(${(ps:,:)${${line[${begin[NAMES]},-1]}%% *}})
+            for name in $names; do
+                s="${${name%_*}#*_}:${(l:15:: :::)${${line[${begin[CREATED]},${end[CREATED]}]/ ago/}%% ##}}"
+                s="$s, ${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}"
+                s="$s, ${${${line[$begin[IMAGE],$end[IMAGE]]}/:/\\:}%% ##}"
+                if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = Exit* ]]; then
+                    stopped=($stopped $s)
+                else
+                    running=($running $s)
+                fi
+            done
+        fi
+    done
+
+    [[ $kind = (running|all) ]] && _describe -t services-running "running services" running
+    [[ $kind = (stopped|all) ]] && _describe -t services-stopped "stopped services" stopped
+}
+
+__docker-compose_stoppedservices() {
+    __docker-compose_get_services stopped "$@"
+}
+
+__docker-compose_runningservices() {
+    __docker-compose_get_services running "$@"
+}
+
+__docker-compose_services () {
+    __docker-compose_get_services all "$@"
+}
+
+__docker-compose_caching_policy() {
+    oldp=( "$1"(Nmh+1) )     # 1 hour
+    (( $#oldp ))
+}
+
+__docker-compose_commands () {
+    local cache_policy
+
+    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
+    if [[ -z "$cache_policy" ]]; then
+        zstyle ":completion:${curcontext}:" cache-policy __docker-compose_caching_policy
+    fi
+
+    if ( [[ ${+_docker_compose_subcommands} -eq 0 ]] || _cache_invalid docker_compose_subcommands) \
+        && ! _retrieve_cache docker_compose_subcommands;
+    then
+        local -a lines
+        lines=(${(f)"$(_call_program commands docker-compose 2>&1)"})
+        _docker_compose_subcommands=(${${${lines[$((${lines[(i)Commands:]} + 1)),${lines[(I)  *]}]}## #}/ ##/:})
+        _store_cache docker_compose_subcommands _docker_compose_subcommands
+    fi
+    _describe -t docker-compose-commands "docker-compose command" _docker_compose_subcommands
+}
+
+__docker-compose_subcommand () {
+    local -a _command_args
+    integer ret=1
+    case "$words[1]" in
+        (build)
+            _arguments \
+                '--no-cache[Do not use cache when building the image]' \
+                '*:services:__docker-compose_services_from_build' && ret=0
+            ;;
+        (help)
+            _arguments ':subcommand:__docker-compose_commands' && ret=0
+            ;;
+        (kill)
+            _arguments \
+                '-s[SIGNAL to send to the container. Default signal is SIGKILL.]:signal:_signals' \
+                '*:running services:__docker-compose_runningservices' && ret=0
+            ;;
+        (logs)
+            _arguments \
+                '--no-color[Produce monochrome output.]' \
+                '*:services:__docker-compose_services_all' && ret=0
+            ;;
+        (migrate-to-labels)
+            _arguments \
+                '(-):Recreate containers to add labels' && ret=0
+            ;;
+        (port)
+            _arguments \
+                '--protocol=-[tcp or udap (defaults to tcp)]:protocol:(tcp udp)' \
+                '--index=-[index of the container if there are mutiple instances of a service (defaults to 1)]:index: ' \
+                '1:running services:__docker-compose_runningservices' \
+                '2:port:_ports' && ret=0
+            ;;
+        (ps)
+            _arguments \
+                '-q[Only display IDs]' \
+                '*:services:__docker-compose_services_all' && ret=0
+            ;;
+        (pull)
+            _arguments \
+                '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \
+                '*:services:__docker-compose_services_from_image' && ret=0
+            ;;
+        (rm)
+            _arguments \
+                '(-f --force)'{-f,--force}"[Don't ask to confirm removal]" \
+                '-v[Remove volumes associated with containers]' \
+                '*:stopped services:__docker-compose_stoppedservices' && ret=0
+            ;;
+        (run)
+            _arguments \
+                '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \
+                '-d[Detached mode: Run container in the background, print new container name.]' \
+                '--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
+                '*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
+                '(-u --user)'{-u,--user=-}'[Run as specified username or uid]:username or uid:_users' \
+                "--no-deps[Don't start linked services.]" \
+                '--rm[Remove container after run. Ignored in detached mode.]' \
+                "--service-ports[Run command with the service's ports enabled and mapped to the host.]" \
+                '-T[Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.]' \
+                '(-):services:__docker-compose_services' \
+                '(-):command: _command_names -e' \
+                '*::arguments: _normal' && ret=0
+            ;;
+        (scale)
+            _arguments '*:running services:__docker-compose_runningservices' && ret=0
+            ;;
+        (start)
+            _arguments '*:stopped services:__docker-compose_stoppedservices' && ret=0
+            ;;
+        (stop|restart)
+            _arguments \
+                '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
+                '*:running services:__docker-compose_runningservices' && ret=0
+            ;;
+        (up)
+            _arguments \
+                '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \
+                '-d[Detached mode: Run containers in the background, print new container names.]' \
+                '--no-color[Produce monochrome output.]' \
+                "--no-deps[Don't start linked services.]" \
+                "--no-recreate[If containers already exist, don't recreate them.]" \
+                "--no-build[Don't build an image, even if it's missing]" \
+                '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
+                '*:services:__docker-compose_services_all' && ret=0
+            ;;
+        (*)
+            _message 'Unknown sub command'
+    esac
+
+    return ret
+}
+
+_docker-compose () {
+    # Support for subservices, which allows for `compdef _docker docker-shell=_docker_containers`.
+    # Based on /usr/share/zsh/functions/Completion/Unix/_git without support for `ret`.
+    if [[ $service != docker-compose ]]; then
+        _call_function - _$service
+        return
+    fi
+
+    local curcontext="$curcontext" state line ret=1
+    typeset -A opt_args
+
+    _arguments -C \
+        '(- :)'{-h,--help}'[Get help]' \
+        '--verbose[Show more output]' \
+        '(- :)--version[Print version and exit]' \
+        '(-f --file)'{-f,--file}'[Specify an alternate docker-compose file (default: docker-compose.yml)]:file:_files -g "*.yml"' \
+        '(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \
+        '(-): :->command' \
+        '(-)*:: :->option-or-argument' && ret=0
+
+    local counter=1
+    #local compose_file compose_project
+    while [ $counter -lt ${#words[@]} ]; do
+        case "${words[$counter]}" in
+            -f|--file)
+                (( counter++ ))
+                compose_file="${words[$counter]}"
+                ;;
+            -p|--project-name)
+                (( counter++ ))
+                compose_project="${words[$counter]}"
+                ;;
+            *)
+                ;;
+        esac
+        (( counter++ ))
+    done
+
+    case $state in
+        (command)
+            __docker-compose_commands && ret=0
+            ;;
+        (option-or-argument)
+            curcontext=${curcontext%:*:*}:docker-compose-$words[1]:
+            __docker-compose_subcommand && ret=0
+            ;;
+    esac
+
+    return ret
+}
+
+_docker-compose "$@"
diff --git a/docs/completion.md b/docs/completion.md
index 35c53b55..5168971f 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -3,23 +3,44 @@ layout: default
 title: Command Completion
 ---
 
-#Command Completion
+# Command Completion
 
 Compose comes with [command completion](http://en.wikipedia.org/wiki/Command-line_completion)
-for the bash shell.
+for the bash and zsh shell.
 
-##Installing Command Completion
+## Installing Command Completion
+
+### Bash
 
 Make sure bash completion is installed. If you use a current Linux in a non-minimal installation, bash completion should be available.
 On a Mac, install with `brew install bash-completion`
- 
-Place the completion script in `/etc/bash_completion.d/` (`/usr/local/etc/bash_completion.d/` on a Mac), using e.g. 
 
-     curl -L https://raw.githubusercontent.com/docker/compose/1.2.0/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose
- 
+Place the completion script in `/etc/bash_completion.d/` (`/usr/local/etc/bash_completion.d/` on a Mac), using e.g.
+
+     curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose --version | awk '{print $2}')/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose
+
 Completion will be available upon next login.
 
-##Available completions
+### Zsh
+
+Place the completion script in your `/path/to/zsh/completion`, using e.g. `~/.zsh/completion/`
+
+    mkdir -p ~/.zsh/completion
+    curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose --version | awk '{print $2}')/contrib/completion/zsh/_docker-compose > ~/.zsh/completion/_docker-compose
+
+Include the directory in your `$fpath`, e.g. by adding in `~/.zshrc`
+
+    fpath=(~/.zsh/completion $fpath)
+
+Make sure `compinit` is loaded or do it by adding in `~/.zshrc`
+
+    autoload -Uz compinit && compinit -i
+
+Then reload your shell
+
+    exec $SHELL -l
+
+## Available completions
 
 Depending on what you typed on the command line so far, it will complete
 

From 1d5526c71db6e9696eb8d613ca2d0b92bde5908b Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Fri, 29 May 2015 14:23:37 +0200
Subject: [PATCH 0012/1265] Support --x-smart-recreate and -v in zsh completion

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 9dc2789f..31052e1e 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -240,6 +240,7 @@ __docker-compose_subcommand () {
                 "--no-recreate[If containers already exist, don't recreate them.]" \
                 "--no-build[Don't build an image, even if it's missing]" \
                 '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
+                "--x-smart-recreate[Only recreate containers whose configuration or image needs to be updated. (EXPERIMENTAL)]" \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
         (*)
@@ -263,7 +264,7 @@ _docker-compose () {
     _arguments -C \
         '(- :)'{-h,--help}'[Get help]' \
         '--verbose[Show more output]' \
-        '(- :)--version[Print version and exit]' \
+        '(- :)'{-v,--version}'[Print version and exit]' \
         '(-f --file)'{-f,--file}'[Specify an alternate docker-compose file (default: docker-compose.yml)]:file:_files -g "*.yml"' \
         '(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \
         '(-): :->command' \

From c571bb485d62fd9d55657428b4476a5c2d47ce5e Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 28 May 2015 17:18:04 +0100
Subject: [PATCH 0013/1265] Report Python and OpenSSL versions in --version
 output

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/utils.py     | 4 +++-
 script/build-linux-inner | 2 +-
 script/build-osx         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index 489b52e2..7f2ba2e0 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -8,6 +8,7 @@ from docker import version as docker_py_version
 import os
 import platform
 import subprocess
+import ssl
 
 
 def yesno(prompt, default=None):
@@ -132,6 +133,7 @@ def get_version_info(scope):
     elif scope == 'full':
         return versioninfo + '\n' \
             + "docker-py version: %s\n" % docker_py_version \
-            + "%s version: %s" % (platform.python_implementation(), platform.python_version())
+            + "%s version: %s\n" % (platform.python_implementation(), platform.python_version()) \
+            + "OpenSSL version: %s" % ssl.OPENSSL_VERSION
     else:
         raise RuntimeError('passed unallowed value to `cli.utils.get_version_info`')
diff --git a/script/build-linux-inner b/script/build-linux-inner
index 34b0c06f..adc030ea 100755
--- a/script/build-linux-inner
+++ b/script/build-linux-inner
@@ -7,4 +7,4 @@ chmod 777 `pwd`/dist
 
 pyinstaller -F bin/docker-compose
 mv dist/docker-compose dist/docker-compose-Linux-x86_64
-dist/docker-compose-Linux-x86_64 --version
+dist/docker-compose-Linux-x86_64 version
diff --git a/script/build-osx b/script/build-osx
index 6ad00bcd..78a18294 100755
--- a/script/build-osx
+++ b/script/build-osx
@@ -7,4 +7,4 @@ venv/bin/pip install -r requirements-dev.txt
 venv/bin/pip install .
 venv/bin/pyinstaller -F bin/docker-compose
 mv dist/docker-compose dist/docker-compose-Darwin-x86_64
-dist/docker-compose-Darwin-x86_64 --version
+dist/docker-compose-Darwin-x86_64 version

From 8ad11c0bc870b5d9c94b9f0d9212eb15637ed3f7 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 28 May 2015 17:24:03 +0100
Subject: [PATCH 0014/1265] Make sure we use Python 2.7.9 and OpenSSL 1.0.1
 when building OSX binary

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/build-osx   |  3 +++
 script/prepare-osx | 39 +++++++++++++++++++++++++++++++++++----
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/script/build-osx b/script/build-osx
index 78a18294..2a9cf512 100755
--- a/script/build-osx
+++ b/script/build-osx
@@ -1,5 +1,8 @@
 #!/bin/bash
 set -ex
+
+PATH="/usr/local/bin:$PATH"
+
 rm -rf venv
 virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
diff --git a/script/prepare-osx b/script/prepare-osx
index 69ac56f1..ca2776b6 100755
--- a/script/prepare-osx
+++ b/script/prepare-osx
@@ -2,20 +2,51 @@
 
 set -ex
 
+python_version() {
+  python -V 2>&1
+}
+
+openssl_version() {
+  python -c "import ssl; print ssl.OPENSSL_VERSION"
+}
+
+desired_python_version="2.7.9"
+desired_python_brew_version="2.7.9"
+python_formula="https://raw.githubusercontent.com/Homebrew/homebrew/1681e193e4d91c9620c4901efd4458d9b6fcda8e/Library/Formula/python.rb"
+
+desired_openssl_version="1.0.1j"
+desired_openssl_brew_version="1.0.1j_1"
+openssl_formula="https://raw.githubusercontent.com/Homebrew/homebrew/62fc2a1a65e83ba9dbb30b2e0a2b7355831c714b/Library/Formula/openssl.rb"
+
+PATH="/usr/local/bin:$PATH"
+
 if !(which brew); then
   ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 fi
 
 brew update
 
-if [ ! -f /usr/local/bin/python ]; then
-  brew install python
+if !(python_version | grep "$desired_python_version"); then
+  if brew list | grep python; then
+    brew unlink python
+  fi
+
+  brew install "$python_formula"
+  brew switch python "$desired_python_brew_version"
 fi
 
-if [ -n "$(brew outdated | grep python)" ]; then
-  brew upgrade python
+if !(openssl_version | grep "$desired_openssl_version"); then
+  if brew list | grep openssl; then
+    brew unlink openssl
+  fi
+
+  brew install "$openssl_formula"
+  brew switch openssl "$desired_openssl_brew_version"
 fi
 
+echo "*** Using $(python_version)"
+echo "*** Using $(openssl_version)"
+
 if !(which virtualenv); then
   pip install virtualenv
 fi

From 25942820820fcd8ed3fbd33dde2dcb24005ef997 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 1 Jun 2015 14:01:30 +0100
Subject: [PATCH 0015/1265] Build Python 2.7.9 in Docker image

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 Dockerfile | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b2ae0063..fca5f980 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,11 @@ FROM debian:wheezy
 RUN set -ex; \
     apt-get update -qq; \
     apt-get install -y \
-        python \
-        python-pip \
-        python-dev \
+        gcc \
+        make \
+        zlib1g \
+        zlib1g-dev \
+        libssl-dev \
         git \
         apt-transport-https \
         ca-certificates \
@@ -15,6 +17,37 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*
 
+# Build Python 2.7.9 from source
+RUN set -ex; \
+    curl -LO https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz; \
+    tar -xzf Python-2.7.9.tgz; \
+    cd Python-2.7.9; \
+    ./configure --enable-shared; \
+    make; \
+    make install; \
+    cd ..; \
+    rm -rf /Python-2.7.9; \
+    rm Python-2.7.9.tgz
+
+# Make libpython findable
+ENV LD_LIBRARY_PATH /usr/local/lib
+
+# Install setuptools
+RUN set -ex; \
+    curl -LO https://bootstrap.pypa.io/ez_setup.py; \
+    python ez_setup.py; \
+    rm ez_setup.py
+
+# Install pip
+RUN set -ex; \
+    curl -LO https://pypi.python.org/packages/source/p/pip/pip-7.0.1.tar.gz; \
+    tar -xzf pip-7.0.1.tar.gz; \
+    cd pip-7.0.1; \
+    python setup.py install; \
+    cd ..; \
+    rm -rf pip-7.0.1; \
+    rm pip-7.0.1.tar.gz
+
 ENV ALL_DOCKER_VERSIONS 1.6.0
 
 RUN set -ex; \

From 77409737ceed62674fb0afeb9132204c3861b012 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Tue, 2 Jun 2015 12:38:23 +0200
Subject: [PATCH 0016/1265] Support version command in zsh completion

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 31052e1e..19c06675 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -243,6 +243,10 @@ __docker-compose_subcommand () {
                 "--x-smart-recreate[Only recreate containers whose configuration or image needs to be updated. (EXPERIMENTAL)]" \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
+        (version)
+            _arguments \
+                "--short[Shows only Compose's version number.]" && ret=0
+            ;;
         (*)
             _message 'Unknown sub command'
     esac

From be92b79b4200f66e15d5913589b73de03efb6020 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Wed, 3 Jun 2015 13:25:26 -0700
Subject: [PATCH 0017/1265] Support version command in Bash completion

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index ba3dff35..ad636f5f 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -302,6 +302,15 @@ _docker-compose_up() {
 }
 
 
+_docker-compose_version() {
+	case "$cur" in
+		-*)
+			COMPREPLY=( $( compgen -W "--short" -- "$cur" ) )
+			;;
+	esac
+}
+
+
 _docker-compose() {
 	local previous_extglob_setting=$(shopt -p extglob)
 	shopt -s extglob
@@ -322,6 +331,7 @@ _docker-compose() {
 		start
 		stop
 		up
+		version
 	)
 
 	COMPREPLY=()

From cfcc12692f4aac4aa868941028a4dfe47ac88289 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 3 Jun 2015 22:59:12 +0200
Subject: [PATCH 0018/1265] Update dockerproject.com links

The dockerproject.com domain is moving to dockerproject.org
this changes the buildstatus link to point to the new
domain.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index acd3cbe7..4b18fc9d 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,6 @@ Installation and documentation
 Contributing
 ------------
 
-[![Build Status](http://jenkins.dockerproject.com/buildStatus/icon?job=Compose Master)](http://jenkins.dockerproject.com/job/Compose%20Master/)
+[![Build Status](http://jenkins.dockerproject.org/buildStatus/icon?job=Compose%20Master)](http://jenkins.dockerproject.org/job/Compose%20Master/)
 
 Want to help build Compose? Check out our [contributing documentation](https://github.com/docker/compose/blob/master/CONTRIBUTING.md).

From 2527ef8055410ee5100631da807ed650ec64c36f Mon Sep 17 00:00:00 2001
From: dano <oreilldf@gmail.com>
Date: Sat, 6 Jun 2015 15:12:13 -0400
Subject: [PATCH 0019/1265] Validate that service names passed to
 Project.containers aren't bogus.

Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
---
 compose/project.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/compose/project.py b/compose/project.py
index d3deeeaf..e6ec6d67 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -274,6 +274,9 @@ class Project(object):
             service.remove_stopped(**options)
 
     def containers(self, service_names=None, stopped=False, one_off=False):
+        if service_names:
+            # Will raise NoSuchService if one of the names is invalid
+            self.get_services(service_names)
         containers = [
             Container.from_ps(self.client, container)
             for container in self.client.containers(

From f59b43ac27d93e8222bd2cfaef6439a6b233d504 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 8 Jun 2015 10:51:46 -0400
Subject: [PATCH 0020/1265] Fix duplicate logging on up/run

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py | 1 +
 compose/service.py  | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 482794cc..7a7dff51 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -336,6 +336,7 @@ class TopLevelCommand(Command):
             container_options['ports'] = []
 
         container = service.create_container(
+            quiet=True,
             one_off=True,
             insecure_registry=insecure_registry,
             **container_options
diff --git a/compose/service.py b/compose/service.py
index 48759827..5d0d171d 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -197,6 +197,7 @@ class Service(object):
                          do_build=True,
                          previous_container=None,
                          number=None,
+                         quiet=False,
                          **override_options):
         """
         Create a container for this service. If the image doesn't exist, attempt to pull
@@ -214,7 +215,7 @@ class Service(object):
             previous_container=previous_container,
         )
 
-        if 'name' in container_options:
+        if 'name' in container_options and not quiet:
             log.info("Creating %s..." % container_options['name'])
 
         return Container.create(self.client, **container_options)
@@ -376,6 +377,7 @@ class Service(object):
             do_build=False,
             previous_container=container,
             number=container.labels.get(LABEL_CONTAINER_NUMBER),
+            quiet=True,
         )
         self.start_container(new_container)
         container.remove()

From db2d02dc0bc7f24a5f631ff39cade1ba2acab0c7 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 8 Jun 2015 10:58:11 -0400
Subject: [PATCH 0021/1265] Remove Service.start_or_create_containers()

It's only used in a single test method.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py                | 15 ---------------
 tests/integration/service_test.py |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 48759827..3d8304ee 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -392,21 +392,6 @@ class Service(object):
         container.start()
         return container
 
-    def start_or_create_containers(
-            self,
-            insecure_registry=False,
-            do_build=True):
-        containers = self.containers(stopped=True)
-
-        if not containers:
-            new_container = self.create_container(
-                insecure_registry=insecure_registry,
-                do_build=do_build,
-            )
-            return [self.start_container(new_container)]
-        else:
-            return [self.start_container_if_stopped(c) for c in containers]
-
     def config_hash(self):
         return json_hash(self.config_dict())
 
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 7e88557f..32de5fa4 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -501,10 +501,10 @@ class ServiceTest(DockerClientTestCase):
             ],
         })
 
-    def test_start_with_image_id(self):
+    def test_create_with_image_id(self):
         # Image id for the current busybox:latest
         service = self.create_service('foo', image='8c2e06607696')
-        self.assertTrue(service.start_or_create_containers())
+        service.create_container()
 
     def test_scale(self):
         service = self.create_service('web')

From b6a7db787ffa8cd5f871610e65a3adf2474badf6 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 8 Jun 2015 11:16:00 -0400
Subject: [PATCH 0022/1265] Remove logging on run --rm

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 482794cc..80dec699 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -348,7 +348,6 @@ class TopLevelCommand(Command):
             dockerpty.start(project.client, container.id, interactive=not options['-T'])
             exit_code = container.wait()
             if options['--rm']:
-                log.info("Removing %s..." % container.name)
                 project.client.remove_container(container.id)
             sys.exit(exit_code)
 

From ce880af8215a9c07f91b6d55edf0d4aadd4a610f Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 8 Jun 2015 16:56:14 -0400
Subject: [PATCH 0023/1265] Update dockerpty to 0.3.4

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index b9398848..d3909b76 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 PyYAML==3.10
 docker-py==1.2.2
-dockerpty==0.3.3
+dockerpty==0.3.4
 docopt==0.6.1
 requests==2.6.1
 six==1.7.3
diff --git a/setup.py b/setup.py
index 153275f6..9364f57f 100644
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@ install_requires = [
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.11.0, < 1.0',
     'docker-py >= 1.2.2, < 1.3',
-    'dockerpty >= 0.3.3, < 0.4',
+    'dockerpty >= 0.3.4, < 0.4',
     'six >= 1.3.0, < 2',
 ]
 

From c59c9dd95159036a82a9a6ce8d50a4cadc2f9e07 Mon Sep 17 00:00:00 2001
From: Dan O'Reilly <oreilldf@gmail.com>
Date: Mon, 8 Jun 2015 17:04:42 -0400
Subject: [PATCH 0024/1265] Add integration test for service name verification

Add a test to make sure NoSuchService is raised if
a bogus service name is given to 'docker-compose logs'.

Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
---
 tests/integration/cli_test.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index ae57e919..a5289ef8 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -7,6 +7,7 @@ from mock import patch
 
 from .testcases import DockerClientTestCase
 from compose.cli.main import TopLevelCommand
+from compose.project import NoSuchService
 
 
 class CLITestCase(DockerClientTestCase):
@@ -349,6 +350,10 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(service.containers(stopped=True)), 1)
         self.assertFalse(service.containers(stopped=True)[0].is_running)
 
+    def test_logs_invalid_service_name(self):
+        with self.assertRaises(NoSuchService):
+            self.command.dispatch(['logs', 'madeupname'], None)
+
     def test_kill(self):
         self.command.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')

From ff151c8ea04268d2060cf8d281294a0d500ecbba Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 9 Jun 2015 12:54:59 -0400
Subject: [PATCH 0025/1265] Test that data volumes now survive a crash when
 recreating

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/integration/resilience_test.py | 37 ++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 tests/integration/resilience_test.py

diff --git a/tests/integration/resilience_test.py b/tests/integration/resilience_test.py
new file mode 100644
index 00000000..8229e9d3
--- /dev/null
+++ b/tests/integration/resilience_test.py
@@ -0,0 +1,37 @@
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
+import mock
+
+from compose.project import Project
+from .testcases import DockerClientTestCase
+
+
+class ResilienceTest(DockerClientTestCase):
+    def test_recreate_fails(self):
+        db = self.create_service('db', volumes=['/var/db'], command='top')
+        project = Project('composetest', [db], self.client)
+
+        container = db.create_container()
+        db.start_container(container)
+        host_path = container.get('Volumes')['/var/db']
+
+        project.up()
+        container = db.containers()[0]
+        self.assertEqual(container.get('Volumes')['/var/db'], host_path)
+
+        with mock.patch('compose.service.Service.create_container', crash):
+            with self.assertRaises(Crash):
+                project.up()
+
+        project.up()
+        container = db.containers()[0]
+        self.assertEqual(container.get('Volumes')['/var/db'], host_path)
+
+
+class Crash(Exception):
+    pass
+
+
+def crash(*args, **kwargs):
+    raise Crash()

From e3ba302627d9f7e63f70e46aecd79e5bd97e0282 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Wed, 10 Jun 2015 14:37:12 +0100
Subject: [PATCH 0026/1265] Docs: Update boot2docker shellinit example to use
 'eval'

The boot2docker documentation has since changed the recommended way to
use shellinit - see boot2docker/boot2docker#786.

Signed-off-by: Ed Morley <emorley@mozilla.com>
---
 docs/cli.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/cli.md b/docs/cli.md
index 9da12e69..1fbd4cb2 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -157,7 +157,7 @@ By default, if there are existing containers for a service, `docker-compose up`
 Several environment variables are available for you to configure Compose's behaviour.
 
 Variables starting with `DOCKER_` are the same as those used to configure the
-Docker command-line client. If you're using boot2docker, `$(boot2docker shellinit)`
+Docker command-line client. If you're using boot2docker, `eval "$(boot2docker shellinit)"`
 will set them to their correct values.
 
 ### COMPOSE\_PROJECT\_NAME

From 4fd5d580762d5402b11a7103717b9f003b8efba2 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 2 Jun 2015 14:28:21 +0100
Subject: [PATCH 0027/1265] Test against Docker 1.7.0 RC2

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 Dockerfile                    | 6 ++++--
 tests/integration/cli_test.py | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fca5f980..1ff2d382 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,11 +48,13 @@ RUN set -ex; \
     rm -rf pip-7.0.1; \
     rm pip-7.0.1.tar.gz
 
-ENV ALL_DOCKER_VERSIONS 1.6.0
+ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0-rc2
 
 RUN set -ex; \
     curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -o /usr/local/bin/docker-1.6.0; \
-    chmod +x /usr/local/bin/docker-1.6.0
+    chmod +x /usr/local/bin/docker-1.6.0; \
+    curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0-rc2 -o /usr/local/bin/docker-1.7.0-rc2; \
+    chmod +x /usr/local/bin/docker-1.7.0-rc2
 
 # Set the default Docker to be run
 RUN ln -s /usr/local/bin/docker-1.6.0 /usr/local/bin/docker
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index ae57e919..cb7bc17f 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 import sys
 import os
+import shlex
 
 from six import StringIO
 from mock import patch
@@ -240,8 +241,8 @@ class CLITestCase(DockerClientTestCase):
         service = self.project.get_service(name)
         container = service.containers(stopped=True, one_off=True)[0]
         self.assertEqual(
-            container.human_readable_command,
-            u'/bin/echo helloworld'
+            shlex.split(container.human_readable_command),
+            [u'/bin/echo', u'helloworld'],
         )
 
     @patch('dockerpty.start')

From a5fd91c705a874e87bb1dd2ab8778514d1162c87 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Tue, 12 May 2015 13:44:52 +0200
Subject: [PATCH 0028/1265] Fixing docker-compose port with scale (#667)

Fixes #667 and Closes #735 (taking over it)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 compose/cli/main.py                           |  7 +++---
 .../docker-compose.yml                        |  6 +++++
 tests/integration/cli_test.py                 | 22 +++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 tests/fixtures/ports-composefile-scale/docker-compose.yml

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 1a2f3c72..8f55eccb 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -170,13 +170,14 @@ class TopLevelCommand(Command):
         Usage: port [options] SERVICE PRIVATE_PORT
 
         Options:
-            --protocol=proto  tcp or udp (defaults to tcp)
+            --protocol=proto  tcp or udp [default: tcp]
             --index=index     index of the container if there are multiple
-                              instances of a service (defaults to 1)
+                              instances of a service [default: 1]
         """
+        index = int(options.get('--index'))
         service = project.get_service(options['SERVICE'])
         try:
-            container = service.get_container(number=options.get('--index') or 1)
+            container = service.get_container(number=index)
         except ValueError as e:
             raise UserError(str(e))
         print(container.get_local_port(
diff --git a/tests/fixtures/ports-composefile-scale/docker-compose.yml b/tests/fixtures/ports-composefile-scale/docker-compose.yml
new file mode 100644
index 00000000..1a2bb485
--- /dev/null
+++ b/tests/fixtures/ports-composefile-scale/docker-compose.yml
@@ -0,0 +1,6 @@
+
+simple:
+  image: busybox:latest
+  command: /bin/sleep 300
+  ports:
+    - '3000'
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index cb7bc17f..2d1f1f76 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from operator import attrgetter
 import sys
 import os
 import shlex
@@ -436,6 +437,27 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(get_port(3001), "0.0.0.0:49152")
         self.assertEqual(get_port(3002), "")
 
+    def test_port_with_scale(self):
+
+        self.command.base_dir = 'tests/fixtures/ports-composefile-scale'
+        self.command.dispatch(['scale', 'simple=2'], None)
+        containers = sorted(
+            self.project.containers(service_names=['simple']),
+            key=attrgetter('name'))
+
+        @patch('sys.stdout', new_callable=StringIO)
+        def get_port(number, mock_stdout, index=None):
+            if index is None:
+                self.command.dispatch(['port', 'simple', str(number)], None)
+            else:
+                self.command.dispatch(['port', '--index=' + str(index), 'simple', str(number)], None)
+            return mock_stdout.getvalue().rstrip()
+
+        self.assertEqual(get_port(3000), containers[0].get_local_port(3000))
+        self.assertEqual(get_port(3000, index=1), containers[0].get_local_port(3000))
+        self.assertEqual(get_port(3000, index=2), containers[1].get_local_port(3000))
+        self.assertEqual(get_port(3002), "")
+
     def test_env_file_relative_to_compose_file(self):
         config_path = os.path.abspath('tests/fixtures/env-file/docker-compose.yml')
         self.command.dispatch(['-f', config_path, 'up', '-d'], None)

From 7995fc2ed21943289578e60742384a7d411fcb5e Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 11 Jun 2015 11:41:01 -0400
Subject: [PATCH 0029/1265] Reorder service.py utility methods

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py | 135 ++++++++++++++++++++++++++-------------------
 1 file changed, 78 insertions(+), 57 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index ed3a0d0e..71edd5e5 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -693,6 +693,47 @@ class Service(object):
         stream_output(output, sys.stdout)
 
 
+# Names
+
+
+def build_container_name(project, service, number, one_off=False):
+    bits = [project, service]
+    if one_off:
+        bits.append('run')
+    return '_'.join(bits + [str(number)])
+
+
+# Images
+
+
+def parse_repository_tag(s):
+    if ":" not in s:
+        return s, ""
+    repo, tag = s.rsplit(":", 1)
+    if "/" in tag:
+        return s, ""
+    return repo, tag
+
+
+# Volumes
+
+
+def merge_volume_bindings(volumes_option, previous_container):
+    """Return a list of volume bindings for a container. Container data volumes
+    are replaced by those from the previous container.
+    """
+    volume_bindings = dict(
+        build_volume_binding(parse_volume_spec(volume))
+        for volume in volumes_option or []
+        if ':' in volume)
+
+    if previous_container:
+        volume_bindings.update(
+            get_container_data_volumes(previous_container, volumes_option))
+
+    return volume_bindings
+
+
 def get_container_data_volumes(container, volumes_option):
     """Find the container data volumes that are in `volumes_option`, and return
     a mapping of volume bindings for those volumes.
@@ -721,51 +762,9 @@ def get_container_data_volumes(container, volumes_option):
     return dict(volumes)
 
 
-def merge_volume_bindings(volumes_option, previous_container):
-    """Return a list of volume bindings for a container. Container data volumes
-    are replaced by those from the previous container.
-    """
-    volume_bindings = dict(
-        build_volume_binding(parse_volume_spec(volume))
-        for volume in volumes_option or []
-        if ':' in volume)
-
-    if previous_container:
-        volume_bindings.update(
-            get_container_data_volumes(previous_container, volumes_option))
-
-    return volume_bindings
-
-
-def build_container_name(project, service, number, one_off=False):
-    bits = [project, service]
-    if one_off:
-        bits.append('run')
-    return '_'.join(bits + [str(number)])
-
-
-def build_container_labels(label_options, service_labels, number, one_off=False):
-    labels = label_options or {}
-    labels.update(label.split('=', 1) for label in service_labels)
-    labels[LABEL_CONTAINER_NUMBER] = str(number)
-    labels[LABEL_VERSION] = __version__
-    return labels
-
-
-def parse_restart_spec(restart_config):
-    if not restart_config:
-        return None
-    parts = restart_config.split(':')
-    if len(parts) > 2:
-        raise ConfigError("Restart %s has incorrect format, should be "
-                          "mode[:max_retry]" % restart_config)
-    if len(parts) == 2:
-        name, max_retry_count = parts
-    else:
-        name, = parts
-        max_retry_count = 0
-
-    return {'Name': name, 'MaximumRetryCount': int(max_retry_count)}
+def build_volume_binding(volume_spec):
+    internal = {'bind': volume_spec.internal, 'ro': volume_spec.mode == 'ro'}
+    return volume_spec.external, internal
 
 
 def parse_volume_spec(volume_config):
@@ -788,18 +787,7 @@ def parse_volume_spec(volume_config):
     return VolumeSpec(external, internal, mode)
 
 
-def parse_repository_tag(s):
-    if ":" not in s:
-        return s, ""
-    repo, tag = s.rsplit(":", 1)
-    if "/" in tag:
-        return s, ""
-    return repo, tag
-
-
-def build_volume_binding(volume_spec):
-    internal = {'bind': volume_spec.internal, 'ro': volume_spec.mode == 'ro'}
-    return volume_spec.external, internal
+# Ports
 
 
 def build_port_bindings(ports):
@@ -830,6 +818,39 @@ def split_port(port):
     return internal_port, (external_ip, external_port or None)
 
 
+# Labels
+
+
+def build_container_labels(label_options, service_labels, number, one_off=False):
+    labels = label_options or {}
+    labels.update(label.split('=', 1) for label in service_labels)
+    labels[LABEL_CONTAINER_NUMBER] = str(number)
+    labels[LABEL_VERSION] = __version__
+    return labels
+
+
+# Restart policy
+
+
+def parse_restart_spec(restart_config):
+    if not restart_config:
+        return None
+    parts = restart_config.split(':')
+    if len(parts) > 2:
+        raise ConfigError("Restart %s has incorrect format, should be "
+                          "mode[:max_retry]" % restart_config)
+    if len(parts) == 2:
+        name, max_retry_count = parts
+    else:
+        name, = parts
+        max_retry_count = 0
+
+    return {'Name': name, 'MaximumRetryCount': int(max_retry_count)}
+
+
+# Extra hosts
+
+
 def build_extra_hosts(extra_hosts_config):
     if not extra_hosts_config:
         return {}

From f31d4c8a93fbf5ada1aeb9af494fcd1fb809b89f Mon Sep 17 00:00:00 2001
From: Travis Thieman <travis.thieman@gmail.com>
Date: Thu, 11 Jun 2015 14:03:08 -0400
Subject: [PATCH 0030/1265] Correct misspelling of "Service" in an error
 message

Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
---
 compose/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/project.py b/compose/project.py
index d3deeeaf..bc093628 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -171,7 +171,7 @@ class Project(object):
                     try:
                         net = Container.from_id(self.client, net_name)
                     except APIError:
-                        raise ConfigurationError('Serivce "%s" is trying to use the network of "%s", which is not the name of a service or container.' % (service_dict['name'], net_name))
+                        raise ConfigurationError('Service "%s" is trying to use the network of "%s", which is not the name of a service or container.' % (service_dict['name'], net_name))
             else:
                 net = service_dict['net']
 

From ac222140e74979e705473bb9086a90c359a08232 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Thu, 11 Jun 2015 15:58:07 -0700
Subject: [PATCH 0031/1265] Add image affinity to test script

This will allow tests to be run on a Swarm. This is being fixed in
Swarm 0.4: https://github.com/docker/swarm/issues/743

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 script/test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/test b/script/test
index f278023a..625af09b 100755
--- a/script/test
+++ b/script/test
@@ -11,6 +11,7 @@ docker run \
   --volume="/var/run/docker.sock:/var/run/docker.sock" \
   -e DOCKER_VERSIONS \
   -e "TAG=$TAG" \
+  -e "affinity:image==$TAG" \
   --entrypoint="script/test-versions" \
   "$TAG" \
   "$@"

From 08bc4b830bb977b90bf3e866e37bbd93a9546fd6 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 12 Jun 2015 13:51:55 -0400
Subject: [PATCH 0032/1265] Fix volume binds de-duplication

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py         |  5 +--
 requirements.txt           |  2 +-
 tests/unit/service_test.py | 87 +++++++++++++++++++++++++++++++++-----
 3 files changed, 79 insertions(+), 15 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 71edd5e5..1e91a9f2 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -731,7 +731,7 @@ def merge_volume_bindings(volumes_option, previous_container):
         volume_bindings.update(
             get_container_data_volumes(previous_container, volumes_option))
 
-    return volume_bindings
+    return volume_bindings.values()
 
 
 def get_container_data_volumes(container, volumes_option):
@@ -763,8 +763,7 @@ def get_container_data_volumes(container, volumes_option):
 
 
 def build_volume_binding(volume_spec):
-    internal = {'bind': volume_spec.internal, 'ro': volume_spec.mode == 'ro'}
-    return volume_spec.external, internal
+    return volume_spec.internal, "{}:{}:{}".format(*volume_spec)
 
 
 def parse_volume_spec(volume_config):
diff --git a/requirements.txt b/requirements.txt
index d3909b76..47fa1e05 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 PyYAML==3.10
-docker-py==1.2.2
+docker-py==1.2.3-rc1
 dockerpty==0.3.4
 docopt==0.6.1
 requests==2.6.1
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index add48086..fb3a7fcb 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -331,9 +331,7 @@ class ServiceVolumesTest(unittest.TestCase):
 
     def test_build_volume_binding(self):
         binding = build_volume_binding(parse_volume_spec('/outside:/inside'))
-        self.assertEqual(
-            binding,
-            ('/outside', dict(bind='/inside', ro=False)))
+        self.assertEqual(binding, ('/inside', '/outside:/inside:rw'))
 
     def test_get_container_data_volumes(self):
         options = [
@@ -360,8 +358,8 @@ class ServiceVolumesTest(unittest.TestCase):
         }, has_been_inspected=True)
 
         expected = {
-            '/var/lib/docker/aaaaaaaa': {'bind': '/existing/volume', 'ro': False},
-            '/var/lib/docker/cccccccc': {'bind': '/mnt/image/data', 'ro': False},
+            '/existing/volume': '/var/lib/docker/aaaaaaaa:/existing/volume:rw',
+            '/mnt/image/data': '/var/lib/docker/cccccccc:/mnt/image/data:rw',
         }
 
         binds = get_container_data_volumes(container, options)
@@ -384,11 +382,78 @@ class ServiceVolumesTest(unittest.TestCase):
             'Volumes': {'/existing/volume': '/var/lib/docker/aaaaaaaa'},
         }, has_been_inspected=True)
 
-        expected = {
-            '/host/volume': {'bind': '/host/volume', 'ro': True},
-            '/host/rw/volume': {'bind': '/host/rw/volume', 'ro': False},
-            '/var/lib/docker/aaaaaaaa': {'bind': '/existing/volume', 'ro': False},
-        }
+        expected = [
+            '/host/volume:/host/volume:ro',
+            '/host/rw/volume:/host/rw/volume:rw',
+            '/var/lib/docker/aaaaaaaa:/existing/volume:rw',
+        ]
 
         binds = merge_volume_bindings(options, intermediate_container)
-        self.assertEqual(binds, expected)
+        self.assertEqual(set(binds), set(expected))
+
+    def test_mount_same_host_path_to_two_volumes(self):
+        service = Service(
+            'web',
+            image='busybox',
+            volumes=[
+                '/host/path:/data1',
+                '/host/path:/data2',
+            ],
+            client=self.mock_client,
+        )
+
+        self.mock_client.inspect_image.return_value = {
+            'Id': 'ababab',
+            'ContainerConfig': {
+                'Volumes': {}
+            }
+        }
+
+        create_options = service._get_container_create_options(
+            override_options={},
+            number=1,
+        )
+
+        self.assertEqual(
+            set(create_options['host_config']['Binds']),
+            set([
+                '/host/path:/data1:rw',
+                '/host/path:/data2:rw',
+            ]),
+        )
+
+    def test_different_host_path_in_container_json(self):
+        service = Service(
+            'web',
+            image='busybox',
+            volumes=['/host/path:/data'],
+            client=self.mock_client,
+        )
+
+        self.mock_client.inspect_image.return_value = {
+            'Id': 'ababab',
+            'ContainerConfig': {
+                'Volumes': {
+                    '/data': {},
+                }
+            }
+        }
+
+        self.mock_client.inspect_container.return_value = {
+            'Id': '123123123',
+            'Image': 'ababab',
+            'Volumes': {
+                '/data': '/mnt/sda1/host/path',
+            },
+        }
+
+        create_options = service._get_container_create_options(
+            override_options={},
+            number=1,
+            previous_container=Container(self.mock_client, {'Id': '123123123'}),
+        )
+
+        self.assertEqual(
+            create_options['host_config']['Binds'],
+            ['/mnt/sda1/host/path:/data:rw'],
+        )

From d827809ffb080cbb90e1d431299de7d388e0d326 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Sat, 30 May 2015 14:52:10 -0400
Subject: [PATCH 0033/1265] Use labels to filter containers.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 tests/integration/testcases.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 48fcf3ef..5a1c5e12 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 from __future__ import absolute_import
 from compose.service import Service
 from compose.config import make_service_dict
+from compose.const import LABEL_PROJECT
 from compose.cli.docker_client import docker_client
 from compose.progress_stream import stream_output
 from .. import unittest
@@ -12,12 +13,12 @@ class DockerClientTestCase(unittest.TestCase):
     def setUpClass(cls):
         cls.client = docker_client()
 
-    # TODO: update to use labels in #652
     def setUp(self):
-        for c in self.client.containers(all=True):
-            if c['Names'] and 'composetest' in c['Names'][0]:
-                self.client.kill(c['Id'])
-                self.client.remove_container(c['Id'])
+        for c in self.client.containers(
+                all=True,
+                filters={'label': '%s=composetest' % LABEL_PROJECT}):
+            self.client.kill(c['Id'])
+            self.client.remove_container(c['Id'])
         for i in self.client.images():
             if isinstance(i.get('Tag'), basestring) and 'composetest' in i['Tag']:
                 self.client.remove_image(i)

From 60351a8e0760112109dee92038c61e9626c17368 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Sat, 30 May 2015 16:17:21 -0400
Subject: [PATCH 0034/1265] Speed up integration test and make cleanup easier
 by using labels

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 tests/fixtures/build-ctx/Dockerfile           |  1 +
 .../dockerfile-with-volume/Dockerfile         |  3 +-
 .../dockerfile_with_entrypoint/Dockerfile     |  1 +
 tests/fixtures/simple-dockerfile/Dockerfile   |  1 +
 tests/integration/cli_test.py                 |  6 +--
 tests/integration/legacy_test.py              | 24 +++++++++--
 tests/integration/project_test.py             | 41 +++----------------
 tests/integration/service_test.py             |  9 +++-
 tests/integration/state_test.py               |  5 ++-
 tests/integration/testcases.py                |  9 ++--
 10 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/tests/fixtures/build-ctx/Dockerfile b/tests/fixtures/build-ctx/Dockerfile
index d1ceac6b..dd864b83 100644
--- a/tests/fixtures/build-ctx/Dockerfile
+++ b/tests/fixtures/build-ctx/Dockerfile
@@ -1,2 +1,3 @@
 FROM busybox:latest
+LABEL com.docker.compose.test_image=true
 CMD echo "success"
diff --git a/tests/fixtures/dockerfile-with-volume/Dockerfile b/tests/fixtures/dockerfile-with-volume/Dockerfile
index 6e5d0a55..0d376ec4 100644
--- a/tests/fixtures/dockerfile-with-volume/Dockerfile
+++ b/tests/fixtures/dockerfile-with-volume/Dockerfile
@@ -1,3 +1,4 @@
-FROM busybox
+FROM busybox:latest
+LABEL com.docker.compose.test_image=true
 VOLUME /data
 CMD top
diff --git a/tests/fixtures/dockerfile_with_entrypoint/Dockerfile b/tests/fixtures/dockerfile_with_entrypoint/Dockerfile
index 7d28d293..e7454e59 100644
--- a/tests/fixtures/dockerfile_with_entrypoint/Dockerfile
+++ b/tests/fixtures/dockerfile_with_entrypoint/Dockerfile
@@ -1,2 +1,3 @@
 FROM busybox:latest
+LABEL com.docker.compose.test_image=true
 ENTRYPOINT echo "From prebuilt entrypoint"
diff --git a/tests/fixtures/simple-dockerfile/Dockerfile b/tests/fixtures/simple-dockerfile/Dockerfile
index d1ceac6b..dd864b83 100644
--- a/tests/fixtures/simple-dockerfile/Dockerfile
+++ b/tests/fixtures/simple-dockerfile/Dockerfile
@@ -1,2 +1,3 @@
 FROM busybox:latest
+LABEL com.docker.compose.test_image=true
 CMD echo "success"
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index cb7bc17f..e9650668 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -24,6 +24,7 @@ class CLITestCase(DockerClientTestCase):
         self.project.remove_stopped()
         for container in self.project.containers(stopped=True, one_off=True):
             container.remove(force=True)
+        super(CLITestCase, self).tearDown()
 
     @property
     def project(self):
@@ -207,13 +208,10 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(old_ids, new_ids)
 
     @patch('dockerpty.start')
-    def test_run_without_command(self, __):
+    def test_run_without_command(self, _):
         self.command.base_dir = 'tests/fixtures/commands-composefile'
         self.check_build('tests/fixtures/simple-dockerfile', tag='composetest_test')
 
-        for c in self.project.containers(stopped=True, one_off=True):
-            c.remove()
-
         self.command.dispatch(['run', 'implicit'], None)
         service = self.project.get_service('implicit')
         containers = service.containers(stopped=True, one_off=True)
diff --git a/tests/integration/legacy_test.py b/tests/integration/legacy_test.py
index 6c52b68d..346c84f2 100644
--- a/tests/integration/legacy_test.py
+++ b/tests/integration/legacy_test.py
@@ -1,12 +1,15 @@
+from docker.errors import APIError
+
 from compose import legacy
 from compose.project import Project
 from .testcases import DockerClientTestCase
 
 
-class ProjectTest(DockerClientTestCase):
+class LegacyTestCase(DockerClientTestCase):
 
     def setUp(self):
-        super(ProjectTest, self).setUp()
+        super(LegacyTestCase, self).setUp()
+        self.containers = []
 
         db = self.create_service('db')
         web = self.create_service('web', links=[(db, 'db')])
@@ -23,12 +26,25 @@ class ProjectTest(DockerClientTestCase):
                 **service.options
             )
             self.client.start(container)
+            self.containers.append(container)
 
         # Create a single one-off legacy container
-        self.client.create_container(
+        self.containers.append(self.client.create_container(
             name='{}_{}_run_1'.format(self.project.name, self.services[0].name),
             **self.services[0].options
-        )
+        ))
+
+    def tearDown(self):
+        super(LegacyTestCase, self).tearDown()
+        for container in self.containers:
+            try:
+                self.client.kill(container)
+            except APIError:
+                pass
+            try:
+                self.client.remove_container(container)
+            except APIError:
+                pass
 
     def get_legacy_containers(self, **kwargs):
         return list(legacy.get_legacy_containers(
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 2976af82..5e252526 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -1,5 +1,7 @@
 from __future__ import unicode_literals
+
 from compose import config
+from compose.const import LABEL_PROJECT
 from compose.project import Project
 from compose.container import Container
 from .testcases import DockerClientTestCase
@@ -55,6 +57,7 @@ class ProjectTest(DockerClientTestCase):
             image='busybox:latest',
             volumes=['/var/data'],
             name='composetest_data_container',
+            labels={LABEL_PROJECT: 'composetest'},
         )
         project = Project.from_dicts(
             name='composetest',
@@ -69,9 +72,6 @@ class ProjectTest(DockerClientTestCase):
         db = project.get_service('db')
         self.assertEqual(db.volumes_from, [data_container])
 
-        project.kill()
-        project.remove_stopped()
-
     def test_net_from_service(self):
         project = Project.from_dicts(
             name='composetest',
@@ -95,15 +95,13 @@ class ProjectTest(DockerClientTestCase):
         net = project.get_service('net')
         self.assertEqual(web._get_net(), 'container:' + net.containers()[0].id)
 
-        project.kill()
-        project.remove_stopped()
-
     def test_net_from_container(self):
         net_container = Container.create(
             self.client,
             image='busybox:latest',
             name='composetest_net_container',
-            command='top'
+            command='top',
+            labels={LABEL_PROJECT: 'composetest'},
         )
         net_container.start()
 
@@ -123,9 +121,6 @@ class ProjectTest(DockerClientTestCase):
         web = project.get_service('web')
         self.assertEqual(web._get_net(), 'container:' + net_container.id)
 
-        project.kill()
-        project.remove_stopped()
-
     def test_start_stop_kill_remove(self):
         web = self.create_service('web')
         db = self.create_service('db')
@@ -171,9 +166,6 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(db.containers()), 1)
         self.assertEqual(len(web.containers()), 0)
 
-        project.kill()
-        project.remove_stopped()
-
     def test_project_up_starts_uncreated_services(self):
         db = self.create_service('db')
         web = self.create_service('web', links=[(db, 'db')])
@@ -205,9 +197,6 @@ class ProjectTest(DockerClientTestCase):
         self.assertNotEqual(db_container.id, old_db_id)
         self.assertEqual(db_container.get('Volumes./etc'), db_volume_path)
 
-        project.kill()
-        project.remove_stopped()
-
     def test_project_up_with_no_recreate_running(self):
         web = self.create_service('web')
         db = self.create_service('db', volumes=['/var/db'])
@@ -228,9 +217,6 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(db_container.inspect()['Volumes']['/var/db'],
                          db_volume_path)
 
-        project.kill()
-        project.remove_stopped()
-
     def test_project_up_with_no_recreate_stopped(self):
         web = self.create_service('web')
         db = self.create_service('db', volumes=['/var/db'])
@@ -258,9 +244,6 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(db_container.inspect()['Volumes']['/var/db'],
                          db_volume_path)
 
-        project.kill()
-        project.remove_stopped()
-
     def test_project_up_without_all_services(self):
         console = self.create_service('console')
         db = self.create_service('db')
@@ -273,9 +256,6 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(db.containers()), 1)
         self.assertEqual(len(console.containers()), 1)
 
-        project.kill()
-        project.remove_stopped()
-
     def test_project_up_starts_links(self):
         console = self.create_service('console')
         db = self.create_service('db', volumes=['/var/db'])
@@ -291,9 +271,6 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(db.containers()), 1)
         self.assertEqual(len(console.containers()), 0)
 
-        project.kill()
-        project.remove_stopped()
-
     def test_project_up_starts_depends(self):
         project = Project.from_dicts(
             name='composetest',
@@ -329,9 +306,6 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(project.get_service('data').containers()), 1)
         self.assertEqual(len(project.get_service('console').containers()), 0)
 
-        project.kill()
-        project.remove_stopped()
-
     def test_project_up_with_no_deps(self):
         project = Project.from_dicts(
             name='composetest',
@@ -368,9 +342,6 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(project.get_service('data').containers(stopped=True)), 1)
         self.assertEqual(len(project.get_service('console').containers()), 0)
 
-        project.kill()
-        project.remove_stopped()
-
     def test_unscale_after_restart(self):
         web = self.create_service('web')
         project = Project('composetest', [web], self.client)
@@ -395,5 +366,3 @@ class ProjectTest(DockerClientTestCase):
         project.up()
         service = project.get_service('web')
         self.assertEqual(len(service.containers()), 1)
-        project.kill()
-        project.remove_stopped()
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 32de5fa4..5a725f07 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -235,7 +235,12 @@ class ServiceTest(DockerClientTestCase):
     def test_create_container_with_volumes_from(self):
         volume_service = self.create_service('data')
         volume_container_1 = volume_service.create_container()
-        volume_container_2 = Container.create(self.client, image='busybox:latest', command=["top"])
+        volume_container_2 = Container.create(
+            self.client,
+            image='busybox:latest',
+            command=["top"],
+            labels={LABEL_PROJECT: 'composetest'},
+        )
         host_service = self.create_service('host', volumes_from=[volume_service, volume_container_2])
         host_container = host_service.create_container()
         host_service.start_container(host_container)
@@ -408,7 +413,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(len(self.client.images(name='composetest_test')), 1)
 
     def test_start_container_uses_tagged_image_if_it_exists(self):
-        self.client.build('tests/fixtures/simple-dockerfile', tag='composetest_test')
+        self.check_build('tests/fixtures/simple-dockerfile', tag='composetest_test')
         service = Service(
             name='test',
             client=self.client,
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index 7a7d2b58..b99a299a 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -216,18 +216,19 @@ class ServiceStateTest(DockerClientTestCase):
 
     def test_trigger_recreate_with_build(self):
         context = tempfile.mkdtemp()
+        base_image = "FROM busybox\nLABEL com.docker.compose.test_image=true\n"
 
         try:
             dockerfile = os.path.join(context, 'Dockerfile')
 
             with open(dockerfile, 'w') as f:
-                f.write('FROM busybox\n')
+                f.write(base_image)
 
             web = self.create_service('web', build=context)
             container = web.create_container()
 
             with open(dockerfile, 'w') as f:
-                f.write('FROM busybox\nCMD echo hello world\n')
+                f.write(base_image + 'CMD echo hello world\n')
             web.build()
 
             web = self.create_service('web', build=context)
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 5a1c5e12..98c5876e 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -13,15 +13,15 @@ class DockerClientTestCase(unittest.TestCase):
     def setUpClass(cls):
         cls.client = docker_client()
 
-    def setUp(self):
+    def tearDown(self):
         for c in self.client.containers(
                 all=True,
                 filters={'label': '%s=composetest' % LABEL_PROJECT}):
             self.client.kill(c['Id'])
             self.client.remove_container(c['Id'])
-        for i in self.client.images():
-            if isinstance(i.get('Tag'), basestring) and 'composetest' in i['Tag']:
-                self.client.remove_image(i)
+        for i in self.client.images(
+                filters={'label': 'com.docker.compose.test_image'}):
+            self.client.remove_image(i)
 
     def create_service(self, name, **kwargs):
         if 'image' not in kwargs and 'build' not in kwargs:
@@ -37,5 +37,6 @@ class DockerClientTestCase(unittest.TestCase):
         )
 
     def check_build(self, *args, **kwargs):
+        kwargs.setdefault('rm', True)
         build_output = self.client.build(*args, **kwargs)
         stream_output(build_output, open('/dev/null', 'w'))

From c24d5380e69a2b27a4c7b0c34ff05aac5794de26 Mon Sep 17 00:00:00 2001
From: Travis Thieman <travis.thieman@gmail.com>
Date: Thu, 28 May 2015 09:28:02 -0400
Subject: [PATCH 0035/1265] Extend up -t to pass timeout to stop running
 containers

Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
---
 compose/cli/main.py           | 11 ++++++-----
 compose/project.py            |  4 +++-
 compose/service.py            | 10 +++++++---
 tests/integration/cli_test.py | 13 +++++++++++++
 tests/unit/service_test.py    |  9 +++++++++
 5 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 1a2f3c72..a9d04472 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -439,9 +439,9 @@ class TopLevelCommand(Command):
                                    image needs to be updated. (EXPERIMENTAL)
             --no-recreate          If containers already exist, don't recreate them.
             --no-build             Don't build an image, even if it's missing
-            -t, --timeout TIMEOUT  When attached, use this timeout in seconds
-                                   for the shutdown. (default: 10)
-
+            -t, --timeout TIMEOUT  Use this timeout in seconds for container shutdown
+                                   when attached or when containers are already
+                                   running. (default: 10)
         """
         insecure_registry = options['--allow-insecure-ssl']
         detached = options['-d']
@@ -452,6 +452,7 @@ class TopLevelCommand(Command):
         allow_recreate = not options['--no-recreate']
         smart_recreate = options['--x-smart-recreate']
         service_names = options['SERVICE']
+        timeout = int(options['--timeout']) if options['--timeout'] is not None else None
 
         project.up(
             service_names=service_names,
@@ -460,6 +461,7 @@ class TopLevelCommand(Command):
             smart_recreate=smart_recreate,
             insecure_registry=insecure_registry,
             do_build=not options['--no-build'],
+            timeout=timeout
         )
 
         to_attach = [c for s in project.get_services(service_names) for c in s.containers()]
@@ -477,8 +479,7 @@ class TopLevelCommand(Command):
                 signal.signal(signal.SIGINT, handler)
 
                 print("Gracefully stopping... (press Ctrl+C again to force)")
-                timeout = options.get('--timeout')
-                params = {} if timeout is None else {'timeout': int(timeout)}
+                params = {} if timeout is None else {'timeout': timeout}
                 project.stop(service_names=service_names, **params)
 
     def migrate_to_labels(self, project, _options):
diff --git a/compose/project.py b/compose/project.py
index bc093628..ddf681d5 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -211,7 +211,8 @@ class Project(object):
            allow_recreate=True,
            smart_recreate=False,
            insecure_registry=False,
-           do_build=True):
+           do_build=True,
+           timeout=None):
 
         services = self.get_services(service_names, include_deps=start_deps)
 
@@ -228,6 +229,7 @@ class Project(object):
                 plans[service.name],
                 insecure_registry=insecure_registry,
                 do_build=do_build,
+                timeout=timeout
             )
         ]
 
diff --git a/compose/service.py b/compose/service.py
index 1e91a9f2..7a0264c2 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -311,7 +311,8 @@ class Service(object):
     def execute_convergence_plan(self,
                                  plan,
                                  insecure_registry=False,
-                                 do_build=True):
+                                 do_build=True,
+                                 timeout=None):
         (action, containers) = plan
 
         if action == 'create':
@@ -328,6 +329,7 @@ class Service(object):
                 self.recreate_container(
                     c,
                     insecure_registry=insecure_registry,
+                    timeout=timeout
                 )
                 for c in containers
             ]
@@ -349,7 +351,8 @@ class Service(object):
 
     def recreate_container(self,
                            container,
-                           insecure_registry=False):
+                           insecure_registry=False,
+                           timeout=None):
         """Recreate a container.
 
         The original container is renamed to a temporary name so that data
@@ -358,7 +361,8 @@ class Service(object):
         """
         log.info("Recreating %s..." % container.name)
         try:
-            container.stop()
+            stop_params = {} if timeout is None else {'timeout': timeout}
+            container.stop(**stop_params)
         except APIError as e:
             if (e.response.status_code == 500
                     and e.explanation
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index e9650668..f9b251e1 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -162,6 +162,19 @@ class CLITestCase(DockerClientTestCase):
 
         self.assertEqual(old_ids, new_ids)
 
+    def test_up_with_timeout(self):
+        self.command.dispatch(['up', '-d', '-t', '1'], None)
+        service = self.project.get_service('simple')
+        another = self.project.get_service('another')
+        self.assertEqual(len(service.containers()), 1)
+        self.assertEqual(len(another.containers()), 1)
+
+        # Ensure containers don't have stdin and stdout connected in -d mode
+        config = service.containers()[0].inspect()['Config']
+        self.assertFalse(config['AttachStderr'])
+        self.assertFalse(config['AttachStdout'])
+        self.assertFalse(config['AttachStdin'])
+
     @patch('dockerpty.start')
     def test_run_service_without_links(self, mock_stdout):
         self.command.base_dir = 'tests/fixtures/links-composefile'
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index fb3a7fcb..595b9d37 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -254,6 +254,15 @@ class ServiceTest(unittest.TestCase):
         new_container.start.assert_called_once_with()
         mock_container.remove.assert_called_once_with()
 
+    @mock.patch('compose.service.Container', autospec=True)
+    def test_recreate_container_with_timeout(self, _):
+        mock_container = mock.create_autospec(Container)
+        self.mock_client.inspect_image.return_value = {'Id': 'abc123'}
+        service = Service('foo', client=self.mock_client, image='someimage')
+        service.recreate_container(mock_container, timeout=1)
+
+        mock_container.stop.assert_called_once_with(timeout=1)
+
     def test_parse_repository_tag(self):
         self.assertEqual(parse_repository_tag("root"), ("root", ""))
         self.assertEqual(parse_repository_tag("root:tag"), ("root", "tag"))

From 06db577105d54394842b4634038a54e55e83252f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Sun, 14 Jun 2015 17:11:29 -0400
Subject: [PATCH 0036/1265] Move converge() to a test module, and use a short
 timeout for tests.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/cli/main.py               | 19 ++++++++---------
 compose/const.py                  |  1 +
 compose/project.py                |  4 ++--
 compose/service.py                | 28 ++++---------------------
 tests/integration/service_test.py | 33 +++++++++++++++++++++---------
 tests/integration/state_test.py   | 34 ++++++++++++++++++++++++++-----
 tests/unit/service_test.py        |  2 +-
 7 files changed, 69 insertions(+), 52 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index a9d04472..8d21beaf 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -10,7 +10,9 @@ import sys
 from docker.errors import APIError
 import dockerpty
 
-from .. import __version__, legacy
+from .. import __version__
+from .. import legacy
+from ..const import DEFAULT_TIMEOUT
 from ..project import NoSuchService, ConfigurationError
 from ..service import BuildError, NeedsBuildError
 from ..config import parse_environment
@@ -394,9 +396,8 @@ class TopLevelCommand(Command):
           -t, --timeout TIMEOUT      Specify a shutdown timeout in seconds.
                                      (default: 10)
         """
-        timeout = options.get('--timeout')
-        params = {} if timeout is None else {'timeout': int(timeout)}
-        project.stop(service_names=options['SERVICE'], **params)
+        timeout = float(options.get('--timeout') or DEFAULT_TIMEOUT)
+        project.stop(service_names=options['SERVICE'], timeout=timeout)
 
     def restart(self, project, options):
         """
@@ -408,9 +409,8 @@ class TopLevelCommand(Command):
           -t, --timeout TIMEOUT      Specify a shutdown timeout in seconds.
                                      (default: 10)
         """
-        timeout = options.get('--timeout')
-        params = {} if timeout is None else {'timeout': int(timeout)}
-        project.restart(service_names=options['SERVICE'], **params)
+        timeout = float(options.get('--timeout') or DEFAULT_TIMEOUT)
+        project.restart(service_names=options['SERVICE'], timeout=timeout)
 
     def up(self, project, options):
         """
@@ -452,7 +452,7 @@ class TopLevelCommand(Command):
         allow_recreate = not options['--no-recreate']
         smart_recreate = options['--x-smart-recreate']
         service_names = options['SERVICE']
-        timeout = int(options['--timeout']) if options['--timeout'] is not None else None
+        timeout = float(options.get('--timeout') or DEFAULT_TIMEOUT)
 
         project.up(
             service_names=service_names,
@@ -479,8 +479,7 @@ class TopLevelCommand(Command):
                 signal.signal(signal.SIGINT, handler)
 
                 print("Gracefully stopping... (press Ctrl+C again to force)")
-                params = {} if timeout is None else {'timeout': timeout}
-                project.stop(service_names=service_names, **params)
+                project.stop(service_names=service_names, timeout=timeout)
 
     def migrate_to_labels(self, project, _options):
         """
diff --git a/compose/const.py b/compose/const.py
index f76fb572..709c3a10 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -1,4 +1,5 @@
 
+DEFAULT_TIMEOUT = 10
 LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
 LABEL_ONE_OFF = 'com.docker.compose.oneoff'
 LABEL_PROJECT = 'com.docker.compose.project'
diff --git a/compose/project.py b/compose/project.py
index ddf681d5..b4ed12ea 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -6,7 +6,7 @@ from functools import reduce
 from docker.errors import APIError
 
 from .config import get_service_name_from_net, ConfigurationError
-from .const import LABEL_PROJECT, LABEL_SERVICE, LABEL_ONE_OFF
+from .const import LABEL_PROJECT, LABEL_SERVICE, LABEL_ONE_OFF, DEFAULT_TIMEOUT
 from .service import Service
 from .container import Container
 from .legacy import check_for_legacy_containers
@@ -212,7 +212,7 @@ class Project(object):
            smart_recreate=False,
            insecure_registry=False,
            do_build=True,
-           timeout=None):
+           timeout=DEFAULT_TIMEOUT):
 
         services = self.get_services(service_names, include_deps=start_deps)
 
diff --git a/compose/service.py b/compose/service.py
index 7a0264c2..53073ffb 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -13,6 +13,7 @@ from docker.utils import create_host_config, LogConfig
 from . import __version__
 from .config import DOCKER_CONFIG_KEYS, merge_environment
 from .const import (
+    DEFAULT_TIMEOUT,
     LABEL_CONTAINER_NUMBER,
     LABEL_ONE_OFF,
     LABEL_PROJECT,
@@ -251,26 +252,6 @@ class Service(object):
         else:
             return self.options['image']
 
-    def converge(self,
-                 allow_recreate=True,
-                 smart_recreate=False,
-                 insecure_registry=False,
-                 do_build=True):
-        """
-        If a container for this service doesn't exist, create and start one. If there are
-        any, stop them, create+start new ones, and remove the old containers.
-        """
-        plan = self.convergence_plan(
-            allow_recreate=allow_recreate,
-            smart_recreate=smart_recreate,
-        )
-
-        return self.execute_convergence_plan(
-            plan,
-            insecure_registry=insecure_registry,
-            do_build=do_build,
-        )
-
     def convergence_plan(self,
                          allow_recreate=True,
                          smart_recreate=False):
@@ -312,7 +293,7 @@ class Service(object):
                                  plan,
                                  insecure_registry=False,
                                  do_build=True,
-                                 timeout=None):
+                                 timeout=DEFAULT_TIMEOUT):
         (action, containers) = plan
 
         if action == 'create':
@@ -352,7 +333,7 @@ class Service(object):
     def recreate_container(self,
                            container,
                            insecure_registry=False,
-                           timeout=None):
+                           timeout=DEFAULT_TIMEOUT):
         """Recreate a container.
 
         The original container is renamed to a temporary name so that data
@@ -361,8 +342,7 @@ class Service(object):
         """
         log.info("Recreating %s..." % container.name)
         try:
-            stop_params = {} if timeout is None else {'timeout': timeout}
-            container.stop(**stop_params)
+            container.stop(timeout=timeout)
         except APIError as e:
             if (e.response.status_code == 500
                     and e.explanation
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 5a725f07..3b3ac22f 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -2,8 +2,9 @@ from __future__ import unicode_literals
 from __future__ import absolute_import
 import os
 from os import path
-import mock
 
+from docker.errors import APIError
+import mock
 import tempfile
 import shutil
 import six
@@ -18,11 +19,11 @@ from compose.const import (
 )
 from compose.service import (
     ConfigError,
+    ConvergencePlan,
     Service,
     build_extra_hosts,
 )
 from compose.container import Container
-from docker.errors import APIError
 from .testcases import DockerClientTestCase
 
 
@@ -249,7 +250,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertIn(volume_container_2.id,
                       host_container.get('HostConfig.VolumesFrom'))
 
-    def test_converge(self):
+    def test_execute_convergence_plan_recreate(self):
         service = self.create_service(
             'db',
             environment={'FOO': '1'},
@@ -269,7 +270,8 @@ class ServiceTest(DockerClientTestCase):
         num_containers_before = len(self.client.containers(all=True))
 
         service.options['environment']['FOO'] = '2'
-        new_container = service.converge()[0]
+        new_container, = service.execute_convergence_plan(
+            ConvergencePlan('recreate', [old_container]))
 
         self.assertEqual(new_container.get('Config.Entrypoint'), ['top'])
         self.assertEqual(new_container.get('Config.Cmd'), ['-d', '1'])
@@ -286,7 +288,7 @@ class ServiceTest(DockerClientTestCase):
                           self.client.inspect_container,
                           old_container.id)
 
-    def test_converge_when_containers_are_stopped(self):
+    def test_execute_convergence_plan_when_containers_are_stopped(self):
         service = self.create_service(
             'db',
             environment={'FOO': '1'},
@@ -295,11 +297,21 @@ class ServiceTest(DockerClientTestCase):
             command=['-d', '1']
         )
         service.create_container()
-        self.assertEqual(len(service.containers(stopped=True)), 1)
-        service.converge()
-        self.assertEqual(len(service.containers(stopped=True)), 1)
 
-    def test_converge_with_image_declared_volume(self):
+        containers = service.containers(stopped=True)
+        self.assertEqual(len(containers), 1)
+        container, = containers
+        self.assertFalse(container.is_running)
+
+        service.execute_convergence_plan(ConvergencePlan('start', [container]))
+
+        containers = service.containers()
+        self.assertEqual(len(containers), 1)
+        container.inspect()
+        self.assertEqual(container, containers[0])
+        self.assertTrue(container.is_running)
+
+    def test_execute_convergence_plan_with_image_declared_volume(self):
         service = Service(
             project='composetest',
             name='db',
@@ -311,7 +323,8 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(old_container.get('Volumes').keys(), ['/data'])
         volume_path = old_container.get('Volumes')['/data']
 
-        new_container = service.converge()[0]
+        new_container, = service.execute_convergence_plan(
+            ConvergencePlan('recreate', [old_container]))
         self.assertEqual(new_container.get('Volumes').keys(), ['/data'])
         self.assertEqual(new_container.get('Volumes')['/data'], volume_path)
 
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index b99a299a..cd59d13c 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -12,8 +12,8 @@ from .testcases import DockerClientTestCase
 
 class ProjectTestCase(DockerClientTestCase):
     def run_up(self, cfg, **kwargs):
-        if 'smart_recreate' not in kwargs:
-            kwargs['smart_recreate'] = True
+        kwargs.setdefault('smart_recreate', True)
+        kwargs.setdefault('timeout', 0.1)
 
         project = self.make_project(cfg)
         project.up(**kwargs)
@@ -153,7 +153,31 @@ class ProjectWithDependenciesTest(ProjectTestCase):
         self.assertEqual(new_containers - old_containers, set())
 
 
+def converge(service,
+             allow_recreate=True,
+             smart_recreate=False,
+             insecure_registry=False,
+             do_build=True):
+    """
+    If a container for this service doesn't exist, create and start one. If there are
+    any, stop them, create+start new ones, and remove the old containers.
+    """
+    plan = service.convergence_plan(
+        allow_recreate=allow_recreate,
+        smart_recreate=smart_recreate,
+    )
+
+    return service.execute_convergence_plan(
+        plan,
+        insecure_registry=insecure_registry,
+        do_build=do_build,
+        timeout=0.1,
+    )
+
+
 class ServiceStateTest(DockerClientTestCase):
+    """Test cases for Service.convergence_plan."""
+
     def test_trigger_create(self):
         web = self.create_service('web')
         self.assertEqual(('create', []), web.convergence_plan(smart_recreate=True))
@@ -250,15 +274,15 @@ class ConfigHashTest(DockerClientTestCase):
 
     def test_config_hash_with_custom_labels(self):
         web = self.create_service('web', labels={'foo': '1'})
-        container = web.converge()[0]
+        container = converge(web)[0]
         self.assertIn(LABEL_CONFIG_HASH, container.labels)
         self.assertIn('foo', container.labels)
 
     def test_config_hash_sticks_around(self):
         web = self.create_service('web', command=["top"])
-        container = web.converge()[0]
+        container = converge(web)[0]
         self.assertIn(LABEL_CONFIG_HASH, container.labels)
 
         web = self.create_service('web', command=["top", "-d", "1"])
-        container = web.converge()[0]
+        container = converge(web)[0]
         self.assertIn(LABEL_CONFIG_HASH, container.labels)
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 595b9d37..82ea0410 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -246,7 +246,7 @@ class ServiceTest(unittest.TestCase):
         service.image = lambda: {'Id': 'abc123'}
         new_container = service.recreate_container(mock_container)
 
-        mock_container.stop.assert_called_once_with()
+        mock_container.stop.assert_called_once_with(timeout=10)
         self.mock_client.rename.assert_called_once_with(
             mock_container.id,
             '%s_%s' % (mock_container.short_id, mock_container.name))

From e40fc0256111aae16013baad9aed82a07e9dd302 Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Sun, 7 Jun 2015 13:59:58 -0700
Subject: [PATCH 0037/1265] Testing with documentation tooling Updating with
 changes Updating for Hugo Adding a README' moving index.md
 compose-overview.md in links changing overview Updating image to pull

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/Dockerfile                        | 31 +++++++----
 docs/Makefile                          | 55 ++++++++++++++++++
 docs/README.md                         | 77 ++++++++++++++++++++++++++
 docs/cli.md                            | 17 ++++--
 docs/completion.md                     | 18 ++++--
 docs/{index.md => compose-overview.md} | 16 ++++--
 docs/django.md                         | 18 ++++--
 docs/env.md                            | 18 ++++--
 docs/extends.md                        | 17 ++++--
 docs/install.md                        | 21 ++++---
 docs/mkdocs.yml                        | 12 ----
 docs/production.md                     | 13 ++++-
 docs/rails.md                          | 19 ++++---
 docs/wordpress.md                      | 21 ++++---
 docs/yml.md                            | 19 ++++---
 15 files changed, 283 insertions(+), 89 deletions(-)
 create mode 100644 docs/Makefile
 create mode 100644 docs/README.md
 rename docs/{index.md => compose-overview.md} (96%)
 delete mode 100644 docs/mkdocs.yml

diff --git a/docs/Dockerfile b/docs/Dockerfile
index 59ef66cd..55e7ce70 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -1,15 +1,24 @@
-FROM docs/base:latest
-MAINTAINER Sven Dowideit <SvenDowideit@docker.com> (@SvenDowideit)
+FROM docs/base:hugo
+MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)
 
-# to get the git info for this repo
+# To get the git info for this repo
 COPY . /src
 
-# Reset the /docs dir so we can replace the theme meta with the new repo's git info
-RUN git reset --hard
+COPY . /docs/content/compose/
 
-RUN grep "__version" /src/compose/__init__.py | sed "s/.*'\(.*\)'/\1/" > /docs/VERSION
-COPY docs/* /docs/sources/compose/
-COPY docs/mkdocs.yml /docs/mkdocs-compose.yml
-
-# Then build everything together, ready for mkdocs
-RUN /docs/build.sh
+# Sed to process GitHub Markdown
+# 1-2 Remove comment code from metadata block
+# 3 Remove .md extension from link text
+# 4 Change ](/ to ](/project/ in links
+# 5 Change ](word) to ](/project/word)
+# 6 Change ](../../ to ](/project/
+# 7 Change ](../ to ](/project/word)
+# 
+# 
+RUN find /docs/content/compose -type f -name "*.md" -exec sed -i.old \
+    -e '/^<!.*metadata]>/g' \
+    -e '/^<!.*end-metadata.*>/g' \
+    -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g' \
+    -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/compose\//g' \
+    -e 's/\(\][(]\)\([A-z]*[)]\)/\]\(\/compose\/\2/g' \
+    -e 's/\(\][(]\)\(\.\.\/\)/\1\/compose\//g' {} \;
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 00000000..021e8f6e
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,55 @@
+.PHONY: all binary build cross default docs docs-build docs-shell shell test test-unit test-integration test-integration-cli test-docker-py validate
+
+# env vars passed through directly to Docker's build scripts
+# to allow things like `make DOCKER_CLIENTONLY=1 binary` easily
+# `docs/sources/contributing/devenvironment.md ` and `project/PACKAGERS.md` have some limited documentation of some of these
+DOCKER_ENVS := \
+	-e BUILDFLAGS \
+	-e DOCKER_CLIENTONLY \
+	-e DOCKER_EXECDRIVER \
+	-e DOCKER_GRAPHDRIVER \
+	-e TESTDIRS \
+	-e TESTFLAGS \
+	-e TIMEOUT
+# note: we _cannot_ add "-e DOCKER_BUILDTAGS" here because even if it's unset in the shell, that would shadow the "ENV DOCKER_BUILDTAGS" set in our Dockerfile, which is very important for our official builds
+
+# to allow `make DOCSDIR=docs docs-shell` (to create a bind mount in docs)
+DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR)/$(DOCSDIR):/$(DOCSDIR))
+
+# to allow `make DOCSPORT=9000 docs`
+DOCSPORT := 8000
+
+# Get the IP ADDRESS
+DOCKER_IP=$(shell python -c "import urlparse ; print urlparse.urlparse('$(DOCKER_HOST)').hostname or ''")
+HUGO_BASE_URL=$(shell test -z "$(DOCKER_IP)" && echo localhost || echo "$(DOCKER_IP)")
+HUGO_BIND_IP=0.0.0.0
+
+GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
+DOCKER_IMAGE := docker$(if $(GIT_BRANCH),:$(GIT_BRANCH))
+DOCKER_DOCS_IMAGE := docs-base$(if $(GIT_BRANCH),:$(GIT_BRANCH))
+
+
+DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e AWS_S3_BUCKET -e NOCACHE
+
+# for some docs workarounds (see below in "docs-build" target)
+GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
+
+default: docs
+
+docs: docs-build
+	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)
+
+docs-draft: docs-build
+	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --buildDrafts="true" --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)
+
+
+docs-shell: docs-build
+	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash
+
+
+docs-build:
+#	( git remote | grep -v upstream ) || git diff --name-status upstream/release..upstream/docs ./ > ./changed-files
+#	echo "$(GIT_BRANCH)" > GIT_BRANCH
+#	echo "$(AWS_S3_BUCKET)" > AWS_S3_BUCKET
+#	echo "$(GITCOMMIT)" > GITCOMMIT
+	docker build -t "$(DOCKER_DOCS_IMAGE)" .
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 00000000..00736e47
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,77 @@
+# Contributing to the Docker Compose documentation
+
+The documentation in this directory is part of the [https://docs.docker.com](https://docs.docker.com) website.  Docker uses [the Hugo static generator](http://gohugo.io/overview/introduction/) to convert project Markdown files to a static HTML site. 
+
+You don't need to be a Hugo expert to contribute to the compose documentation. If you are familiar with Markdown, you can modify the content in the `docs` files.  
+
+If you want to add a new file or change the location of the document in the menu, you do need to know a little more.
+
+## Documentation contributing workflow
+
+1. Edit a Markdown file in the tree.
+
+2. Save your changes.
+
+3. Make sure you in your `docs` subdirectory.
+
+4. Build the documentation.
+
+        $ make docs
+         ---> ffcf3f6c4e97
+        Removing intermediate container a676414185e8
+        Successfully built ffcf3f6c4e97
+        docker run --rm -it  -e AWS_S3_BUCKET -e NOCACHE -p 8000:8000 -e DOCKERHOST "docs-base:test-tooling" hugo server --port=8000 --baseUrl=192.168.59.103 --bind=0.0.0.0
+        ERROR: 2015/06/13 MenuEntry's .Url is deprecated and will be removed in Hugo 0.15. Use .URL instead.
+        0 of 4 drafts rendered
+        0 future content 
+        12 pages created
+        0 paginator pages created
+        0 tags created
+        0 categories created
+        in 55 ms
+        Serving pages from /docs/public
+        Web Server is available at http://0.0.0.0:8000/
+        Press Ctrl+C to stop
+
+5. Open the available server in your browser.
+
+    The documentation server has the complete menu but only the Docker Compose
+    documentation resolves.  You can't access the other project docs from this
+    localized build.
+
+## Tips on Hugo metadata and menu positioning
+
+The top of each Docker Compose documentation file contains TOML metadata. The metadata is commented out to prevent it from appears in GitHub.
+
+    <!--[metadata]>
+    +++
+    title = "Extending services in Compose"
+    description = "How to use Docker Compose's extends keyword to share configuration between files and projects"
+    keywords = ["fig, composition, compose, docker, orchestration, documentation, docs"]
+    [menu.main]
+    parent="smn_workw_compose"
+    weight=2
+    +++
+    <![end-metadata]-->  
+
+The metadata alone has this structure:
+
+    +++
+    title = "Extending services in Compose"
+    description = "How to use Docker Compose's extends keyword to share configuration between files and projects"
+    keywords = ["fig, composition, compose, docker, orchestration, documentation, docs"]
+    [menu.main]
+    parent="smn_workw_compose"
+    weight=2
+    +++
+    
+The `[menu.main]` section refers to navigation defined [in the main Docker menu](https://github.com/docker/docs-base/blob/hugo/config.toml). This metadata says *add a menu item called* Extending services in Compose *to the menu with the* `smn_workdw_compose` *identifier*.  If you locate the menu in the configuration, you'll find *Create multi-container applications* is the menu title.
+
+You can move an article in the tree by specifying a new parent. You can shift the location of the item by changing its weight.  Higher numbers are heavier and shift the item to the bottom of menu. Low or no numbers shift it up.
+
+
+## Other key documentation repositories
+
+The `docker/docs-base` repository contains [the Hugo theme and menu configuration](https://github.com/docker/docs-base). If you open the `Dockerfile` you'll see the `make docs` relies on this as a base image for building the Compose documentation.
+    
+The `docker/docs.docker.com` repository contains [build system for building the Docker documentation site](https://github.com/docker/docs.docker.com). Fork this repository to build the entire documentation site.
diff --git a/docs/cli.md b/docs/cli.md
index 1fbd4cb2..a2167d9c 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -1,9 +1,16 @@
-page_title: Compose CLI reference
-page_description: Compose CLI reference
-page_keywords: fig, composition, compose, docker, orchestration, cli, reference
+<!--[metadata]>
++++
+title = "Compose CLI reference"
+description = "Compose CLI reference"
+keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
+[menu.main]
+identifier = "smn_install_compose"
+parent = "smn_compose_ref"	
++++
+<![end-metadata]-->
 
 
-# CLI reference
+# Compose CLI reference
 
 Most Docker Compose commands are run against one or more services. If
 the service is not specified, the command will apply to all services.
@@ -185,7 +192,7 @@ Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TL
 
 ## Compose documentation
 
-- [User guide](index.md)
+- [User guide](compose-overview.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/completion.md b/docs/completion.md
index 5168971f..7fb696d8 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -1,7 +1,13 @@
----
-layout: default
-title: Command Completion
----
+<!--[metadata]>
++++
+title = "Command Completion"
+description = "Compose CLI reference"
+keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
+[menu.main]
+parent="smn_workw_compose"
+weight=3
++++
+<![end-metadata]-->
 
 # Command Completion
 
@@ -53,11 +59,11 @@ Enjoy working with Compose faster and with less typos!
 
 ## Compose documentation
 
-- [User guide](index.md)
+- [User guide](compose-overview.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
 - [Command line reference](cli.md)
 - [Yaml file reference](yml.md)
-- [Compose environment variables](env.md)
+- [Compose environment variables](env.md)
\ No newline at end of file
diff --git a/docs/index.md b/docs/compose-overview.md
similarity index 96%
rename from docs/index.md
rename to docs/compose-overview.md
index 981a0270..33629957 100644
--- a/docs/index.md
+++ b/docs/compose-overview.md
@@ -1,11 +1,15 @@
-page_title: Compose: Multi-container orchestration for Docker
-page_description: Introduction and Overview of Compose
-page_keywords: documentation, docs,  docker, compose, orchestration, containers
+<!--[metadata]>
++++
+title = "Overview of Docker Compose"
+description = "Introduction and Overview of Compose"
+keywords = ["documentation, docs,  docker, compose, orchestration,  containers"]
+[menu.main]
+parent="smn_workw_compose"
++++
+<![end-metadata]-->
 
 
-# Docker Compose
-
-## Overview
+# Overview of Docker Compose
 
 Compose is a tool for defining and running multi-container applications with
 Docker. With Compose, you define a multi-container application in a single
diff --git a/docs/django.md b/docs/django.md
index 4cbebe04..c44329e1 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -1,10 +1,16 @@
-page_title: Quickstart Guide: Compose and Django
-page_description: Getting started with Docker Compose and Django
-page_keywords: documentation, docs,  docker, compose, orchestration, containers,
-django
+<!--[metadata]>
++++
+title = "Quickstart Guide: Compose and Django"
+description = "Getting started with Docker Compose and Django"
+keywords = ["documentation, docs,  docker, compose, orchestration, containers"]
+[menu.main]
+parent="smn_workw_compose"
+weight=4
++++
+<![end-metadata]-->
 
 
-## Getting started with Compose and Django
+## Quickstart Guide: Compose and Django
 
 
 This Quick-start Guide will demonstrate how to use Compose to set up and run a
@@ -119,7 +125,7 @@ example, run `docker-compose up` and in another terminal run:
 
 ## More Compose documentation
 
-- [User guide](index.md)
+- [User guide](compose-overview.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/env.md b/docs/env.md
index a4b543ae..73496f32 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -1,9 +1,15 @@
----
-layout: default
-title: Compose environment variables reference
----
+<!--[metadata]>
++++
+title = "Compose environment variables reference"
+description = "Compose CLI reference"
+keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
+[menu.main]
+parent="smn_compose_ref"
+weight=3
++++
+<![end-metadata]-->
 
-Environment variables reference
+# Compose environment variables reference
 ===============================
 
 **Note:** Environment variables are no longer the recommended method for connecting to linked services. Instead, you should use the link name (by default, the name of the linked service) as the hostname to connect to. See the [docker-compose.yml documentation](yml.md#links) for details.
@@ -34,7 +40,7 @@ Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
 
 ## Compose documentation
 
-- [User guide](index.md)
+- [User guide](compose-overview.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/extends.md b/docs/extends.md
index fd372ce2..8527c81b 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -1,6 +1,13 @@
-page_title: Extending services in Compose
-page_description: How to use Docker Compose's "extends" keyword to share configuration between files and projects
-page_keywords: fig, composition, compose, docker, orchestration, documentation, docs
+<!--[metadata]>
++++
+title = "Extending services in Compose"
+description = "How to use Docker Compose's extends keyword to share configuration between files and projects"
+keywords = ["fig, composition, compose, docker, orchestration, documentation, docs"]
+[menu.main]
+parent="smn_workw_compose"
+weight=2
++++
+<![end-metadata]-->
 
 
 ## Extending services in Compose
@@ -79,7 +86,7 @@ For full details on how to use `extends`, refer to the [reference](#reference).
 ### Example use case
 
 In this example, you’ll repurpose the example app from the [quick start
-guide](index.md). (If you're not familiar with Compose, it's recommended that
+guide](compose-overview.md). (If you're not familiar with Compose, it's recommended that
 you go through the quick start first.) This example assumes you want to use
 Compose both to develop an application locally and then deploy it to a
 production environment.
@@ -364,7 +371,7 @@ volumes:
 
 ## Compose documentation
 
-- [User guide](index.md)
+- [User guide](compose-overview.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/install.md b/docs/install.md
index a521ec06..ec0e6e4d 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -1,14 +1,21 @@
-page_title: Installing Compose
-page_description: How to install Docker Compose
-page_keywords: compose, orchestration, install, installation, docker, documentation
+<!--[metadata]>
++++
+title = "Docker Compose"
+description = "How to install Docker Compose"
+keywords = ["compose, orchestration, install, installation, docker, documentation"]
+[menu.main]
+parent="mn_install"
+weight=4
++++
+<![end-metadata]-->
 
 
-## Installing Compose
+# Install Docker Compose
 
 To install Compose, you'll need to install Docker first. You'll then install
 Compose with a `curl` command. 
 
-### Install Docker
+## Install Docker
 
 First, install Docker version 1.6 or greater:
 
@@ -16,7 +23,7 @@ First, install Docker version 1.6 or greater:
 - [Instructions for Ubuntu](http://docs.docker.com/installation/ubuntulinux/)
 - [Instructions for other systems](http://docs.docker.com/installation/)
 
-### Install Compose
+## Install Compose
 
 To install Compose, run the following commands:
 
@@ -38,7 +45,7 @@ You can test the installation by running `docker-compose --version`.
 
 ## Compose documentation
 
-- [User guide](index.md)
+- [User guide](compose-overview.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
deleted file mode 100644
index 428439bc..00000000
--- a/docs/mkdocs.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-- ['compose/index.md', 'User Guide', 'Docker Compose' ]
-- ['compose/production.md', 'User Guide', 'Using Compose in production' ]
-- ['compose/extends.md', 'User Guide', 'Extending services in Compose']
-- ['compose/install.md', 'Installation', 'Docker Compose']
-- ['compose/cli.md', 'Reference', 'Compose command line']
-- ['compose/yml.md', 'Reference', 'Compose yml']
-- ['compose/env.md', 'Reference', 'Compose ENV variables']
-- ['compose/completion.md', 'Reference', 'Compose commandline completion']
-- ['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']
diff --git a/docs/production.md b/docs/production.md
index 60a6873d..294f3c4e 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -1,6 +1,13 @@
-page_title: Using Compose in production
-page_description: Guide to using Docker Compose in production
-page_keywords: documentation, docs,  docker, compose, orchestration, containers, production
+<!--[metadata]>
++++
+title = "Using Compose in production"
+description = "Guide to using Docker Compose in production"
+keywords = ["documentation, docs,  docker, compose, orchestration, containers,  production"]
+[menu.main]
+parent="smn_workw_compose"
+weight=1
++++
+<![end-metadata]-->
 
 
 ## Using Compose in production
diff --git a/docs/rails.md b/docs/rails.md
index aedb4c6e..2ff6f175 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -1,10 +1,15 @@
-page_title: Quickstart Guide: Compose and Rails
-page_description: Getting started with Docker Compose and Rails
-page_keywords: documentation, docs,  docker, compose, orchestration, containers,
-rails
+<!--[metadata]>
++++
+title = "Quickstart Guide: Compose and Rails"
+description = "Getting started with Docker Compose and Rails"
+keywords = ["documentation, docs,  docker, compose, orchestration, containers"]
+[menu.main]
+parent="smn_workw_compose"
+weight=5
++++
+<![end-metadata]-->
 
-
-## Getting started with Compose and Rails
+## Quickstart Guide: Compose and Rails
 
 This Quickstart guide will show you how to use Compose to set up and run a Rails/PostgreSQL app. Before starting, you'll need to have [Compose installed](install.md).
 
@@ -119,7 +124,7 @@ you're using Boot2docker, `boot2docker ip` will tell you its address).
 
 ## More Compose documentation
 
-- [User guide](index.md)
+- [User guide](compose-overview.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/wordpress.md b/docs/wordpress.md
index b40d1a9f..ad0e6296 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -1,14 +1,21 @@
-page_title: Quickstart Guide: Compose and Wordpress
-page_description: Getting started with Docker Compose and Rails
-page_keywords: documentation, docs,  docker, compose, orchestration, containers,
-wordpress
+<!--[metadata]>
++++
+title = "Quickstart Guide: Compose and Wordpress"
+description = "Getting started with Compose and Wordpress"
+keywords = ["documentation, docs,  docker, compose, orchestration, containers"]
+[menu.main]
+parent="smn_workw_compose"
+weight=6
++++
+<![end-metadata]-->
 
-## Getting started with Compose and Wordpress
+
+# Quickstart Guide: Compose and Wordpress
 
 You can use Compose to easily run Wordpress in an isolated environment built
 with Docker containers. 
 
-### Define the project
+## Define the project
 
 First, [Install Compose](install.md) and then download Wordpress into the
 current directory:
@@ -114,7 +121,7 @@ address).
 
 ## More Compose documentation
 
-- [User guide](index.md)
+- [User guide](compose-overview.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/yml.md b/docs/yml.md
index df791bc9..80d6d719 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -1,10 +1,13 @@
----
-layout: default
-title: docker-compose.yml reference
-page_title: docker-compose.yml reference
-page_description: docker-compose.yml reference
-page_keywords: fig, composition, compose, docker
----
+<!--[metadata]>
++++
+title = "docker-compose.yml reference"
+description = "docker-compose.yml reference"
+keywords = ["fig, composition, compose,  docker"]
+[menu.main]
+parent="smn_compose_ref"
++++
+<![end-metadata]-->
+
 
 # docker-compose.yml reference
 
@@ -390,7 +393,7 @@ read_only: true
 
 ## Compose documentation
 
-- [User guide](index.md)
+- [User guide](compose-overview.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)

From 4e108e377e70ef66f4a5c319143eb026fbe4cc73 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 15 Jun 2015 10:18:15 -0700
Subject: [PATCH 0038/1265] Update setup.py with new docker-py minimum

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 9364f57f..a94d8737 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.7',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.11.0, < 1.0',
-    'docker-py >= 1.2.2, < 1.3',
+    'docker-py >= 1.2.3-rc1, < 1.3',
     'dockerpty >= 0.3.4, < 0.4',
     'six >= 1.3.0, < 2',
 ]

From b4c49ed805656890fe3ce9a1315688fe8c514dd5 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 15 Jun 2015 10:25:58 -0700
Subject: [PATCH 0039/1265] Use Docker 1.7 RC3

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1ff2d382..b25e824c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,13 +48,13 @@ RUN set -ex; \
     rm -rf pip-7.0.1; \
     rm pip-7.0.1.tar.gz
 
-ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0-rc2
+ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0-rc3
 
 RUN set -ex; \
     curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -o /usr/local/bin/docker-1.6.0; \
     chmod +x /usr/local/bin/docker-1.6.0; \
-    curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0-rc2 -o /usr/local/bin/docker-1.7.0-rc2; \
-    chmod +x /usr/local/bin/docker-1.7.0-rc2
+    curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0-rc3 -o /usr/local/bin/docker-1.7.0-rc3; \
+    chmod +x /usr/local/bin/docker-1.7.0-rc3
 
 # Set the default Docker to be run
 RUN ln -s /usr/local/bin/docker-1.6.0 /usr/local/bin/docker

From acd8dce595c872c2b19e6f9304db7a2438529a13 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 15 Jun 2015 10:46:01 -0700
Subject: [PATCH 0040/1265] Add upgrading instructions to install docs

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/install.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/install.md b/docs/install.md
index ec0e6e4d..c1abd4fd 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -43,6 +43,18 @@ Compose can also be installed as a Python package:
 No further steps are required; Compose should now be successfully installed.
 You can test the installation by running `docker-compose --version`.
 
+### Upgrading
+
+If you're coming from Compose 1.2 or earlier, you'll need to remove or migrate your existing containers after upgrading Compose. This is because, as of version 1.3, Compose uses Docker labels to keep track of containers, and so they need to be recreated with labels added.
+
+If Compose detects containers that were created without labels, it will refuse to run so that you don't end up with two sets of them. If you want to keep using your existing containers (for example, because they have data volumes you want to preserve) you can migrate them with the following command:
+
+    docker-compose migrate-to-labels
+
+Alternatively, if you're not worried about keeping them, you can remove them - Compose will just create new ones.
+
+    docker rm -f myapp_web_1 myapp_db_1 ...
+
 ## Compose documentation
 
 - [User guide](compose-overview.md)

From c421d23c34fa974df79faeaaf7ca9c15226bfc27 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 15 Jun 2015 13:32:58 -0700
Subject: [PATCH 0041/1265] Update Swarm docs

- Link to libnetwork

- Building now works, but is complicated by scaling

- Document how to set constraints/affinity

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 SWARM.md | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/SWARM.md b/SWARM.md
index 6cb24b60..1ea4e25f 100644
--- a/SWARM.md
+++ b/SWARM.md
@@ -3,30 +3,37 @@ Docker Compose/Swarm integration
 
 Eventually, Compose and Swarm aim to have full integration, meaning you can point a Compose app at a Swarm cluster and have it all just work as if you were using a single Docker host.
 
-However, the current extent of integration is minimal: Compose can create containers on a Swarm cluster, but the majority of Compose apps won’t work out of the box unless all containers are scheduled on one host, defeating much of the purpose of using Swarm in the first place.
+However, integration is currently incomplete: Compose can create containers on a Swarm cluster, but the majority of Compose apps won’t work out of the box unless all containers are scheduled on one host, because links between containers do not work across hosts.
 
-Still, Compose and Swarm can be useful in a “batch processing” scenario (where a large number of containers need to be spun up and down to do independent computation) or a “shared cluster” scenario (where multiple teams want to deploy apps on a cluster without worrying about where to put them).
-
-A number of things need to happen before full integration is achieved, which are documented below.
-
-Links and networking
---------------------
-
-The primary thing stopping multi-container apps from working seamlessly on Swarm is getting them to talk to one another: enabling private communication between containers on different hosts hasn’t been solved in a non-hacky way.
-
-Long-term, networking is [getting overhauled](https://github.com/docker/docker/issues/9983) in such a way that it’ll fit the multi-host model much better. For now, **linked containers are automatically scheduled on the same host**.
+Docker networking is [getting overhauled](https://github.com/docker/libnetwork) in such a way that it’ll fit the multi-host model much better. For now, linked containers are automatically scheduled on the same host.
 
 Building
 --------
 
-`docker build` against a Swarm cluster is not implemented, so for now the `build` option will not work - you will need to manually build your service's image, push it somewhere and use `image` to instruct Compose to pull it. Here's an example using the Docker Hub:
+Swarm can build an image from a Dockerfile just like a single-host Docker instance can, but the resulting image will only live on a single node and won't be distributed to other nodes.
+
+If you want to use Compose to scale the service in question to multiple nodes, you'll have to build it yourself, push it to a registry (e.g. the Docker Hub) and reference it from `docker-compose.yml`:
 
     $ docker build -t myusername/web .
     $ docker push myusername/web
+
     $ cat docker-compose.yml
     web:
       image: myusername/web
-      links: ["db"]
-    db:
-      image: postgres
+
     $ docker-compose up -d
+    $ docker-compose scale web=3
+
+Scheduling
+----------
+
+Swarm offers a rich set of scheduling and affinity hints, enabling you to control where containers are located. They are specified via container environment variables, so you can use Compose's `environment` option to set them.
+
+    environment:
+      # Schedule containers on a node that has the 'storage' label set to 'ssd'
+      - "constraint:storage==ssd"
+
+      # Schedule containers where the 'redis' image is already pulled
+      - "affinity:image==redis"
+
+For the full set of available filters and expressions, see the [Swarm documentation](https://docs.docker.com/swarm/scheduler/filter/).

From 464ab3d7273317507fe42fe1ef03ac3e08d0bd86 Mon Sep 17 00:00:00 2001
From: Dan O'Reilly <oreilldf@gmail.com>
Date: Mon, 15 Jun 2015 23:06:06 -0400
Subject: [PATCH 0042/1265] Add a method specifically for service name
 validation.

Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
---
 compose/project.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index e6ec6d67..d7d35061 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -99,6 +99,16 @@ class Project(object):
 
         raise NoSuchService(name)
 
+    def validate_service_names(self, service_names):
+        """
+        Validate that the given list of service names only contains valid
+        services. Raises NoSuchService if one of the names is invalid.
+        """
+        valid_names = self.service_names
+        for name in service_names:
+            if name not in valid_names:
+                raise NoSuchService(name)
+
     def get_services(self, service_names=None, include_deps=False):
         """
         Returns a list of this project's services filtered
@@ -275,8 +285,7 @@ class Project(object):
 
     def containers(self, service_names=None, stopped=False, one_off=False):
         if service_names:
-            # Will raise NoSuchService if one of the names is invalid
-            self.get_services(service_names)
+            self.validate_service_names(service_names)
         containers = [
             Container.from_ps(self.client, container)
             for container in self.client.containers(

From e0af1a44ea8da7d0d6f072690f4b5a768845dcec Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 16 Jun 2015 10:35:08 -0700
Subject: [PATCH 0043/1265] Use Docker 1.7 RC5

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b25e824c..4f2a0305 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,13 +48,13 @@ RUN set -ex; \
     rm -rf pip-7.0.1; \
     rm pip-7.0.1.tar.gz
 
-ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0-rc3
+ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0-rc5
 
 RUN set -ex; \
     curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -o /usr/local/bin/docker-1.6.0; \
     chmod +x /usr/local/bin/docker-1.6.0; \
-    curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0-rc3 -o /usr/local/bin/docker-1.7.0-rc3; \
-    chmod +x /usr/local/bin/docker-1.7.0-rc3
+    curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0-rc5 -o /usr/local/bin/docker-1.7.0-rc5; \
+    chmod +x /usr/local/bin/docker-1.7.0-rc5
 
 # Set the default Docker to be run
 RUN ln -s /usr/local/bin/docker-1.6.0 /usr/local/bin/docker

From b76ac6e633c5e8881162a34c6afdc2f50874aa02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gruchet?= <gruchet@gmail.com>
Date: Fri, 20 Mar 2015 20:14:30 +0100
Subject: [PATCH 0044/1265] Added support to option mac-address
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Updated doc

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Fixed LINT errors

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Changed mac-address entry order in config keys

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Changed attributes order in docs/yml.md

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
---
 compose/config.py                 | 1 +
 docs/yml.md                       | 5 ++++-
 tests/integration/service_test.py | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/compose/config.py b/compose/config.py
index efc50075..cbdeca2d 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -23,6 +23,7 @@ DOCKER_CONFIG_KEYS = [
     'image',
     'labels',
     'links',
+    'mac_address',
     'mem_limit',
     'net',
     'log_driver',
diff --git a/docs/yml.md b/docs/yml.md
index df791bc9..ed0e6ad8 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -362,7 +362,7 @@ security_opt:
   - label:role:ROLE
 ```
 
-### working\_dir, entrypoint, user, hostname, domainname, mem\_limit, privileged, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only
+### working\_dir, entrypoint, user, hostname, domainname, mac\_address, mem\_limit, privileged, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only 
 
 Each of these is a single value, analogous to its
 [docker run](https://docs.docker.com/reference/run/) counterpart.
@@ -378,6 +378,8 @@ user: postgresql
 hostname: foo
 domainname: foo.com
 
+mac_address: 02:42:ac:11:65:43
+
 mem_limit: 1000000000
 privileged: true
 
@@ -386,6 +388,7 @@ restart: always
 stdin_open: true
 tty: true
 read_only: true
+
 ```
 
 ## Compose documentation
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 7e88557f..4067f419 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -198,6 +198,12 @@ class ServiceTest(DockerClientTestCase):
         service.start_container(container)
         self.assertEqual(set(container.get('HostConfig.SecurityOpt')), set(security_opt))
 
+    def test_create_container_with_mac_address(self):
+        service = self.create_service('db', mac_address='02:42:ac:11:65:43')
+        container = service.create_container()
+        service.start_container(container)
+        self.assertEqual(container.inspect()['Config']['MacAddress'], '02:42:ac:11:65:43')
+
     def test_create_container_with_specified_volume(self):
         host_path = '/tmp/host-path'
         container_path = '/container-path'

From c26b1c8ee9b95f8739fcd3197b838a530dd6d4f3 Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Mon, 15 Jun 2015 20:52:55 -0700
Subject: [PATCH 0045/1265] Entering fixes from Hugo renaming compose-overview
 back to index Updating with fixes per Aanand. And others found through test

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/Dockerfile                        | 14 +++++++-------
 docs/cli.md                            |  2 +-
 docs/completion.md                     |  2 +-
 docs/django.md                         |  2 +-
 docs/env.md                            |  2 +-
 docs/extends.md                        |  4 ++--
 docs/{compose-overview.md => index.md} |  0
 docs/install.md                        |  2 +-
 docs/rails.md                          |  2 +-
 docs/wordpress.md                      |  2 +-
 docs/yml.md                            |  2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)
 rename docs/{compose-overview.md => index.md} (100%)

diff --git a/docs/Dockerfile b/docs/Dockerfile
index 55e7ce70..a49c1e7f 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -8,17 +8,17 @@ COPY . /docs/content/compose/
 
 # Sed to process GitHub Markdown
 # 1-2 Remove comment code from metadata block
-# 3 Remove .md extension from link text
-# 4 Change ](/ to ](/project/ in links
-# 5 Change ](word) to ](/project/word)
-# 6 Change ](../../ to ](/project/
-# 7 Change ](../ to ](/project/word)
+# 3 Change ](/word to ](/project/ in links
+# 4 Change ](word.md) to ](/project/word)
+# 5 Remove .md extension from link text
+# 6 Change ](../ to ](/project/word) 
+# 7 Change ](../../ to ](/project/ --> not implemented
 # 
 # 
 RUN find /docs/content/compose -type f -name "*.md" -exec sed -i.old \
     -e '/^<!.*metadata]>/g' \
     -e '/^<!.*end-metadata.*>/g' \
-    -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g' \
     -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/compose\//g' \
-    -e 's/\(\][(]\)\([A-z]*[)]\)/\]\(\/compose\/\2/g' \
+    -e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/compose\/\2/g' \
+    -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g'  \
     -e 's/\(\][(]\)\(\.\.\/\)/\1\/compose\//g' {} \;
diff --git a/docs/cli.md b/docs/cli.md
index a2167d9c..61a6aa6d 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -192,7 +192,7 @@ Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TL
 
 ## Compose documentation
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/completion.md b/docs/completion.md
index 7fb696d8..3856d270 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -59,7 +59,7 @@ Enjoy working with Compose faster and with less typos!
 
 ## Compose documentation
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/django.md b/docs/django.md
index c44329e1..84fdcbfe 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -125,7 +125,7 @@ example, run `docker-compose up` and in another terminal run:
 
 ## More Compose documentation
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/env.md b/docs/env.md
index 73496f32..e38e6d50 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -40,7 +40,7 @@ Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
 
 ## Compose documentation
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/extends.md b/docs/extends.md
index 8527c81b..054462b8 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -86,7 +86,7 @@ For full details on how to use `extends`, refer to the [reference](#reference).
 ### Example use case
 
 In this example, you’ll repurpose the example app from the [quick start
-guide](compose-overview.md). (If you're not familiar with Compose, it's recommended that
+guide](index.md). (If you're not familiar with Compose, it's recommended that
 you go through the quick start first.) This example assumes you want to use
 Compose both to develop an application locally and then deploy it to a
 production environment.
@@ -371,7 +371,7 @@ volumes:
 
 ## Compose documentation
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/compose-overview.md b/docs/index.md
similarity index 100%
rename from docs/compose-overview.md
rename to docs/index.md
diff --git a/docs/install.md b/docs/install.md
index c1abd4fd..ac35c8d9 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -57,7 +57,7 @@ Alternatively, if you're not worried about keeping them, you can remove them - C
 
 ## Compose documentation
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
diff --git a/docs/rails.md b/docs/rails.md
index 2ff6f175..cb807864 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -124,7 +124,7 @@ you're using Boot2docker, `boot2docker ip` will tell you its address).
 
 ## More Compose documentation
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/wordpress.md b/docs/wordpress.md
index ad0e6296..aa62e4e4 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -121,7 +121,7 @@ address).
 
 ## More Compose documentation
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/yml.md b/docs/yml.md
index 798f8918..70fb385c 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -396,7 +396,7 @@ read_only: true
 
 ## Compose documentation
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)

From ae96e1af16d51c31553072fbc364977315b41aa9 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 18 Jun 2015 10:34:34 -0700
Subject: [PATCH 0046/1265] Use Docker 1.7.0

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4f2a0305..98dc59c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,13 +48,13 @@ RUN set -ex; \
     rm -rf pip-7.0.1; \
     rm pip-7.0.1.tar.gz
 
-ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0-rc5
+ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0
 
 RUN set -ex; \
     curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -o /usr/local/bin/docker-1.6.0; \
     chmod +x /usr/local/bin/docker-1.6.0; \
-    curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0-rc5 -o /usr/local/bin/docker-1.7.0-rc5; \
-    chmod +x /usr/local/bin/docker-1.7.0-rc5
+    curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0 -o /usr/local/bin/docker-1.7.0; \
+    chmod +x /usr/local/bin/docker-1.7.0
 
 # Set the default Docker to be run
 RUN ln -s /usr/local/bin/docker-1.6.0 /usr/local/bin/docker

From ac56ef3d659f04164aa44f1a4f0c991fb5eb6060 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 18 Jun 2015 11:11:51 -0700
Subject: [PATCH 0047/1265] Update docker-py to 1.2.3 final

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 47fa1e05..69bd4c5f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 PyYAML==3.10
-docker-py==1.2.3-rc1
+docker-py==1.2.3
 dockerpty==0.3.4
 docopt==0.6.1
 requests==2.6.1
diff --git a/setup.py b/setup.py
index a94d8737..d2e81e17 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.7',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.11.0, < 1.0',
-    'docker-py >= 1.2.3-rc1, < 1.3',
+    'docker-py >= 1.2.3, < 1.3',
     'dockerpty >= 0.3.4, < 0.4',
     'six >= 1.3.0, < 2',
 ]

From 5aa82a5519e5381a34f14dd51eadb924c4fba00e Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 18 Jun 2015 11:56:43 -0700
Subject: [PATCH 0048/1265] Bump 1.4.0dev

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 CHANGES.md          | 45 +++++++++++++++++++++++++++++++++++++++++++++
 compose/__init__.py |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 277a188a..78e629b8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,51 @@
 Change log
 ==========
 
+1.3.0 (2015-06-18)
+------------------
+
+Firstly, two important notes:
+
+- **This release contains breaking changes, and you will need to either remove or migrate your existing containers before running your app** - see the [upgrading section of the install docs](https://github.com/docker/compose/blob/1.3.0rc1/docs/install.md#upgrading) for details.
+
+- Compose now requires Docker 1.6.0 or later.
+
+We've done a lot of work in this release to remove hacks and make Compose more stable:
+
+- Compose now uses container labels, rather than names, to keep track of containers. This makes Compose both faster and easier to integrate with your own tools.
+
+- Compose no longer uses "intermediate containers" when recreating containers for a service. This makes `docker-compose up` less complex and more resilient to failure.
+
+There are some new features:
+
+- `docker-compose up` has an **experimental** new behaviour: it will only recreate containers for services whose configuration has changed in `docker-compose.yml`. This will eventually become the default, but for now you can take it for a spin:
+
+        $ docker-compose up --x-smart-recreate
+
+- When invoked in a subdirectory of a project, `docker-compose` will now climb up through parent directories until it finds a `docker-compose.yml`.
+
+Several new configuration keys have been added to `docker-compose.yml`:
+
+- `dockerfile`, like `docker build --file`, lets you specify an alternate Dockerfile to use with `build`.
+- `labels`, like `docker run --labels`, lets you add custom metadata to containers.
+- `extra_hosts`, like `docker run --add-host`, lets you add entries to a container's `/etc/hosts` file.
+- `pid: host`, like `docker run --pid=host`, lets you reuse the same PID namespace as the host machine.
+- `cpuset`, like `docker run --cpuset-cpus`, lets you specify which CPUs to allow execution in.
+- `read_only`, like `docker run --read-only`, lets you mount a container's filesystem as read-only.
+- `security_opt`, like `docker run --security-opt`, lets you specify [security options](https://docs.docker.com/reference/run/#security-configuration).
+- `log_driver`, like `docker run --log-driver`, lets you specify a [log driver](https://docs.docker.com/reference/run/#logging-drivers-log-driver).
+
+Many bugs have been fixed, including the following:
+
+- The output of `docker-compose run` was sometimes truncated, especially when running under Jenkins.
+- A service's volumes would sometimes not update after volume configuration was changed in `docker-compose.yml`.
+- Authenticating against third-party registries would sometimes fail.
+- `docker-compose run --rm` would fail to remove the container if the service had a `restart` policy in place.
+- `docker-compose scale` would refuse to scale a service beyond 1 container if it exposed a specific port number on the host.
+- Compose would refuse to create multiple volume entries with the same host path.
+
+Thanks @ahromis, @albers, @aleksandr-vin, @antoineco, @ccverak, @chernjie, @dnephin, @edmorley, @fordhurley, @josephpage, @KyleJamesWalker, @lsowen, @mchasal, @noironetworks, @sdake, @sdurrheimer, @sherter, @stephenlawrence, @thaJeztah, @thieman, @turtlemonvh, @twhiteman, @vdemeester, @xuxinkun and @zwily!
+
 1.2.0 (2015-04-16)
 ------------------
 
diff --git a/compose/__init__.py b/compose/__init__.py
index 045e7914..0d464ee8 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '1.3.0dev'
+__version__ = '1.4.0dev'

From bef0926c58b6ed86d0a1a95160e5548ee2f34502 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 18 Jun 2015 17:43:16 -0700
Subject: [PATCH 0049/1265] Explicitly set pull=False when building

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py         |  1 +
 tests/unit/service_test.py | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/compose/service.py b/compose/service.py
index 53073ffb..eec02256 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -612,6 +612,7 @@ class Service(object):
             tag=self.image_name,
             stream=True,
             rm=True,
+            pull=False,
             nocache=no_cache,
             dockerfile=self.options.get('dockerfile', None),
         )
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 82ea0410..f99cbbc9 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -312,6 +312,17 @@ class ServiceTest(unittest.TestCase):
         with self.assertRaises(NeedsBuildError):
             service.create_container(do_build=False)
 
+    def test_build_does_not_pull(self):
+        self.mock_client.build.return_value = [
+            '{"stream": "Successfully built 12345"}',
+        ]
+
+        service = Service('foo', client=self.mock_client, build='.')
+        service.build()
+
+        self.assertEqual(self.mock_client.build.call_count, 1)
+        self.assertFalse(self.mock_client.build.call_args[1]['pull'])
+
 
 class ServiceVolumesTest(unittest.TestCase):
 

From c3df62472bf8714c655eeaeaa84788dd3147017c Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Fri, 19 Jun 2015 02:28:09 -0700
Subject: [PATCH 0050/1265] Updating from three ticks to code block

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/yml.md | 287 +++++++++++++++++++++-------------------------------
 1 file changed, 116 insertions(+), 171 deletions(-)

diff --git a/docs/yml.md b/docs/yml.md
index 70fb385c..02540b3f 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -24,11 +24,9 @@ specify them again in `docker-compose.yml`.
 Tag or partial image ID. Can be local or remote - Compose will attempt to
 pull if it doesn't exist locally.
 
-```
-image: ubuntu
-image: orchardup/postgresql
-image: a4bc65fd
-```
+    image: ubuntu
+    image: orchardup/postgresql
+    image: a4bc65fd
 
 ### build
 
@@ -38,9 +36,7 @@ itself. This directory is also the build context that is sent to the Docker daem
 
 Compose will build and tag it with a generated name, and use that image thereafter.
 
-```
-build: /path/to/build/dir
-```
+    build: /path/to/build/dir
 
 ### dockerfile
 
@@ -48,17 +44,13 @@ Alternate Dockerfile.
 
 Compose will use an alternate file to build with.
 
-```
-dockerfile: Dockerfile-alternate
-```
+    dockerfile: Dockerfile-alternate
 
 ### command
 
 Override the default command.
 
-```
-command: bundle exec thin -p 3000
-```
+    command: bundle exec thin -p 3000
 
 <a name="links"></a>
 ### links
@@ -67,21 +59,17 @@ Link to containers in another service. Either specify both the service name and
 the link alias (`SERVICE:ALIAS`), or just the service name (which will also be
 used for the alias).
 
-```
-links:
- - db
- - db:database
- - redis
-```
+    links:
+     - db
+     - db:database
+     - redis
 
 An entry with the alias' name will be created in `/etc/hosts` inside containers
 for this service, e.g:
 
-```
-172.17.2.186  db
-172.17.2.186  database
-172.17.2.187  redis
-```
+    172.17.2.186  db
+    172.17.2.186  database
+    172.17.2.187  redis
 
 Environment variables will also be created - see the [environment variable
 reference](env.md) for details.
@@ -93,29 +81,23 @@ of Compose, especially for containers that provide shared or common services.
 `external_links` follow semantics similar to `links` when specifying both the
 container name and the link alias (`CONTAINER:ALIAS`).
 
-```
-external_links:
- - redis_1
- - project_db_1:mysql
- - project_db_1:postgresql
-```
+    external_links:
+     - redis_1
+     - project_db_1:mysql
+     - project_db_1:postgresql
 
 ### extra_hosts
 
 Add hostname mappings. Use the same values as the docker client `--add-host` parameter.
 
-```
-extra_hosts:
- - "somehost:162.242.195.82"
- - "otherhost:50.31.209.229"
-```
+    extra_hosts:
+     - "somehost:162.242.195.82"
+     - "otherhost:50.31.209.229"
 
 An entry with the ip address and hostname will be created in `/etc/hosts` inside containers for this service, e.g:
 
-```
-162.242.195.82  somehost
-50.31.209.229   otherhost
-```
+    162.242.195.82  somehost
+    50.31.209.229   otherhost
 
 ### ports
 
@@ -127,46 +109,38 @@ port (a random host port will be chosen).
 > parse numbers in the format `xx:yy` as sexagesimal (base 60). For this reason,
 > we recommend always explicitly specifying your port mappings as strings.
 
-```
-ports:
- - "3000"
- - "8000:8000"
- - "49100:22"
- - "127.0.0.1:8001:8001"
-```
+    ports:
+     - "3000"
+     - "8000:8000"
+     - "49100:22"
+     - "127.0.0.1:8001:8001"
 
 ### expose
 
 Expose ports without publishing them to the host machine - they'll only be
 accessible to linked services. Only the internal port can be specified.
 
-```
-expose:
- - "3000"
- - "8000"
-```
+    expose:
+     - "3000"
+     - "8000"
 
 ### volumes
 
 Mount paths as volumes, optionally specifying a path on the host machine
 (`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`).
 
-```
-volumes:
- - /var/lib/mysql
- - cache/:/tmp/cache
- - ~/configs:/etc/configs/:ro
-```
+    volumes:
+     - /var/lib/mysql
+     - cache/:/tmp/cache
+     - ~/configs:/etc/configs/:ro
 
 ### volumes_from
 
 Mount all of the volumes from another service or container.
 
-```
-volumes_from:
- - service_name
- - container_name
-```
+    volumes_from:
+     - service_name
+     - container_name
 
 ### environment
 
@@ -175,15 +149,13 @@ Add environment variables. You can use either an array or a dictionary.
 Environment variables with only a key are resolved to their values on the
 machine Compose is running on, which can be helpful for secret or host-specific values.
 
-```
-environment:
-  RACK_ENV: development
-  SESSION_SECRET:
+    environment:
+      RACK_ENV: development
+      SESSION_SECRET:
 
-environment:
-  - RACK_ENV=development
-  - SESSION_SECRET
-```
+    environment:
+      - RACK_ENV=development
+      - SESSION_SECRET
 
 ### env_file
 
@@ -194,22 +166,18 @@ If you have specified a Compose file with `docker-compose -f FILE`, paths in
 
 Environment variables specified in `environment` override these values.
 
-```
-env_file: .env
+    env_file: .env
 
-env_file:
-  - ./common.env
-  - ./apps/web.env
-  - /opt/secrets.env
-```
+    env_file:
+      - ./common.env
+      - ./apps/web.env
+      - /opt/secrets.env
 
 Compose expects each line in an env file to be in `VAR=VAL` format. Lines
 beginning with `#` (i.e. comments) are ignored, as are blank lines.
 
-```
-# Set Rails/Rack environment
-RACK_ENV=development
-```
+    # Set Rails/Rack environment
+    RACK_ENV=development
 
 ### extends
 
@@ -222,30 +190,26 @@ Here's a simple example. Suppose we have 2 files - **common.yml** and
 
 **common.yml**
 
-```
-webapp:
-  build: ./webapp
-  environment:
-    - DEBUG=false
-    - SEND_EMAILS=false
-```
+    webapp:
+      build: ./webapp
+      environment:
+        - DEBUG=false
+        - SEND_EMAILS=false
 
 **development.yml**
 
-```
-web:
-  extends:
-    file: common.yml
-    service: webapp
-  ports:
-    - "8000:8000"
-  links:
-    - db
-  environment:
-    - DEBUG=true
-db:
-  image: postgres
-```
+    web:
+      extends:
+        file: common.yml
+        service: webapp
+      ports:
+        - "8000:8000"
+      links:
+        - db
+      environment:
+        - DEBUG=true
+    db:
+      image: postgres
 
 Here, the `web` service in **development.yml** inherits the configuration of
 the `webapp` service in **common.yml** - the `build` and `environment` keys -
@@ -262,17 +226,15 @@ Add metadata to containers using [Docker labels](http://docs.docker.com/userguid
 
 It's recommended that you use reverse-DNS notation to prevent your labels from conflicting with those used by other software.
 
-```
-labels:
-  com.example.description: "Accounting webapp"
-  com.example.department: "Finance"
-  com.example.label-with-empty-value: ""
+    labels:
+      com.example.description: "Accounting webapp"
+      com.example.department: "Finance"
+      com.example.label-with-empty-value: ""
 
-labels:
-  - "com.example.description=Accounting webapp"
-  - "com.example.department=Finance"
-  - "com.example.label-with-empty-value"
-```
+    labels:
+      - "com.example.description=Accounting webapp"
+      - "com.example.department=Finance"
+      - "com.example.label-with-empty-value"
 
 ### log driver
 
@@ -282,27 +244,22 @@ Allowed values are currently ``json-file``, ``syslog`` and ``none``. The list wi
 
 The default value is json-file.
 
-```
-log_driver: "json-file"
-log_driver: "syslog"
-log_driver: "none"
-```
+    log_driver: "json-file"
+    log_driver: "syslog"
+    log_driver: "none"
 
 ### net
 
 Networking mode. Use the same values as the docker client `--net` parameter.
 
-```
-net: "bridge"
-net: "none"
-net: "container:[name or id]"
-net: "host"
-```
+    net: "bridge"
+    net: "none"
+    net: "container:[name or id]"
+    net: "host"
+
 ### pid
 
-```
-pid: "host"
-```
+    pid: "host"
 
 Sets the PID mode to the host PID mode.  This turns on sharing between
 container and the host operating system the PID address space.  Containers
@@ -313,86 +270,74 @@ containers in the bare-metal machine's namespace and vise-versa.
 
 Custom DNS servers. Can be a single value or a list.
 
-```
-dns: 8.8.8.8
-dns:
-  - 8.8.8.8
-  - 9.9.9.9
-```
+    dns: 8.8.8.8
+    dns:
+      - 8.8.8.8
+      - 9.9.9.9
 
 ### cap_add, cap_drop
 
 Add or drop container capabilities.
 See `man 7 capabilities` for a full list.
 
-```
-cap_add:
-  - ALL
+    cap_add:
+      - ALL
 
-cap_drop:
-  - NET_ADMIN
-  - SYS_ADMIN
-```
+    cap_drop:
+      - NET_ADMIN
+      - SYS_ADMIN
 
 ### dns_search
 
 Custom DNS search domains. Can be a single value or a list.
 
-```
-dns_search: example.com
-dns_search:
-  - dc1.example.com
-  - dc2.example.com
-```
+    dns_search: example.com
+    dns_search:
+      - dc1.example.com
+      - dc2.example.com
 
 ### devices
 
 List of device mappings.  Uses the same format as the `--device` docker 
 client create option.
 
-```
-devices:
-  - "/dev/ttyUSB0:/dev/ttyUSB0"
-```
+    devices:
+      - "/dev/ttyUSB0:/dev/ttyUSB0"
 
 ### security_opt
 
 Override the default labeling scheme for each container.
 
-```
-security_opt:
-  - label:user:USER
-  - label:role:ROLE
-```
+      security_opt:
+        - label:user:USER
+        - label:role:ROLE
 
 ### working\_dir, entrypoint, user, hostname, domainname, mac\_address, mem\_limit, privileged, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only 
 
 Each of these is a single value, analogous to its
 [docker run](https://docs.docker.com/reference/run/) counterpart.
 
-```
-cpu_shares: 73
-cpuset: 0,1
+    cpu_shares: 73
+    cpuset: 0,1
 
-working_dir: /code
-entrypoint: /code/entrypoint.sh
-user: postgresql
+    working_dir: /code
+    entrypoint: /code/entrypoint.sh
+    user: postgresql
 
-hostname: foo
-domainname: foo.com
+    hostname: foo
+    domainname: foo.com
 
-mac_address: 02:42:ac:11:65:43
+    mac_address: 02:42:ac:11:65:43
 
-mem_limit: 1000000000
-privileged: true
+    mem_limit: 1000000000
+    privileged: true
 
-restart: always
+    restart: always
 
-stdin_open: true
-tty: true
-read_only: true
+    stdin_open: true
+    tty: true
+    read_only: true
 
-```
 
 ## Compose documentation
 

From d0102f0761a32e27ef09f1c2983a46a32b812c5d Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Fri, 19 Jun 2015 07:42:18 +0200
Subject: [PATCH 0051/1265] Fix completion docs URLs

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 docs/completion.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/completion.md b/docs/completion.md
index 3856d270..41ef88e6 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -23,7 +23,7 @@ On a Mac, install with `brew install bash-completion`
 
 Place the completion script in `/etc/bash_completion.d/` (`/usr/local/etc/bash_completion.d/` on a Mac), using e.g.
 
-     curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose --version | awk '{print $2}')/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose
+     curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose --version | awk 'NR==1{print $NF}')/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose
 
 Completion will be available upon next login.
 
@@ -32,7 +32,7 @@ Completion will be available upon next login.
 Place the completion script in your `/path/to/zsh/completion`, using e.g. `~/.zsh/completion/`
 
     mkdir -p ~/.zsh/completion
-    curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose --version | awk '{print $2}')/contrib/completion/zsh/_docker-compose > ~/.zsh/completion/_docker-compose
+    curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose --version | awk 'NR==1{print $NF}')/contrib/completion/zsh/_docker-compose > ~/.zsh/completion/_docker-compose
 
 Include the directory in your `$fpath`, e.g. by adding in `~/.zshrc`
 
@@ -66,4 +66,4 @@ Enjoy working with Compose faster and with less typos!
 - [Get started with Wordpress](wordpress.md)
 - [Command line reference](cli.md)
 - [Yaml file reference](yml.md)
-- [Compose environment variables](env.md)
\ No newline at end of file
+- [Compose environment variables](env.md)

From c22cc02df591d9fb2156e5ef7a1ea81973bac070 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 19 Jun 2015 15:22:13 -0700
Subject: [PATCH 0052/1265] Don't set network mode when none is specified

Setting a value overrides the new default network option.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py         |  2 +-
 compose/service.py         |  2 +-
 tests/unit/project_test.py | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index a89918ef..aa0e3e88 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -188,7 +188,7 @@ class Project(object):
             del service_dict['net']
 
         else:
-            net = 'bridge'
+            net = None
 
         return net
 
diff --git a/compose/service.py b/compose/service.py
index 53073ffb..46177b23 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -457,7 +457,7 @@ class Service(object):
 
     def _get_net(self):
         if not self.net:
-            return "bridge"
+            return None
 
         if isinstance(self.net, Service):
             containers = self.net.containers()
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index fc49e9b8..9ee6f28c 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -209,6 +209,18 @@ class ProjectTest(unittest.TestCase):
         ], None)
         self.assertEqual(project.get_service('test')._get_volumes_from(), container_ids)
 
+    def test_net_unset(self):
+        mock_client = mock.create_autospec(docker.Client)
+        project = Project.from_dicts('test', [
+            {
+                'name': 'test',
+                'image': 'busybox:latest',
+            }
+        ], mock_client)
+        service = project.get_service('test')
+        self.assertEqual(service._get_net(), None)
+        self.assertNotIn('NetworkMode', service._get_container_host_config({}))
+
     def test_use_net_from_container(self):
         container_id = 'aabbccddee'
         container_dict = dict(Name='aaa', Id=container_id)

From 93372dd6654ffd480e967a9c6d4fd3ec1cdd7f26 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 19 Jun 2015 11:35:06 -0700
Subject: [PATCH 0053/1265] Fix 'docker-compose help migrate-to-labels'

- Fix "No such command" error

- Add text from migration section of install docs

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/docopt_command.py | 15 +++++++++------
 compose/cli/main.py           | 24 ++++++++++++++++++++----
 tests/unit/cli_test.py        | 17 +++++++++++++++++
 3 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/compose/cli/docopt_command.py b/compose/cli/docopt_command.py
index ee694701..6eeb33a3 100644
--- a/compose/cli/docopt_command.py
+++ b/compose/cli/docopt_command.py
@@ -33,12 +33,7 @@ class DocoptCommand(object):
         if command is None:
             raise SystemExit(getdoc(self))
 
-        command = command.replace('-', '_')
-
-        if not hasattr(self, command):
-            raise NoSuchCommand(command, self)
-
-        handler = getattr(self, command)
+        handler = self.get_handler(command)
         docstring = getdoc(handler)
 
         if docstring is None:
@@ -47,6 +42,14 @@ class DocoptCommand(object):
         command_options = docopt_full_help(docstring, options['ARGS'], options_first=True)
         return options, handler, command_options
 
+    def get_handler(self, command):
+        command = command.replace('-', '_')
+
+        if not hasattr(self, command):
+            raise NoSuchCommand(command, self)
+
+        return getattr(self, command)
+
 
 class NoSuchCommand(Exception):
     def __init__(self, command, supercommand):
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 0b2ca947..4bde658e 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -131,10 +131,8 @@ class TopLevelCommand(Command):
 
         Usage: help COMMAND
         """
-        command = options['COMMAND']
-        if not hasattr(self, command):
-            raise NoSuchCommand(command, self)
-        raise SystemExit(getdoc(getattr(self, command)))
+        handler = self.get_handler(options['COMMAND'])
+        raise SystemExit(getdoc(handler))
 
     def kill(self, project, options):
         """
@@ -486,6 +484,24 @@ class TopLevelCommand(Command):
         """
         Recreate containers to add labels
 
+        If you're coming from Compose 1.2 or earlier, you'll need to remove or
+        migrate your existing containers after upgrading Compose. This is
+        because, as of version 1.3, Compose uses Docker labels to keep track
+        of containers, and so they need to be recreated with labels added.
+
+        If Compose detects containers that were created without labels, it
+        will refuse to run so that you don't end up with two sets of them. If
+        you want to keep using your existing containers (for example, because
+        they have data volumes you want to preserve) you can migrate them with
+        the following command:
+
+            docker-compose migrate-to-labels
+
+        Alternatively, if you're not worried about keeping them, you can
+        remove them - Compose will just create new ones.
+
+            docker rm -f myapp_web_1 myapp_db_1 ...
+
         Usage: migrate-to-labels
         """
         legacy.migrate_project_to_labels(project)
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 3173a274..d10cb9b3 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -11,6 +11,7 @@ import mock
 
 from compose.cli import main
 from compose.cli.main import TopLevelCommand
+from compose.cli.docopt_command import NoSuchCommand
 from compose.cli.errors import ComposeFileNotFound
 from compose.service import Service
 
@@ -101,6 +102,22 @@ class CLITestCase(unittest.TestCase):
         with self.assertRaises(SystemExit):
             command.dispatch(['-h'], None)
 
+    def test_command_help(self):
+        with self.assertRaises(SystemExit) as ctx:
+            TopLevelCommand().dispatch(['help', 'up'], None)
+
+        self.assertIn('Usage: up', str(ctx.exception))
+
+    def test_command_help_dashes(self):
+        with self.assertRaises(SystemExit) as ctx:
+            TopLevelCommand().dispatch(['help', 'migrate-to-labels'], None)
+
+        self.assertIn('Usage: migrate-to-labels', str(ctx.exception))
+
+    def test_command_help_nonexistent(self):
+        with self.assertRaises(NoSuchCommand):
+            TopLevelCommand().dispatch(['help', 'nonexistent'], None)
+
     def test_setup_logging(self):
         main.setup_logging()
         self.assertEqual(logging.getLogger().level, logging.DEBUG)

From 511fc4a05ce7547024d0858e6655652867d41559 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Sun, 21 Jun 2015 12:37:20 -0700
Subject: [PATCH 0054/1265] Replace backtick code blocks with indentation

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/extends.md   | 188 +++++++++++++++++++++-------------------------
 docs/index.md     |  46 ++++++------
 docs/wordpress.md | 111 +++++++++++++--------------
 3 files changed, 157 insertions(+), 188 deletions(-)

diff --git a/docs/extends.md b/docs/extends.md
index 054462b8..aef1524a 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -28,25 +28,21 @@ the configuration around.
 When defining any service in `docker-compose.yml`, you can declare that you are
 extending another service like this:
 
-```yaml
-web:
-  extends:
-    file: common-services.yml
-    service: webapp
-```
+    web:
+      extends:
+        file: common-services.yml
+        service: webapp
 
 This instructs Compose to re-use the configuration for the `webapp` service
 defined in the `common-services.yml` file. Suppose that `common-services.yml`
 looks like this:
 
-```yaml
-webapp:
-  build: .
-  ports:
-    - "8000:8000"
-  volumes:
-    - "/data"
-```
+    webapp:
+      build: .
+      ports:
+        - "8000:8000"
+      volumes:
+        - "/data"
 
 In this case, you'll get exactly the same result as if you wrote
 `docker-compose.yml` with that `build`, `ports` and `volumes` configuration
@@ -55,31 +51,27 @@ defined directly under `web`.
 You can go further and define (or re-define) configuration locally in
 `docker-compose.yml`:
 
-```yaml
-web:
-  extends:
-    file: common-services.yml
-    service: webapp
-  environment:
-    - DEBUG=1
-  cpu_shares: 5
-```
+    web:
+      extends:
+        file: common-services.yml
+        service: webapp
+      environment:
+        - DEBUG=1
+      cpu_shares: 5
 
 You can also write other services and link your `web` service to them:
 
-```yaml
-web:
-  extends:
-    file: common-services.yml
-    service: webapp
-  environment:
-    - DEBUG=1
-  cpu_shares: 5
-  links:
-    - db
-db:
-  image: postgres
-```
+    web:
+      extends:
+        file: common-services.yml
+        service: webapp
+      environment:
+        - DEBUG=1
+      cpu_shares: 5
+      links:
+        - db
+    db:
+      image: postgres
 
 For full details on how to use `extends`, refer to the [reference](#reference).
 
@@ -271,103 +263,91 @@ For single-value options like `image`, `command` or `mem_limit`, the new value
 replaces the old value. **This is the default behaviour - all exceptions are
 listed below.**
 
-```yaml
-# original service
-command: python app.py
+    # original service
+    command: python app.py
 
-# local service
-command: python otherapp.py
+    # local service
+    command: python otherapp.py
 
-# result
-command: python otherapp.py
-```
+    # result
+    command: python otherapp.py
 
 In the case of `build` and `image`, using one in the local service causes
 Compose to discard the other, if it was defined in the original service.
 
-```yaml
-# original service
-build: .
+    # original service
+    build: .
 
-# local service
-image: redis
+    # local service
+    image: redis
 
-# result
-image: redis
-```
+    # result
+    image: redis
 
-```yaml
-# original service
-image: redis
+    # original service
+    image: redis
 
-# local service
-build: .
+    # local service
+    build: .
 
-# result
-build: .
-```
+    # result
+    build: .
 
 For the **multi-value options** `ports`, `expose`, `external_links`, `dns` and
 `dns_search`, Compose concatenates both sets of values:
 
-```yaml
-# original service
-expose:
-  - "3000"
+    # original service
+    expose:
+      - "3000"
 
-# local service
-expose:
-  - "4000"
-  - "5000"
+    # local service
+    expose:
+      - "4000"
+      - "5000"
 
-# result
-expose:
-  - "3000"
-  - "4000"
-  - "5000"
-```
+    # result
+    expose:
+      - "3000"
+      - "4000"
+      - "5000"
 
 In the case of `environment` and `labels`, Compose "merges" entries together
 with locally-defined values taking precedence:
 
-```yaml
-# original service
-environment:
-  - FOO=original
-  - BAR=original
+    # original service
+    environment:
+      - FOO=original
+      - BAR=original
 
-# local service
-environment:
-  - BAR=local
-  - BAZ=local
+    # local service
+    environment:
+      - BAR=local
+      - BAZ=local
 
-# result
-environment:
-  - FOO=original
-  - BAR=local
-  - BAZ=local
-```
+    # result
+    environment:
+      - FOO=original
+      - BAR=local
+      - BAZ=local
 
 Finally, for `volumes` and `devices`, Compose "merges" entries together with
 locally-defined bindings taking precedence:
 
-```yaml
-# original service
-volumes:
-  - /original-dir/foo:/foo
-  - /original-dir/bar:/bar
+    # original service
+    volumes:
+      - /original-dir/foo:/foo
+      - /original-dir/bar:/bar
 
-# local service
-volumes:
-  - /local-dir/bar:/bar
-  - /local-dir/baz/:baz
+    # local service
+    volumes:
+      - /local-dir/bar:/bar
+      - /local-dir/baz/:baz
 
-# result
-volumes:
-  - /original-dir/foo:/foo
-  - /local-dir/bar:/bar
-  - /local-dir/baz/:baz
-```
+    # result
+    volumes:
+      - /original-dir/foo:/foo
+      - /local-dir/bar:/bar
+      - /local-dir/baz/:baz
 
 ## Compose documentation
 
diff --git a/docs/index.md b/docs/index.md
index 33629957..59a2aa1b 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -29,18 +29,16 @@ they can be run together in an isolated environment:
 
 A `docker-compose.yml` looks like this:
 
-```yaml
-web:
-  build: .
-  ports:
-   - "5000:5000"
-  volumes:
-   - .:/code
-  links:
-   - redis
-redis:
-  image: redis
-```
+    web:
+      build: .
+      ports:
+       - "5000:5000"
+      volumes:
+       - .:/code
+      links:
+       - redis
+    redis:
+      image: redis
 
 Compose has commands for managing the whole lifecycle of your application:
 
@@ -79,21 +77,19 @@ Next, you'll want to make a directory for the project:
 Inside this directory, create `app.py`, a simple web app that uses the Flask
 framework and increments a value in Redis:
 
-```python
-from flask import Flask
-from redis import Redis
-import os
-app = Flask(__name__)
-redis = Redis(host='redis', port=6379)
+    from flask import Flask
+    from redis import Redis
+    import os
+    app = Flask(__name__)
+    redis = Redis(host='redis', port=6379)
 
-@app.route('/')
-def hello():
-    redis.incr('hits')
-    return 'Hello World! I have been seen %s times.' % redis.get('hits')
+    @app.route('/')
+    def hello():
+        redis.incr('hits')
+        return 'Hello World! I have been seen %s times.' % redis.get('hits')
 
-if __name__ == "__main__":
-    app.run(host="0.0.0.0", debug=True)
-```
+    if __name__ == "__main__":
+        app.run(host="0.0.0.0", debug=True)
 
 Next, define the Python dependencies in a file called `requirements.txt`:
 
diff --git a/docs/wordpress.md b/docs/wordpress.md
index aa62e4e4..65a7d17f 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -32,10 +32,8 @@ Dockerfiles, see the
 [Dockerfile reference](http://docs.docker.com/reference/builder/). In this case,
 your Dockerfile should be:
 
-```
-FROM orchardup/php5
-ADD . /code
-```
+    FROM orchardup/php5
+    ADD . /code
 
 This tells Docker how to build an image defining a container that contains PHP
 and Wordpress. 
@@ -43,74 +41,69 @@ and Wordpress.
 Next you'll create a `docker-compose.yml` file that will start your web service
 and a separate MySQL instance:
 
-```
-web:
-  build: .
-  command: php -S 0.0.0.0:8000 -t /code
-  ports:
-    - "8000:8000"
-  links:
-    - db
-  volumes:
-    - .:/code
-db:
-  image: orchardup/mysql
-  environment:
-    MYSQL_DATABASE: wordpress
-```
+    web:
+      build: .
+      command: php -S 0.0.0.0:8000 -t /code
+      ports:
+        - "8000:8000"
+      links:
+        - db
+      volumes:
+        - .:/code
+    db:
+      image: orchardup/mysql
+      environment:
+        MYSQL_DATABASE: wordpress
 
 Two supporting files are needed to get this working - first, `wp-config.php` is
 the standard Wordpress config file with a single change to point the database
 configuration at the `db` container:
 
-```
-<?php
-define('DB_NAME', 'wordpress');
-define('DB_USER', 'root');
-define('DB_PASSWORD', '');
-define('DB_HOST', "db:3306");
-define('DB_CHARSET', 'utf8');
-define('DB_COLLATE', '');
+    <?php
+    define('DB_NAME', 'wordpress');
+    define('DB_USER', 'root');
+    define('DB_PASSWORD', '');
+    define('DB_HOST', "db:3306");
+    define('DB_CHARSET', 'utf8');
+    define('DB_COLLATE', '');
 
-define('AUTH_KEY',         'put your unique phrase here');
-define('SECURE_AUTH_KEY',  'put your unique phrase here');
-define('LOGGED_IN_KEY',    'put your unique phrase here');
-define('NONCE_KEY',        'put your unique phrase here');
-define('AUTH_SALT',        'put your unique phrase here');
-define('SECURE_AUTH_SALT', 'put your unique phrase here');
-define('LOGGED_IN_SALT',   'put your unique phrase here');
-define('NONCE_SALT',       'put your unique phrase here');
+    define('AUTH_KEY',         'put your unique phrase here');
+    define('SECURE_AUTH_KEY',  'put your unique phrase here');
+    define('LOGGED_IN_KEY',    'put your unique phrase here');
+    define('NONCE_KEY',        'put your unique phrase here');
+    define('AUTH_SALT',        'put your unique phrase here');
+    define('SECURE_AUTH_SALT', 'put your unique phrase here');
+    define('LOGGED_IN_SALT',   'put your unique phrase here');
+    define('NONCE_SALT',       'put your unique phrase here');
 
-$table_prefix  = 'wp_';
-define('WPLANG', '');
-define('WP_DEBUG', false);
+    $table_prefix  = 'wp_';
+    define('WPLANG', '');
+    define('WP_DEBUG', false);
 
-if ( !defined('ABSPATH') )
-    define('ABSPATH', dirname(__FILE__) . '/');
+    if ( !defined('ABSPATH') )
+        define('ABSPATH', dirname(__FILE__) . '/');
 
-require_once(ABSPATH . 'wp-settings.php');
-```
+    require_once(ABSPATH . 'wp-settings.php');
 
 Second, `router.php` tells PHP's built-in web server how to run Wordpress:
 
-```
-<?php
+    <?php
+
+    $root = $_SERVER['DOCUMENT_ROOT'];
+    chdir($root);
+    $path = '/'.ltrim(parse_url($_SERVER['REQUEST_URI'])['path'],'/');
+    set_include_path(get_include_path().':'.__DIR__);
+    if(file_exists($root.$path))
+    {
+        if(is_dir($root.$path) && substr($path,strlen($path) - 1, 1) !== '/')
+            $path = rtrim($path,'/').'/index.php';
+        if(strpos($path,'.php') === false) return false;
+        else {
+            chdir(dirname($root.$path));
+            require_once $root.$path;
+        }
+    }else include_once 'index.php';
 
-$root = $_SERVER['DOCUMENT_ROOT'];
-chdir($root);
-$path = '/'.ltrim(parse_url($_SERVER['REQUEST_URI'])['path'],'/');
-set_include_path(get_include_path().':'.__DIR__);
-if(file_exists($root.$path))
-{
-    if(is_dir($root.$path) && substr($path,strlen($path) - 1, 1) !== '/')
-        $path = rtrim($path,'/').'/index.php';
-    if(strpos($path,'.php') === false) return false;
-    else {
-        chdir(dirname($root.$path));
-        require_once $root.$path;
-    }
-}else include_once 'index.php';
-```
 ### Build the project
 
 With those four files in place, run `docker-compose up` inside your Wordpress

From 52c19bf96cbe69acb04844219e6d8c05dceef331 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Sun, 21 Jun 2015 13:06:25 -0700
Subject: [PATCH 0055/1265] Fix -d description

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 59a2aa1b..f3e73e33 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -169,8 +169,8 @@ open `http://ip-from-boot2docker:5000` and you should get a message in your brow
 Refreshing the page will increment the number.
 
 If you want to run your services in the background, you can pass the `-d` flag
-(for daemon mode) to `docker-compose up` and use `docker-compose ps` to see what
-is currently running:
+(for "detached" mode) to `docker-compose up` and use `docker-compose ps` to
+see what is currently running:
 
     $ docker-compose up -d
     Starting composetest_redis_1...

From 16213dd49304b1d3bef228dda9ea4545cfdd87a5 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 22 Jun 2015 07:58:08 -0700
Subject: [PATCH 0056/1265] Add experimental Compose/Swarm/multi-host
 networking guide

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 experimental/compose_swarm_networking.md | 183 +++++++++++++++++++++++
 1 file changed, 183 insertions(+)
 create mode 100644 experimental/compose_swarm_networking.md

diff --git a/experimental/compose_swarm_networking.md b/experimental/compose_swarm_networking.md
new file mode 100644
index 00000000..c62d53ea
--- /dev/null
+++ b/experimental/compose_swarm_networking.md
@@ -0,0 +1,183 @@
+# Experimental: Compose, Swarm and Multi-Host Networking
+
+The [experimental build of Docker](https://github.com/docker/docker/tree/master/experimental) has an entirely new networking system, which enables secure communication between containers on multiple hosts. In combination with Docker Swarm and Docker Compose, you can now run multi-container apps on multi-host clusters with the same tooling and configuration format you use to develop them locally.
+
+> Note: This functionality is in the experimental stage, and contains some hacks and workarounds which will be removed as it matures.
+
+## Prerequisites
+
+Before you start, you’ll need to install the experimental build of Docker, and the latest versions of Machine and Compose.
+
+-   To install the experimental Docker build on a Linux machine, follow the instructions [here](https://github.com/docker/docker/tree/master/experimental#install-docker-experimental).
+
+-   To install the experimental Docker build on a Mac, run these commands:
+
+        $ curl -L https://experimental.docker.com/builds/Darwin/x86_64/docker-latest > /usr/local/bin/docker
+        $ chmod +x /usr/local/bin/docker
+
+-   To install Machine, follow the instructions [here](http://docs.docker.com/machine/).
+
+-   To install Compose, follow the instructions [here](http://docs.docker.com/compose/install/).
+
+You’ll also need a [Docker Hub](https://hub.docker.com/account/signup/) account and a [Digital Ocean](https://www.digitalocean.com/) account.
+
+## Set up a swarm with multi-host networking
+
+Set the `DIGITALOCEAN_ACCESS_TOKEN` environment variable to a valid Digital Ocean API token, which you can generate in the [API panel](https://cloud.digitalocean.com/settings/applications).
+
+    $ DIGITALOCEAN_ACCESS_TOKEN=abc12345
+
+Start a consul server:
+
+    $ docker-machine create -d digitalocean --engine-install-url https://experimental.docker.com consul
+    $ docker $(docker-machine config consul) run -d -p 8500:8500 -h consul progrium/consul -server -bootstrap
+
+(In a real world setting you’d set up a distributed consul, but that’s beyond the scope of this guide!)
+
+Create a Swarm token:
+
+    $ SWARM_TOKEN=$(docker run swarm create)
+
+Create a Swarm master:
+
+    $ docker-machine create -d digitalocean --swarm --swarm-discovery=token://$SWARM_TOKEN --engine-install-url="https://experimental.docker.com" --digitalocean-image "ubuntu-14-10-x64" --swarm-master --swarm --engine-opt=default-network=overlay:multihost  --engine-label=com.docker.network.driver.overlay.bind_interface=eth0 --kv-store=consul:$(docker-machine ip consul):8500 swarm-0
+
+Create a Swarm node:
+
+    $ docker-machine create -d digitalocean --swarm --swarm-discovery=token://$SWARM_TOKEN --engine-install-url="https://experimental.docker.com" --digitalocean-image "ubuntu-14-10-x64" --swarm --engine-opt=default-network=overlay:multihost  --engine-label=com.docker.network.driver.overlay.bind_interface=eth0 --kv-store=consul:$(docker-machine ip consul):8500 --engine-label com.docker.network.driver.overlay.neighbor_ip=$(docker-machine ip swarm-0) swarm-1
+
+You can create more Swarm nodes if you want - it’s best to give them sensible names (swarm-2, swarm-3, etc).
+
+Finally, point Docker at your swarm:
+
+    $ eval "$(docker-machine env --swarm swarm-0)"
+
+## Run containers and get them communicating
+
+Now that you’ve got a swarm up and running, you can create containers on it just like a single Docker instance:
+
+    $ docker run busybox echo hello world
+    hello world
+
+If you run `docker ps -a`, you can see what node that container was started on by looking at its name (here it’s swarm-3):
+
+    $ docker ps -a
+    CONTAINER ID        IMAGE                      COMMAND                CREATED              STATUS                      PORTS                                   NAMES
+    41f59749737b        busybox                    "echo hello world"     15 seconds ago       Exited (0) 13 seconds ago                                           swarm-3/trusting_leakey
+
+As you start more containers, they’ll be placed on different nodes across the cluster, thanks to Swarm’s default “spread” scheduling strategy.
+
+Every container started on this swarm will use the “overlay:multihost” network by default, meaning they can all intercommunicate. Each container gets an IP address on that network, and an `/etc/hosts` file which will be updated on-the-fly with every other container’s IP address and name. That means that if you have a running container named ‘foo’, other containers can access it at the hostname ‘foo’.
+
+Let’s verify that multi-host networking is functioning. Start a long-running container:
+
+    $ docker run -d --name long-running busybox top
+    <container id>
+
+If you start a new container and inspect its /etc/hosts file, you’ll see the long-running container in there:
+
+    $ docker run busybox cat /etc/hosts
+    ...
+    172.21.0.6  long-running
+
+Verify that connectivity works between containers:
+
+    $ docker run busybox ping long-running
+    PING long-running (172.21.0.6): 56 data bytes
+    64 bytes from 172.21.0.6: seq=0 ttl=64 time=7.975 ms
+    64 bytes from 172.21.0.6: seq=1 ttl=64 time=1.378 ms
+    64 bytes from 172.21.0.6: seq=2 ttl=64 time=1.348 ms
+    ^C
+    --- long-running ping statistics ---
+    3 packets transmitted, 3 packets received, 0% packet loss
+    round-trip min/avg/max = 1.140/2.099/7.975 ms
+
+## Run a Compose application
+
+Here’s an example of a simple Python + Redis app using multi-host networking on a swarm.
+
+Create a directory for the app:
+
+    $ mkdir composetest
+    $ cd composetest
+
+Inside this directory, create 2 files.
+
+First, create `app.py` - a simple web app that uses the Flask framework and increments a value in Redis:
+
+    from flask import Flask
+    from redis import Redis
+    import os
+    app = Flask(__name__)
+    redis = Redis(host='composetest_redis_1', port=6379)
+
+    @app.route('/')
+    def hello():
+        redis.incr('hits')
+        return 'Hello World! I have been seen %s times.' % redis.get('hits')
+
+    if __name__ == "__main__":
+        app.run(host="0.0.0.0", debug=True)
+
+Note that we’re connecting to a host called `composetest_redis_1` - this is the name of the Redis container that Compose will start.
+
+Second, create a Dockerfile for the app container:
+
+    FROM python:2.7
+    RUN pip install flask redis
+    ADD . /code
+    WORKDIR /code
+    CMD ["python", "app.py"]
+
+Build the Docker image and push it to the Hub (you’ll need a Hub account). Replace `<username>` with your Docker Hub username:
+
+    $ docker build -t <username>/counter .
+    $ docker push <username>/counter
+
+Next, create a `docker-compose.yml`, which defines the configuration for the web and redis containers. Once again, replace `<username>` with your Hub username:
+
+    web:
+      image: <username>/counter
+      ports:
+       - "80:5000"
+    redis:
+      image: redis
+
+Now start the app:
+
+    $ docker-compose up -d
+    Pulling web (username/counter:latest)...
+    swarm-0: Pulling username/counter:latest... : downloaded
+    swarm-2: Pulling username/counter:latest... : downloaded
+    swarm-1: Pulling username/counter:latest... : downloaded
+    swarm-3: Pulling username/counter:latest... : downloaded
+    swarm-4: Pulling username/counter:latest... : downloaded
+    Creating composetest_web_1...
+    Pulling redis (redis:latest)...
+    swarm-2: Pulling redis:latest... : downloaded
+    swarm-1: Pulling redis:latest... : downloaded
+    swarm-3: Pulling redis:latest... : downloaded
+    swarm-4: Pulling redis:latest... : downloaded
+    swarm-0: Pulling redis:latest... : downloaded
+    Creating composetest_redis_1...
+
+Swarm has created containers for both web and redis, and placed them on different nodes, which you can check with `docker ps`:
+
+    $ docker ps
+    CONTAINER ID        IMAGE                      COMMAND                CREATED             STATUS              PORTS                                  NAMES
+    92faad2135c9        redis                      "/entrypoint.sh redi   43 seconds ago      Up 42 seconds                                              swarm-2/composetest_redis_1
+    adb809e5cdac        username/counter           "/bin/sh -c 'python    55 seconds ago      Up 54 seconds       45.67.8.9:80->5000/tcp                 swarm-1/composetest_web_1
+
+You can also see that the web container has exposed port 80 on its swarm node. If you curl that IP, you’ll get a response from the container:
+
+    $ curl http://45.67.8.9
+    Hello World! I have been seen 1 times.
+
+If you hit it repeatedly, the counter will increment, demonstrating that the web and redis container are communicating:
+
+    $ curl http://45.67.8.9
+    Hello World! I have been seen 2 times.
+    $ curl http://45.67.8.9
+    Hello World! I have been seen 3 times.
+    $ curl http://45.67.8.9
+    Hello World! I have been seen 4 times.

From 52975eca6f3298c4984cf85281ba59e7f6d1e60b Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 22 Jun 2015 08:38:50 -0700
Subject: [PATCH 0057/1265] Fixes

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 experimental/compose_swarm_networking.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/experimental/compose_swarm_networking.md b/experimental/compose_swarm_networking.md
index c62d53ea..e3dcf6cc 100644
--- a/experimental/compose_swarm_networking.md
+++ b/experimental/compose_swarm_networking.md
@@ -25,32 +25,32 @@ You’ll also need a [Docker Hub](https://hub.docker.com/account/signup/) accoun
 
 Set the `DIGITALOCEAN_ACCESS_TOKEN` environment variable to a valid Digital Ocean API token, which you can generate in the [API panel](https://cloud.digitalocean.com/settings/applications).
 
-    $ DIGITALOCEAN_ACCESS_TOKEN=abc12345
+    DIGITALOCEAN_ACCESS_TOKEN=abc12345
 
 Start a consul server:
 
-    $ docker-machine create -d digitalocean --engine-install-url https://experimental.docker.com consul
-    $ docker $(docker-machine config consul) run -d -p 8500:8500 -h consul progrium/consul -server -bootstrap
+    docker-machine create -d digitalocean --engine-install-url https://experimental.docker.com consul
+    docker $(docker-machine config consul) run -d -p 8500:8500 -h consul progrium/consul -server -bootstrap
 
 (In a real world setting you’d set up a distributed consul, but that’s beyond the scope of this guide!)
 
 Create a Swarm token:
 
-    $ SWARM_TOKEN=$(docker run swarm create)
+    SWARM_TOKEN=$(docker run swarm create)
 
 Create a Swarm master:
 
-    $ docker-machine create -d digitalocean --swarm --swarm-discovery=token://$SWARM_TOKEN --engine-install-url="https://experimental.docker.com" --digitalocean-image "ubuntu-14-10-x64" --swarm-master --swarm --engine-opt=default-network=overlay:multihost  --engine-label=com.docker.network.driver.overlay.bind_interface=eth0 --kv-store=consul:$(docker-machine ip consul):8500 swarm-0
+    docker-machine create -d digitalocean --swarm --swarm-master --swarm-discovery=token://$SWARM_TOKEN --engine-install-url="https://experimental.docker.com" --digitalocean-image "ubuntu-14-10-x64" --engine-opt=default-network=overlay:multihost --engine-label=com.docker.network.driver.overlay.bind_interface=eth0 --engine-opt=kv-store=consul:$(docker-machine ip consul):8500 swarm-0
 
 Create a Swarm node:
 
-    $ docker-machine create -d digitalocean --swarm --swarm-discovery=token://$SWARM_TOKEN --engine-install-url="https://experimental.docker.com" --digitalocean-image "ubuntu-14-10-x64" --swarm --engine-opt=default-network=overlay:multihost  --engine-label=com.docker.network.driver.overlay.bind_interface=eth0 --kv-store=consul:$(docker-machine ip consul):8500 --engine-label com.docker.network.driver.overlay.neighbor_ip=$(docker-machine ip swarm-0) swarm-1
+    docker-machine create -d digitalocean --swarm --swarm-discovery=token://$SWARM_TOKEN --engine-install-url="https://experimental.docker.com" --digitalocean-image "ubuntu-14-10-x64" --engine-opt=default-network=overlay:multihost --engine-label=com.docker.network.driver.overlay.bind_interface=eth0 --engine-opt=kv-store=consul:$(docker-machine ip consul):8500 --engine-label com.docker.network.driver.overlay.neighbor_ip=$(docker-machine ip swarm-0) swarm-1
 
 You can create more Swarm nodes if you want - it’s best to give them sensible names (swarm-2, swarm-3, etc).
 
 Finally, point Docker at your swarm:
 
-    $ eval "$(docker-machine env --swarm swarm-0)"
+    eval "$(docker-machine env --swarm swarm-0)"
 
 ## Run containers and get them communicating
 

From 9a8020d1bf92e4a756a46ff9c3cee8ac9c53f9a3 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Thu, 25 Jun 2015 12:41:43 -0700
Subject: [PATCH 0058/1265] Add --help to bash completion

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 46 +++++++++++++++++++-------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index ad636f5f..b785a992 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -82,7 +82,7 @@ __docker-compose_services_stopped() {
 _docker-compose_build() {
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--no-cache" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help --no-cache" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_from_build
@@ -128,7 +128,7 @@ _docker-compose_kill() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "-s" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help -s" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_running
@@ -140,7 +140,7 @@ _docker-compose_kill() {
 _docker-compose_logs() {
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--no-color" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help --no-color" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_all
@@ -149,6 +149,15 @@ _docker-compose_logs() {
 }
 
 
+_docker-compose_migrate-to-labels() {
+	case "$cur" in
+		-*)
+			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
+			;;
+	esac
+}
+
+
 _docker-compose_port() {
 	case "$prev" in
 		--protocol)
@@ -162,7 +171,7 @@ _docker-compose_port() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--protocol --index" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help --index --protocol" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_all
@@ -174,7 +183,7 @@ _docker-compose_port() {
 _docker-compose_ps() {
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "-q" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help -q" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_all
@@ -186,7 +195,7 @@ _docker-compose_ps() {
 _docker-compose_pull() {
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--allow-insecure-ssl" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--allow-insecure-ssl --help" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_from_image
@@ -204,7 +213,7 @@ _docker-compose_restart() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "-t --timeout" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help --timeout -t" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_running
@@ -216,7 +225,7 @@ _docker-compose_restart() {
 _docker-compose_rm() {
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--force -f -v" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--force -f --help -v" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_stopped
@@ -239,7 +248,7 @@ _docker-compose_run() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--allow-insecure-ssl -d --entrypoint -e --no-deps --rm --service-ports -T --user -u" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--allow-insecure-ssl -d --entrypoint -e --help --no-deps --rm --service-ports -T --user -u" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_all
@@ -258,11 +267,24 @@ _docker-compose_scale() {
 			compopt -o nospace
 			;;
 	esac
+
+	case "$cur" in
+		-*)
+			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
+			;;
+	esac
 }
 
 
 _docker-compose_start() {
-	__docker-compose_services_stopped
+	case "$cur" in
+		-*)
+			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
+			;;
+		*)
+			__docker-compose_services_stopped
+			;;
+	esac
 }
 
 
@@ -275,7 +297,7 @@ _docker-compose_stop() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "-t --timeout" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help --timeout -t" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_running
@@ -293,7 +315,7 @@ _docker-compose_up() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--allow-insecure-ssl -d --no-build --no-color --no-deps --no-recreate -t --timeout --x-smart-recreate" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--allow-insecure-ssl -d --help --no-build --no-color --no-deps --no-recreate --timeout -t --x-smart-recreate" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_all

From 745e838673fa1f51af2793ea9407355d14f4efea Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Fri, 26 Jun 2015 09:00:47 +0200
Subject: [PATCH 0059/1265] Add --help to subcommands in zsh completion

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 19c06675..e2e5b8f9 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -162,6 +162,7 @@ __docker-compose_subcommand () {
     case "$words[1]" in
         (build)
             _arguments \
+                '--help[Print usage]' \
                 '--no-cache[Do not use cache when building the image]' \
                 '*:services:__docker-compose_services_from_build' && ret=0
             ;;
@@ -170,20 +171,24 @@ __docker-compose_subcommand () {
             ;;
         (kill)
             _arguments \
+                '--help[Print usage]' \
                 '-s[SIGNAL to send to the container. Default signal is SIGKILL.]:signal:_signals' \
                 '*:running services:__docker-compose_runningservices' && ret=0
             ;;
         (logs)
             _arguments \
+                '--help[Print usage]' \
                 '--no-color[Produce monochrome output.]' \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
         (migrate-to-labels)
-            _arguments \
+            _arguments -A '-*' \
+                '--help[Print usage]' \
                 '(-):Recreate containers to add labels' && ret=0
             ;;
         (port)
             _arguments \
+                '--help[Print usage]' \
                 '--protocol=-[tcp or udap (defaults to tcp)]:protocol:(tcp udp)' \
                 '--index=-[index of the container if there are mutiple instances of a service (defaults to 1)]:index: ' \
                 '1:running services:__docker-compose_runningservices' \
@@ -191,17 +196,20 @@ __docker-compose_subcommand () {
             ;;
         (ps)
             _arguments \
+                '--help[Print usage]' \
                 '-q[Only display IDs]' \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
         (pull)
             _arguments \
                 '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \
+                '--help[Print usage]' \
                 '*:services:__docker-compose_services_from_image' && ret=0
             ;;
         (rm)
             _arguments \
                 '(-f --force)'{-f,--force}"[Don't ask to confirm removal]" \
+                '--help[Print usage]' \
                 '-v[Remove volumes associated with containers]' \
                 '*:stopped services:__docker-compose_stoppedservices' && ret=0
             ;;
@@ -211,6 +219,7 @@ __docker-compose_subcommand () {
                 '-d[Detached mode: Run container in the background, print new container name.]' \
                 '--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
                 '*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
+                '--help[Print usage]' \
                 '(-u --user)'{-u,--user=-}'[Run as specified username or uid]:username or uid:_users' \
                 "--no-deps[Don't start linked services.]" \
                 '--rm[Remove container after run. Ignored in detached mode.]' \
@@ -221,13 +230,18 @@ __docker-compose_subcommand () {
                 '*::arguments: _normal' && ret=0
             ;;
         (scale)
-            _arguments '*:running services:__docker-compose_runningservices' && ret=0
+            _arguments \
+                '--help[Print usage]' \
+                '*:running services:__docker-compose_runningservices' && ret=0
             ;;
         (start)
-            _arguments '*:stopped services:__docker-compose_stoppedservices' && ret=0
+            _arguments \
+                '--help[Print usage]' \
+                '*:stopped services:__docker-compose_stoppedservices' && ret=0
             ;;
         (stop|restart)
             _arguments \
+                '--help[Print usage]' \
                 '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
                 '*:running services:__docker-compose_runningservices' && ret=0
             ;;
@@ -235,6 +249,7 @@ __docker-compose_subcommand () {
             _arguments \
                 '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \
                 '-d[Detached mode: Run containers in the background, print new container names.]' \
+                '--help[Print usage]' \
                 '--no-color[Produce monochrome output.]' \
                 "--no-deps[Don't start linked services.]" \
                 "--no-recreate[If containers already exist, don't recreate them.]" \
@@ -245,6 +260,7 @@ __docker-compose_subcommand () {
             ;;
         (version)
             _arguments \
+                '--help[Print usage]' \
                 "--short[Shows only Compose's version number.]" && ret=0
             ;;
         (*)

From 8197d0e261acc28d128338b392d0d6fce1d0a502 Mon Sep 17 00:00:00 2001
From: Andy Wendt <andy@awendt.com>
Date: Tue, 30 Jun 2015 10:21:36 -0600
Subject: [PATCH 0060/1265] Added uninstall documentation for pip and curl

Signed-off-by: Andy Wendt <andy@awendt.com>
---
 docs/install.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/install.md b/docs/install.md
index ac35c8d9..debd2e4e 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -55,6 +55,21 @@ Alternatively, if you're not worried about keeping them, you can remove them - C
 
     docker rm -f myapp_web_1 myapp_db_1 ...
 
+
+## Uninstallation
+
+To uninstall Docker Compose if you installed using `curl`:
+
+    $ rm /usr/local/bin/docker-compose
+
+
+To uninstall Docker Compose if you installed using `pip`:
+
+    $ pip uninstall docker-compose
+    
+> Note: If you get a "Permission denied" error using either of the above methods, you probably do not have the proper permissions to remove `docker-compose`.  To force the removal, prepend `sudo` to either of the above commands and run again.
+
+
 ## Compose documentation
 
 - [User guide](/)

From 63941b8f6cb97c600040633a8371ffcac961bd3d Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 1 Jul 2015 15:38:07 +0100
Subject: [PATCH 0061/1265] Add Mazz to MAINTAINERS

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 8ac3985f..00324232 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,3 +1,4 @@
 Aanand Prasad <aanand.prasad@gmail.com> (@aanand)
 Ben Firshman <ben@firshman.co.uk> (@bfirsh)
 Daniel Nephin <dnephin@gmail.com> (@dnephin)
+Mazz Mosley <mazz@houseofmnowster.com> (@mnowster)

From 3906bd067e30f7c4cfbec7c2b7e878254402242d Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 15:57:26 +0100
Subject: [PATCH 0062/1265] Remove redundant import

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index f3e73e33..faeb8a77 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -79,7 +79,7 @@ framework and increments a value in Redis:
 
     from flask import Flask
     from redis import Redis
-    import os
+
     app = Flask(__name__)
     redis = Redis(host='redis', port=6379)
 

From 4d69a57edda88944ab4ee6fe76640999b79e7e13 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 15:57:27 +0100
Subject: [PATCH 0063/1265] Include flask output

When running `docker-compose up`, an extra line of output, from flask,
is outputted. I've included it so anyone new to docker-compose who
sees this output will know that it's expected and not worry that
something might have gone wrong.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index faeb8a77..3320bba9 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -159,6 +159,7 @@ Now, when you run `docker-compose up`, Compose will pull a Redis image, build an
     Starting composetest_web_1...
     redis_1 | [8] 02 Jan 18:43:35.576 # Server started, Redis version 2.8.3
     web_1   |  * Running on http://0.0.0.0:5000/
+    web_1   |  * Restarting with stat
 
 The web app should now be listening on port 5000 on your Docker daemon host (if
 you're using Boot2docker, `boot2docker ip` will tell you its address). In a browser,

From a7a08884469b5bd7a8a63ee91cfd11e52d16a03c Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 15:57:27 +0100
Subject: [PATCH 0064/1265] Re-phrasing for clarity

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 00736e47..4d646563 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -12,7 +12,7 @@ If you want to add a new file or change the location of the document in the menu
 
 2. Save your changes.
 
-3. Make sure you in your `docs` subdirectory.
+3. Make sure you are in the `docs` subdirectory.
 
 4. Build the documentation.
 
@@ -41,7 +41,7 @@ If you want to add a new file or change the location of the document in the menu
 
 ## Tips on Hugo metadata and menu positioning
 
-The top of each Docker Compose documentation file contains TOML metadata. The metadata is commented out to prevent it from appears in GitHub.
+The top of each Docker Compose documentation file contains TOML metadata. The metadata is commented out to prevent it from appearing in GitHub.
 
     <!--[metadata]>
     +++

From 4c31741ac9593d0affc5ef23e3482ac872133379 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 15:57:27 +0100
Subject: [PATCH 0065/1265] Include command completion link

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 3320bba9..43f52d01 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -188,7 +188,7 @@ services. For example, to see what environment variables are available to the
 
     $ docker-compose run web env
 
-See `docker-compose --help` to see other available commands.
+See `docker-compose --help` to see other available commands. You can also install [command completion](completion.md) for the bash shell, which will also show you available commands.
 
 If you started Compose with `docker-compose up -d`, you'll probably want to stop
 your services once you've finished with them:

From d0c499329eb2f9ddb960224101208cb18d4731d7 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 15:57:27 +0100
Subject: [PATCH 0066/1265] Add a note not to worry

When reading through the code for the first time and seeing redis,
those unfamiliar with docker first thought might be that they need
to install redis. Adding this sentence helps make it clearer that
this is not needed. Docker will take care of this in services.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 43f52d01..24ed1027 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -75,7 +75,7 @@ Next, you'll want to make a directory for the project:
     $ cd composetest
 
 Inside this directory, create `app.py`, a simple web app that uses the Flask
-framework and increments a value in Redis:
+framework and increments a value in Redis. Don't worry if you don't have Redis installed, docker is going to take care of that for you when we [define services](#define-services):
 
     from flask import Flask
     from redis import Redis

From c45c16cead684700192f499ce942a52a67c8df1d Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 15:57:27 +0100
Subject: [PATCH 0067/1265] Improve localhost & boot2docker info

Added a link to boot2docker for those unfamiliar with it.

http://0.0.0.0:5000 didn't resolve for me, however localhost:5000
did, so included reference to that.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/index.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 24ed1027..e4366f46 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -161,9 +161,11 @@ Now, when you run `docker-compose up`, Compose will pull a Redis image, build an
     web_1   |  * Running on http://0.0.0.0:5000/
     web_1   |  * Restarting with stat
 
-The web app should now be listening on port 5000 on your Docker daemon host (if
-you're using Boot2docker, `boot2docker ip` will tell you its address). In a browser,
-open `http://ip-from-boot2docker:5000` and you should get a message in your browser saying:
+The web app should now be listening on port 5000 on your Docker daemon host. If http://0.0.0.0:5000 doesn't resolve, you can also try localhost:5000. 
+
+If you're using [Boot2docker](https://github.com/boot2docker/boot2docker), then `boot2docker ip` will tell you its address and you can open `http://ip-from-boot2docker:5000` in a browser. 
+
+You should get a message in your browser saying:
 
 `Hello World! I have been seen 1 times.`
 

From 4e0f4aa20ad4ca2b8c5b43b7c92f8391ed8e810f Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 15:57:27 +0100
Subject: [PATCH 0068/1265] Split out release process

To aid clarity in how to contribute, I've moved the release process
out into it's own RELEASE_PROCESS.md file. The release process info
is only relevant for maintainers who are building new releases of
compose.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 CONTRIBUTING.md    | 35 -----------------------------------
 README.md          |  5 +++++
 RELEASE_PROCESS.md | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 35 deletions(-)
 create mode 100644 RELEASE_PROCESS.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6914e215..558af11d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -50,38 +50,3 @@ you can specify a test directory, file, module, class or method:
     $ script/test tests/unit/cli_test.py
     $ script/test tests.integration.service_test
     $ script/test tests.integration.service_test:ServiceTest.test_containers
-
-## Building binaries
-
-`script/build-linux` will build the Linux binary inside a Docker container:
-
-    $ script/build-linux
-
-`script/build-osx` will build the Mac OS X binary inside a virtualenv:
-
-    $ script/build-osx
-
-For official releases, you should build inside a Mountain Lion VM for proper
-compatibility. Run the this script first to prepare the environment before
-building - it will use Homebrew to make sure Python is installed and
-up-to-date.
-
-    $ script/prepare-osx
-
-## Release process
-
-1. Open pull request that:
- - Updates the version in `compose/__init__.py`
- - Updates the binary URL in `docs/install.md`
- - Adds release notes to `CHANGES.md`
-2. Create unpublished GitHub release with release notes
-3. Build Linux version on any Docker host with `script/build-linux` and attach
-   to release
-4. Build OS X version on Mountain Lion with `script/build-osx` and attach to
-   release as `docker-compose-Darwin-x86_64` and `docker-compose-Linux-x86_64`.
-5. Publish GitHub release, creating tag
-6. Update website with `script/deploy-docs`
-7. Upload PyPi package
-
-        $ git checkout $VERSION
-        $ python setup.py sdist upload
diff --git a/README.md b/README.md
index 4b18fc9d..7121f6a2 100644
--- a/README.md
+++ b/README.md
@@ -50,3 +50,8 @@ Contributing
 [![Build Status](http://jenkins.dockerproject.org/buildStatus/icon?job=Compose%20Master)](http://jenkins.dockerproject.org/job/Compose%20Master/)
 
 Want to help build Compose? Check out our [contributing documentation](https://github.com/docker/compose/blob/master/CONTRIBUTING.md).
+
+Releasing
+---------
+
+Releases are built by maintainers, following an outline of the [release process](https://github.com/docker/compose/blob/master/RELEASE_PROCESS.md).
\ No newline at end of file
diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
new file mode 100644
index 00000000..91a0d773
--- /dev/null
+++ b/RELEASE_PROCESS.md
@@ -0,0 +1,36 @@
+# Building a Compose release
+
+## Building binaries
+
+`script/build-linux` will build the Linux binary inside a Docker container:
+
+    $ script/build-linux
+
+`script/build-osx` will build the Mac OS X binary inside a virtualenv:
+
+    $ script/build-osx
+
+For official releases, you should build inside a Mountain Lion VM for proper
+compatibility. Run the this script first to prepare the environment before
+building - it will use Homebrew to make sure Python is installed and
+up-to-date.
+
+    $ script/prepare-osx
+
+## Release process
+
+1. Open pull request that:
+ - Updates the version in `compose/__init__.py`
+ - Updates the binary URL in `docs/install.md`
+ - Adds release notes to `CHANGES.md`
+2. Create unpublished GitHub release with release notes
+3. Build Linux version on any Docker host with `script/build-linux` and attach
+   to release
+4. Build OS X version on Mountain Lion with `script/build-osx` and attach to
+   release as `docker-compose-Darwin-x86_64` and `docker-compose-Linux-x86_64`.
+5. Publish GitHub release, creating tag
+6. Update website with `script/deploy-docs`
+7. Upload PyPi package
+
+        $ git checkout $VERSION
+        $ python setup.py sdist upload

From 098ec3dcaab48e693463cdd3d2e9450534024130 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 15:57:27 +0100
Subject: [PATCH 0069/1265] Add in `git fork` syncing links

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 CONTRIBUTING.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 558af11d..480b9cd7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,8 +22,9 @@ that should get you started.
 1. Fork [https://github.com/docker/compose](https://github.com/docker/compose)
    to your username.
 2. Clone your forked repository locally `git clone git@github.com:yourusername/compose.git`.
-3. Enter the local directory `cd compose`.
-4. Set up a development environment by running `python setup.py develop`. This
+3. You must [configure](https://help.github.com/articles/configuring-a-remote-for-a-fork/) a remote for your fork so that you can [sync changes you make](https://help.github.com/articles/syncing-a-fork/) with the original repository.
+4. Enter the local directory `cd compose`.
+5. Set up a development environment by running `python setup.py develop`. This
    will install the dependencies and set up a symlink from your `docker-compose`
    executable to the checkout of the repository. When you now run
    `docker-compose` from anywhere on your machine, it will run your development

From 94ecc515d35aea5637096a4ee48dfe069788ca8d Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 15:57:27 +0100
Subject: [PATCH 0070/1265] Link to docker's contrib workflow

This will aid people in how to make pull requests for code and docs.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 CONTRIBUTING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 480b9cd7..136e37db 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,6 +30,10 @@ that should get you started.
    `docker-compose` from anywhere on your machine, it will run your development
    version of Compose.
 
+## Submitting a pull request
+
+See docker's [basic contribution workflow](https://docs.docker.com/project/make-a-contribution/#the-basic-contribution-workflow) for a guide on how to submit a pull request for code or documentation.
+
 ## Running the test suite
 
 Use the test script to run linting checks and then the full test suite against

From ab03f2310bcf926a49595db0ed93b74ff840b8e8 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 16:13:38 +0100
Subject: [PATCH 0071/1265] Include zsh shell

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index e4366f46..56cd77c3 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -190,7 +190,7 @@ services. For example, to see what environment variables are available to the
 
     $ docker-compose run web env
 
-See `docker-compose --help` to see other available commands. You can also install [command completion](completion.md) for the bash shell, which will also show you available commands.
+See `docker-compose --help` to see other available commands. You can also install [command completion](completion.md) for the bash and zsh shell, which will also show you available commands.
 
 If you started Compose with `docker-compose up -d`, you'll probably want to stop
 your services once you've finished with them:

From 8a477911614dde82e9b93b44a25d9f44189d8cf2 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 16:19:12 +0100
Subject: [PATCH 0072/1265] Re-arrange for the more common case

boot2docker is the more common case so let's have that one first.
Also be more explicit and clear that the localhost:5000 is applicable
for people running on linux.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 56cd77c3..62f2198e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -161,10 +161,10 @@ Now, when you run `docker-compose up`, Compose will pull a Redis image, build an
     web_1   |  * Running on http://0.0.0.0:5000/
     web_1   |  * Restarting with stat
 
-The web app should now be listening on port 5000 on your Docker daemon host. If http://0.0.0.0:5000 doesn't resolve, you can also try localhost:5000. 
-
 If you're using [Boot2docker](https://github.com/boot2docker/boot2docker), then `boot2docker ip` will tell you its address and you can open `http://ip-from-boot2docker:5000` in a browser. 
 
+If you're not using Boot2docker and are on linux, then the web app should now be listening on port 5000 on your Docker daemon host. If http://0.0.0.0:5000 doesn't resolve, you can also try localhost:5000.
+
 You should get a message in your browser saying:
 
 `Hello World! I have been seen 1 times.`

From 8cf84ea552e8fa14d26875b41b3d70d70ee7b44e Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 17:47:44 +0100
Subject: [PATCH 0073/1265] Fix missing image names

These tests were indeed raising a config error, but not for the reason
intended/tested for. I've added in the image name so the config error
raise is correctly testing the Service name.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/unit/service_test.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index f99cbbc9..fb6b56c4 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -28,16 +28,16 @@ class ServiceTest(unittest.TestCase):
         self.mock_client = mock.create_autospec(docker.Client)
 
     def test_name_validations(self):
-        self.assertRaises(ConfigError, lambda: Service(name=''))
+        self.assertRaises(ConfigError, lambda: Service(name='', image='foo'))
 
-        self.assertRaises(ConfigError, lambda: Service(name=' '))
-        self.assertRaises(ConfigError, lambda: Service(name='/'))
-        self.assertRaises(ConfigError, lambda: Service(name='!'))
-        self.assertRaises(ConfigError, lambda: Service(name='\xe2'))
-        self.assertRaises(ConfigError, lambda: Service(name='_'))
-        self.assertRaises(ConfigError, lambda: Service(name='____'))
-        self.assertRaises(ConfigError, lambda: Service(name='foo_bar'))
-        self.assertRaises(ConfigError, lambda: Service(name='__foo_bar__'))
+        self.assertRaises(ConfigError, lambda: Service(name=' ', image='foo'))
+        self.assertRaises(ConfigError, lambda: Service(name='/', image='foo'))
+        self.assertRaises(ConfigError, lambda: Service(name='!', image='foo'))
+        self.assertRaises(ConfigError, lambda: Service(name='\xe2', image='foo'))
+        self.assertRaises(ConfigError, lambda: Service(name='_', image='foo'))
+        self.assertRaises(ConfigError, lambda: Service(name='____', image='foo'))
+        self.assertRaises(ConfigError, lambda: Service(name='foo_bar', image='foo'))
+        self.assertRaises(ConfigError, lambda: Service(name='__foo_bar__', image='foo'))
 
         Service('a', image='foo')
         Service('foo', image='foo')

From f33f673b491989e2f5db2d1c9321ce1e94914e07 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 17:56:39 +0100
Subject: [PATCH 0074/1265] Allow _.- chars in service names

As VALID_CHARS is shared with project names, these chars are also
now allowed within project names.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/service.py         |  2 +-
 tests/unit/service_test.py | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 89851e07..012499af 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -47,7 +47,7 @@ DOCKER_START_KEYS = [
     'security_opt',
 ]
 
-VALID_NAME_CHARS = '[a-zA-Z0-9]'
+VALID_NAME_CHARS = '[a-zA-Z0-9\._\-]'
 
 
 class BuildError(Exception):
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index fb6b56c4..0327874c 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -34,18 +34,23 @@ class ServiceTest(unittest.TestCase):
         self.assertRaises(ConfigError, lambda: Service(name='/', image='foo'))
         self.assertRaises(ConfigError, lambda: Service(name='!', image='foo'))
         self.assertRaises(ConfigError, lambda: Service(name='\xe2', image='foo'))
-        self.assertRaises(ConfigError, lambda: Service(name='_', image='foo'))
-        self.assertRaises(ConfigError, lambda: Service(name='____', image='foo'))
-        self.assertRaises(ConfigError, lambda: Service(name='foo_bar', image='foo'))
-        self.assertRaises(ConfigError, lambda: Service(name='__foo_bar__', image='foo'))
 
         Service('a', image='foo')
         Service('foo', image='foo')
+        Service('foo-bar', image='foo')
+        Service('foo.bar', image='foo')
+        Service('foo_bar', image='foo')
+        Service('_', image='foo')
+        Service('___', image='foo')
+        Service('-', image='foo')
+        Service('--', image='foo')
+        Service('.__.', image='foo')
 
     def test_project_validation(self):
         self.assertRaises(ConfigError, lambda: Service('bar'))
-        self.assertRaises(ConfigError, lambda: Service(name='foo', project='_', image='foo'))
-        Service(name='foo', project='bar', image='foo')
+        self.assertRaises(ConfigError, lambda: Service(name='foo', project='>', image='foo'))
+
+        Service(name='foo', project='bar.bar__', image='foo')
 
     def test_containers(self):
         service = Service('db', self.mock_client, 'myproject', image='foo')

From 9549bd0539c32a4be165103c8e9143ee51543a93 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 18:05:21 +0100
Subject: [PATCH 0075/1265] Initial cap Docker

Use lowercase docker only when referencing a command/daemon

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 136e37db..c55f012d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ that should get you started.
 
 ## Submitting a pull request
 
-See docker's [basic contribution workflow](https://docs.docker.com/project/make-a-contribution/#the-basic-contribution-workflow) for a guide on how to submit a pull request for code or documentation.
+See Docker's [basic contribution workflow](https://docs.docker.com/project/make-a-contribution/#the-basic-contribution-workflow) for a guide on how to submit a pull request for code or documentation.
 
 ## Running the test suite
 

From f0dd63d5bc4f6a359426481c960896798c16332c Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 1 Jul 2015 18:06:09 +0100
Subject: [PATCH 0076/1265] Don't use future tense

As per style-guide, future tense is not necessary.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 RELEASE_PROCESS.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index 91a0d773..86522faa 100644
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -2,11 +2,11 @@
 
 ## Building binaries
 
-`script/build-linux` will build the Linux binary inside a Docker container:
+`script/build-linux` builds the Linux binary inside a Docker container:
 
     $ script/build-linux
 
-`script/build-osx` will build the Mac OS X binary inside a virtualenv:
+`script/build-osx` builds the Mac OS X binary inside a virtualenv:
 
     $ script/build-osx
 

From a8ea82f78f48749c6a1ece6173fb906aded48804 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 2 Jul 2015 15:39:22 +0100
Subject: [PATCH 0077/1265] Improve link caption

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c55f012d..b261df53 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,7 +22,7 @@ that should get you started.
 1. Fork [https://github.com/docker/compose](https://github.com/docker/compose)
    to your username.
 2. Clone your forked repository locally `git clone git@github.com:yourusername/compose.git`.
-3. You must [configure](https://help.github.com/articles/configuring-a-remote-for-a-fork/) a remote for your fork so that you can [sync changes you make](https://help.github.com/articles/syncing-a-fork/) with the original repository.
+3. You must [configure a remote](https://help.github.com/articles/configuring-a-remote-for-a-fork/) for your fork so that you can [sync changes you make](https://help.github.com/articles/syncing-a-fork/) with the original repository.
 4. Enter the local directory `cd compose`.
 5. Set up a development environment by running `python setup.py develop`. This
    will install the dependencies and set up a symlink from your `docker-compose`

From 8709dc3c2477f59c270951a365dbfb53a2784c96 Mon Sep 17 00:00:00 2001
From: Jeff Kramer <jeff.kramer@voxmedia.com>
Date: Thu, 2 Jul 2015 12:51:40 -0500
Subject: [PATCH 0078/1265] Added env var parsing to volume container paths

This commit adds environment variable parsing to the container side
of the volume mapping in configs. The common use case for this is
mounting SSH agent sockets in a container, using code like:

volumes:
    - $SSH_AUTH_SOCK:$SSH_AUTH_SOCK
environment:
    - SSH_AUTH_SOCK

Signed-off-by: Jeff Kramer <jeff.kramer@voxmedia.com>
---
 compose/config.py         | 14 +++++++-------
 tests/unit/config_test.py | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/compose/config.py b/compose/config.py
index cbdeca2d..3e9065b1 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -184,7 +184,7 @@ def process_container_options(service_dict, working_dir=None):
     service_dict = service_dict.copy()
 
     if 'volumes' in service_dict:
-        service_dict['volumes'] = resolve_host_paths(service_dict['volumes'], working_dir=working_dir)
+        service_dict['volumes'] = resolve_volume_paths(service_dict['volumes'], working_dir=working_dir)
 
     if 'build' in service_dict:
         service_dict['build'] = resolve_build_path(service_dict['build'], working_dir=working_dir)
@@ -345,18 +345,18 @@ def env_vars_from_file(filename):
     return env
 
 
-def resolve_host_paths(volumes, working_dir=None):
+def resolve_volume_paths(volumes, working_dir=None):
     if working_dir is None:
-        raise Exception("No working_dir passed to resolve_host_paths()")
+        raise Exception("No working_dir passed to resolve_volume_paths()")
 
-    return [resolve_host_path(v, working_dir) for v in volumes]
+    return [resolve_volume_path(v, working_dir) for v in volumes]
 
 
-def resolve_host_path(volume, working_dir):
+def resolve_volume_path(volume, working_dir):
     container_path, host_path = split_path_mapping(volume)
+    container_path = os.path.expanduser(os.path.expandvars(container_path))
     if host_path is not None:
-        host_path = os.path.expanduser(host_path)
-        host_path = os.path.expandvars(host_path)
+        host_path = os.path.expanduser(os.path.expandvars(host_path))
         return "%s:%s" % (expand_path(working_dir, host_path), container_path)
     else:
         return container_path
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index ebd2af7d..af33421f 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -334,6 +334,25 @@ class EnvTest(unittest.TestCase):
             {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''},
         )
 
+    @mock.patch.dict(os.environ)
+    def test_resolve_path(self):
+        os.environ['HOSTENV'] = '/tmp'
+        os.environ['CONTAINERENV'] = '/host/tmp'
+
+        service_dict = config.make_service_dict(
+            'foo',
+            {'volumes': ['$HOSTENV:$CONTAINERENV']},
+            working_dir="tests/fixtures/env"
+        )
+        self.assertEqual(set(service_dict['volumes']), set(['/tmp:/host/tmp']))
+
+        service_dict = config.make_service_dict(
+            'foo',
+            {'volumes': ['/opt${HOSTENV}:/opt${CONTAINERENV}']},
+            working_dir="tests/fixtures/env"
+        )
+        self.assertEqual(set(service_dict['volumes']), set(['/opt/tmp:/opt/host/tmp']))
+
 
 class ExtendsTest(unittest.TestCase):
     def test_extends(self):

From 58f3b576c915be46b7fe828e4fd47e86742b02d9 Mon Sep 17 00:00:00 2001
From: Ben Hamill <git-commits@benhamill.com>
Date: Fri, 17 Apr 2015 15:47:28 -0500
Subject: [PATCH 0079/1265] Replace - with _ in completion identifiers.

Signed-off-by: Ben Hamill <git-commits@benhamill.com>
---
 contrib/completion/bash/docker-compose | 100 ++++++++++++-------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index b785a992..a8a5084d 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -20,7 +20,7 @@
 # For compatibility reasons, Compose and therefore its completion supports several
 # stack compositon files as listed here, in descending priority.
 # Support for these filenames might be dropped in some future version.
-__docker-compose_compose_file() {
+__docker_compose_compose_file() {
 	local file
 	for file in docker-compose.y{,a}ml fig.y{,a}ml ; do
 		[ -e $file ] && {
@@ -32,34 +32,34 @@ __docker-compose_compose_file() {
 }
 
 # Extracts all service names from the compose file.
-___docker-compose_all_services_in_compose_file() {
-	awk -F: '/^[a-zA-Z0-9]/{print $1}' "${compose_file:-$(__docker-compose_compose_file)}" 2>/dev/null
+___docker_compose_all_services_in_compose_file() {
+	awk -F: '/^[a-zA-Z0-9]/{print $1}' "${compose_file:-$(__docker_compose_compose_file)}" 2>/dev/null
 }
 
 # All services, even those without an existing container
-__docker-compose_services_all() {
-	COMPREPLY=( $(compgen -W "$(___docker-compose_all_services_in_compose_file)" -- "$cur") )
+__docker_compose_services_all() {
+	COMPREPLY=( $(compgen -W "$(___docker_compose_all_services_in_compose_file)" -- "$cur") )
 }
 
 # All services that have an entry with the given key in their compose_file section
-___docker-compose_services_with_key() {
+___docker_compose_services_with_key() {
 	# flatten sections to one line, then filter lines containing the key and return section name.
-	awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' "${compose_file:-$(__docker-compose_compose_file)}" | awk -F: -v key=": +$1:" '$0 ~ key {print $1}'
+	awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' "${compose_file:-$(__docker_compose_compose_file)}" | awk -F: -v key=": +$1:" '$0 ~ key {print $1}'
 }
 
 # All services that are defined by a Dockerfile reference
-__docker-compose_services_from_build() {
-	COMPREPLY=( $(compgen -W "$(___docker-compose_services_with_key build)" -- "$cur") )
+__docker_compose_services_from_build() {
+	COMPREPLY=( $(compgen -W "$(___docker_compose_services_with_key build)" -- "$cur") )
 }
 
 # All services that are defined by an image
-__docker-compose_services_from_image() {
-	COMPREPLY=( $(compgen -W "$(___docker-compose_services_with_key image)" -- "$cur") )
+__docker_compose_services_from_image() {
+	COMPREPLY=( $(compgen -W "$(___docker_compose_services_with_key image)" -- "$cur") )
 }
 
 # The services for which containers have been created, optionally filtered
 # by a boolean expression passed in as argument.
-__docker-compose_services_with() {
+__docker_compose_services_with() {
 	local containers names
 	containers="$(docker-compose 2>/dev/null ${compose_file:+-f $compose_file} ${compose_project:+-p $compose_project} ps -q)"
 	names=( $(docker 2>/dev/null inspect --format "{{if ${1:-true}}} {{ .Name }} {{end}}" $containers) )
@@ -69,29 +69,29 @@ __docker-compose_services_with() {
 }
 
 # The services for which at least one running container exists
-__docker-compose_services_running() {
-	__docker-compose_services_with '.State.Running'
+__docker_compose_services_running() {
+	__docker_compose_services_with '.State.Running'
 }
 
 # The services for which at least one stopped container exists
-__docker-compose_services_stopped() {
-	__docker-compose_services_with 'not .State.Running'
+__docker_compose_services_stopped() {
+	__docker_compose_services_with 'not .State.Running'
 }
 
 
-_docker-compose_build() {
+_docker_compose_build() {
 	case "$cur" in
 		-*)
 			COMPREPLY=( $( compgen -W "--help --no-cache" -- "$cur" ) )
 			;;
 		*)
-			__docker-compose_services_from_build
+			__docker_compose_services_from_build
 			;;
 	esac
 }
 
 
-_docker-compose_docker-compose() {
+_docker_compose_docker_compose() {
 	case "$prev" in
 		--file|-f)
 			_filedir "y?(a)ml"
@@ -113,12 +113,12 @@ _docker-compose_docker-compose() {
 }
 
 
-_docker-compose_help() {
+_docker_compose_help() {
 	COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
 }
 
 
-_docker-compose_kill() {
+_docker_compose_kill() {
 	case "$prev" in
 		-s)
 			COMPREPLY=( $( compgen -W "SIGHUP SIGINT SIGKILL SIGUSR1 SIGUSR2" -- "$(echo $cur | tr '[:lower:]' '[:upper:]')" ) )
@@ -131,25 +131,25 @@ _docker-compose_kill() {
 			COMPREPLY=( $( compgen -W "--help -s" -- "$cur" ) )
 			;;
 		*)
-			__docker-compose_services_running
+			__docker_compose_services_running
 			;;
 	esac
 }
 
 
-_docker-compose_logs() {
+_docker_compose_logs() {
 	case "$cur" in
 		-*)
 			COMPREPLY=( $( compgen -W "--help --no-color" -- "$cur" ) )
 			;;
 		*)
-			__docker-compose_services_all
+			__docker_compose_services_all
 			;;
 	esac
 }
 
 
-_docker-compose_migrate-to-labels() {
+_docker_compose_migrate_to_labels() {
 	case "$cur" in
 		-*)
 			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
@@ -158,7 +158,7 @@ _docker-compose_migrate-to-labels() {
 }
 
 
-_docker-compose_port() {
+_docker_compose_port() {
 	case "$prev" in
 		--protocol)
 			COMPREPLY=( $( compgen -W "tcp udp" -- "$cur" ) )
@@ -174,37 +174,37 @@ _docker-compose_port() {
 			COMPREPLY=( $( compgen -W "--help --index --protocol" -- "$cur" ) )
 			;;
 		*)
-			__docker-compose_services_all
+			__docker_compose_services_all
 			;;
 	esac
 }
 
 
-_docker-compose_ps() {
+_docker_compose_ps() {
 	case "$cur" in
 		-*)
 			COMPREPLY=( $( compgen -W "--help -q" -- "$cur" ) )
 			;;
 		*)
-			__docker-compose_services_all
+			__docker_compose_services_all
 			;;
 	esac
 }
 
 
-_docker-compose_pull() {
+_docker_compose_pull() {
 	case "$cur" in
 		-*)
 			COMPREPLY=( $( compgen -W "--allow-insecure-ssl --help" -- "$cur" ) )
 			;;
 		*)
-			__docker-compose_services_from_image
+			__docker_compose_services_from_image
 			;;
 	esac
 }
 
 
-_docker-compose_restart() {
+_docker_compose_restart() {
 	case "$prev" in
 		-t | --timeout)
 			return
@@ -216,25 +216,25 @@ _docker-compose_restart() {
 			COMPREPLY=( $( compgen -W "--help --timeout -t" -- "$cur" ) )
 			;;
 		*)
-			__docker-compose_services_running
+			__docker_compose_services_running
 			;;
 	esac
 }
 
 
-_docker-compose_rm() {
+_docker_compose_rm() {
 	case "$cur" in
 		-*)
 			COMPREPLY=( $( compgen -W "--force -f --help -v" -- "$cur" ) )
 			;;
 		*)
-			__docker-compose_services_stopped
+			__docker_compose_services_stopped
 			;;
 	esac
 }
 
 
-_docker-compose_run() {
+_docker_compose_run() {
 	case "$prev" in
 		-e)
 			COMPREPLY=( $( compgen -e -- "$cur" ) )
@@ -251,19 +251,19 @@ _docker-compose_run() {
 			COMPREPLY=( $( compgen -W "--allow-insecure-ssl -d --entrypoint -e --help --no-deps --rm --service-ports -T --user -u" -- "$cur" ) )
 			;;
 		*)
-			__docker-compose_services_all
+			__docker_compose_services_all
 			;;
 	esac
 }
 
 
-_docker-compose_scale() {
+_docker_compose_scale() {
 	case "$prev" in
 		=)
 			COMPREPLY=("$cur")
 			;;
 		*)
-			COMPREPLY=( $(compgen -S "=" -W "$(___docker-compose_all_services_in_compose_file)" -- "$cur") )
+			COMPREPLY=( $(compgen -S "=" -W "$(___docker_compose_all_services_in_compose_file)" -- "$cur") )
 			compopt -o nospace
 			;;
 	esac
@@ -276,19 +276,19 @@ _docker-compose_scale() {
 }
 
 
-_docker-compose_start() {
+_docker_compose_start() {
 	case "$cur" in
 		-*)
 			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
 			;;
 		*)
-			__docker-compose_services_stopped
+			__docker_compose_services_stopped
 			;;
 	esac
 }
 
 
-_docker-compose_stop() {
+_docker_compose_stop() {
 	case "$prev" in
 		-t | --timeout)
 			return
@@ -300,13 +300,13 @@ _docker-compose_stop() {
 			COMPREPLY=( $( compgen -W "--help --timeout -t" -- "$cur" ) )
 			;;
 		*)
-			__docker-compose_services_running
+			__docker_compose_services_running
 			;;
 	esac
 }
 
 
-_docker-compose_up() {
+_docker_compose_up() {
 	case "$prev" in
 		-t | --timeout)
 			return
@@ -318,13 +318,13 @@ _docker-compose_up() {
 			COMPREPLY=( $( compgen -W "--allow-insecure-ssl -d --help --no-build --no-color --no-deps --no-recreate --timeout -t --x-smart-recreate" -- "$cur" ) )
 			;;
 		*)
-			__docker-compose_services_all
+			__docker_compose_services_all
 			;;
 	esac
 }
 
 
-_docker-compose_version() {
+_docker_compose_version() {
 	case "$cur" in
 		-*)
 			COMPREPLY=( $( compgen -W "--short" -- "$cur" ) )
@@ -333,7 +333,7 @@ _docker-compose_version() {
 }
 
 
-_docker-compose() {
+_docker_compose() {
 	local previous_extglob_setting=$(shopt -p extglob)
 	shopt -s extglob
 
@@ -362,7 +362,7 @@ _docker-compose() {
 
 	# search subcommand and invoke its handler.
 	# special treatment of some top-level options
-	local command='docker-compose'
+	local command='docker_compose'
 	local counter=1
 	local compose_file compose_project
 	while [ $counter -lt $cword ]; do
@@ -385,11 +385,11 @@ _docker-compose() {
 		(( counter++ ))
 	done
 
-	local completions_func=_docker-compose_${command}
+	local completions_func=_docker_compose_${command//-/_}
 	declare -F $completions_func >/dev/null && $completions_func
 
 	eval "$previous_extglob_setting"
 	return 0
 }
 
-complete -F _docker-compose docker-compose
+complete -F _docker_compose docker-compose

From ae96fc0071f4b899e4a95023a80c103468646350 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 26 May 2015 22:09:26 -0400
Subject: [PATCH 0080/1265] Support reading config from stdin.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/cli/command.py            |  54 ++++----------
 compose/cli/errors.py             |   9 ---
 compose/config.py                 |  68 ++++++++++++++++-
 docs/cli.md                       |   3 +
 tests/integration/cli_test.py     |   2 +-
 tests/integration/project_test.py |  18 +++--
 tests/integration/state_test.py   |   2 +-
 tests/unit/cli_test.py            |  60 ++-------------
 tests/unit/config_test.py         | 117 ++++++++++++++++++++++++------
 tests/unit/project_test.py        |  11 +--
 10 files changed, 197 insertions(+), 147 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 7858dfbc..204ed527 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -10,7 +10,7 @@ from .. import config
 from ..project import Project
 from ..service import ConfigError
 from .docopt_command import DocoptCommand
-from .utils import call_silently, is_mac, is_ubuntu, find_candidates_in_parent_dirs
+from .utils import call_silently, is_mac, is_ubuntu
 from .docker_client import docker_client
 from . import verbose_proxy
 from . import errors
@@ -18,13 +18,6 @@ from .. import __version__
 
 log = logging.getLogger(__name__)
 
-SUPPORTED_FILENAMES = [
-    'docker-compose.yml',
-    'docker-compose.yaml',
-    'fig.yml',
-    'fig.yaml',
-]
-
 
 class Command(DocoptCommand):
     base_dir = '.'
@@ -59,7 +52,7 @@ class Command(DocoptCommand):
 
         explicit_config_path = options.get('--file') or os.environ.get('COMPOSE_FILE') or os.environ.get('FIG_FILE')
         project = self.get_project(
-            self.get_config_path(explicit_config_path),
+            explicit_config_path,
             project_name=options.get('--project-name'),
             verbose=options.get('--verbose'))
 
@@ -76,16 +69,18 @@ class Command(DocoptCommand):
             return verbose_proxy.VerboseProxy('docker', client)
         return client
 
-    def get_project(self, config_path, project_name=None, verbose=False):
+    def get_project(self, config_path=None, project_name=None, verbose=False):
+        config_details = config.find(self.base_dir, config_path)
+
         try:
             return Project.from_dicts(
-                self.get_project_name(config_path, project_name),
-                config.load(config_path),
+                self.get_project_name(config_details.working_dir, project_name),
+                config.load(config_details),
                 self.get_client(verbose=verbose))
         except ConfigError as e:
             raise errors.UserError(six.text_type(e))
 
-    def get_project_name(self, config_path, project_name=None):
+    def get_project_name(self, working_dir, project_name=None):
         def normalize_name(name):
             return re.sub(r'[^a-z0-9]', '', name.lower())
 
@@ -93,38 +88,15 @@ class Command(DocoptCommand):
             log.warn('The FIG_PROJECT_NAME environment variable is deprecated.')
             log.warn('Please use COMPOSE_PROJECT_NAME instead.')
 
-        project_name = project_name or os.environ.get('COMPOSE_PROJECT_NAME') or os.environ.get('FIG_PROJECT_NAME')
+        project_name = (
+            project_name or
+            os.environ.get('COMPOSE_PROJECT_NAME') or
+            os.environ.get('FIG_PROJECT_NAME'))
         if project_name is not None:
             return normalize_name(project_name)
 
-        project = os.path.basename(os.path.dirname(os.path.abspath(config_path)))
+        project = os.path.basename(os.path.abspath(working_dir))
         if project:
             return normalize_name(project)
 
         return 'default'
-
-    def get_config_path(self, file_path=None):
-        if file_path:
-            return os.path.join(self.base_dir, file_path)
-
-        (candidates, path) = find_candidates_in_parent_dirs(SUPPORTED_FILENAMES, self.base_dir)
-
-        if len(candidates) == 0:
-            raise errors.ComposeFileNotFound(SUPPORTED_FILENAMES)
-
-        winner = candidates[0]
-
-        if len(candidates) > 1:
-            log.warning("Found multiple config files with supported names: %s", ", ".join(candidates))
-            log.warning("Using %s\n", winner)
-
-        if winner == 'docker-compose.yaml':
-            log.warning("Please be aware that .yml is the expected extension "
-                        "in most cases, and using .yaml can cause compatibility "
-                        "issues in future.\n")
-
-        if winner.startswith("fig."):
-            log.warning("%s is deprecated and will not be supported in future. "
-                        "Please rename your config file to docker-compose.yml\n" % winner)
-
-        return os.path.join(path, winner)
diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index 9a909e46..135710d4 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -53,12 +53,3 @@ class ConnectionErrorGeneric(UserError):
 
         If it's at a non-standard location, specify the URL with the DOCKER_HOST environment variable.
         """ % url)
-
-
-class ComposeFileNotFound(UserError):
-    def __init__(self, supported_filenames):
-        super(ComposeFileNotFound, self).__init__("""
-        Can't find a suitable configuration file in this directory or any parent. Are you in the right directory?
-
-        Supported filenames: %s
-        """ % ", ".join(supported_filenames))
diff --git a/compose/config.py b/compose/config.py
index cbdeca2d..53196974 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -1,7 +1,13 @@
+import logging
 import os
+import sys
 import yaml
+from collections import namedtuple
+
 import six
 
+from compose.cli.utils import find_candidates_in_parent_dirs
+
 
 DOCKER_CONFIG_KEYS = [
     'cap_add',
@@ -64,12 +70,57 @@ DOCKER_CONFIG_HINTS = {
 }
 
 
-def load(filename):
-    working_dir = os.path.dirname(filename)
-    return from_dictionary(load_yaml(filename), working_dir=working_dir, filename=filename)
+SUPPORTED_FILENAMES = [
+    'docker-compose.yml',
+    'docker-compose.yaml',
+    'fig.yml',
+    'fig.yaml',
+]
 
 
-def from_dictionary(dictionary, working_dir=None, filename=None):
+log = logging.getLogger(__name__)
+
+
+ConfigDetails = namedtuple('ConfigDetails', 'config working_dir filename')
+
+
+def find(base_dir, filename):
+    if filename == '-':
+        return ConfigDetails(yaml.safe_load(sys.stdin), os.getcwd(), None)
+
+    if filename:
+        filename = os.path.join(base_dir, filename)
+    else:
+        filename = get_config_path(base_dir)
+    return ConfigDetails(load_yaml(filename), os.path.dirname(filename), filename)
+
+
+def get_config_path(base_dir):
+    (candidates, path) = find_candidates_in_parent_dirs(SUPPORTED_FILENAMES, base_dir)
+
+    if len(candidates) == 0:
+        raise ComposeFileNotFound(SUPPORTED_FILENAMES)
+
+    winner = candidates[0]
+
+    if len(candidates) > 1:
+        log.warn("Found multiple config files with supported names: %s", ", ".join(candidates))
+        log.warn("Using %s\n", winner)
+
+    if winner == 'docker-compose.yaml':
+        log.warn("Please be aware that .yml is the expected extension "
+                 "in most cases, and using .yaml can cause compatibility "
+                 "issues in future.\n")
+
+    if winner.startswith("fig."):
+        log.warn("%s is deprecated and will not be supported in future. "
+                 "Please rename your config file to docker-compose.yml\n" % winner)
+
+    return os.path.join(path, winner)
+
+
+def load(config_details):
+    dictionary, working_dir, filename = config_details
     service_dicts = []
 
     for service_name, service_dict in list(dictionary.items()):
@@ -488,3 +539,12 @@ class CircularReference(ConfigurationError):
             for (filename, service_name) in self.trail
         ]
         return "Circular reference:\n  {}".format("\n  extends ".join(lines))
+
+
+class ComposeFileNotFound(ConfigurationError):
+    def __init__(self, supported_filenames):
+        super(ComposeFileNotFound, self).__init__("""
+        Can't find a suitable configuration file in this directory or any parent. Are you in the right directory?
+
+        Supported filenames: %s
+        """ % ", ".join(supported_filenames))
diff --git a/docs/cli.md b/docs/cli.md
index 61a6aa6d..c178fc78 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -153,6 +153,9 @@ By default, if there are existing containers for a service, `docker-compose up`
  for `docker-compose.yml` in the current working directory, and then each parent
  directory successively, until found.
 
+ Use a `-` as the filename to read configuration from stdin. When stdin is used
+ all paths in the configuration will be relative to the current working
+ directory.
 
 ### -p, --project-name NAME
 
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 421d5985..c3597815 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -36,7 +36,7 @@ class CLITestCase(DockerClientTestCase):
         if hasattr(self, '_project'):
             return self._project
 
-        return self.command.get_project(self.command.get_config_path())
+        return self.command.get_project()
 
     def test_help(self):
         old_base_dir = self.command.base_dir
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 5e252526..471b4149 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -7,6 +7,10 @@ from compose.container import Container
 from .testcases import DockerClientTestCase
 
 
+def build_service_dicts(service_config):
+    return config.load(config.ConfigDetails(service_config, 'working_dir', None))
+
+
 class ProjectTest(DockerClientTestCase):
 
     def test_containers(self):
@@ -32,7 +36,7 @@ class ProjectTest(DockerClientTestCase):
             ['composetest_web_1'])
 
     def test_volumes_from_service(self):
-        service_dicts = config.from_dictionary({
+        service_dicts = build_service_dicts({
             'data': {
                 'image': 'busybox:latest',
                 'volumes': ['/var/data'],
@@ -41,7 +45,7 @@ class ProjectTest(DockerClientTestCase):
                 'image': 'busybox:latest',
                 'volumes_from': ['data'],
             },
-        }, working_dir='.')
+        })
         project = Project.from_dicts(
             name='composetest',
             service_dicts=service_dicts,
@@ -61,7 +65,7 @@ class ProjectTest(DockerClientTestCase):
         )
         project = Project.from_dicts(
             name='composetest',
-            service_dicts=config.from_dictionary({
+            service_dicts=build_service_dicts({
                 'db': {
                     'image': 'busybox:latest',
                     'volumes_from': ['composetest_data_container'],
@@ -75,7 +79,7 @@ class ProjectTest(DockerClientTestCase):
     def test_net_from_service(self):
         project = Project.from_dicts(
             name='composetest',
-            service_dicts=config.from_dictionary({
+            service_dicts=build_service_dicts({
                 'net': {
                     'image': 'busybox:latest',
                     'command': ["top"]
@@ -107,7 +111,7 @@ class ProjectTest(DockerClientTestCase):
 
         project = Project.from_dicts(
             name='composetest',
-            service_dicts=config.from_dictionary({
+            service_dicts=build_service_dicts({
                 'web': {
                     'image': 'busybox:latest',
                     'net': 'container:composetest_net_container'
@@ -274,7 +278,7 @@ class ProjectTest(DockerClientTestCase):
     def test_project_up_starts_depends(self):
         project = Project.from_dicts(
             name='composetest',
-            service_dicts=config.from_dictionary({
+            service_dicts=build_service_dicts({
                 'console': {
                     'image': 'busybox:latest',
                     'command': ["top"],
@@ -309,7 +313,7 @@ class ProjectTest(DockerClientTestCase):
     def test_project_up_with_no_deps(self):
         project = Project.from_dicts(
             name='composetest',
-            service_dicts=config.from_dictionary({
+            service_dicts=build_service_dicts({
                 'console': {
                     'image': 'busybox:latest',
                     'command': ["top"],
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index cd59d13c..68c7b0c6 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -23,7 +23,7 @@ class ProjectTestCase(DockerClientTestCase):
         return Project.from_dicts(
             name='composetest',
             client=self.client,
-            service_dicts=config.from_dictionary(cfg),
+            service_dicts=config.load(config.ConfigDetails(cfg, 'working_dir', None))
         )
 
 
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index d10cb9b3..1a0a37aa 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -2,17 +2,14 @@ from __future__ import unicode_literals
 from __future__ import absolute_import
 import logging
 import os
-import tempfile
-import shutil
 from .. import unittest
 
 import docker
 import mock
 
 from compose.cli import main
-from compose.cli.main import TopLevelCommand
 from compose.cli.docopt_command import NoSuchCommand
-from compose.cli.errors import ComposeFileNotFound
+from compose.cli.main import TopLevelCommand
 from compose.service import Service
 
 
@@ -23,7 +20,7 @@ class CLITestCase(unittest.TestCase):
         try:
             os.chdir('tests/fixtures/simple-composefile')
             command = TopLevelCommand()
-            project_name = command.get_project_name(command.get_config_path())
+            project_name = command.get_project_name('.')
             self.assertEquals('simplecomposefile', project_name)
         finally:
             os.chdir(cwd)
@@ -31,13 +28,13 @@ class CLITestCase(unittest.TestCase):
     def test_project_name_with_explicit_base_dir(self):
         command = TopLevelCommand()
         command.base_dir = 'tests/fixtures/simple-composefile'
-        project_name = command.get_project_name(command.get_config_path())
+        project_name = command.get_project_name(command.base_dir)
         self.assertEquals('simplecomposefile', project_name)
 
     def test_project_name_with_explicit_uppercase_base_dir(self):
         command = TopLevelCommand()
         command.base_dir = 'tests/fixtures/UpperCaseDir'
-        project_name = command.get_project_name(command.get_config_path())
+        project_name = command.get_project_name(command.base_dir)
         self.assertEquals('uppercasedir', project_name)
 
     def test_project_name_with_explicit_project_name(self):
@@ -62,37 +59,10 @@ class CLITestCase(unittest.TestCase):
             project_name = command.get_project_name(None)
         self.assertEquals(project_name, name)
 
-    def test_filename_check(self):
-        files = [
-            'docker-compose.yml',
-            'docker-compose.yaml',
-            'fig.yml',
-            'fig.yaml',
-        ]
-
-        """Test with files placed in the basedir"""
-
-        self.assertEqual('docker-compose.yml', get_config_filename_for_files(files[0:]))
-        self.assertEqual('docker-compose.yaml', get_config_filename_for_files(files[1:]))
-        self.assertEqual('fig.yml', get_config_filename_for_files(files[2:]))
-        self.assertEqual('fig.yaml', get_config_filename_for_files(files[3:]))
-        self.assertRaises(ComposeFileNotFound, lambda: get_config_filename_for_files([]))
-
-        """Test with files placed in the subdir"""
-
-        def get_config_filename_for_files_in_subdir(files):
-            return get_config_filename_for_files(files, subdir=True)
-
-        self.assertEqual('docker-compose.yml', get_config_filename_for_files_in_subdir(files[0:]))
-        self.assertEqual('docker-compose.yaml', get_config_filename_for_files_in_subdir(files[1:]))
-        self.assertEqual('fig.yml', get_config_filename_for_files_in_subdir(files[2:]))
-        self.assertEqual('fig.yaml', get_config_filename_for_files_in_subdir(files[3:]))
-        self.assertRaises(ComposeFileNotFound, lambda: get_config_filename_for_files_in_subdir([]))
-
     def test_get_project(self):
         command = TopLevelCommand()
         command.base_dir = 'tests/fixtures/longer-filename-composefile'
-        project = command.get_project(command.get_config_path())
+        project = command.get_project()
         self.assertEqual(project.name, 'longerfilenamecomposefile')
         self.assertTrue(project.client)
         self.assertTrue(project.services)
@@ -201,23 +171,3 @@ class CLITestCase(unittest.TestCase):
         })
         _, _, call_kwargs = mock_client.create_container.mock_calls[0]
         self.assertFalse('RestartPolicy' in call_kwargs['host_config'])
-
-
-def get_config_filename_for_files(filenames, subdir=None):
-    project_dir = tempfile.mkdtemp()
-    try:
-        make_files(project_dir, filenames)
-        command = TopLevelCommand()
-        if subdir:
-            command.base_dir = tempfile.mkdtemp(dir=project_dir)
-        else:
-            command.base_dir = project_dir
-        return os.path.basename(command.get_config_path())
-    finally:
-        shutil.rmtree(project_dir)
-
-
-def make_files(dirname, filenames):
-    for fname in filenames:
-        with open(os.path.join(dirname, fname), 'w') as f:
-            f.write('')
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index ebd2af7d..f5bb2fdc 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -1,16 +1,24 @@
-import os
 import mock
+import os
+import shutil
+import tempfile
 from .. import unittest
 
 from compose import config
 
 
 class ConfigTest(unittest.TestCase):
-    def test_from_dictionary(self):
-        service_dicts = config.from_dictionary({
-            'foo': {'image': 'busybox'},
-            'bar': {'environment': ['FOO=1']},
-        })
+    def test_load(self):
+        service_dicts = config.load(
+            config.ConfigDetails(
+                {
+                    'foo': {'image': 'busybox'},
+                    'bar': {'environment': ['FOO=1']},
+                },
+                'working_dir',
+                'filename.yml'
+            )
+        )
 
         self.assertEqual(
             sorted(service_dicts, key=lambda d: d['name']),
@@ -26,11 +34,15 @@ class ConfigTest(unittest.TestCase):
             ])
         )
 
-    def test_from_dictionary_throws_error_when_not_dict(self):
+    def test_load_throws_error_when_not_dict(self):
         with self.assertRaises(config.ConfigurationError):
-            config.from_dictionary({
-                'web': 'busybox:latest',
-            })
+            config.load(
+                config.ConfigDetails(
+                    {'web': 'busybox:latest'},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
 
     def test_config_validation(self):
         self.assertRaises(
@@ -335,9 +347,13 @@ class EnvTest(unittest.TestCase):
         )
 
 
+def load_from_filename(filename):
+    return config.load(config.find('.', filename))
+
+
 class ExtendsTest(unittest.TestCase):
     def test_extends(self):
-        service_dicts = config.load('tests/fixtures/extends/docker-compose.yml')
+        service_dicts = load_from_filename('tests/fixtures/extends/docker-compose.yml')
 
         service_dicts = sorted(
             service_dicts,
@@ -364,7 +380,7 @@ class ExtendsTest(unittest.TestCase):
         ])
 
     def test_nested(self):
-        service_dicts = config.load('tests/fixtures/extends/nested.yml')
+        service_dicts = load_from_filename('tests/fixtures/extends/nested.yml')
 
         self.assertEqual(service_dicts, [
             {
@@ -380,7 +396,7 @@ class ExtendsTest(unittest.TestCase):
 
     def test_circular(self):
         try:
-            config.load('tests/fixtures/extends/circle-1.yml')
+            load_from_filename('tests/fixtures/extends/circle-1.yml')
             raise Exception("Expected config.CircularReference to be raised")
         except config.CircularReference as e:
             self.assertEqual(
@@ -445,7 +461,7 @@ class ExtendsTest(unittest.TestCase):
             print load_config()
 
     def test_volume_path(self):
-        dicts = config.load('tests/fixtures/volume-path/docker-compose.yml')
+        dicts = load_from_filename('tests/fixtures/volume-path/docker-compose.yml')
 
         paths = [
             '%s:/foo' % os.path.abspath('tests/fixtures/volume-path/common/foo'),
@@ -455,7 +471,7 @@ class ExtendsTest(unittest.TestCase):
         self.assertEqual(set(dicts[0]['volumes']), set(paths))
 
     def test_parent_build_path_dne(self):
-        child = config.load('tests/fixtures/extends/nonexistent-path-child.yml')
+        child = load_from_filename('tests/fixtures/extends/nonexistent-path-child.yml')
 
         self.assertEqual(child, [
             {
@@ -475,14 +491,16 @@ class BuildPathTest(unittest.TestCase):
         self.abs_context_path = os.path.join(os.getcwd(), 'tests/fixtures/build-ctx')
 
     def test_nonexistent_path(self):
-        options = {'build': 'nonexistent.path'}
-        self.assertRaises(
-            config.ConfigurationError,
-            lambda: config.from_dictionary({
-                'foo': options,
-                'working_dir': 'tests/fixtures/build-path'
-            })
-        )
+        with self.assertRaises(config.ConfigurationError):
+            config.load(
+                config.ConfigDetails(
+                    {
+                        'foo': {'build': 'nonexistent.path'},
+                    },
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
 
     def test_relative_path(self):
         relative_build_path = '../build-ctx/'
@@ -502,5 +520,56 @@ class BuildPathTest(unittest.TestCase):
         self.assertEquals(service_dict['build'], self.abs_context_path)
 
     def test_from_file(self):
-        service_dict = config.load('tests/fixtures/build-path/docker-compose.yml')
+        service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml')
         self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])
+
+
+class GetConfigPathTestCase(unittest.TestCase):
+
+    files = [
+        'docker-compose.yml',
+        'docker-compose.yaml',
+        'fig.yml',
+        'fig.yaml',
+    ]
+
+    def test_get_config_path_default_file_in_basedir(self):
+        files = self.files
+        self.assertEqual('docker-compose.yml', get_config_filename_for_files(files[0:]))
+        self.assertEqual('docker-compose.yaml', get_config_filename_for_files(files[1:]))
+        self.assertEqual('fig.yml', get_config_filename_for_files(files[2:]))
+        self.assertEqual('fig.yaml', get_config_filename_for_files(files[3:]))
+        with self.assertRaises(config.ComposeFileNotFound):
+            get_config_filename_for_files([])
+
+    def test_get_config_path_default_file_in_parent_dir(self):
+        """Test with files placed in the subdir"""
+        files = self.files
+
+        def get_config_in_subdir(files):
+            return get_config_filename_for_files(files, subdir=True)
+
+        self.assertEqual('docker-compose.yml', get_config_in_subdir(files[0:]))
+        self.assertEqual('docker-compose.yaml', get_config_in_subdir(files[1:]))
+        self.assertEqual('fig.yml', get_config_in_subdir(files[2:]))
+        self.assertEqual('fig.yaml', get_config_in_subdir(files[3:]))
+        with self.assertRaises(config.ComposeFileNotFound):
+            get_config_in_subdir([])
+
+
+def get_config_filename_for_files(filenames, subdir=None):
+    def make_files(dirname, filenames):
+        for fname in filenames:
+            with open(os.path.join(dirname, fname), 'w') as f:
+                f.write('')
+
+    project_dir = tempfile.mkdtemp()
+    try:
+        make_files(project_dir, filenames)
+        if subdir:
+            base_dir = tempfile.mkdtemp(dir=project_dir)
+        else:
+            base_dir = project_dir
+        return os.path.basename(config.get_config_path(base_dir))
+    finally:
+        shutil.rmtree(project_dir)
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 9ee6f28c..e8aecae3 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -3,7 +3,6 @@ from .. import unittest
 from compose.service import Service
 from compose.project import Project
 from compose.container import Container
-from compose import config
 
 import mock
 import docker
@@ -51,14 +50,16 @@ class ProjectTest(unittest.TestCase):
         self.assertEqual(project.services[2].name, 'web')
 
     def test_from_config(self):
-        dicts = config.from_dictionary({
-            'web': {
+        dicts = [
+            {
+                'name': 'web',
                 'image': 'busybox:latest',
             },
-            'db': {
+            {
+                'name': 'db',
                 'image': 'busybox:latest',
             },
-        })
+        ]
         project = Project.from_dicts('composetest', dicts, None)
         self.assertEqual(len(project.services), 2)
         self.assertEqual(project.get_service('web').name, 'web')

From 62b47224f0102ad6e559a485953eb43dca5648fd Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 3 Jul 2015 10:28:39 +0100
Subject: [PATCH 0081/1265] Fix bug where duplicate container is leftover after
 'up' fails

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py                   |  3 +++
 compose/service.py                   | 20 +++++++++++++++
 tests/integration/resilience_test.py | 37 ++++++++++++++++++----------
 tests/integration/service_test.py    | 15 +++++++++++
 4 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index aa0e3e88..34a86dae 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -226,6 +226,9 @@ class Project(object):
 
         services = self.get_services(service_names, include_deps=start_deps)
 
+        for service in services:
+            service.remove_duplicate_containers()
+
         plans = self._get_convergence_plans(
             services,
             allow_recreate=allow_recreate,
diff --git a/compose/service.py b/compose/service.py
index 89851e07..85df0663 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -378,6 +378,26 @@ class Service(object):
         container.start()
         return container
 
+    def remove_duplicate_containers(self, timeout=DEFAULT_TIMEOUT):
+        for c in self.duplicate_containers():
+            log.info('Removing %s...' % c.name)
+            c.stop(timeout=timeout)
+            c.remove()
+
+    def duplicate_containers(self):
+        containers = sorted(
+            self.containers(stopped=True),
+            key=lambda c: c.get('Created'),
+        )
+
+        numbers = set()
+
+        for c in containers:
+            if c.number in numbers:
+                yield c
+            else:
+                numbers.add(c.number)
+
     def config_hash(self):
         return json_hash(self.config_dict())
 
diff --git a/tests/integration/resilience_test.py b/tests/integration/resilience_test.py
index 8229e9d3..39249090 100644
--- a/tests/integration/resilience_test.py
+++ b/tests/integration/resilience_test.py
@@ -8,25 +8,36 @@ from .testcases import DockerClientTestCase
 
 
 class ResilienceTest(DockerClientTestCase):
-    def test_recreate_fails(self):
-        db = self.create_service('db', volumes=['/var/db'], command='top')
-        project = Project('composetest', [db], self.client)
+    def setUp(self):
+        self.db = self.create_service('db', volumes=['/var/db'], command='top')
+        self.project = Project('composetest', [self.db], self.client)
 
-        container = db.create_container()
-        db.start_container(container)
-        host_path = container.get('Volumes')['/var/db']
+        container = self.db.create_container()
+        self.db.start_container(container)
+        self.host_path = container.get('Volumes')['/var/db']
 
-        project.up()
-        container = db.containers()[0]
-        self.assertEqual(container.get('Volumes')['/var/db'], host_path)
+    def test_successful_recreate(self):
+        self.project.up()
+        container = self.db.containers()[0]
+        self.assertEqual(container.get('Volumes')['/var/db'], self.host_path)
 
+    def test_create_failure(self):
         with mock.patch('compose.service.Service.create_container', crash):
             with self.assertRaises(Crash):
-                project.up()
+                self.project.up()
 
-        project.up()
-        container = db.containers()[0]
-        self.assertEqual(container.get('Volumes')['/var/db'], host_path)
+        self.project.up()
+        container = self.db.containers()[0]
+        self.assertEqual(container.get('Volumes')['/var/db'], self.host_path)
+
+    def test_start_failure(self):
+        with mock.patch('compose.service.Service.start_container', crash):
+            with self.assertRaises(Crash):
+                self.project.up()
+
+        self.project.up()
+        container = self.db.containers()[0]
+        self.assertEqual(container.get('Volumes')['/var/db'], self.host_path)
 
 
 class Crash(Exception):
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index c95ae07b..9880b8e8 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -729,3 +729,18 @@ class ServiceTest(DockerClientTestCase):
 
         self.assertEqual(1, len(device_config))
         self.assertDictEqual(device_dict, device_config[0])
+
+    def test_duplicate_containers(self):
+        service = self.create_service('web')
+
+        options = service._get_container_create_options({}, 1)
+        original = Container.create(service.client, **options)
+
+        self.assertEqual(set(service.containers(stopped=True)), set([original]))
+        self.assertEqual(set(service.duplicate_containers()), set())
+
+        options['name'] = 'temporary_container_name'
+        duplicate = Container.create(service.client, **options)
+
+        self.assertEqual(set(service.containers(stopped=True)), set([original, duplicate]))
+        self.assertEqual(set(service.duplicate_containers()), set([duplicate]))

From 31dedd8bddc789ed03864c6280ba119f9c24d90c Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 2 Jul 2015 14:28:44 +0100
Subject: [PATCH 0082/1265] Rename function process to validate

The process function contained purely validation checks, so re-named
the function to aid intent clarity.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose/config.py b/compose/config.py
index f1883e69..a5fe5b3e 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -158,7 +158,7 @@ class ServiceLoader(object):
         if 'extends' not in service_dict:
             return service_dict
 
-        extends_options = process_extends_options(service_dict['name'], service_dict['extends'])
+        extends_options = validate_extends_options(service_dict['name'], service_dict['extends'])
 
         if self.working_dir is None:
             raise Exception("No working_dir passed to ServiceLoader()")
@@ -190,7 +190,7 @@ class ServiceLoader(object):
         return (self.filename, name)
 
 
-def process_extends_options(service_name, extends_options):
+def validate_extends_options(service_name, extends_options):
     error_prefix = "Invalid 'extends' configuration for %s:" % service_name
 
     if not isinstance(extends_options, dict):

From 6e4a954dbd4f899b15d8cc621175463c56d6ac70 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 2 Jul 2015 15:31:38 +0100
Subject: [PATCH 0083/1265] 'file' key can be omitted from extends

If the 'file' key is not set in the extends_options dict then we
look for the 'service' from within the same file.

Fixes this issue: https://github.com/docker/compose/issues/1237

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config.py                            |  7 +++++-
 tests/fixtures/extends/no-file-specified.yml |  9 ++++++++
 tests/unit/config_test.py                    | 24 ++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 tests/fixtures/extends/no-file-specified.yml

diff --git a/compose/config.py b/compose/config.py
index a5fe5b3e..cf831f31 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -163,7 +163,12 @@ class ServiceLoader(object):
         if self.working_dir is None:
             raise Exception("No working_dir passed to ServiceLoader()")
 
-        other_config_path = expand_path(self.working_dir, extends_options['file'])
+        try:
+            extends_from_filename = extends_options['file']
+        except KeyError:
+            extends_from_filename = os.path.split(self.filename)[1]
+
+        other_config_path = expand_path(self.working_dir, extends_from_filename)
         other_working_dir = os.path.dirname(other_config_path)
         other_already_seen = self.already_seen + [self.signature(service_dict['name'])]
         other_loader = ServiceLoader(
diff --git a/tests/fixtures/extends/no-file-specified.yml b/tests/fixtures/extends/no-file-specified.yml
new file mode 100644
index 00000000..40e43c4b
--- /dev/null
+++ b/tests/fixtures/extends/no-file-specified.yml
@@ -0,0 +1,9 @@
+myweb:
+  extends:
+    service: web
+  environment:
+    - "BAR=1"
+web:
+  image: busybox
+  environment:
+    - "BAZ=3"
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 5a61ad52..4f0f1893 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -447,6 +447,30 @@ class ExtendsTest(unittest.TestCase):
         dictionary['extends']['what'] = 'is this'
         self.assertRaisesRegexp(config.ConfigurationError, 'what', load_config)
 
+    def test_extends_file_defaults_to_self(self):
+        """
+        Test not specifying a file in our extends options that the
+        config is valid and correctly extends from itself.
+        """
+        service_dicts = config.load('tests/fixtures/extends/no-file-specified.yml')
+        self.assertEqual(service_dicts, [
+            {
+                'name': 'myweb',
+                'image': 'busybox',
+                'environment': {
+                    "BAR": "1",
+                    "BAZ": "3",
+                }
+            },
+            {
+                'name': 'web',
+                'image': 'busybox',
+                'environment': {
+                    "BAZ": "3",
+                }
+            }
+        ])
+
     def test_blacklisted_options(self):
         def load_config():
             return config.make_service_dict('myweb', {

From 5e2d43843c3155b864dce97bd23494ff45f3a601 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 2 Jul 2015 16:50:33 +0100
Subject: [PATCH 0084/1265] Reduce path manipulation

If we're using self.filename, then it's already a full path and we
don't need to splice off the filename.yml just so we can .join it
back together again.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compose/config.py b/compose/config.py
index cf831f31..2427476f 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -163,12 +163,12 @@ class ServiceLoader(object):
         if self.working_dir is None:
             raise Exception("No working_dir passed to ServiceLoader()")
 
-        try:
+        if 'file' in extends_options:
             extends_from_filename = extends_options['file']
-        except KeyError:
-            extends_from_filename = os.path.split(self.filename)[1]
+            other_config_path = expand_path(self.working_dir, extends_from_filename)
+        else:
+            other_config_path = self.filename
 
-        other_config_path = expand_path(self.working_dir, extends_from_filename)
         other_working_dir = os.path.dirname(other_config_path)
         other_already_seen = self.already_seen + [self.signature(service_dict['name'])]
         other_loader = ServiceLoader(

From 24c1d95869a6fbebacbb11ec57c27e5ffb9134d9 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 3 Jul 2015 10:36:44 +0100
Subject: [PATCH 0085/1265] Refactor extends validation tests

Split them out into individual validation tests so it is clearer
to see what is going on and to enable adding further validation
tests.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/unit/config_test.py | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 4f0f1893..48dd9afa 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -427,7 +427,7 @@ class ExtendsTest(unittest.TestCase):
                 ],
             )
 
-    def test_extends_validation(self):
+    def test_extends_validation_empty_dictionary(self):
         dictionary = {'extends': None}
 
         def load_config():
@@ -438,15 +438,35 @@ class ExtendsTest(unittest.TestCase):
         dictionary['extends'] = {}
         self.assertRaises(config.ConfigurationError, load_config)
 
-        dictionary['extends']['file'] = 'common.yml'
+    def test_extends_validation_missing_service_key(self):
+        dictionary = {'extends': {'file': 'common.yml'}}
+
+        def load_config():
+            return config.make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
+
         self.assertRaisesRegexp(config.ConfigurationError, 'service', load_config)
 
-        dictionary['extends']['service'] = 'web'
-        self.assertIsInstance(load_config(), dict)
+    def test_extends_validation_invalid_key(self):
+        dictionary = {
+            'extends':
+            {
+                'service': 'web', 'file': 'common.yml', 'what': 'is this'
+            }
+        }
+
+        def load_config():
+            return config.make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
 
-        dictionary['extends']['what'] = 'is this'
         self.assertRaisesRegexp(config.ConfigurationError, 'what', load_config)
 
+    def test_extends_validation_valid_config(self):
+        dictionary = {'extends': {'service': 'web', 'file': 'common.yml'}}
+
+        def load_config():
+            return config.make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
+
+        self.assertIsInstance(load_config(), dict)
+
     def test_extends_file_defaults_to_self(self):
         """
         Test not specifying a file in our extends options that the

From 254bc4908ca2270413b95aae11cc3156911ac463 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 3 Jul 2015 10:39:03 +0100
Subject: [PATCH 0086/1265] Move extends validation into ServiceLoader class

This refactoring allows us to raise an error when there is no
'file' key specified in the .yml and no self.filename set. This
error was specific to the tests, as the tests are
the only place that constructs service dicts without sometimes
setting a filename.

Moving the function within the class as well as it is code that
is exclusively for the use of validating properties for the
ServiceLoader class.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config.py         | 34 +++++++++++++++++++---------------
 tests/unit/config_test.py |  8 ++++++++
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/compose/config.py b/compose/config.py
index 2427476f..c054213e 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -158,7 +158,7 @@ class ServiceLoader(object):
         if 'extends' not in service_dict:
             return service_dict
 
-        extends_options = validate_extends_options(service_dict['name'], service_dict['extends'])
+        extends_options = self.validate_extends_options(service_dict['name'], service_dict['extends'])
 
         if self.working_dir is None:
             raise Exception("No working_dir passed to ServiceLoader()")
@@ -194,25 +194,29 @@ class ServiceLoader(object):
     def signature(self, name):
         return (self.filename, name)
 
+    def validate_extends_options(self, service_name, extends_options):
+        error_prefix = "Invalid 'extends' configuration for %s:" % service_name
 
-def validate_extends_options(service_name, extends_options):
-    error_prefix = "Invalid 'extends' configuration for %s:" % service_name
+        if not isinstance(extends_options, dict):
+            raise ConfigurationError("%s must be a dictionary" % error_prefix)
 
-    if not isinstance(extends_options, dict):
-        raise ConfigurationError("%s must be a dictionary" % error_prefix)
-
-    if 'service' not in extends_options:
-        raise ConfigurationError(
-            "%s you need to specify a service, e.g. 'service: web'" % error_prefix
-        )
-
-    for k, _ in extends_options.items():
-        if k not in ['file', 'service']:
+        if 'service' not in extends_options:
             raise ConfigurationError(
-                "%s unsupported configuration option '%s'" % (error_prefix, k)
+                "%s you need to specify a service, e.g. 'service: web'" % error_prefix
             )
 
-    return extends_options
+        if 'file' not in extends_options and self.filename is None:
+            raise ConfigurationError(
+                "%s you need to specify a 'file', e.g. 'file: something.yml'" % error_prefix
+            )
+
+        for k, _ in extends_options.items():
+            if k not in ['file', 'service']:
+                raise ConfigurationError(
+                    "%s unsupported configuration option '%s'" % (error_prefix, k)
+                )
+
+        return extends_options
 
 
 def validate_extended_service_dict(service_dict, filename, service):
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 48dd9afa..4047a725 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -459,6 +459,14 @@ class ExtendsTest(unittest.TestCase):
 
         self.assertRaisesRegexp(config.ConfigurationError, 'what', load_config)
 
+    def test_extends_validation_no_file_key_no_filename_set(self):
+        dictionary = {'extends': {'service': 'web'}}
+
+        def load_config():
+            return config.make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
+
+        self.assertRaisesRegexp(config.ConfigurationError, 'file', load_config)
+
     def test_extends_validation_valid_config(self):
         dictionary = {'extends': {'service': 'web', 'file': 'common.yml'}}
 

From bd7fcd112339c40c2add6d394f584305275b749a Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 3 Jul 2015 12:21:12 +0100
Subject: [PATCH 0087/1265] Use absolute paths

A circular reference bug occurs when there is a difference in the paths
of the file specified in the extends. So one time it is relative, second
time is absolute thus allowing a further circular reference to occur.

By using absolute paths we can be sure that the service filename check
is correct.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/compose/config.py b/compose/config.py
index c054213e..d32fe37e 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -140,8 +140,11 @@ def make_service_dict(name, service_dict, working_dir=None):
 
 class ServiceLoader(object):
     def __init__(self, working_dir, filename=None, already_seen=None):
-        self.working_dir = working_dir
-        self.filename = filename
+        self.working_dir = os.path.abspath(working_dir)
+        if filename:
+            self.filename = os.path.abspath(filename)
+        else:
+            self.filename = filename
         self.already_seen = already_seen or []
 
     def make_service_dict(self, name, service_dict):

From c51d53afbab679ec6e42956e39ed84ba18396190 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 3 Jul 2015 12:24:33 +0100
Subject: [PATCH 0088/1265] Fix off by one error

In our circular reference check the stack was previously off by one,
by not including the current service name that was calling another.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/config.py b/compose/config.py
index d32fe37e..9adbcfbd 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -149,7 +149,7 @@ class ServiceLoader(object):
 
     def make_service_dict(self, name, service_dict):
         if self.signature(name) in self.already_seen:
-            raise CircularReference(self.already_seen)
+            raise CircularReference(self.already_seen + [self.signature(name)])
 
         service_dict = service_dict.copy()
         service_dict['name'] = name

From ba71e2a54925aabd8dde248f4759c30648688e51 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 3 Jul 2015 14:05:14 +0100
Subject: [PATCH 0089/1265] Use new load_from_filename

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/unit/config_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 4047a725..3e9b56c3 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -480,7 +480,7 @@ class ExtendsTest(unittest.TestCase):
         Test not specifying a file in our extends options that the
         config is valid and correctly extends from itself.
         """
-        service_dicts = config.load('tests/fixtures/extends/no-file-specified.yml')
+        service_dicts = load_from_filename('tests/fixtures/extends/no-file-specified.yml')
         self.assertEqual(service_dicts, [
             {
                 'name': 'myweb',

From 6a6e7934bde138ddaa2cfa0bc20786a33fa3027a Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 3 Jul 2015 14:05:35 +0100
Subject: [PATCH 0090/1265] Refactor circular-reference check

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/compose/config.py b/compose/config.py
index 9adbcfbd..ba8bd8e0 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -147,10 +147,11 @@ class ServiceLoader(object):
             self.filename = filename
         self.already_seen = already_seen or []
 
-    def make_service_dict(self, name, service_dict):
+    def detect_cycle(self, name):
         if self.signature(name) in self.already_seen:
             raise CircularReference(self.already_seen + [self.signature(name)])
 
+    def make_service_dict(self, name, service_dict):
         service_dict = service_dict.copy()
         service_dict['name'] = name
         service_dict = resolve_environment(service_dict, working_dir=self.working_dir)
@@ -182,6 +183,7 @@ class ServiceLoader(object):
 
         other_config = load_yaml(other_config_path)
         other_service_dict = other_config[extends_options['service']]
+        other_loader.detect_cycle(extends_options['service'])
         other_service_dict = other_loader.make_service_dict(
             service_dict['name'],
             other_service_dict,

From c6e03d739d3318e67aa8b3eb0df091cbd775ba56 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 3 Jul 2015 14:14:47 +0100
Subject: [PATCH 0091/1265] Test self referencing 'file'

When specifying the 'file' key to a value of it's own name, test
that this works and does not cause a false positive circular reference
error.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 .../fixtures/extends/specify-file-as-self.yml | 16 +++++++++++
 tests/unit/config_test.py                     | 27 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 tests/fixtures/extends/specify-file-as-self.yml

diff --git a/tests/fixtures/extends/specify-file-as-self.yml b/tests/fixtures/extends/specify-file-as-self.yml
new file mode 100644
index 00000000..7e249976
--- /dev/null
+++ b/tests/fixtures/extends/specify-file-as-self.yml
@@ -0,0 +1,16 @@
+myweb:
+  extends:
+    file: specify-file-as-self.yml
+    service: web
+  environment:
+    - "BAR=1"
+web:
+  extends:
+    file: specify-file-as-self.yml
+    service: otherweb
+  image: busybox
+  environment:
+    - "BAZ=3"
+otherweb:
+  environment:
+    - "YEP=1"
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 3e9b56c3..d66b9fbb 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -413,6 +413,33 @@ class ExtendsTest(unittest.TestCase):
             },
         ])
 
+    def test_self_referencing_file(self):
+        """
+        We specify a 'file' key that is the filename we're already in.
+        """
+        service_dicts = load_from_filename('tests/fixtures/extends/specify-file-as-self.yml')
+        self.assertEqual(service_dicts, [
+            {
+                'environment':
+                {
+                    'YEP': '1', 'BAR': '1', 'BAZ': '3'
+                },
+                'image': 'busybox',
+                'name': 'myweb'
+            },
+            {
+                'environment':
+                {'YEP': '1'},
+                'name': 'otherweb'
+            },
+            {
+                'environment':
+                {'YEP': '1', 'BAZ': '3'},
+                'image': 'busybox',
+                'name': 'web'
+            }
+        ])
+
     def test_circular(self):
         try:
             load_from_filename('tests/fixtures/extends/circle-1.yml')

From 0b887b841f41b8cca6934f4f996eae162eb220e6 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 3 Jul 2015 14:25:15 +0100
Subject: [PATCH 0092/1265] Stop 'rm' and 'ps' listing services not defined in
 the current file

If you have an alternate YAML file with different services defined,
containers for those services will be shown in `docker-compose ps` even
if you don't pass that file in.

Furthermore, `docker-compose rm` will claim that it's going to remove
them, but actually won't.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py                |  5 +++--
 tests/integration/project_test.py | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index aa0e3e88..3a0d886c 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -288,6 +288,9 @@ class Project(object):
     def containers(self, service_names=None, stopped=False, one_off=False):
         if service_names:
             self.validate_service_names(service_names)
+        else:
+            service_names = self.service_names
+
         containers = [
             Container.from_ps(self.client, container)
             for container in self.client.containers(
@@ -295,8 +298,6 @@ class Project(object):
                 filters={'label': self.labels(one_off=one_off)})]
 
         def matches_service_names(container):
-            if not service_names:
-                return True
             return container.labels.get(LABEL_SERVICE) in service_names
 
         if not containers:
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 471b4149..19594042 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -35,6 +35,21 @@ class ProjectTest(DockerClientTestCase):
             [c.name for c in containers],
             ['composetest_web_1'])
 
+    def test_containers_with_extra_service(self):
+        web = self.create_service('web')
+        web_1 = web.create_container()
+
+        db = self.create_service('db')
+        db_1 = db.create_container()
+
+        self.create_service('extra').create_container()
+
+        project = Project('composetest', [web, db], self.client)
+        self.assertEqual(
+            set(project.containers(stopped=True)),
+            set([web_1, db_1]),
+        )
+
     def test_volumes_from_service(self):
         service_dicts = build_service_dicts({
             'data': {

From 6e6dbdad955d7e85dceb2011b21feca2d124fcad Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 3 Jul 2015 14:56:18 +0100
Subject: [PATCH 0093/1265] working_dir is no longer optional

When building test data using make_service_dict, we need to include
working_dir as it is core to some of the functionality of
ServiceLoader.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config.py         |  2 +-
 tests/unit/config_test.py | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/compose/config.py b/compose/config.py
index ba8bd8e0..a465586c 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -134,7 +134,7 @@ def load(config_details):
     return service_dicts
 
 
-def make_service_dict(name, service_dict, working_dir=None):
+def make_service_dict(name, service_dict, working_dir):
     return ServiceLoader(working_dir=working_dir).make_service_dict(name, service_dict)
 
 
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index d66b9fbb..57dec467 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -47,9 +47,9 @@ class ConfigTest(unittest.TestCase):
     def test_config_validation(self):
         self.assertRaises(
             config.ConfigurationError,
-            lambda: config.make_service_dict('foo', {'port': ['8000']})
+            lambda: config.make_service_dict('foo', {'port': ['8000']}, 'tests/')
         )
-        config.make_service_dict('foo', {'ports': ['8000']})
+        config.make_service_dict('foo', {'ports': ['8000']}, 'tests/')
 
 
 class VolumePathTest(unittest.TestCase):
@@ -219,36 +219,36 @@ class MergeLabelsTest(unittest.TestCase):
 
     def test_no_override(self):
         service_dict = config.merge_service_dicts(
-            config.make_service_dict('foo', {'labels': ['foo=1', 'bar']}),
-            config.make_service_dict('foo', {}),
+            config.make_service_dict('foo', {'labels': ['foo=1', 'bar']}, 'tests/'),
+            config.make_service_dict('foo', {}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '1', 'bar': ''})
 
     def test_no_base(self):
         service_dict = config.merge_service_dicts(
-            config.make_service_dict('foo', {}),
-            config.make_service_dict('foo', {'labels': ['foo=2']}),
+            config.make_service_dict('foo', {}, 'tests/'),
+            config.make_service_dict('foo', {'labels': ['foo=2']}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '2'})
 
     def test_override_explicit_value(self):
         service_dict = config.merge_service_dicts(
-            config.make_service_dict('foo', {'labels': ['foo=1', 'bar']}),
-            config.make_service_dict('foo', {'labels': ['foo=2']}),
+            config.make_service_dict('foo', {'labels': ['foo=1', 'bar']}, 'tests/'),
+            config.make_service_dict('foo', {'labels': ['foo=2']}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '2', 'bar': ''})
 
     def test_add_explicit_value(self):
         service_dict = config.merge_service_dicts(
-            config.make_service_dict('foo', {'labels': ['foo=1', 'bar']}),
-            config.make_service_dict('foo', {'labels': ['bar=2']}),
+            config.make_service_dict('foo', {'labels': ['foo=1', 'bar']}, 'tests/'),
+            config.make_service_dict('foo', {'labels': ['bar=2']}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '1', 'bar': '2'})
 
     def test_remove_explicit_value(self):
         service_dict = config.merge_service_dicts(
-            config.make_service_dict('foo', {'labels': ['foo=1', 'bar=2']}),
-            config.make_service_dict('foo', {'labels': ['bar']}),
+            config.make_service_dict('foo', {'labels': ['foo=1', 'bar=2']}, 'tests/'),
+            config.make_service_dict('foo', {'labels': ['bar']}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '1', 'bar': ''})
 
@@ -295,6 +295,7 @@ class EnvTest(unittest.TestCase):
                     'NO_DEF': None
                 },
             },
+            'tests/'
         )
 
         self.assertEqual(

From 317bbec98c0aa263a8760177f77b76b8911e165d Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 3 Jul 2015 15:06:53 +0100
Subject: [PATCH 0094/1265] Move make_service_dict out of config

This top level function is a test helper, so I've moved it into the
config_test file and updated accordingly.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config.py              |  4 ---
 tests/integration/testcases.py |  6 ++--
 tests/unit/config_test.py      | 65 +++++++++++++++++++---------------
 3 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/compose/config.py b/compose/config.py
index a465586c..7fceb50c 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -134,10 +134,6 @@ def load(config_details):
     return service_dicts
 
 
-def make_service_dict(name, service_dict, working_dir):
-    return ServiceLoader(working_dir=working_dir).make_service_dict(name, service_dict)
-
-
 class ServiceLoader(object):
     def __init__(self, working_dir, filename=None, already_seen=None):
         self.working_dir = os.path.abspath(working_dir)
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 98c5876e..2a7c0a44 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
 from compose.service import Service
-from compose.config import make_service_dict
+from compose.config import ServiceLoader
 from compose.const import LABEL_PROJECT
 from compose.cli.docker_client import docker_client
 from compose.progress_stream import stream_output
@@ -30,10 +30,12 @@ class DockerClientTestCase(unittest.TestCase):
         if 'command' not in kwargs:
             kwargs['command'] = ["top"]
 
+        options = ServiceLoader(working_dir='.').make_service_dict(name, kwargs)
+
         return Service(
             project='composetest',
             client=self.client,
-            **make_service_dict(name, kwargs, working_dir='.')
+            **options
         )
 
     def check_build(self, *args, **kwargs):
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 57dec467..d56b2a18 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -7,6 +7,13 @@ from .. import unittest
 from compose import config
 
 
+def make_service_dict(name, service_dict, working_dir):
+    """
+    Test helper function to contruct a ServiceLoader
+    """
+    return config.ServiceLoader(working_dir=working_dir).make_service_dict(name, service_dict)
+
+
 class ConfigTest(unittest.TestCase):
     def test_load(self):
         service_dicts = config.load(
@@ -47,22 +54,22 @@ class ConfigTest(unittest.TestCase):
     def test_config_validation(self):
         self.assertRaises(
             config.ConfigurationError,
-            lambda: config.make_service_dict('foo', {'port': ['8000']}, 'tests/')
+            lambda: make_service_dict('foo', {'port': ['8000']}, 'tests/')
         )
-        config.make_service_dict('foo', {'ports': ['8000']}, 'tests/')
+        make_service_dict('foo', {'ports': ['8000']}, 'tests/')
 
 
 class VolumePathTest(unittest.TestCase):
     @mock.patch.dict(os.environ)
     def test_volume_binding_with_environ(self):
         os.environ['VOLUME_PATH'] = '/host/path'
-        d = config.make_service_dict('foo', {'volumes': ['${VOLUME_PATH}:/container/path']}, working_dir='.')
+        d = make_service_dict('foo', {'volumes': ['${VOLUME_PATH}:/container/path']}, working_dir='.')
         self.assertEqual(d['volumes'], ['/host/path:/container/path'])
 
     @mock.patch.dict(os.environ)
     def test_volume_binding_with_home(self):
         os.environ['HOME'] = '/home/user'
-        d = config.make_service_dict('foo', {'volumes': ['~:/container/path']}, working_dir='.')
+        d = make_service_dict('foo', {'volumes': ['~:/container/path']}, working_dir='.')
         self.assertEqual(d['volumes'], ['/home/user:/container/path'])
 
 
@@ -219,36 +226,36 @@ class MergeLabelsTest(unittest.TestCase):
 
     def test_no_override(self):
         service_dict = config.merge_service_dicts(
-            config.make_service_dict('foo', {'labels': ['foo=1', 'bar']}, 'tests/'),
-            config.make_service_dict('foo', {}, 'tests/'),
+            make_service_dict('foo', {'labels': ['foo=1', 'bar']}, 'tests/'),
+            make_service_dict('foo', {}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '1', 'bar': ''})
 
     def test_no_base(self):
         service_dict = config.merge_service_dicts(
-            config.make_service_dict('foo', {}, 'tests/'),
-            config.make_service_dict('foo', {'labels': ['foo=2']}, 'tests/'),
+            make_service_dict('foo', {}, 'tests/'),
+            make_service_dict('foo', {'labels': ['foo=2']}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '2'})
 
     def test_override_explicit_value(self):
         service_dict = config.merge_service_dicts(
-            config.make_service_dict('foo', {'labels': ['foo=1', 'bar']}, 'tests/'),
-            config.make_service_dict('foo', {'labels': ['foo=2']}, 'tests/'),
+            make_service_dict('foo', {'labels': ['foo=1', 'bar']}, 'tests/'),
+            make_service_dict('foo', {'labels': ['foo=2']}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '2', 'bar': ''})
 
     def test_add_explicit_value(self):
         service_dict = config.merge_service_dicts(
-            config.make_service_dict('foo', {'labels': ['foo=1', 'bar']}, 'tests/'),
-            config.make_service_dict('foo', {'labels': ['bar=2']}, 'tests/'),
+            make_service_dict('foo', {'labels': ['foo=1', 'bar']}, 'tests/'),
+            make_service_dict('foo', {'labels': ['bar=2']}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '1', 'bar': '2'})
 
     def test_remove_explicit_value(self):
         service_dict = config.merge_service_dicts(
-            config.make_service_dict('foo', {'labels': ['foo=1', 'bar=2']}, 'tests/'),
-            config.make_service_dict('foo', {'labels': ['bar']}, 'tests/'),
+            make_service_dict('foo', {'labels': ['foo=1', 'bar=2']}, 'tests/'),
+            make_service_dict('foo', {'labels': ['bar']}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '1', 'bar': ''})
 
@@ -286,7 +293,7 @@ class EnvTest(unittest.TestCase):
         os.environ['FILE_DEF_EMPTY'] = 'E2'
         os.environ['ENV_DEF'] = 'E3'
 
-        service_dict = config.make_service_dict(
+        service_dict = make_service_dict(
             'foo', {
                 'environment': {
                     'FILE_DEF': 'F1',
@@ -304,7 +311,7 @@ class EnvTest(unittest.TestCase):
         )
 
     def test_env_from_file(self):
-        service_dict = config.make_service_dict(
+        service_dict = make_service_dict(
             'foo',
             {'env_file': 'one.env'},
             'tests/fixtures/env',
@@ -315,7 +322,7 @@ class EnvTest(unittest.TestCase):
         )
 
     def test_env_from_multiple_files(self):
-        service_dict = config.make_service_dict(
+        service_dict = make_service_dict(
             'foo',
             {'env_file': ['one.env', 'two.env']},
             'tests/fixtures/env',
@@ -329,7 +336,7 @@ class EnvTest(unittest.TestCase):
         options = {'env_file': 'nonexistent.env'}
         self.assertRaises(
             config.ConfigurationError,
-            lambda: config.make_service_dict('foo', options, 'tests/fixtures/env'),
+            lambda: make_service_dict('foo', options, 'tests/fixtures/env'),
         )
 
     @mock.patch.dict(os.environ)
@@ -337,7 +344,7 @@ class EnvTest(unittest.TestCase):
         os.environ['FILE_DEF'] = 'E1'
         os.environ['FILE_DEF_EMPTY'] = 'E2'
         os.environ['ENV_DEF'] = 'E3'
-        service_dict = config.make_service_dict(
+        service_dict = make_service_dict(
             'foo',
             {'env_file': 'resolve.env'},
             'tests/fixtures/env',
@@ -352,14 +359,14 @@ class EnvTest(unittest.TestCase):
         os.environ['HOSTENV'] = '/tmp'
         os.environ['CONTAINERENV'] = '/host/tmp'
 
-        service_dict = config.make_service_dict(
+        service_dict = make_service_dict(
             'foo',
             {'volumes': ['$HOSTENV:$CONTAINERENV']},
             working_dir="tests/fixtures/env"
         )
         self.assertEqual(set(service_dict['volumes']), set(['/tmp:/host/tmp']))
 
-        service_dict = config.make_service_dict(
+        service_dict = make_service_dict(
             'foo',
             {'volumes': ['/opt${HOSTENV}:/opt${CONTAINERENV}']},
             working_dir="tests/fixtures/env"
@@ -459,7 +466,7 @@ class ExtendsTest(unittest.TestCase):
         dictionary = {'extends': None}
 
         def load_config():
-            return config.make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
+            return make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
 
         self.assertRaisesRegexp(config.ConfigurationError, 'dictionary', load_config)
 
@@ -470,7 +477,7 @@ class ExtendsTest(unittest.TestCase):
         dictionary = {'extends': {'file': 'common.yml'}}
 
         def load_config():
-            return config.make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
+            return make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
 
         self.assertRaisesRegexp(config.ConfigurationError, 'service', load_config)
 
@@ -483,7 +490,7 @@ class ExtendsTest(unittest.TestCase):
         }
 
         def load_config():
-            return config.make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
+            return make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
 
         self.assertRaisesRegexp(config.ConfigurationError, 'what', load_config)
 
@@ -491,7 +498,7 @@ class ExtendsTest(unittest.TestCase):
         dictionary = {'extends': {'service': 'web'}}
 
         def load_config():
-            return config.make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
+            return make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
 
         self.assertRaisesRegexp(config.ConfigurationError, 'file', load_config)
 
@@ -499,7 +506,7 @@ class ExtendsTest(unittest.TestCase):
         dictionary = {'extends': {'service': 'web', 'file': 'common.yml'}}
 
         def load_config():
-            return config.make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
+            return make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
 
         self.assertIsInstance(load_config(), dict)
 
@@ -529,7 +536,7 @@ class ExtendsTest(unittest.TestCase):
 
     def test_blacklisted_options(self):
         def load_config():
-            return config.make_service_dict('myweb', {
+            return make_service_dict('myweb', {
                 'extends': {
                     'file': 'whatever',
                     'service': 'web',
@@ -603,7 +610,7 @@ class BuildPathTest(unittest.TestCase):
 
     def test_relative_path(self):
         relative_build_path = '../build-ctx/'
-        service_dict = config.make_service_dict(
+        service_dict = make_service_dict(
             'relpath',
             {'build': relative_build_path},
             working_dir='tests/fixtures/build-path'
@@ -611,7 +618,7 @@ class BuildPathTest(unittest.TestCase):
         self.assertEquals(service_dict['build'], self.abs_context_path)
 
     def test_absolute_path(self):
-        service_dict = config.make_service_dict(
+        service_dict = make_service_dict(
             'abspath',
             {'build': self.abs_context_path},
             working_dir='tests/fixtures/build-path'

From bd554a6feab9945281c340effa0226e1fb6ecb2e Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Fri, 3 Jul 2015 10:29:26 -0400
Subject: [PATCH 0095/1265] Fix race condition in docker-compose up.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/cli/main.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 4bde658e..ae91eeb5 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -453,7 +453,7 @@ class TopLevelCommand(Command):
         service_names = options['SERVICE']
         timeout = float(options.get('--timeout') or DEFAULT_TIMEOUT)
 
-        project.up(
+        to_attach = project.up(
             service_names=service_names,
             start_deps=start_deps,
             allow_recreate=allow_recreate,
@@ -463,8 +463,6 @@ class TopLevelCommand(Command):
             timeout=timeout
         )
 
-        to_attach = [c for s in project.get_services(service_names) for c in s.containers()]
-
         if not detached:
             print("Attaching to", list_containers(to_attach))
             log_printer = LogPrinter(to_attach, attach_params={"logs": True}, monochrome=monochrome)

From 2fc7cd6e03c5795cf8d9392cfe397182aa9660c1 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Sun, 5 Jul 2015 19:18:01 +0200
Subject: [PATCH 0096/1265] Mention zsh command completion in general install
 section

Signed-off-by: Harald Albers <github@albersweb.de>
---
 docs/install.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/install.md b/docs/install.md
index debd2e4e..80a377db 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -33,7 +33,7 @@ To install Compose, run the following commands:
 > Note: If you get a "Permission denied" error, your `/usr/local/bin` directory probably isn't writable and you'll need to install Compose as the superuser. Run `sudo -i`, then the two commands above, then `exit`.
 
 Optionally, you can also install [command completion](completion.md) for the
-bash shell.
+bash and zsh shell.
 
 Compose is available for OS X and 64-bit Linux. If you're on another platform,
 Compose can also be installed as a Python package:

From e98caf5cf9b332236fa2dcf8d555cff454779f5c Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 3 Jul 2015 13:35:54 +0100
Subject: [PATCH 0097/1265] Show an error on 'run' when there are legacy
 one-off containers

Also warn the user about the one-off containers in the standard error
message about legacy containers.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py              |  24 ++++--
 compose/legacy.py                |  94 +++++++++++++++++-----
 compose/project.py               |   3 +-
 compose/service.py               |   3 +-
 tests/integration/legacy_test.py | 129 +++++++++++++++++++++++++++++--
 tests/unit/cli_test.py           |   6 +-
 6 files changed, 221 insertions(+), 38 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index ae91eeb5..adb11df4 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -34,7 +34,7 @@ def main():
     except KeyboardInterrupt:
         log.error("\nAborting.")
         sys.exit(1)
-    except (UserError, NoSuchService, ConfigurationError, legacy.LegacyContainersError) as e:
+    except (UserError, NoSuchService, ConfigurationError, legacy.LegacyError) as e:
         log.error(e.msg)
         sys.exit(1)
     except NoSuchCommand as e:
@@ -336,12 +336,22 @@ class TopLevelCommand(Command):
         if not options['--service-ports']:
             container_options['ports'] = []
 
-        container = service.create_container(
-            quiet=True,
-            one_off=True,
-            insecure_registry=insecure_registry,
-            **container_options
-        )
+        try:
+            container = service.create_container(
+                quiet=True,
+                one_off=True,
+                insecure_registry=insecure_registry,
+                **container_options
+            )
+        except APIError as e:
+            legacy.check_for_legacy_containers(
+                project.client,
+                project.name,
+                [service.name],
+                allow_one_off=False,
+            )
+
+            raise e
 
         if options['-d']:
             service.start_container(container)
diff --git a/compose/legacy.py b/compose/legacy.py
index 340511a7..c9ec6581 100644
--- a/compose/legacy.py
+++ b/compose/legacy.py
@@ -1,6 +1,7 @@
 import logging
 import re
 
+from .const import LABEL_VERSION
 from .container import get_container_name, Container
 
 
@@ -24,41 +25,82 @@ Alternatively, remove them:
     $ docker rm -f {rm_args}
 """
 
+ONE_OFF_ADDENDUM_FORMAT = """
+You should also remove your one-off containers:
+
+    $ docker rm -f {rm_args}
+"""
+
+ONE_OFF_ERROR_MESSAGE_FORMAT = """
+Compose found the following containers without labels:
+
+{names_list}
+
+As of Compose 1.3.0, containers are identified with labels instead of naming convention.
+
+Remove them before continuing:
+
+    $ docker rm -f {rm_args}
+"""
+
 
 def check_for_legacy_containers(
         client,
         project,
         services,
-        stopped=False,
-        one_off=False):
+        allow_one_off=True):
     """Check if there are containers named using the old naming convention
     and warn the user that those containers may need to be migrated to
     using labels, so that compose can find them.
     """
-    containers = list(get_legacy_containers(
-        client,
-        project,
-        services,
-        stopped=stopped,
-        one_off=one_off))
+    containers = get_legacy_containers(client, project, services, one_off=False)
 
     if containers:
-        raise LegacyContainersError([c.name for c in containers])
+        one_off_containers = get_legacy_containers(client, project, services, one_off=True)
+
+        raise LegacyContainersError(
+            [c.name for c in containers],
+            [c.name for c in one_off_containers],
+        )
+
+    if not allow_one_off:
+        one_off_containers = get_legacy_containers(client, project, services, one_off=True)
+
+        if one_off_containers:
+            raise LegacyOneOffContainersError(
+                [c.name for c in one_off_containers],
+            )
 
 
-class LegacyContainersError(Exception):
-    def __init__(self, names):
+class LegacyError(Exception):
+    def __unicode__(self):
+        return self.msg
+
+    __str__ = __unicode__
+
+
+class LegacyContainersError(LegacyError):
+    def __init__(self, names, one_off_names):
         self.names = names
+        self.one_off_names = one_off_names
 
         self.msg = ERROR_MESSAGE_FORMAT.format(
             names_list="\n".join("    {}".format(name) for name in names),
             rm_args=" ".join(names),
         )
 
-    def __unicode__(self):
-        return self.msg
+        if one_off_names:
+            self.msg += ONE_OFF_ADDENDUM_FORMAT.format(rm_args=" ".join(one_off_names))
 
-    __str__ = __unicode__
+
+class LegacyOneOffContainersError(LegacyError):
+    def __init__(self, one_off_names):
+        self.one_off_names = one_off_names
+
+        self.msg = ONE_OFF_ERROR_MESSAGE_FORMAT.format(
+            names_list="\n".join("    {}".format(name) for name in one_off_names),
+            rm_args=" ".join(one_off_names),
+        )
 
 
 def add_labels(project, container):
@@ -76,8 +118,8 @@ def migrate_project_to_labels(project):
         project.client,
         project.name,
         project.service_names,
-        stopped=True,
-        one_off=False)
+        one_off=False,
+    )
 
     for container in containers:
         add_labels(project, container)
@@ -87,13 +129,29 @@ def get_legacy_containers(
         client,
         project,
         services,
-        stopped=False,
         one_off=False):
 
-    containers = client.containers(all=stopped)
+    return list(_get_legacy_containers_iter(
+        client,
+        project,
+        services,
+        one_off=one_off,
+    ))
+
+
+def _get_legacy_containers_iter(
+        client,
+        project,
+        services,
+        one_off=False):
+
+    containers = client.containers(all=True)
 
     for service in services:
         for container in containers:
+            if LABEL_VERSION in container['Labels']:
+                continue
+
             name = get_container_name(container)
             if has_container(project, service, name, one_off=one_off):
                 yield Container.from_ps(client, container)
diff --git a/compose/project.py b/compose/project.py
index 288afc5f..11c1e1ce 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -308,8 +308,7 @@ class Project(object):
                 self.client,
                 self.name,
                 self.service_names,
-                stopped=stopped,
-                one_off=one_off)
+            )
 
         return filter(matches_service_names, containers)
 
diff --git a/compose/service.py b/compose/service.py
index 6fec794f..f852b9bb 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -106,8 +106,7 @@ class Service(object):
                 self.client,
                 self.project,
                 [self.name],
-                stopped=stopped,
-                one_off=one_off)
+            )
 
         return containers
 
diff --git a/tests/integration/legacy_test.py b/tests/integration/legacy_test.py
index 346c84f2..806b9a45 100644
--- a/tests/integration/legacy_test.py
+++ b/tests/integration/legacy_test.py
@@ -1,3 +1,5 @@
+import unittest
+
 from docker.errors import APIError
 
 from compose import legacy
@@ -5,6 +7,64 @@ from compose.project import Project
 from .testcases import DockerClientTestCase
 
 
+class UtilitiesTestCase(unittest.TestCase):
+    def test_has_container(self):
+        self.assertTrue(
+            legacy.has_container("composetest", "web", "composetest_web_1", one_off=False),
+        )
+        self.assertFalse(
+            legacy.has_container("composetest", "web", "composetest_web_run_1", one_off=False),
+        )
+
+    def test_has_container_one_off(self):
+        self.assertFalse(
+            legacy.has_container("composetest", "web", "composetest_web_1", one_off=True),
+        )
+        self.assertTrue(
+            legacy.has_container("composetest", "web", "composetest_web_run_1", one_off=True),
+        )
+
+    def test_has_container_different_project(self):
+        self.assertFalse(
+            legacy.has_container("composetest", "web", "otherapp_web_1", one_off=False),
+        )
+        self.assertFalse(
+            legacy.has_container("composetest", "web", "otherapp_web_run_1", one_off=True),
+        )
+
+    def test_has_container_different_service(self):
+        self.assertFalse(
+            legacy.has_container("composetest", "web", "composetest_db_1", one_off=False),
+        )
+        self.assertFalse(
+            legacy.has_container("composetest", "web", "composetest_db_run_1", one_off=True),
+        )
+
+    def test_is_valid_name(self):
+        self.assertTrue(
+            legacy.is_valid_name("composetest_web_1", one_off=False),
+        )
+        self.assertFalse(
+            legacy.is_valid_name("composetest_web_run_1", one_off=False),
+        )
+
+    def test_is_valid_name_one_off(self):
+        self.assertFalse(
+            legacy.is_valid_name("composetest_web_1", one_off=True),
+        )
+        self.assertTrue(
+            legacy.is_valid_name("composetest_web_run_1", one_off=True),
+        )
+
+    def test_is_valid_name_invalid(self):
+        self.assertFalse(
+            legacy.is_valid_name("foo"),
+        )
+        self.assertFalse(
+            legacy.is_valid_name("composetest_web_lol_1", one_off=True),
+        )
+
+
 class LegacyTestCase(DockerClientTestCase):
 
     def setUp(self):
@@ -30,7 +90,7 @@ class LegacyTestCase(DockerClientTestCase):
 
         # Create a single one-off legacy container
         self.containers.append(self.client.create_container(
-            name='{}_{}_run_1'.format(self.project.name, self.services[0].name),
+            name='{}_{}_run_1'.format(self.project.name, db.name),
             **self.services[0].options
         ))
 
@@ -47,27 +107,84 @@ class LegacyTestCase(DockerClientTestCase):
                 pass
 
     def get_legacy_containers(self, **kwargs):
-        return list(legacy.get_legacy_containers(
+        return legacy.get_legacy_containers(
             self.client,
             self.project.name,
             [s.name for s in self.services],
             **kwargs
-        ))
+        )
 
     def test_get_legacy_container_names(self):
         self.assertEqual(len(self.get_legacy_containers()), len(self.services))
 
     def test_get_legacy_container_names_one_off(self):
-        self.assertEqual(len(self.get_legacy_containers(stopped=True, one_off=True)), 1)
+        self.assertEqual(len(self.get_legacy_containers(one_off=True)), 1)
 
     def test_migration_to_labels(self):
+        # Trying to get the container list raises an exception
+
         with self.assertRaises(legacy.LegacyContainersError) as cm:
-            self.assertEqual(self.project.containers(stopped=True), [])
+            self.project.containers(stopped=True)
 
         self.assertEqual(
             set(cm.exception.names),
             set(['composetest_db_1', 'composetest_web_1', 'composetest_nginx_1']),
         )
 
+        self.assertEqual(
+            set(cm.exception.one_off_names),
+            set(['composetest_db_run_1']),
+        )
+
+        # Migrate the containers
+
         legacy.migrate_project_to_labels(self.project)
-        self.assertEqual(len(self.project.containers(stopped=True)), len(self.services))
+
+        # Getting the list no longer raises an exception
+
+        containers = self.project.containers(stopped=True)
+        self.assertEqual(len(containers), len(self.services))
+
+    def test_migration_one_off(self):
+        # We've already migrated
+
+        legacy.migrate_project_to_labels(self.project)
+
+        # Trying to create a one-off container results in a Docker API error
+
+        with self.assertRaises(APIError) as cm:
+            self.project.get_service('db').create_container(one_off=True)
+
+        # Checking for legacy one-off containers raises an exception
+
+        with self.assertRaises(legacy.LegacyOneOffContainersError) as cm:
+            legacy.check_for_legacy_containers(
+                self.client,
+                self.project.name,
+                ['db'],
+                allow_one_off=False,
+            )
+
+        self.assertEqual(
+            set(cm.exception.one_off_names),
+            set(['composetest_db_run_1']),
+        )
+
+        # Remove the old one-off container
+
+        c = self.client.inspect_container('composetest_db_run_1')
+        self.client.remove_container(c)
+
+        # Checking no longer raises an exception
+
+        legacy.check_for_legacy_containers(
+            self.client,
+            self.project.name,
+            ['db'],
+            allow_one_off=False,
+        )
+
+        # Creating a one-off container no longer results in an API error
+
+        self.project.get_service('db').create_container(one_off=True)
+        self.assertIsInstance(self.client.inspect_container('composetest_db_run_1'), dict)
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 1a0a37aa..7f06f5e3 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -97,7 +97,7 @@ class CLITestCase(unittest.TestCase):
     def test_run_with_environment_merged_with_options_list(self, mock_dockerpty):
         command = TopLevelCommand()
         mock_client = mock.create_autospec(docker.Client)
-        mock_project = mock.Mock()
+        mock_project = mock.Mock(client=mock_client)
         mock_project.get_service.return_value = Service(
             'service',
             client=mock_client,
@@ -126,7 +126,7 @@ class CLITestCase(unittest.TestCase):
     def test_run_service_with_restart_always(self):
         command = TopLevelCommand()
         mock_client = mock.create_autospec(docker.Client)
-        mock_project = mock.Mock()
+        mock_project = mock.Mock(client=mock_client)
         mock_project.get_service.return_value = Service(
             'service',
             client=mock_client,
@@ -150,7 +150,7 @@ class CLITestCase(unittest.TestCase):
 
         command = TopLevelCommand()
         mock_client = mock.create_autospec(docker.Client)
-        mock_project = mock.Mock()
+        mock_project = mock.Mock(client=mock_client)
         mock_project.get_service.return_value = Service(
             'service',
             client=mock_client,

From fc26982132b4a08f4efa2365a8cd668f94ff004e Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 6 Jul 2015 17:07:31 +0100
Subject: [PATCH 0098/1265] Add in memswap_limit run option

By allowing the memswap_limit option to be defined we also need to
check that mem_limit is set, you can't have swap without a limit.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config.py          |  5 +++++
 docs/yml.md                |  3 ++-
 tests/unit/config_test.py  | 25 +++++++++++++++++++++++++
 tests/unit/service_test.py |  7 +++++++
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/compose/config.py b/compose/config.py
index 7fceb50c..d04903db 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -31,6 +31,7 @@ DOCKER_CONFIG_KEYS = [
     'links',
     'mac_address',
     'mem_limit',
+    'memswap_limit',
     'net',
     'log_driver',
     'pid',
@@ -61,6 +62,7 @@ DOCKER_CONFIG_HINTS = {
     'extra_host': 'extra_hosts',
     'device': 'devices',
     'link': 'links',
+    'memory_swap': 'memswap_limit',
     'port': 'ports',
     'privilege': 'privileged',
     'priviliged': 'privileged',
@@ -244,6 +246,9 @@ def process_container_options(service_dict, working_dir=None):
 
     service_dict = service_dict.copy()
 
+    if 'memswap_limit' in service_dict and 'mem_limit' not in service_dict:
+        raise ConfigurationError("Invalid 'memswap_limit' configuration for %s service: when defining 'memswap_limit' you must set 'mem_limit' as well" % service_dict['name'])
+
     if 'volumes' in service_dict:
         service_dict['volumes'] = resolve_volume_paths(service_dict['volumes'], working_dir=working_dir)
 
diff --git a/docs/yml.md b/docs/yml.md
index 02540b3f..4bab73b2 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -312,7 +312,7 @@ Override the default labeling scheme for each container.
         - label:user:USER
         - label:role:ROLE
 
-### working\_dir, entrypoint, user, hostname, domainname, mac\_address, mem\_limit, privileged, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only 
+### working\_dir, entrypoint, user, hostname, domainname, mac\_address, mem\_limit, memswap\_limit, privileged, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only 
 
 Each of these is a single value, analogous to its
 [docker run](https://docs.docker.com/reference/run/) counterpart.
@@ -330,6 +330,7 @@ Each of these is a single value, analogous to its
     mac_address: 02:42:ac:11:65:43
 
     mem_limit: 1000000000
+    memswap_limit: 2000000000
     privileged: true
 
     restart: always
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index d56b2a18..281717db 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -260,6 +260,31 @@ class MergeLabelsTest(unittest.TestCase):
         self.assertEqual(service_dict['labels'], {'foo': '1', 'bar': ''})
 
 
+class MemoryOptionsTest(unittest.TestCase):
+    def test_validation_fails_with_just_memswap_limit(self):
+        """
+        When you set a 'memswap_limit' it is invalid config unless you also set
+        a mem_limit
+        """
+        with self.assertRaises(config.ConfigurationError):
+            make_service_dict(
+                'foo', {
+                    'memswap_limit': 2000000,
+                },
+                'tests/'
+            )
+
+    def test_validation_with_correct_memswap_values(self):
+        service_dict = make_service_dict(
+            'foo', {
+                'mem_limit': 1000000,
+                'memswap_limit': 2000000,
+            },
+            'tests/'
+        )
+        self.assertEqual(service_dict['memswap_limit'], 2000000)
+
+
 class EnvTest(unittest.TestCase):
     def test_parse_environment_as_list(self):
         environment = [
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 0327874c..d3693715 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -155,6 +155,13 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(opts['hostname'], 'name', 'hostname')
         self.assertFalse('domainname' in opts, 'domainname')
 
+    def test_memory_swap_limit(self):
+        service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, mem_limit=1000000000, memswap_limit=2000000000)
+        self.mock_client.containers.return_value = []
+        opts = service._get_container_create_options({'some': 'overrides'}, 1)
+        self.assertEqual(opts['memswap_limit'], 2000000000)
+        self.assertEqual(opts['mem_limit'], 1000000000)
+
     def test_split_domainname_fqdn(self):
         service = Service(
             'foo',

From c1223bfd3a76f8d90dac8b8962d4bdccb3860536 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 7 Jul 2015 12:02:05 +0100
Subject: [PATCH 0099/1265] Keep config keys in alphabetised order

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/config.py b/compose/config.py
index d04903db..08be9166 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -24,7 +24,6 @@ DOCKER_CONFIG_KEYS = [
     'env_file',
     'environment',
     'extra_hosts',
-    'read_only',
     'hostname',
     'image',
     'labels',
@@ -37,6 +36,7 @@ DOCKER_CONFIG_KEYS = [
     'pid',
     'ports',
     'privileged',
+    'read_only',
     'restart',
     'security_opt',
     'stdin_open',

From 531265bc8421ca17d91099f38d54aa7cf91d777e Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 6 Jul 2015 15:30:27 +0100
Subject: [PATCH 0100/1265] Fix smart recreate when 'image' is changed to
 something nonexistent

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py              | 23 ++++++++++++++++++++---
 tests/integration/state_test.py |  7 +++++++
 tests/unit/service_test.py      | 16 ++++++++++++----
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 6fec794f..0793f662 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -65,6 +65,10 @@ class NeedsBuildError(Exception):
         self.service = service
 
 
+class NoSuchImageError(Exception):
+    pass
+
+
 VolumeSpec = namedtuple('VolumeSpec', 'external internal mode')
 
 
@@ -225,8 +229,11 @@ class Service(object):
                             do_build=True,
                             insecure_registry=False):
 
-        if self.image():
+        try:
+            self.image()
             return
+        except NoSuchImageError:
+            pass
 
         if self.can_be_built():
             if do_build:
@@ -241,7 +248,7 @@ class Service(object):
             return self.client.inspect_image(self.image_name)
         except APIError as e:
             if e.response.status_code == 404 and e.explanation and 'No such image' in str(e.explanation):
-                return None
+                raise NoSuchImageError("Image '{}' not found".format(self.image_name))
             else:
                 raise
 
@@ -275,7 +282,17 @@ class Service(object):
         return ConvergencePlan('recreate', containers)
 
     def _containers_have_diverged(self, containers):
-        config_hash = self.config_hash()
+        config_hash = None
+
+        try:
+            config_hash = self.config_hash()
+        except NoSuchImageError as e:
+            log.debug(
+                'Service %s has diverged: %s',
+                self.name, six.text_type(e),
+            )
+            return True
+
         has_diverged = False
 
         for c in containers:
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index 68c7b0c6..d36e6320 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -215,6 +215,13 @@ class ServiceStateTest(DockerClientTestCase):
         web = self.create_service('web', command=["top", "-d", "1"])
         self.assertEqual(('recreate', [container]), web.convergence_plan(smart_recreate=True))
 
+    def test_trigger_recreate_with_nonexistent_image_tag(self):
+        web = self.create_service('web', image="busybox:latest")
+        container = web.create_container()
+
+        web = self.create_service('web', image="nonexistent-image")
+        self.assertEqual(('recreate', [container]), web.convergence_plan(smart_recreate=True))
+
     def test_trigger_recreate_with_image_change(self):
         repo = 'composetest_myimage'
         tag = 'latest'
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index d3693715..818cb0f7 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -12,6 +12,7 @@ from compose.const import LABEL_SERVICE, LABEL_PROJECT, LABEL_ONE_OFF
 from compose.service import (
     ConfigError,
     NeedsBuildError,
+    NoSuchImageError,
     build_port_bindings,
     build_volume_binding,
     get_container_data_volumes,
@@ -245,7 +246,7 @@ class ServiceTest(unittest.TestCase):
             images.append({'Id': 'abc123'})
             return []
 
-        service.image = lambda: images[0] if images else None
+        service.image = lambda *args, **kwargs: mock_get_image(images)
         self.mock_client.pull = pull
 
         service.create_container(insecure_registry=True)
@@ -294,7 +295,7 @@ class ServiceTest(unittest.TestCase):
             images.append({'Id': 'abc123'})
             return []
 
-        service.image = lambda: images[0] if images else None
+        service.image = lambda *args, **kwargs: mock_get_image(images)
         self.mock_client.pull = pull
 
         service.create_container()
@@ -304,7 +305,7 @@ class ServiceTest(unittest.TestCase):
         service = Service('foo', client=self.mock_client, build='.')
 
         images = []
-        service.image = lambda *args, **kwargs: images[0] if images else None
+        service.image = lambda *args, **kwargs: mock_get_image(images)
         service.build = lambda: images.append({'Id': 'abc123'})
 
         service.create_container(do_build=True)
@@ -319,7 +320,7 @@ class ServiceTest(unittest.TestCase):
 
     def test_create_container_no_build_but_needs_build(self):
         service = Service('foo', client=self.mock_client, build='.')
-        service.image = lambda: None
+        service.image = lambda *args, **kwargs: mock_get_image([])
 
         with self.assertRaises(NeedsBuildError):
             service.create_container(do_build=False)
@@ -336,6 +337,13 @@ class ServiceTest(unittest.TestCase):
         self.assertFalse(self.mock_client.build.call_args[1]['pull'])
 
 
+def mock_get_image(images):
+    if images:
+        return images[0]
+    else:
+        raise NoSuchImageError()
+
+
 class ServiceVolumesTest(unittest.TestCase):
 
     def setUp(self):

From 6f31e8ebe90661e8a2ccd80d4273afc9b8b2966f Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 7 Jul 2015 12:40:16 +0100
Subject: [PATCH 0101/1265] Add support for log_opt

When specifying a log_driver you want to specify some options for
the logger as per the docker run --log-opt option. The logger
options are key value pairs.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config.py          |  1 +
 compose/service.py         |  6 +++++-
 docs/yml.md                |  8 ++++++++
 tests/unit/service_test.py | 11 +++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/compose/config.py b/compose/config.py
index 08be9166..2baf327b 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -33,6 +33,7 @@ DOCKER_CONFIG_KEYS = [
     'memswap_limit',
     'net',
     'log_driver',
+    'log_opt',
     'pid',
     'ports',
     'privileged',
diff --git a/compose/service.py b/compose/service.py
index 6fec794f..33cc9f61 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -40,6 +40,7 @@ DOCKER_START_KEYS = [
     'read_only',
     'net',
     'log_driver',
+    'log_opt',
     'pid',
     'privileged',
     'restart',
@@ -583,7 +584,10 @@ class Service(object):
         privileged = options.get('privileged', False)
         cap_add = options.get('cap_add', None)
         cap_drop = options.get('cap_drop', None)
-        log_config = LogConfig(type=options.get('log_driver', 'json-file'))
+        log_config = LogConfig(
+            type=options.get('log_driver', 'json-file'),
+            config=options.get('log_opt', None)
+        )
         pid = options.get('pid', None)
         security_opt = options.get('security_opt', None)
 
diff --git a/docs/yml.md b/docs/yml.md
index 4bab73b2..ddf3e6cc 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -248,6 +248,14 @@ The default value is json-file.
     log_driver: "syslog"
     log_driver: "none"
 
+Specify logging options with `log_opt` for the logging driver, as with the ``--log-opt`` option for `docker run`.
+
+Logging options are key value pairs. An example of `syslog` options:
+
+    log_driver: "syslog"
+    log_opt:
+      address: "tcp://192.168.0.42:123"
+
 ### net
 
 Networking mode. Use the same values as the docker client `--net` parameter.
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index d3693715..550a675a 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -5,6 +5,7 @@ from .. import unittest
 import mock
 
 import docker
+from docker.utils import LogConfig
 
 from compose.service import Service
 from compose.container import Container
@@ -162,6 +163,16 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(opts['memswap_limit'], 2000000000)
         self.assertEqual(opts['mem_limit'], 1000000000)
 
+    def test_log_opt(self):
+        log_opt = {'address': 'tcp://192.168.0.42:123'}
+        service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, log_driver='syslog', log_opt=log_opt)
+        self.mock_client.containers.return_value = []
+        opts = service._get_container_create_options({'some': 'overrides'}, 1)
+
+        self.assertIsInstance(opts['host_config']['LogConfig'], LogConfig)
+        self.assertEqual(opts['host_config']['LogConfig'].type, 'syslog')
+        self.assertEqual(opts['host_config']['LogConfig'].config, log_opt)
+
     def test_split_domainname_fqdn(self):
         service = Service(
             'foo',

From ef8ae071458176dbfcdff61770b6453b2e67ca64 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 7 Jul 2015 14:17:09 +0100
Subject: [PATCH 0102/1265] Docs for `file` default behaviour

Change in behaviour, `file` key is optional and if not set the
default is to look within the same file as `extends` is defined.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/extends.md | 10 ++++++----
 docs/yml.md     |  3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/extends.md b/docs/extends.md
index aef1524a..7a92b771 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -233,11 +233,13 @@ manually keep both environments in sync.
 ### Reference
 
 You can use `extends` on any service together with other configuration keys. It
-always expects a dictionary that should always contain two keys: `file` and
-`service`.
+always expects a dictionary that should always contain the key: `service` and optionally the `file` key.
 
-The `file` key specifies which file to look in. It can be an absolute path or a
-relative one&mdash;if relative, it's treated as relative to the current file.
+The `file` key specifies the location of a Compose configuration file defining
+the extension. The `file` value can be an absolute or relative path. If you
+specify a relative path, Docker Compose treats it as relative to the location
+of the current file. If you don't specify a `file`, Compose looks in the
+current configuration file.
 
 The `service` key specifies the name of the service to extend, for example `web`
 or `database`.
diff --git a/docs/yml.md b/docs/yml.md
index 4bab73b2..be91138b 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -217,6 +217,9 @@ and adds `ports` and `links` configuration. It overrides one of the defined
 environment variables (DEBUG) with a new value, and the other one
 (SEND_EMAILS) is left untouched.
 
+The `file` key is optional, if it is not set then Compose will look for the
+service within the current file.
+
 For more on `extends`, see the [tutorial](extends.md#example) and
 [reference](extends.md#reference).
 

From 2db0a377e29d221a66d3889d5a62f919bc4f15dc Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 10 Jul 2015 14:18:27 +0100
Subject: [PATCH 0103/1265] Minor test refactor

Rather than creating a docker client within each test, create one
at setup and make it accessible to the whole class.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/unit/project_test.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index e8aecae3..39ad30a1 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -9,6 +9,9 @@ import docker
 
 
 class ProjectTest(unittest.TestCase):
+    def setUp(self):
+        self.mock_client = mock.create_autospec(docker.Client)
+
     def test_from_dict(self):
         project = Project.from_dicts('composetest', [
             {
@@ -155,21 +158,19 @@ class ProjectTest(unittest.TestCase):
     def test_use_volumes_from_container(self):
         container_id = 'aabbccddee'
         container_dict = dict(Name='aaa', Id=container_id)
-        mock_client = mock.create_autospec(docker.Client)
-        mock_client.inspect_container.return_value = container_dict
+        self.mock_client.inspect_container.return_value = container_dict
         project = Project.from_dicts('test', [
             {
                 'name': 'test',
                 'image': 'busybox:latest',
                 'volumes_from': ['aaa']
             }
-        ], mock_client)
+        ], self.mock_client)
         self.assertEqual(project.get_service('test')._get_volumes_from(), [container_id])
 
     def test_use_volumes_from_service_no_container(self):
         container_name = 'test_vol_1'
-        mock_client = mock.create_autospec(docker.Client)
-        mock_client.containers.return_value = [
+        self.mock_client.containers.return_value = [
             {
                 "Name": container_name,
                 "Names": [container_name],
@@ -187,7 +188,7 @@ class ProjectTest(unittest.TestCase):
                 'image': 'busybox:latest',
                 'volumes_from': ['vol']
             }
-        ], mock_client)
+        ], self.mock_client)
         self.assertEqual(project.get_service('test')._get_volumes_from(), [container_name])
 
     @mock.patch.object(Service, 'containers')
@@ -211,13 +212,12 @@ class ProjectTest(unittest.TestCase):
         self.assertEqual(project.get_service('test')._get_volumes_from(), container_ids)
 
     def test_net_unset(self):
-        mock_client = mock.create_autospec(docker.Client)
         project = Project.from_dicts('test', [
             {
                 'name': 'test',
                 'image': 'busybox:latest',
             }
-        ], mock_client)
+        ], self.mock_client)
         service = project.get_service('test')
         self.assertEqual(service._get_net(), None)
         self.assertNotIn('NetworkMode', service._get_container_host_config({}))
@@ -225,22 +225,20 @@ class ProjectTest(unittest.TestCase):
     def test_use_net_from_container(self):
         container_id = 'aabbccddee'
         container_dict = dict(Name='aaa', Id=container_id)
-        mock_client = mock.create_autospec(docker.Client)
-        mock_client.inspect_container.return_value = container_dict
+        self.mock_client.inspect_container.return_value = container_dict
         project = Project.from_dicts('test', [
             {
                 'name': 'test',
                 'image': 'busybox:latest',
                 'net': 'container:aaa'
             }
-        ], mock_client)
+        ], self.mock_client)
         service = project.get_service('test')
         self.assertEqual(service._get_net(), 'container:' + container_id)
 
     def test_use_net_from_service(self):
         container_name = 'test_aaa_1'
-        mock_client = mock.create_autospec(docker.Client)
-        mock_client.containers.return_value = [
+        self.mock_client.containers.return_value = [
             {
                 "Name": container_name,
                 "Names": [container_name],
@@ -258,7 +256,7 @@ class ProjectTest(unittest.TestCase):
                 'image': 'busybox:latest',
                 'net': 'container:aaa'
             }
-        ], mock_client)
+        ], self.mock_client)
 
         service = project.get_service('test')
         self.assertEqual(service._get_net(), 'container:' + container_name)

From fdc34a187e2e89ce5c74b5dd0d0797d78a707d6d Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 14 Jul 2015 16:17:12 +0100
Subject: [PATCH 0104/1265] Use docker-py 1.3.0

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 requirements.txt | 4 ++--
 setup.py         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 69bd4c5f..fc5b6848 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 PyYAML==3.10
-docker-py==1.2.3
+docker-py==1.3.0
 dockerpty==0.3.4
 docopt==0.6.1
 requests==2.6.1
 six==1.7.3
 texttable==0.8.2
-websocket-client==0.11.0
+websocket-client==0.32.0
diff --git a/setup.py b/setup.py
index d2e81e17..d0ec1067 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.7',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.11.0, < 1.0',
-    'docker-py >= 1.2.3, < 1.3',
+    'docker-py >= 1.3.0, < 1.4',
     'dockerpty >= 0.3.4, < 0.4',
     'six >= 1.3.0, < 2',
 ]

From b7edb3ca9d21faa2497d1d15bf3ce2c6c56a1029 Mon Sep 17 00:00:00 2001
From: Erik Kristensen <erik@erikkristensen.com>
Date: Tue, 14 Jul 2015 12:03:11 -0600
Subject: [PATCH 0105/1265] do not wrap table cells

Signed-off-by: Erik Kristensen <erik@erikkristensen.com>
---
 compose/cli/formatter.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/compose/cli/formatter.py b/compose/cli/formatter.py
index df777d50..765659dd 100644
--- a/compose/cli/formatter.py
+++ b/compose/cli/formatter.py
@@ -3,18 +3,9 @@ from __future__ import absolute_import
 import os
 import texttable
 
-
-def get_tty_width():
-    tty_size = os.popen('stty size', 'r').read().split()
-    if len(tty_size) != 2:
-        return 80
-    _, width = tty_size
-    return int(width)
-
-
 class Formatter(object):
     def table(self, headers, rows):
-        table = texttable.Texttable(max_width=get_tty_width())
+        table = texttable.Texttable(max_width=0)
         table.set_cols_dtype(['t' for h in headers])
         table.add_rows([headers] + rows)
         table.set_deco(table.HEADER)

From 7937611366f58d5d1d5a87cb973b72ec492b2e6e Mon Sep 17 00:00:00 2001
From: Erik Kristensen <erik@erikkristensen.com>
Date: Tue, 14 Jul 2015 12:30:54 -0600
Subject: [PATCH 0106/1265] change 80 to 0

Signed-off-by: Erik Kristensen <erik@erikkristensen.com>
---
 compose/cli/formatter.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/compose/cli/formatter.py b/compose/cli/formatter.py
index 765659dd..b5b0b3c0 100644
--- a/compose/cli/formatter.py
+++ b/compose/cli/formatter.py
@@ -3,9 +3,18 @@ from __future__ import absolute_import
 import os
 import texttable
 
+
+def get_tty_width():
+    tty_size = os.popen('stty size', 'r').read().split()
+    if len(tty_size) != 2:
+        return 0
+    _, width = tty_size
+    return int(width)
+
+
 class Formatter(object):
     def table(self, headers, rows):
-        table = texttable.Texttable(max_width=0)
+        table = texttable.Texttable(max_width=get_tty_width())
         table.set_cols_dtype(['t' for h in headers])
         table.add_rows([headers] + rows)
         table.set_deco(table.HEADER)

From aab6df6ba4e4b13f56effbfc632c2030b89232a9 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Thu, 28 May 2015 19:02:19 +0100
Subject: [PATCH 0107/1265] Add test coverage support

Prints out results on console and puts HTML report in `coverage-html`.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 .dockerignore        | 1 +
 .gitignore           | 1 +
 requirements-dev.txt | 1 +
 script/test          | 3 +++
 script/test-versions | 3 ++-
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index a03616e5..b85b7e5d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,3 +2,4 @@
 build
 dist
 venv
+coverage-html
diff --git a/.gitignore b/.gitignore
index da7fe7fa..52a78bd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /docs/_site
 /venv
 docker-compose.spec
+coverage-html
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 7b529623..c5d9c106 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -4,3 +4,4 @@ git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c
 unittest2==0.8.0
 flake8==2.3.0
 pep8==1.6.1
+coverage==3.7.1
diff --git a/script/test b/script/test
index 625af09b..adf3fb1b 100755
--- a/script/test
+++ b/script/test
@@ -5,6 +5,8 @@ set -ex
 
 TAG="docker-compose:$(git rev-parse --short HEAD)"
 
+rm -rf coverage-html
+
 docker build -t "$TAG" .
 docker run \
   --rm \
@@ -12,6 +14,7 @@ docker run \
   -e DOCKER_VERSIONS \
   -e "TAG=$TAG" \
   -e "affinity:image==$TAG" \
+  -e "COVERAGE_DIR=$(pwd)/coverage-html" \
   --entrypoint="script/test-versions" \
   "$TAG" \
   "$@"
diff --git a/script/test-versions b/script/test-versions
index 7f1a14a9..9e81a515 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -19,8 +19,9 @@ for version in $DOCKER_VERSIONS; do
     --rm \
     --privileged \
     --volume="/var/lib/docker" \
+    --volume="${COVERAGE_DIR:-$(pwd)/coverage-html}:/code/coverage-html" \
     -e "DOCKER_VERSION=$version" \
     --entrypoint="script/dind" \
     "$TAG" \
-    script/wrapdocker nosetests "$@"
+    script/wrapdocker nosetests --with-coverage --cover-branches --cover-package=compose --cover-erase --cover-html-dir=coverage-html --cover-html "$@"
 done

From a68ca199a2f1258d96b09cf2ea62a819aecfcbdb Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 13 Jul 2015 14:03:44 +0100
Subject: [PATCH 0108/1265] Execute container commands in parallel

Commands able to use this parallelisation are `stop`, `kill` and `rm`.

We're using a backported function from python 3, to allow us to make
the most of a pool of threads without having to write the low level
code for managing this ourselves.

A default value for number of threads is a low enough number so it
shouldn't cause performance problems but if someone knows the
capability of their system and wants to increase it, they can via
an environment variable DEFAULT_MAX_WORKERS

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/const.py   |  1 +
 compose/project.py | 22 +++++++++++-----------
 compose/service.py |  3 +++
 compose/utils.py   | 36 +++++++++++++++++++++++++++++++++++-
 requirements.txt   |  1 +
 setup.py           |  1 +
 6 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/compose/const.py b/compose/const.py
index 709c3a10..9c39d5f8 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -1,4 +1,5 @@
 
+DEFAULT_MAX_WORKERS = 5
 DEFAULT_TIMEOUT = 10
 LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
 LABEL_ONE_OFF = 'com.docker.compose.oneoff'
diff --git a/compose/project.py b/compose/project.py
index 11c1e1ce..7928316a 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -1,15 +1,16 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
-import logging
 from functools import reduce
+import logging
 
 from docker.errors import APIError
 
 from .config import get_service_name_from_net, ConfigurationError
-from .const import LABEL_PROJECT, LABEL_SERVICE, LABEL_ONE_OFF, DEFAULT_TIMEOUT
-from .service import Service
+from .const import DEFAULT_TIMEOUT, LABEL_PROJECT, LABEL_SERVICE, LABEL_ONE_OFF
 from .container import Container
 from .legacy import check_for_legacy_containers
+from .service import Service
+from .utils import parallel_execute
 
 log = logging.getLogger(__name__)
 
@@ -197,12 +198,15 @@ class Project(object):
             service.start(**options)
 
     def stop(self, service_names=None, **options):
-        for service in reversed(self.get_services(service_names)):
-            service.stop(**options)
+        parallel_execute("stop", self.containers(service_names), "Stopping", "Stopped", **options)
 
     def kill(self, service_names=None, **options):
-        for service in reversed(self.get_services(service_names)):
-            service.kill(**options)
+        parallel_execute("kill", self.containers(service_names), "Killing", "Killed", **options)
+
+    def remove_stopped(self, service_names=None, **options):
+        all_containers = self.containers(service_names, stopped=True)
+        stopped_containers = [c for c in all_containers if not c.is_running]
+        parallel_execute("remove", stopped_containers, "Removing", "Removed", **options)
 
     def restart(self, service_names=None, **options):
         for service in self.get_services(service_names):
@@ -284,10 +288,6 @@ class Project(object):
         for service in self.get_services(service_names, include_deps=True):
             service.pull(insecure_registry=insecure_registry)
 
-    def remove_stopped(self, service_names=None, **options):
-        for service in self.get_services(service_names):
-            service.remove_stopped(**options)
-
     def containers(self, service_names=None, stopped=False, one_off=False):
         if service_names:
             self.validate_service_names(service_names)
diff --git a/compose/service.py b/compose/service.py
index 9a03192e..213f54fa 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -129,6 +129,7 @@ class Service(object):
         for c in self.containers(stopped=True):
             self.start_container_if_stopped(c, **options)
 
+    # TODO: remove these functions, project takes care of starting/stopping,
     def stop(self, **options):
         for c in self.containers():
             log.info("Stopping %s..." % c.name)
@@ -144,6 +145,8 @@ class Service(object):
             log.info("Restarting %s..." % c.name)
             c.restart(**options)
 
+    # end TODO
+
     def scale(self, desired_num):
         """
         Adjusts the number of containers to the specified number and ensures
diff --git a/compose/utils.py b/compose/utils.py
index 76a4c6b9..cc7bd5dd 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -1,5 +1,39 @@
-import json
 import hashlib
+import json
+import logging
+import os
+
+import concurrent.futures
+
+from .const import DEFAULT_MAX_WORKERS
+
+
+log = logging.getLogger(__name__)
+
+
+def parallel_execute(command, containers, doing_msg, done_msg, **options):
+    """
+    Execute a given command upon a list of containers in parallel.
+    """
+    max_workers = os.environ.get('MAX_WORKERS', DEFAULT_MAX_WORKERS)
+
+    def container_command_execute(container, command, **options):
+        log.info("{} {}...".format(doing_msg, container.name))
+        return getattr(container, command)(**options)
+
+    with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
+        future_container = {
+            executor.submit(
+                container_command_execute,
+                container,
+                command,
+                **options
+            ): container for container in containers
+        }
+
+        for future in concurrent.futures.as_completed(future_container):
+            container = future_container[future]
+            log.info("{} {}".format(done_msg, container.name))
 
 
 def json_hash(obj):
diff --git a/requirements.txt b/requirements.txt
index 69bd4c5f..4a0c5be5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,7 @@ PyYAML==3.10
 docker-py==1.2.3
 dockerpty==0.3.4
 docopt==0.6.1
+futures==3.0.3
 requests==2.6.1
 six==1.7.3
 texttable==0.8.2
diff --git a/setup.py b/setup.py
index d2e81e17..ebd53119 100644
--- a/setup.py
+++ b/setup.py
@@ -33,6 +33,7 @@ install_requires = [
     'docker-py >= 1.2.3, < 1.3',
     'dockerpty >= 0.3.4, < 0.4',
     'six >= 1.3.0, < 2',
+    'futures >= 3.0.3',
 ]
 
 

From 03d34336a85e189c8e40bfcd7dbbfe801f0c76dc Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 15 Jul 2015 11:56:06 +0100
Subject: [PATCH 0109/1265] Document DEFAULT_MAX_WORKERS

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/cli.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/cli.md b/docs/cli.md
index c178fc78..ce0f0447 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -193,6 +193,12 @@ the daemon.
 
 Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TLS verification. Defaults to `~/.docker`.
 
+### DEFAULT\_MAX\_WORKERS
+
+Configures the maximum number of worker threads to be used when executing
+commands in parallel. Only a subset of commands execute in parallel, `stop`,
+`kill` and `rm`.
+
 ## Compose documentation
 
 - [User guide](/)

From 200b4088433766b2d7eb00f4f0b67976c6f589f9 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Wed, 15 Jul 2015 11:56:46 +0100
Subject: [PATCH 0110/1265] Link to waffle board from CONTRIBUTING.md

Closes #1067

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 CONTRIBUTING.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b261df53..c9188ac9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,3 +55,9 @@ you can specify a test directory, file, module, class or method:
     $ script/test tests/unit/cli_test.py
     $ script/test tests.integration.service_test
     $ script/test tests.integration.service_test:ServiceTest.test_containers
+
+## Finding things to work on
+
+We use a [Waffle.io board](https://waffle.io/docker/compose) to keep track of specific things we are working on and planning to work on. If you're looking for things to work on, stuff in the backlog is a great place to start.
+
+For more information about our project planning, take a look at our [GitHub wiki](https://github.com/docker/compose/wiki).

From e675d677741f7bb8a32e4b644a0a1f20a874aca5 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 15 Jul 2015 11:42:51 +0100
Subject: [PATCH 0111/1265] Test against Docker 1.6.2 and 1.7.1

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 98dc59c5..738e0b99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,16 +48,16 @@ RUN set -ex; \
     rm -rf pip-7.0.1; \
     rm pip-7.0.1.tar.gz
 
-ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0
+ENV ALL_DOCKER_VERSIONS 1.6.2 1.7.1
 
 RUN set -ex; \
-    curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -o /usr/local/bin/docker-1.6.0; \
-    chmod +x /usr/local/bin/docker-1.6.0; \
-    curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0 -o /usr/local/bin/docker-1.7.0; \
-    chmod +x /usr/local/bin/docker-1.7.0
+    curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.2 -o /usr/local/bin/docker-1.6.2; \
+    chmod +x /usr/local/bin/docker-1.6.2; \
+    curl https://get.docker.com/builds/Linux/x86_64/docker-1.7.1 -o /usr/local/bin/docker-1.7.1; \
+    chmod +x /usr/local/bin/docker-1.7.1
 
 # Set the default Docker to be run
-RUN ln -s /usr/local/bin/docker-1.6.0 /usr/local/bin/docker
+RUN ln -s /usr/local/bin/docker-1.6.2 /usr/local/bin/docker
 
 RUN useradd -d /home/user -m -s /bin/bash user
 WORKDIR /code/

From f03dec766dc18e4922ff693568e885ae46b374d8 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 15 Jul 2015 16:43:43 +0100
Subject: [PATCH 0112/1265] Rename max workers env var and fix docs

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/utils.py | 2 +-
 docs/cli.md      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose/utils.py b/compose/utils.py
index cc7bd5dd..6dc751c6 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -15,7 +15,7 @@ def parallel_execute(command, containers, doing_msg, done_msg, **options):
     """
     Execute a given command upon a list of containers in parallel.
     """
-    max_workers = os.environ.get('MAX_WORKERS', DEFAULT_MAX_WORKERS)
+    max_workers = os.environ.get('COMPOSE_MAX_WORKERS', DEFAULT_MAX_WORKERS)
 
     def container_command_execute(container, command, **options):
         log.info("{} {}...".format(doing_msg, container.name))
diff --git a/docs/cli.md b/docs/cli.md
index ce0f0447..6b04f21d 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -193,7 +193,7 @@ the daemon.
 
 Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TLS verification. Defaults to `~/.docker`.
 
-### DEFAULT\_MAX\_WORKERS
+### COMPOSE\_MAX\_WORKERS
 
 Configures the maximum number of worker threads to be used when executing
 commands in parallel. Only a subset of commands execute in parallel, `stop`,

From ec8bf066ba2433a7e9b0049e519c8af66cef2e7a Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 15 Jul 2015 16:56:39 +0100
Subject: [PATCH 0113/1265] Make sure up/restart/stop timeout is an int

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py             | 6 +++---
 tests/integration/state_test.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index adb11df4..ada5e495 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -405,7 +405,7 @@ class TopLevelCommand(Command):
           -t, --timeout TIMEOUT      Specify a shutdown timeout in seconds.
                                      (default: 10)
         """
-        timeout = float(options.get('--timeout') or DEFAULT_TIMEOUT)
+        timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
         project.stop(service_names=options['SERVICE'], timeout=timeout)
 
     def restart(self, project, options):
@@ -418,7 +418,7 @@ class TopLevelCommand(Command):
           -t, --timeout TIMEOUT      Specify a shutdown timeout in seconds.
                                      (default: 10)
         """
-        timeout = float(options.get('--timeout') or DEFAULT_TIMEOUT)
+        timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
         project.restart(service_names=options['SERVICE'], timeout=timeout)
 
     def up(self, project, options):
@@ -461,7 +461,7 @@ class TopLevelCommand(Command):
         allow_recreate = not options['--no-recreate']
         smart_recreate = options['--x-smart-recreate']
         service_names = options['SERVICE']
-        timeout = float(options.get('--timeout') or DEFAULT_TIMEOUT)
+        timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
 
         to_attach = project.up(
             service_names=service_names,
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index d36e6320..ce7c0d81 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -13,7 +13,7 @@ from .testcases import DockerClientTestCase
 class ProjectTestCase(DockerClientTestCase):
     def run_up(self, cfg, **kwargs):
         kwargs.setdefault('smart_recreate', True)
-        kwargs.setdefault('timeout', 0.1)
+        kwargs.setdefault('timeout', 1)
 
         project = self.make_project(cfg)
         project.up(**kwargs)
@@ -171,7 +171,7 @@ def converge(service,
         plan,
         insecure_registry=insecure_registry,
         do_build=do_build,
-        timeout=0.1,
+        timeout=1,
     )
 
 

From 0c5c8d1f00e13267be233f8b9da8627abf6135d4 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 15 Jul 2015 17:13:33 +0100
Subject: [PATCH 0114/1265] Handle case where /containers/json returns
 "Labels": null

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/legacy.py                |  2 +-
 tests/integration/legacy_test.py | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/compose/legacy.py b/compose/legacy.py
index c9ec6581..6fbf74d6 100644
--- a/compose/legacy.py
+++ b/compose/legacy.py
@@ -149,7 +149,7 @@ def _get_legacy_containers_iter(
 
     for service in services:
         for container in containers:
-            if LABEL_VERSION in container['Labels']:
+            if LABEL_VERSION in (container.get('Labels') or {}):
                 continue
 
             name = get_container_name(container)
diff --git a/tests/integration/legacy_test.py b/tests/integration/legacy_test.py
index 806b9a45..f79089b2 100644
--- a/tests/integration/legacy_test.py
+++ b/tests/integration/legacy_test.py
@@ -1,4 +1,5 @@
 import unittest
+from mock import Mock
 
 from docker.errors import APIError
 
@@ -64,6 +65,22 @@ class UtilitiesTestCase(unittest.TestCase):
             legacy.is_valid_name("composetest_web_lol_1", one_off=True),
         )
 
+    def test_get_legacy_containers_no_labels(self):
+        client = Mock()
+        client.containers.return_value = [
+            {
+                "Id": "abc123",
+                "Image": "def456",
+                "Name": "composetest_web_1",
+                "Labels": None,
+            },
+        ]
+
+        containers = list(legacy.get_legacy_containers(
+            client, "composetest", ["web"]))
+
+        self.assertEqual(len(containers), 1)
+
 
 class LegacyTestCase(DockerClientTestCase):
 

From da6cbd4535f7e458e382dc070008f0aa41928e6b Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 15 Jul 2015 17:44:46 +0100
Subject: [PATCH 0115/1265] Improve output for parallel command

This approach takes the style of replacing the output message, in
place, when the command has finished executing. Bringing it a bit
more inline with what `docker pull` does.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/utils.py | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/compose/utils.py b/compose/utils.py
index 6dc751c6..3efde052 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -1,7 +1,9 @@
+import codecs
 import hashlib
 import json
 import logging
 import os
+import sys
 
 import concurrent.futures
 
@@ -16,9 +18,11 @@ def parallel_execute(command, containers, doing_msg, done_msg, **options):
     Execute a given command upon a list of containers in parallel.
     """
     max_workers = os.environ.get('COMPOSE_MAX_WORKERS', DEFAULT_MAX_WORKERS)
+    stream = codecs.getwriter('utf-8')(sys.stdout)
+    lines = []
 
     def container_command_execute(container, command, **options):
-        log.info("{} {}...".format(doing_msg, container.name))
+        write_out_msg(stream, lines, container.name, doing_msg)
         return getattr(container, command)(**options)
 
     with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
@@ -33,7 +37,24 @@ def parallel_execute(command, containers, doing_msg, done_msg, **options):
 
         for future in concurrent.futures.as_completed(future_container):
             container = future_container[future]
-            log.info("{} {}".format(done_msg, container.name))
+            write_out_msg(stream, lines, container.name, done_msg)
+
+
+def write_out_msg(stream, lines, container_name, msg):
+    if container_name in lines:
+        position = lines.index(container_name)
+        diff = len(lines) - position
+        # move up
+        stream.write("%c[%dA" % (27, diff))
+        # erase
+        stream.write("%c[2K\r" % 27)
+        stream.write("{}: {} \n".format(container_name, msg))
+        # move back down
+        stream.write("%c[%dB" % (27, diff))
+    else:
+        diff = 0
+        lines.append(container_name)
+        stream.write("{}: {}... \r\n".format(container_name, msg))
 
 
 def json_hash(obj):

From 29f51f821601461e1d8a85df2a174ac858829fd6 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 16 Jul 2015 16:17:26 +0100
Subject: [PATCH 0116/1265] Increase max-workers

There's significant speed improvement by having more workers. This
value still shouldn't cause anyone's machines to melt/explode.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/const.py b/compose/const.py
index 9c39d5f8..479b6af4 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -1,5 +1,5 @@
 
-DEFAULT_MAX_WORKERS = 5
+DEFAULT_MAX_WORKERS = 20
 DEFAULT_TIMEOUT = 10
 LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
 LABEL_ONE_OFF = 'com.docker.compose.oneoff'

From 9d0bbdf8dd503ff149409d4f8cca18852df9dea7 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 16 Jul 2015 16:39:38 +0100
Subject: [PATCH 0117/1265] Make scale timeout configurable, default to 10

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py | 10 ++++++++--
 compose/service.py  |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index ada5e495..bfe38943 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -372,8 +372,14 @@ class TopLevelCommand(Command):
 
             $ docker-compose scale web=2 worker=3
 
-        Usage: scale [SERVICE=NUM...]
+        Usage: scale [options] [SERVICE=NUM...]
+
+        Options:
+          -t, --timeout TIMEOUT      Specify a shutdown timeout in seconds.
+                                     (default: 10)
         """
+        timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
+
         for s in options['SERVICE=NUM']:
             if '=' not in s:
                 raise UserError('Arguments to scale should be in the form service=num')
@@ -383,7 +389,7 @@ class TopLevelCommand(Command):
             except ValueError:
                 raise UserError('Number of containers for service "%s" is not a '
                                 'number' % service_name)
-            project.get_service(service_name).scale(num)
+            project.get_service(service_name).scale(num, timeout=timeout)
 
     def start(self, project, options):
         """
diff --git a/compose/service.py b/compose/service.py
index 213f54fa..d10d563e 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -147,7 +147,7 @@ class Service(object):
 
     # end TODO
 
-    def scale(self, desired_num):
+    def scale(self, desired_num, timeout=DEFAULT_TIMEOUT):
         """
         Adjusts the number of containers to the specified number and ensures
         they are running.
@@ -181,7 +181,7 @@ class Service(object):
         while len(running_containers) > desired_num:
             c = running_containers.pop()
             log.info("Stopping %s..." % c.name)
-            c.stop(timeout=1)
+            c.stop(timeout=timeout)
             stopped_containers.append(c)
 
         # Start containers

From ced94a35045f0fef9dfa707769539c3c3692e385 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 15 Jul 2015 16:19:39 +0100
Subject: [PATCH 0118/1265] Make smart recreate the default

Add --force-recreate flag to enable the old default behaviour of
recreating everything.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py                  | 35 +++++++++++++++++-----------
 compose/project.py                   | 15 +++++++-----
 compose/service.py                   | 23 ++++++++++--------
 docs/cli.md                          | 17 +++++++++-----
 tests/integration/cli_test.py        | 11 ++++++---
 tests/integration/project_test.py    |  4 ++--
 tests/integration/resilience_test.py |  6 ++---
 tests/integration/state_test.py      | 19 +++++++--------
 8 files changed, 77 insertions(+), 53 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index bfe38943..58b22530 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -429,17 +429,22 @@ class TopLevelCommand(Command):
 
     def up(self, project, options):
         """
-        Build, (re)create, start and attach to containers for a service.
+        Builds, (re)creates, starts, and attaches to containers for a service.
 
-        By default, `docker-compose up` will aggregate the output of each container, and
-        when it exits, all containers will be stopped. If you run `docker-compose up -d`,
-        it'll start the containers in the background and leave them running.
+        Unless they are already running, this command also starts any linked services.
 
-        If there are existing containers for a service, `docker-compose up` will stop
-        and recreate them (preserving mounted volumes with volumes-from),
-        so that changes in `docker-compose.yml` are picked up. If you do not want existing
-        containers to be recreated, `docker-compose up --no-recreate` will re-use existing
-        containers.
+        The `docker-compose up` command aggregates the output of each container. When
+        the command exits, all containers are stopped. Running `docker-compose up -d`
+        starts the containers in the background and leaves them running.
+
+        If there are existing containers for a service, and the service's configuration
+        or image was changed after the container's creation, `docker-compose up` picks
+        up the changes by stopping and recreating the containers (preserving mounted
+        volumes). To prevent Compose from picking up changes, use the `--no-recreate`
+        flag.
+
+        If you want to force Compose to stop and recreate all containers, use the
+        `--force-recreate` flag.
 
         Usage: up [options] [SERVICE...]
 
@@ -450,9 +455,10 @@ class TopLevelCommand(Command):
                                    print new container names.
             --no-color             Produce monochrome output.
             --no-deps              Don't start linked services.
-            --x-smart-recreate     Only recreate containers whose configuration or
-                                   image needs to be updated. (EXPERIMENTAL)
+            --force-recreate       Recreate containers even if their configuration and
+                                   image haven't changed. Incompatible with --no-recreate.
             --no-recreate          If containers already exist, don't recreate them.
+                                   Incompatible with --force-recreate.
             --no-build             Don't build an image, even if it's missing
             -t, --timeout TIMEOUT  Use this timeout in seconds for container shutdown
                                    when attached or when containers are already
@@ -465,15 +471,18 @@ class TopLevelCommand(Command):
 
         start_deps = not options['--no-deps']
         allow_recreate = not options['--no-recreate']
-        smart_recreate = options['--x-smart-recreate']
+        force_recreate = options['--force-recreate']
         service_names = options['SERVICE']
         timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
 
+        if force_recreate and not allow_recreate:
+            raise UserError("--force-recreate and --no-recreate cannot be combined.")
+
         to_attach = project.up(
             service_names=service_names,
             start_deps=start_deps,
             allow_recreate=allow_recreate,
-            smart_recreate=smart_recreate,
+            force_recreate=force_recreate,
             insecure_registry=insecure_registry,
             do_build=not options['--no-build'],
             timeout=timeout
diff --git a/compose/project.py b/compose/project.py
index 7928316a..541ff3ff 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -223,11 +223,14 @@ class Project(object):
            service_names=None,
            start_deps=True,
            allow_recreate=True,
-           smart_recreate=False,
+           force_recreate=False,
            insecure_registry=False,
            do_build=True,
            timeout=DEFAULT_TIMEOUT):
 
+        if force_recreate and not allow_recreate:
+            raise ValueError("force_recreate and allow_recreate are in conflict")
+
         services = self.get_services(service_names, include_deps=start_deps)
 
         for service in services:
@@ -236,7 +239,7 @@ class Project(object):
         plans = self._get_convergence_plans(
             services,
             allow_recreate=allow_recreate,
-            smart_recreate=smart_recreate,
+            force_recreate=force_recreate,
         )
 
         return [
@@ -253,7 +256,7 @@ class Project(object):
     def _get_convergence_plans(self,
                                services,
                                allow_recreate=True,
-                               smart_recreate=False):
+                               force_recreate=False):
 
         plans = {}
 
@@ -265,19 +268,19 @@ class Project(object):
                 and plans[name].action == 'recreate'
             ]
 
-            if updated_dependencies:
+            if updated_dependencies and allow_recreate:
                 log.debug(
                     '%s has upstream changes (%s)',
                     service.name, ", ".join(updated_dependencies),
                 )
                 plan = service.convergence_plan(
                     allow_recreate=allow_recreate,
-                    smart_recreate=False,
+                    force_recreate=True,
                 )
             else:
                 plan = service.convergence_plan(
                     allow_recreate=allow_recreate,
-                    smart_recreate=smart_recreate,
+                    force_recreate=force_recreate,
                 )
 
             plans[service.name] = plan
diff --git a/compose/service.py b/compose/service.py
index d10d563e..a488b2c6 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -264,25 +264,28 @@ class Service(object):
 
     def convergence_plan(self,
                          allow_recreate=True,
-                         smart_recreate=False):
+                         force_recreate=False):
+
+        if force_recreate and not allow_recreate:
+            raise ValueError("force_recreate and allow_recreate are in conflict")
 
         containers = self.containers(stopped=True)
 
         if not containers:
             return ConvergencePlan('create', [])
 
-        if smart_recreate and not self._containers_have_diverged(containers):
-            stopped = [c for c in containers if not c.is_running]
-
-            if stopped:
-                return ConvergencePlan('start', stopped)
-
-            return ConvergencePlan('noop', containers)
-
         if not allow_recreate:
             return ConvergencePlan('start', containers)
 
-        return ConvergencePlan('recreate', containers)
+        if force_recreate or self._containers_have_diverged(containers):
+            return ConvergencePlan('recreate', containers)
+
+        stopped = [c for c in containers if not c.is_running]
+
+        if stopped:
+            return ConvergencePlan('start', stopped)
+
+        return ConvergencePlan('noop', containers)
 
     def _containers_have_diverged(self, containers):
         config_hash = None
diff --git a/docs/cli.md b/docs/cli.md
index 6b04f21d..43cf61c5 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -127,15 +127,20 @@ Stops running containers without removing them. They can be started again with
 
 Builds, (re)creates, starts, and attaches to containers for a service.
 
-Linked services will be started, unless they are already running.
+Unless they are already running, this command also starts any linked services.
 
-By default, `docker-compose up` will aggregate the output of each container and,
-when it exits, all containers will be stopped. Running `docker-compose up -d`,
-will start the containers in the background and leave them running.
+The `docker-compose up` command aggregates the output of each container. When
+the command exits, all containers are stopped. Running `docker-compose up -d`
+starts the containers in the background and leaves them running.
 
-By default, if there are existing containers for a service, `docker-compose up` will stop and recreate them (preserving mounted volumes with [volumes-from]), so that changes in `docker-compose.yml` are picked up. If you do not want containers stopped and recreated, use `docker-compose up --no-recreate`. This will still start any stopped containers, if needed.
+If there are existing containers for a service, and the service's configuration
+or image was changed after the container's creation, `docker-compose up` picks
+up the changes by stopping and recreating the containers (preserving mounted
+volumes). To prevent Compose from picking up changes, use the `--no-recreate`
+flag.
 
-[volumes-from]: http://docs.docker.io/en/latest/use/working_with_volumes/
+If you want to force Compose to stop and recreate all containers, use the
+`--force-recreate` flag.
 
 ## Options
 
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index c3597815..f3b3b9f5 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -9,6 +9,7 @@ from mock import patch
 
 from .testcases import DockerClientTestCase
 from compose.cli.main import TopLevelCommand
+from compose.cli.errors import UserError
 from compose.project import NoSuchService
 
 
@@ -136,21 +137,21 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(db.containers()), 0)
         self.assertEqual(len(console.containers()), 0)
 
-    def test_up_with_recreate(self):
+    def test_up_with_force_recreate(self):
         self.command.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
         self.assertEqual(len(service.containers()), 1)
 
         old_ids = [c.id for c in service.containers()]
 
-        self.command.dispatch(['up', '-d'], None)
+        self.command.dispatch(['up', '-d', '--force-recreate'], None)
         self.assertEqual(len(service.containers()), 1)
 
         new_ids = [c.id for c in service.containers()]
 
         self.assertNotEqual(old_ids, new_ids)
 
-    def test_up_with_keep_old(self):
+    def test_up_with_no_recreate(self):
         self.command.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
         self.assertEqual(len(service.containers()), 1)
@@ -164,6 +165,10 @@ class CLITestCase(DockerClientTestCase):
 
         self.assertEqual(old_ids, new_ids)
 
+    def test_up_with_force_recreate_and_no_recreate(self):
+        with self.assertRaises(UserError):
+            self.command.dispatch(['up', '-d', '--force-recreate', '--no-recreate'], None)
+
     def test_up_with_timeout(self):
         self.command.dispatch(['up', '-d', '-t', '1'], None)
         service = self.project.get_service('simple')
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 19594042..9788c186 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -197,7 +197,7 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(db.containers()), 1)
         self.assertEqual(len(web.containers()), 1)
 
-    def test_project_up_recreates_containers(self):
+    def test_recreate_preserves_volumes(self):
         web = self.create_service('web')
         db = self.create_service('db', volumes=['/etc'])
         project = Project('composetest', [web, db], self.client)
@@ -209,7 +209,7 @@ class ProjectTest(DockerClientTestCase):
         old_db_id = project.containers()[0].id
         db_volume_path = project.containers()[0].get('Volumes./etc')
 
-        project.up()
+        project.up(force_recreate=True)
         self.assertEqual(len(project.containers()), 2)
 
         db_container = [c for c in project.containers() if 'db' in c.name][0]
diff --git a/tests/integration/resilience_test.py b/tests/integration/resilience_test.py
index 39249090..e0c76f29 100644
--- a/tests/integration/resilience_test.py
+++ b/tests/integration/resilience_test.py
@@ -17,14 +17,14 @@ class ResilienceTest(DockerClientTestCase):
         self.host_path = container.get('Volumes')['/var/db']
 
     def test_successful_recreate(self):
-        self.project.up()
+        self.project.up(force_recreate=True)
         container = self.db.containers()[0]
         self.assertEqual(container.get('Volumes')['/var/db'], self.host_path)
 
     def test_create_failure(self):
         with mock.patch('compose.service.Service.create_container', crash):
             with self.assertRaises(Crash):
-                self.project.up()
+                self.project.up(force_recreate=True)
 
         self.project.up()
         container = self.db.containers()[0]
@@ -33,7 +33,7 @@ class ResilienceTest(DockerClientTestCase):
     def test_start_failure(self):
         with mock.patch('compose.service.Service.start_container', crash):
             with self.assertRaises(Crash):
-                self.project.up()
+                self.project.up(force_recreate=True)
 
         self.project.up()
         container = self.db.containers()[0]
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index ce7c0d81..63027586 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -12,7 +12,6 @@ from .testcases import DockerClientTestCase
 
 class ProjectTestCase(DockerClientTestCase):
     def run_up(self, cfg, **kwargs):
-        kwargs.setdefault('smart_recreate', True)
         kwargs.setdefault('timeout', 1)
 
         project = self.make_project(cfg)
@@ -155,7 +154,7 @@ class ProjectWithDependenciesTest(ProjectTestCase):
 
 def converge(service,
              allow_recreate=True,
-             smart_recreate=False,
+             force_recreate=False,
              insecure_registry=False,
              do_build=True):
     """
@@ -164,7 +163,7 @@ def converge(service,
     """
     plan = service.convergence_plan(
         allow_recreate=allow_recreate,
-        smart_recreate=smart_recreate,
+        force_recreate=force_recreate,
     )
 
     return service.execute_convergence_plan(
@@ -180,7 +179,7 @@ class ServiceStateTest(DockerClientTestCase):
 
     def test_trigger_create(self):
         web = self.create_service('web')
-        self.assertEqual(('create', []), web.convergence_plan(smart_recreate=True))
+        self.assertEqual(('create', []), web.convergence_plan())
 
     def test_trigger_noop(self):
         web = self.create_service('web')
@@ -188,7 +187,7 @@ class ServiceStateTest(DockerClientTestCase):
         web.start()
 
         web = self.create_service('web')
-        self.assertEqual(('noop', [container]), web.convergence_plan(smart_recreate=True))
+        self.assertEqual(('noop', [container]), web.convergence_plan())
 
     def test_trigger_start(self):
         options = dict(command=["top"])
@@ -205,7 +204,7 @@ class ServiceStateTest(DockerClientTestCase):
         web = self.create_service('web', **options)
         self.assertEqual(
             ('start', containers[0:1]),
-            web.convergence_plan(smart_recreate=True),
+            web.convergence_plan(),
         )
 
     def test_trigger_recreate_with_config_change(self):
@@ -213,14 +212,14 @@ class ServiceStateTest(DockerClientTestCase):
         container = web.create_container()
 
         web = self.create_service('web', command=["top", "-d", "1"])
-        self.assertEqual(('recreate', [container]), web.convergence_plan(smart_recreate=True))
+        self.assertEqual(('recreate', [container]), web.convergence_plan())
 
     def test_trigger_recreate_with_nonexistent_image_tag(self):
         web = self.create_service('web', image="busybox:latest")
         container = web.create_container()
 
         web = self.create_service('web', image="nonexistent-image")
-        self.assertEqual(('recreate', [container]), web.convergence_plan(smart_recreate=True))
+        self.assertEqual(('recreate', [container]), web.convergence_plan())
 
     def test_trigger_recreate_with_image_change(self):
         repo = 'composetest_myimage'
@@ -240,7 +239,7 @@ class ServiceStateTest(DockerClientTestCase):
             self.client.remove_container(c)
 
             web = self.create_service('web', image=image)
-            self.assertEqual(('recreate', [container]), web.convergence_plan(smart_recreate=True))
+            self.assertEqual(('recreate', [container]), web.convergence_plan())
 
         finally:
             self.client.remove_image(image)
@@ -263,7 +262,7 @@ class ServiceStateTest(DockerClientTestCase):
             web.build()
 
             web = self.create_service('web', build=context)
-            self.assertEqual(('recreate', [container]), web.convergence_plan(smart_recreate=True))
+            self.assertEqual(('recreate', [container]), web.convergence_plan())
         finally:
             shutil.rmtree(context)
 

From 36f4d413fd5153e4a1558d05c543b258417a1fdd Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Thu, 16 Jul 2015 17:30:49 -0700
Subject: [PATCH 0119/1265] Updating Compose documentation - Split out commands
 into individual pages for maintainability - Add full usage in commands pages
 for usability - Updated description of the run command - adding in Aanand's
 comment

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/env.md                      |  1 -
 docs/reference/build.md          | 22 +++++++++++
 docs/reference/docker-compose.md | 55 ++++++++++++++++++++++++++
 docs/reference/help.md           | 17 ++++++++
 docs/reference/index.md          | 29 ++++++++++++++
 docs/reference/kill.md           | 23 +++++++++++
 docs/reference/logs.md           | 20 ++++++++++
 docs/reference/overview.md       | 68 ++++++++++++++++++++++++++++++++
 docs/reference/port.md           | 22 +++++++++++
 docs/reference/ps.md             | 20 ++++++++++
 docs/reference/pull.md           | 20 ++++++++++
 docs/reference/restart.md        | 20 ++++++++++
 docs/reference/rm.md             | 21 ++++++++++
 docs/reference/run.md            | 54 +++++++++++++++++++++++++
 docs/reference/scale.md          | 21 ++++++++++
 docs/reference/start.md          | 17 ++++++++
 docs/reference/stop.md           | 21 ++++++++++
 docs/reference/up.md             | 42 ++++++++++++++++++++
 18 files changed, 492 insertions(+), 1 deletion(-)
 create mode 100644 docs/reference/build.md
 create mode 100644 docs/reference/docker-compose.md
 create mode 100644 docs/reference/help.md
 create mode 100644 docs/reference/index.md
 create mode 100644 docs/reference/kill.md
 create mode 100644 docs/reference/logs.md
 create mode 100644 docs/reference/overview.md
 create mode 100644 docs/reference/port.md
 create mode 100644 docs/reference/ps.md
 create mode 100644 docs/reference/pull.md
 create mode 100644 docs/reference/restart.md
 create mode 100644 docs/reference/rm.md
 create mode 100644 docs/reference/run.md
 create mode 100644 docs/reference/scale.md
 create mode 100644 docs/reference/start.md
 create mode 100644 docs/reference/stop.md
 create mode 100644 docs/reference/up.md

diff --git a/docs/env.md b/docs/env.md
index e38e6d50..afeb829e 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -10,7 +10,6 @@ weight=3
 <![end-metadata]-->
 
 # Compose environment variables reference
-===============================
 
 **Note:** Environment variables are no longer the recommended method for connecting to linked services. Instead, you should use the link name (by default, the name of the linked service) as the hostname to connect to. See the [docker-compose.yml documentation](yml.md#links) for details.
 
diff --git a/docs/reference/build.md b/docs/reference/build.md
new file mode 100644
index 00000000..b2b01511
--- /dev/null
+++ b/docs/reference/build.md
@@ -0,0 +1,22 @@
+<!--[metadata]>
++++
+title = "build"
+description = "build"
+keywords = ["fig, composition, compose, docker, orchestration, cli,  build"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# build
+
+```
+Usage: build [options] [SERVICE...]
+
+Options:
+--no-cache  Do not use cache when building the image.
+```
+
+Services are built once and then tagged as `project_service`, e.g.,
+`composetest_db`. If you change a service's Dockerfile or the contents of its
+build directory, run `docker-compose build` to rebuild it.
\ No newline at end of file
diff --git a/docs/reference/docker-compose.md b/docs/reference/docker-compose.md
new file mode 100644
index 00000000..e252da0a
--- /dev/null
+++ b/docs/reference/docker-compose.md
@@ -0,0 +1,55 @@
+<!--[metadata]>
++++
+title = "docker-compose"
+description = "docker-compose Command Binary"
+keywords = ["fig, composition, compose, docker, orchestration, cli,  docker-compose"]
+[menu.main]
+parent = "smn_compose_cli"
+weight=-2	
++++
+<![end-metadata]-->
+
+
+# docker-compose Command
+
+```
+Usage:
+  docker-compose [options] [COMMAND] [ARGS...]
+  docker-compose -h|--help
+
+Options:
+  -f, --file FILE           Specify an alternate compose file (default: docker-compose.yml)
+  -p, --project-name NAME   Specify an alternate project name (default: directory name)
+  --verbose                 Show more output
+  -v, --version             Print version and exit
+
+Commands:
+  build              Build or rebuild services
+  help               Get help on a command
+  kill               Kill containers
+  logs               View output from containers
+  port               Print the public port for a port binding
+  ps                 List containers
+  pull               Pulls service images
+  restart            Restart services
+  rm                 Remove stopped containers
+  run                Run a one-off command
+  scale              Set number of containers for a service
+  start              Start services
+  stop               Stop services
+  up                 Create and start containers
+  migrate-to-labels  Recreate containers to add labels
+```
+
+The Docker Compose binary. You use this command to build and manage multiple services in Docker containers.
+
+Use the `-f` flag to specify the location of a Compose configuration file. This
+flag is optional. If you don't provide this flag. Compose looks for a file named
+`docker-compose.yml` in the  working directory. If the file is not found,
+Compose looks in each parent directory successively, until it finds the file.
+
+Use a `-` as the filename to read configuration file from stdin. When stdin is
+used all paths in the configuration are relative to the current working
+directory.
+
+Each configuration can has a project name. If you supply a `-p` flag, you can specify a project name. If you don't specify the flag, Compose uses the current directory name.
diff --git a/docs/reference/help.md b/docs/reference/help.md
new file mode 100644
index 00000000..229ac5de
--- /dev/null
+++ b/docs/reference/help.md
@@ -0,0 +1,17 @@
+<!--[metadata]>
++++
+title = "help"
+description = "help"
+keywords = ["fig, composition, compose, docker, orchestration, cli,  help"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# help
+
+```
+Usage: help COMMAND
+```
+
+Displays help and usage instructions for a command.
diff --git a/docs/reference/index.md b/docs/reference/index.md
new file mode 100644
index 00000000..3d3d55d8
--- /dev/null
+++ b/docs/reference/index.md
@@ -0,0 +1,29 @@
+<!--[metadata]>
++++
+title = "Compose CLI reference"
+description = "Compose CLI reference"
+keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
+[menu.main]
+identifier = "smn_compose_cli"
+parent = "smn_compose_ref"	
++++
+<![end-metadata]-->
+
+## Compose CLI reference
+
+The following pages describe the usage information for the [docker-compose](/reference/docker-compose.md) subcommands. You can also see this information by running `docker-compose [SUBCOMMAND] --help` from the command line.
+
+* [build](/reference/reference/build.md)
+* [help](/reference/help.md)
+* [kill](/reference/kill.md)          
+* [ps](/reference/ps.md)
+* [restart](/reference/restart.md)
+* [run](/reference/run.md)
+* [start](/reference/start.md)
+* [up](/reference/up.md)
+* [logs](/reference/logs.md)
+* [port](/reference/port.md)
+* [pull](/reference/pull.md) 
+* [rm](/reference/rm.md)
+* [scale](/reference/scale.md)
+* [stop](/reference/stop.md)
diff --git a/docs/reference/kill.md b/docs/reference/kill.md
new file mode 100644
index 00000000..c7160874
--- /dev/null
+++ b/docs/reference/kill.md
@@ -0,0 +1,23 @@
+<!--[metadata]>
++++
+title = "kill"
+description = "Forces running containers to stop."
+keywords = ["fig, composition, compose, docker, orchestration, cli,  kill"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# kill
+
+```
+Usage: kill [options] [SERVICE...]
+
+Options:
+-s SIGNAL         SIGNAL to send to the container. Default signal is SIGKILL.
+```
+
+Forces running containers to stop by sending a `SIGKILL` signal. Optionally the
+signal can be passed, for example:
+
+    $ docker-compose kill -s SIGINT
\ No newline at end of file
diff --git a/docs/reference/logs.md b/docs/reference/logs.md
new file mode 100644
index 00000000..87f93727
--- /dev/null
+++ b/docs/reference/logs.md
@@ -0,0 +1,20 @@
+<!--[metadata]>
++++
+title = "logs"
+description = "Displays log output from services."
+keywords = ["fig, composition, compose, docker, orchestration, cli,  logs"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# logs
+
+```
+Usage: logs [options] [SERVICE...]
+
+Options:
+--no-color  Produce monochrome output.
+```
+
+Displays log output from services.
diff --git a/docs/reference/overview.md b/docs/reference/overview.md
new file mode 100644
index 00000000..561069df
--- /dev/null
+++ b/docs/reference/overview.md
@@ -0,0 +1,68 @@
+<!--[metadata]>
++++
+title = "Introduction to the CLI"
+description = "Introduction to the CLI"
+keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
+[menu.main]
+parent = "smn_compose_cli"
+weight=-2	
++++
+<![end-metadata]-->
+
+
+# Introduction to the CLI
+
+This section describes the subcommands you can use with the `docker-compose` command.  You can run subcommand against one or more services. To run against a specific service, you supply the service name from your compose configuration. If you do not specify the service name, the command runs against all the services in your configuration.
+
+## Environment Variables
+
+Several environment variables are available for you to configure the Docker Compose command-line behaviour.
+
+Variables starting with `DOCKER_` are the same as those used to configure the
+Docker command-line client. If you're using `docker-machine`, then the `eval "$(docker-machine env my-docker-vm)"` command should set them to their correct values. (In this example, `my-docker-vm` is the name of a machine you created.)
+
+### COMPOSE\_PROJECT\_NAME
+
+Sets the project name. This value is prepended along with the service name to the container container on start up. For example, if you project name is `myapp` and it includes two services `db` and `web` then compose starts containers named  `myapp_db_1` and `myapp_web_1` respectively.
+
+Setting this is optional. If you do not set this, the `COMPOSE_PROJECT_NAME` defaults to the `basename` of the current working directory.
+
+### COMPOSE\_FILE
+
+Specify the file containing the compose configuration. If not provided, Compose looks for a file named  `docker-compose.yml` in the current directory and then each parent directory in succession until a file by that name is found.
+
+### DOCKER\_HOST
+
+Sets the URL of the `docker` daemon. As with the Docker client, defaults to `unix:///var/run/docker.sock`.
+
+### DOCKER\_TLS\_VERIFY
+
+When set to anything other than an empty string, enables TLS communication with
+the `docker` daemon.
+
+### DOCKER\_CERT\_PATH
+
+Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TLS verification. Defaults to `~/.docker`.
+
+### COMPOSE\_MAX\_WORKERS
+
+Configures the maximum number of worker threads to be used when executing
+commands in parallel. Only a subset of commands execute in parallel, `stop`,
+`kill` and `rm`.
+
+
+
+
+
+
+
+## Compose documentation
+
+- [User guide](/)
+- [Installing Compose](install.md)
+- [Get started with Django](django.md)
+- [Get started with Rails](rails.md)
+- [Get started with Wordpress](wordpress.md)
+- [Yaml file reference](yml.md)
+- [Compose environment variables](env.md)
+- [Compose command line completion](completion.md)
diff --git a/docs/reference/port.md b/docs/reference/port.md
new file mode 100644
index 00000000..4745c92d
--- /dev/null
+++ b/docs/reference/port.md
@@ -0,0 +1,22 @@
+<!--[metadata]>
++++
+title = "port"
+description = "Prints the public port for a port binding.s"
+keywords = ["fig, composition, compose, docker, orchestration, cli,  port"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# port
+
+```
+Usage: port [options] SERVICE PRIVATE_PORT
+
+Options:
+--protocol=proto  tcp or udp [default: tcp]
+--index=index     index of the container if there are multiple
+                  instances of a service [default: 1]
+```
+
+Prints the public port for a port binding.
\ No newline at end of file
diff --git a/docs/reference/ps.md b/docs/reference/ps.md
new file mode 100644
index 00000000..b271376f
--- /dev/null
+++ b/docs/reference/ps.md
@@ -0,0 +1,20 @@
+<!--[metadata]>
++++
+title = "ps"
+description = "Lists containers."
+keywords = ["fig, composition, compose, docker, orchestration, cli,  ps"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# ps
+
+```
+Usage: ps [options] [SERVICE...]
+
+Options:
+-q    Only display IDs
+```
+
+Lists containers.
diff --git a/docs/reference/pull.md b/docs/reference/pull.md
new file mode 100644
index 00000000..571d3872
--- /dev/null
+++ b/docs/reference/pull.md
@@ -0,0 +1,20 @@
+<!--[metadata]>
++++
+title = "pull"
+description = "Pulls service images."
+keywords = ["fig, composition, compose, docker, orchestration, cli,  pull"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# pull
+
+```
+Usage: pull [options] [SERVICE...]
+
+Options:
+--allow-insecure-ssl    Allow insecure connections to the docker registry
+```
+
+Pulls service images.
\ No newline at end of file
diff --git a/docs/reference/restart.md b/docs/reference/restart.md
new file mode 100644
index 00000000..9b570082
--- /dev/null
+++ b/docs/reference/restart.md
@@ -0,0 +1,20 @@
+<!--[metadata]>
++++
+title = "restart"
+description = "Restarts Docker Compose services."
+keywords = ["fig, composition, compose, docker, orchestration, cli,  restart"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# restart
+
+```
+Usage: restart [options] [SERVICE...]
+
+Options:
+-t, --timeout TIMEOUT      Specify a shutdown timeout in seconds. (default: 10)
+```
+
+Restarts services.
diff --git a/docs/reference/rm.md b/docs/reference/rm.md
new file mode 100644
index 00000000..0a4ba5b6
--- /dev/null
+++ b/docs/reference/rm.md
@@ -0,0 +1,21 @@
+<!--[metadata]>
++++
+title = "rm"
+description = "Removes stopped service containers."
+keywords = ["fig, composition, compose, docker, orchestration, cli,  rm"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# rm
+
+```
+Usage: rm [options] [SERVICE...]
+
+Options:
+-f, --force   Don't ask to confirm removal
+-v            Remove volumes associated with containers
+```
+
+Removes stopped service containers.
diff --git a/docs/reference/run.md b/docs/reference/run.md
new file mode 100644
index 00000000..78ec20fc
--- /dev/null
+++ b/docs/reference/run.md
@@ -0,0 +1,54 @@
+<!--[metadata]>
++++
+title = "run"
+description = "Runs a one-off command on a service."
+keywords = ["fig, composition, compose, docker, orchestration, cli,  run"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# run
+
+```
+Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]
+
+Options:
+--allow-insecure-ssl  Allow insecure connections to the docker
+                          registry
+-d                    Detached mode: Run container in the background, print
+                          new container name.
+--entrypoint CMD      Override the entrypoint of the image.
+-e KEY=VAL            Set an environment variable (can be used multiple times)
+-u, --user=""         Run as specified username or uid
+--no-deps             Don't start linked services.
+--rm                  Remove container after run. Ignored in detached mode.
+--service-ports       Run command with the service's ports enabled and mapped to the host.
+-T                    Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.
+```
+
+Runs a one-time command against a service. For example, the following command starts the `web` service and runs `bash` as its command. 
+
+    $ docker-compose run web bash
+
+Commands you use with `run` start in new containers with the same configuration as defined by the service' configuration. This means the container has the same volumes, links, as defined in the configuration file. There two differences though.
+
+First, the command passed by `run` overrides the command defined in the service configuration. For example, if the  `web` service configuration is started with `bash`, then `docker-compose run web python app.py` overrides it with `python app.py`.
+
+The second difference is the `docker-compose run` command does not create any of the ports specified in the service configuration. This prevents the port collisions with already open ports. If you *do want* the service's ports created and mapped to the host, specify the `--service-ports` flag:
+
+    $ docker-compose run --service-ports web python manage.py shell
+
+If you start a service configured with links, the `run` command first checks to see if the linked service is running and starts the service if it is stopped.  Once all the linked services are running, the `run` executes the command you passed it.  So, for example, you could run:
+
+    $ docker-compose run db psql -h db -U docker
+
+This would open up an interactive PostgreSQL shell for the linked `db` container.
+
+If you do not want the `run` command to start linked containers, specify the `--no-deps` flag:
+
+    $ docker-compose run --no-deps web python manage.py shell
+
+
+
+
diff --git a/docs/reference/scale.md b/docs/reference/scale.md
new file mode 100644
index 00000000..95418300
--- /dev/null
+++ b/docs/reference/scale.md
@@ -0,0 +1,21 @@
+<!--[metadata]>
++++
+title = "scale"
+description = "Sets the number of containers to run for a service."
+keywords = ["fig, composition, compose, docker, orchestration, cli,  scale"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# scale
+
+```
+Usage: scale [SERVICE=NUM...]
+```
+
+Sets the number of containers to run for a service.
+
+Numbers are specified as arguments in the form `service=num`. For example:
+
+    $ docker-compose scale web=2 worker=3
\ No newline at end of file
diff --git a/docs/reference/start.md b/docs/reference/start.md
new file mode 100644
index 00000000..69d853f9
--- /dev/null
+++ b/docs/reference/start.md
@@ -0,0 +1,17 @@
+<!--[metadata]>
++++
+title = "start"
+description = "Starts existing containers for a service."
+keywords = ["fig, composition, compose, docker, orchestration, cli,  start"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# start
+
+```
+Usage: start [SERVICE...]
+```
+
+Starts existing containers for a service.
diff --git a/docs/reference/stop.md b/docs/reference/stop.md
new file mode 100644
index 00000000..8ff92129
--- /dev/null
+++ b/docs/reference/stop.md
@@ -0,0 +1,21 @@
+<!--[metadata]>
++++
+title = "stop"
+description = "Stops running containers without removing them. "
+keywords = ["fig, composition, compose, docker, orchestration, cli, stop"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# stop
+
+```
+Usage: stop [options] [SERVICE...]
+
+Options:
+-t, --timeout TIMEOUT      Specify a shutdown timeout in seconds (default: 10).
+```
+
+Stops running containers without removing them. They can be started again with
+`docker-compose start`.
diff --git a/docs/reference/up.md b/docs/reference/up.md
new file mode 100644
index 00000000..0a1cecff
--- /dev/null
+++ b/docs/reference/up.md
@@ -0,0 +1,42 @@
+<!--[metadata]>
++++
+title = "up"
+description = "Builds, (re)creates, starts, and attaches to containers for a service."
+keywords = ["fig, composition, compose, docker, orchestration, cli,  up"]
+[menu.main]
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# up
+
+```
+Usage: up [options] [SERVICE...]
+
+Options:
+--allow-insecure-ssl   Allow insecure connections to the docker
+                       registry
+-d                     Detached mode: Run containers in the background,
+                       print new container names.
+--no-color             Produce monochrome output.
+--no-deps              Don't start linked services.
+--x-smart-recreate     Only recreate containers whose configuration or
+                       image needs to be updated. (EXPERIMENTAL)
+--no-recreate          If containers already exist, don't recreate them.
+--no-build             Don't build an image, even if it's missing
+-t, --timeout TIMEOUT  Use this timeout in seconds for container shutdown
+                       when attached or when containers are already
+                       running. (default: 10)
+```
+
+Builds, (re)creates, starts, and attaches to containers for a service.
+
+Linked services will be started, unless they are already running.
+
+By default, `docker-compose up` will aggregate the output of each container and,
+when it exits, all containers will be stopped. Running `docker-compose up -d`,
+will start the containers in the background and leave them running.
+
+By default, if there are existing containers for a service, `docker-compose up` will stop and recreate them (preserving mounted volumes with [volumes-from]), so that changes in `docker-compose.yml` are picked up. If you do not want containers stopped and recreated, use `docker-compose up --no-recreate`. This will still start any stopped containers, if needed.
+
+[volumes-from]: http://docs.docker.io/en/latest/use/working_with_volumes/

From 9ffe69a572e862eb90017cceddd65d76c4eed555 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 16 Jul 2015 12:46:15 +0100
Subject: [PATCH 0120/1265] Refactor can_be_scaled for clarity

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index a488b2c6..f73fa96b 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -157,7 +157,7 @@ class Service(object):
         - starts containers until there are at least `desired_num` running
         - removes all stopped containers
         """
-        if not self.can_be_scaled():
+        if self.specifies_host_port():
             log.warn('Service %s specifies a port on the host. If multiple containers '
                      'for this service are created on a single host, the port will clash.'
                      % self.name)
@@ -703,11 +703,11 @@ class Service(object):
             '{0}={1}'.format(LABEL_ONE_OFF, "True" if one_off else "False")
         ]
 
-    def can_be_scaled(self):
+    def specifies_host_port(self):
         for port in self.options.get('ports', []):
             if ':' in str(port):
-                return False
-        return True
+                return True
+        return False
 
     def pull(self, insecure_registry=False):
         if 'image' not in self.options:

From 445fe89fcec3292919b3432223f90c77cafbbbee Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 17 Jul 2015 14:59:43 +0100
Subject: [PATCH 0121/1265] Tweak wording of scale warning

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/service.py b/compose/service.py
index f73fa96b..d606e6b2 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -158,7 +158,7 @@ class Service(object):
         - removes all stopped containers
         """
         if self.specifies_host_port():
-            log.warn('Service %s specifies a port on the host. If multiple containers '
+            log.warn('The "%s" service specifies a port on the host. If multiple containers '
                      'for this service are created on a single host, the port will clash.'
                      % self.name)
 

From 35092f1d5ebd9433ceb1dd2c403a69009d122a95 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 17 Jul 2015 15:27:20 +0100
Subject: [PATCH 0122/1265] Fix regression in docs for 'up'

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/reference/up.md | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/docs/reference/up.md b/docs/reference/up.md
index 0a1cecff..8fe4fad5 100644
--- a/docs/reference/up.md
+++ b/docs/reference/up.md
@@ -20,9 +20,10 @@ Options:
                        print new container names.
 --no-color             Produce monochrome output.
 --no-deps              Don't start linked services.
---x-smart-recreate     Only recreate containers whose configuration or
-                       image needs to be updated. (EXPERIMENTAL)
+--force-recreate       Recreate containers even if their configuration and
+                       image haven't changed. Incompatible with --no-recreate.
 --no-recreate          If containers already exist, don't recreate them.
+                       Incompatible with --force-recreate.
 --no-build             Don't build an image, even if it's missing
 -t, --timeout TIMEOUT  Use this timeout in seconds for container shutdown
                        when attached or when containers are already
@@ -31,12 +32,17 @@ Options:
 
 Builds, (re)creates, starts, and attaches to containers for a service.
 
-Linked services will be started, unless they are already running.
+Unless they are already running, this command also starts any linked services.
 
-By default, `docker-compose up` will aggregate the output of each container and,
-when it exits, all containers will be stopped. Running `docker-compose up -d`,
-will start the containers in the background and leave them running.
+The `docker-compose up` command aggregates the output of each container. When
+the command exits, all containers are stopped. Running `docker-compose up -d`
+starts the containers in the background and leaves them running.
 
-By default, if there are existing containers for a service, `docker-compose up` will stop and recreate them (preserving mounted volumes with [volumes-from]), so that changes in `docker-compose.yml` are picked up. If you do not want containers stopped and recreated, use `docker-compose up --no-recreate`. This will still start any stopped containers, if needed.
+If there are existing containers for a service, and the service's configuration
+or image was changed after the container's creation, `docker-compose up` picks
+up the changes by stopping and recreating the containers (preserving mounted
+volumes). To prevent Compose from picking up changes, use the `--no-recreate`
+flag.
 
-[volumes-from]: http://docs.docker.io/en/latest/use/working_with_volumes/
+If you want to force Compose to stop and recreate all containers, use the
+`--force-recreate` flag.

From a3191ab90f57a42aa84c94e9920287b9e9b81f3f Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 16 Jul 2015 12:51:15 +0100
Subject: [PATCH 0123/1265] Add container_name option

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config.py                 |  1 +
 compose/service.py                | 12 +++++++++++-
 docs/yml.md                       | 10 ++++++++++
 tests/integration/service_test.py |  7 +++++++
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/compose/config.py b/compose/config.py
index 2baf327b..064dadae 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -50,6 +50,7 @@ DOCKER_CONFIG_KEYS = [
 
 ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
     'build',
+    'container_name',
     'dockerfile',
     'expose',
     'external_links',
diff --git a/compose/service.py b/compose/service.py
index d606e6b2..d90318f5 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -157,6 +157,12 @@ class Service(object):
         - starts containers until there are at least `desired_num` running
         - removes all stopped containers
         """
+        if self.custom_container_name() and desired_num > 1:
+            log.warn('The "%s" service is using the custom container name "%s". '
+                     'Docker requires each container to have a unique name. '
+                     'Remove the custom name to scale the service.'
+                     % (self.name, self.custom_container_name()))
+
         if self.specifies_host_port():
             log.warn('The "%s" service specifies a port on the host. If multiple containers '
                      'for this service are created on a single host, the port will clash.'
@@ -531,7 +537,8 @@ class Service(object):
             for k in DOCKER_CONFIG_KEYS if k in self.options)
         container_options.update(override_options)
 
-        container_options['name'] = self.get_container_name(number, one_off)
+        container_options['name'] = self.custom_container_name() \
+            or self.get_container_name(number, one_off)
 
         if add_config_hash:
             config_hash = self.config_hash()
@@ -703,6 +710,9 @@ class Service(object):
             '{0}={1}'.format(LABEL_ONE_OFF, "True" if one_off else "False")
         ]
 
+    def custom_container_name(self):
+        return self.options.get('container_name')
+
     def specifies_host_port(self):
         for port in self.options.get('ports', []):
             if ':' in str(port):
diff --git a/docs/yml.md b/docs/yml.md
index 772e5dd5..f92b5682 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -239,6 +239,16 @@ It's recommended that you use reverse-DNS notation to prevent your labels from c
       - "com.example.department=Finance"
       - "com.example.label-with-empty-value"
 
+### container_name
+
+Specify a custom container name, rather than a generated default name.
+
+    container_name: my-web-container
+
+Because Docker container names must be unique, you cannot scale a service
+beyond 1 container if you have specified a custom name. Attempting to do so
+results in an error.
+
 ### log driver
 
 Specify a logging driver for the service's containers, as with the ``--log-driver`` option for docker run ([documented here](http://docs.docker.com/reference/run/#logging-drivers-log-driver)).
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 9880b8e8..dbb97d8f 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -699,6 +699,13 @@ class ServiceTest(DockerClientTestCase):
         for name in labels_list:
             self.assertIn((name, ''), labels)
 
+    def test_custom_container_name(self):
+        service = self.create_service('web', container_name='my-web-container')
+        self.assertEqual(service.custom_container_name(), 'my-web-container')
+
+        container = create_and_start_container(service)
+        self.assertEqual(container.name, 'my-web-container')
+
     def test_log_drive_invalid(self):
         service = self.create_service('web', log_driver='xxx')
         self.assertRaises(ValueError, lambda: create_and_start_container(service))

From 89f6caf871f5e7591f91ce1bc39d79c4ab8c90bd Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 5 Jun 2015 09:57:00 +0100
Subject: [PATCH 0124/1265] Allow any volume mode to be specified

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py         |  7 +------
 tests/unit/service_test.py | 30 ++++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index a488b2c6..006696c2 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -809,12 +809,7 @@ def parse_volume_spec(volume_config):
     if len(parts) == 2:
         parts.append('rw')
 
-    external, internal, mode = parts
-    if mode not in ('rw', 'ro'):
-        raise ConfigError("Volume %s has invalid mode (%s), should be "
-                          "one of: rw, ro." % (volume_config, mode))
-
-    return VolumeSpec(external, internal, mode)
+    return VolumeSpec(*parts)
 
 
 # Ports
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 2b370ebe..104a90d5 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -372,14 +372,13 @@ class ServiceVolumesTest(unittest.TestCase):
         spec = parse_volume_spec('external:interval:ro')
         self.assertEqual(spec, ('external', 'interval', 'ro'))
 
+        spec = parse_volume_spec('external:interval:z')
+        self.assertEqual(spec, ('external', 'interval', 'z'))
+
     def test_parse_volume_spec_too_many_parts(self):
         with self.assertRaises(ConfigError):
             parse_volume_spec('one:two:three:four')
 
-    def test_parse_volume_bad_mode(self):
-        with self.assertRaises(ConfigError):
-            parse_volume_spec('one:two:notrw')
-
     def test_build_volume_binding(self):
         binding = build_volume_binding(parse_volume_spec('/outside:/inside'))
         self.assertEqual(binding, ('/inside', '/outside:/inside:rw'))
@@ -508,3 +507,26 @@ class ServiceVolumesTest(unittest.TestCase):
             create_options['host_config']['Binds'],
             ['/mnt/sda1/host/path:/data:rw'],
         )
+
+    def test_create_with_special_volume_mode(self):
+        self.mock_client.inspect_image.return_value = {'Id': 'imageid'}
+
+        create_calls = []
+
+        def create_container(*args, **kwargs):
+            create_calls.append((args, kwargs))
+            return {'Id': 'containerid'}
+
+        self.mock_client.create_container = create_container
+
+        volumes = ['/tmp:/foo:z']
+
+        Service(
+            'web',
+            client=self.mock_client,
+            image='busybox',
+            volumes=volumes,
+        ).create_container()
+
+        self.assertEqual(len(create_calls), 1)
+        self.assertEqual(create_calls[0][1]['host_config']['Binds'], volumes)

From 24071935947a3008a2087185d05f133e54937a78 Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Fri, 17 Jul 2015 09:14:44 -0700
Subject: [PATCH 0125/1265] remove cli

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/cli.md | 216 ----------------------------------------------------
 1 file changed, 216 deletions(-)
 delete mode 100644 docs/cli.md

diff --git a/docs/cli.md b/docs/cli.md
deleted file mode 100644
index 43cf61c5..00000000
--- a/docs/cli.md
+++ /dev/null
@@ -1,216 +0,0 @@
-<!--[metadata]>
-+++
-title = "Compose CLI reference"
-description = "Compose CLI reference"
-keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
-[menu.main]
-identifier = "smn_install_compose"
-parent = "smn_compose_ref"	
-+++
-<![end-metadata]-->
-
-
-# Compose CLI reference
-
-Most Docker Compose commands are run against one or more services. If
-the service is not specified, the command will apply to all services.
-
-For full usage information, run `docker-compose [COMMAND] --help`.
-
-## Commands
-
-### build
-
-Builds or rebuilds services.
-
-Services are built once and then tagged as `project_service`, e.g.,
-`composetest_db`. If you change a service's Dockerfile or the contents of its
-build directory, run `docker-compose build` to rebuild it.
-
-### help
-
-Displays help and usage instructions for a command.
-
-### kill
-
-Forces running containers to stop by sending a `SIGKILL` signal. Optionally the
-signal can be passed, for example:
-
-    $ docker-compose kill -s SIGINT
-
-### logs
-
-Displays log output from services.
-
-### port
-
-Prints the public port for a port binding
-
-### ps
-
-Lists containers.
-
-### pull
-
-Pulls service images.
-
-### restart
-
-Restarts services.
-
-### rm
-
-Removes stopped service containers.
-
-
-### run
-
-Runs a one-off command on a service.
-
-For example,
-
-    $ docker-compose run web python manage.py shell
-
-will start the `web` service and then run `manage.py shell` in python.
-Note that by default, linked services will also be started, unless they are
-already running.
-
-One-off commands are started in new containers with the same configuration as a
-normal container for that service, so volumes, links, etc will all be created as
-expected. When using `run`, there are two differences from bringing up a
-container normally:
-
-1. the command will be overridden with the one specified. So, if you run
-`docker-compose run web bash`, the container's web command (which could default
-to, e.g., `python app.py`) will be overridden to `bash`
-
-2. by default no ports will be created in case they collide with already opened
-ports.
-
-Links are also created between one-off commands and the other containers which
-are part of that service. So, for example, you could run:
-
-    $ docker-compose run db psql -h db -U docker
-
-This would open up an interactive PostgreSQL shell for the linked `db` container
-(which would get created or started as needed).
-
-If you do not want linked containers to start when running the one-off command,
-specify the `--no-deps` flag:
-
-    $ docker-compose run --no-deps web python manage.py shell
-
-Similarly, if you do want the service's ports to be created and mapped to the
-host, specify the `--service-ports` flag:
-
-    $ docker-compose run --service-ports web python manage.py shell
-
-
-### scale
-
-Sets the number of containers to run for a service.
-
-Numbers are specified as arguments in the form `service=num`. For example:
-
-    $ docker-compose scale web=2 worker=3
-
-### start
-
-Starts existing containers for a service.
-
-### stop
-
-Stops running containers without removing them. They can be started again with
-`docker-compose start`.
-
-### up
-
-Builds, (re)creates, starts, and attaches to containers for a service.
-
-Unless they are already running, this command also starts any linked services.
-
-The `docker-compose up` command aggregates the output of each container. When
-the command exits, all containers are stopped. Running `docker-compose up -d`
-starts the containers in the background and leaves them running.
-
-If there are existing containers for a service, and the service's configuration
-or image was changed after the container's creation, `docker-compose up` picks
-up the changes by stopping and recreating the containers (preserving mounted
-volumes). To prevent Compose from picking up changes, use the `--no-recreate`
-flag.
-
-If you want to force Compose to stop and recreate all containers, use the
-`--force-recreate` flag.
-
-## Options
-
-### --verbose
-
- Shows more output
-
-### -v, --version
-
- Prints version and exits
-
-### -f, --file FILE
-
- Specify what file to read configuration from. If not provided, Compose will look
- for `docker-compose.yml` in the current working directory, and then each parent
- directory successively, until found.
-
- Use a `-` as the filename to read configuration from stdin. When stdin is used
- all paths in the configuration will be relative to the current working
- directory.
-
-### -p, --project-name NAME
-
- Specifies an alternate project name (default: current directory name)
-
-
-## Environment Variables
-
-Several environment variables are available for you to configure Compose's behaviour.
-
-Variables starting with `DOCKER_` are the same as those used to configure the
-Docker command-line client. If you're using boot2docker, `eval "$(boot2docker shellinit)"`
-will set them to their correct values.
-
-### COMPOSE\_PROJECT\_NAME
-
-Sets the project name, which is prepended to the name of every container started by Compose. Defaults to the `basename` of the current working directory.
-
-### COMPOSE\_FILE
-
-Specify what file to read configuration from. If not provided, Compose will look
-for `docker-compose.yml` in the current working directory, and then each parent
-directory successively, until found.
-
-### DOCKER\_HOST
-
-Sets the URL of the docker daemon. As with the Docker client, defaults to `unix:///var/run/docker.sock`.
-
-### DOCKER\_TLS\_VERIFY
-
-When set to anything other than an empty string, enables TLS communication with
-the daemon.
-
-### DOCKER\_CERT\_PATH
-
-Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TLS verification. Defaults to `~/.docker`.
-
-### COMPOSE\_MAX\_WORKERS
-
-Configures the maximum number of worker threads to be used when executing
-commands in parallel. Only a subset of commands execute in parallel, `stop`,
-`kill` and `rm`.
-
-## Compose documentation
-
-- [User guide](/)
-- [Installing Compose](install.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with Wordpress](wordpress.md)
-- [Yaml file reference](yml.md)
-- [Compose environment variables](env.md)
-- [Compose command line completion](completion.md)

From 4ca210edd78bc00bb63ebc4ad834ae6627cc453a Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Fri, 17 Jul 2015 16:17:46 -0700
Subject: [PATCH 0126/1265] Removing references to boot2docker - Replace with
 machine references - 1.8 boot2docker is deprecated

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/django.md    | 3 +--
 docs/index.md     | 2 +-
 docs/rails.md     | 4 ++--
 docs/wordpress.md | 4 +---
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/docs/django.md b/docs/django.md
index 844c24f6..71df4e11 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -115,8 +115,7 @@ Then, run `docker-compose up`:
     myapp_web_1 | Starting development server at http://0.0.0.0:8000/
     myapp_web_1 | Quit the server with CONTROL-C.
 
-Your Django app should nw be running at port 8000 on your Docker daemon (if
-you're using Boot2docker, `boot2docker ip` will tell you its address).
+Your Django app should nw be running at port 8000 on your Docker daemon. If you are using a Docker Machine VM, you can use the `docker-machine ip MACHINE_NAME` to get the IP address.
 
 You can also run management commands with Docker. To set up your database, for
 example, run `docker-compose up` and in another terminal run:
diff --git a/docs/index.md b/docs/index.md
index 62f2198e..6d949f88 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -161,7 +161,7 @@ Now, when you run `docker-compose up`, Compose will pull a Redis image, build an
     web_1   |  * Running on http://0.0.0.0:5000/
     web_1   |  * Restarting with stat
 
-If you're using [Boot2docker](https://github.com/boot2docker/boot2docker), then `boot2docker ip` will tell you its address and you can open `http://ip-from-boot2docker:5000` in a browser. 
+If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` will tell you its address and you can open `http://MACHINE_VM_IP:5000` in a browser. 
 
 If you're not using Boot2docker and are on linux, then the web app should now be listening on port 5000 on your Docker daemon host. If http://0.0.0.0:5000 doesn't resolve, you can also try localhost:5000.
 
diff --git a/docs/rails.md b/docs/rails.md
index cb807864..7394aadc 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -119,8 +119,8 @@ Finally, you need to create the database. In another terminal, run:
 
     $ docker-compose run web rake db:create
 
-That's it. Your app should now be running on port 3000 on your Docker daemon (if
-you're using Boot2docker, `boot2docker ip` will tell you its address).
+That's it. Your app should now be running on port 3000 on your Docker daemon. If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` returns the Docker host IP address. 
+
 
 ## More Compose documentation
 
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 65a7d17f..eda755c1 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -108,9 +108,7 @@ Second, `router.php` tells PHP's built-in web server how to run Wordpress:
 
 With those four files in place, run `docker-compose up` inside your Wordpress
 directory and it'll pull and build the needed images, and then start the web and
-database containers. You'll then be able to visit Wordpress at port 8000 on your
-Docker daemon (if you're using Boot2docker, `boot2docker ip` will tell you its
-address).
+database containers. If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser. 
 
 ## More Compose documentation
 

From 949dd5b2c7fffdd3790a9429f89af37dd2a8e0af Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Sun, 19 Jul 2015 16:08:01 -0700
Subject: [PATCH 0127/1265] Updating with the latest image

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Dockerfile b/docs/Dockerfile
index a49c1e7f..d6864c2d 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -1,4 +1,4 @@
-FROM docs/base:hugo
+FROM docs/base:latest
 MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)
 
 # To get the git info for this repo

From 61787fecea4e0058dc65d5dcb29afe3399621ce0 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 16 Jul 2015 14:32:39 +0100
Subject: [PATCH 0128/1265] Resolve race condition

Sometimes, some messages were being executed at the same time, meaning
that the status wasn't being overwritten, it was displaying on a
separate line for both doing and done messages.

Rather than trying to have both sets of statuses being written out
concurrently, we write out all of the doing messages first. Then
the done messages are written out/updated, as they are completed.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/utils.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/compose/utils.py b/compose/utils.py
index 3efde052..5ffe7b70 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -21,8 +21,10 @@ def parallel_execute(command, containers, doing_msg, done_msg, **options):
     stream = codecs.getwriter('utf-8')(sys.stdout)
     lines = []
 
-    def container_command_execute(container, command, **options):
+    for container in containers:
         write_out_msg(stream, lines, container.name, doing_msg)
+
+    def container_command_execute(container, command, **options):
         return getattr(container, command)(**options)
 
     with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
@@ -41,6 +43,10 @@ def parallel_execute(command, containers, doing_msg, done_msg, **options):
 
 
 def write_out_msg(stream, lines, container_name, msg):
+    """
+    Using special ANSI code characters we can write out the msg over the top of
+    a previous status message, if it exists.
+    """
     if container_name in lines:
         position = lines.index(container_name)
         diff = len(lines) - position
@@ -56,6 +62,8 @@ def write_out_msg(stream, lines, container_name, msg):
         lines.append(container_name)
         stream.write("{}: {}... \r\n".format(container_name, msg))
 
+    stream.flush()
+
 
 def json_hash(obj):
     dump = json.dumps(obj, sort_keys=True, separators=(',', ':'))

From 9d9b8657966a574ff4ec30390985606227ea6e14 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 16 Jul 2015 16:07:30 +0100
Subject: [PATCH 0129/1265] Add in error handling

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/utils.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/compose/utils.py b/compose/utils.py
index 5ffe7b70..c3316ccd 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -5,6 +5,7 @@ import logging
 import os
 import sys
 
+from docker.errors import APIError
 import concurrent.futures
 
 from .const import DEFAULT_MAX_WORKERS
@@ -20,12 +21,16 @@ def parallel_execute(command, containers, doing_msg, done_msg, **options):
     max_workers = os.environ.get('COMPOSE_MAX_WORKERS', DEFAULT_MAX_WORKERS)
     stream = codecs.getwriter('utf-8')(sys.stdout)
     lines = []
+    errors = {}
 
     for container in containers:
         write_out_msg(stream, lines, container.name, doing_msg)
 
     def container_command_execute(container, command, **options):
-        return getattr(container, command)(**options)
+        try:
+            getattr(container, command)(**options)
+        except APIError as e:
+            errors[container.name] = e.explanation
 
     with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
         future_container = {
@@ -41,6 +46,10 @@ def parallel_execute(command, containers, doing_msg, done_msg, **options):
             container = future_container[future]
             write_out_msg(stream, lines, container.name, done_msg)
 
+    if errors:
+        for container in errors:
+            stream.write("ERROR: for {}  {} \n".format(container, errors[container]))
+
 
 def write_out_msg(stream, lines, container_name, msg):
     """

From 4ba9d9dac2c661d6ed56ad0dfca71e64c4162b9c Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 20 Jul 2015 14:03:44 +0100
Subject: [PATCH 0130/1265] Make parallel tasks interruptible with Ctrl-C

The concurrent.futures backport doesn't play well with
KeyboardInterrupt, so I'm using Thread and Queue instead.

Since thread pooling would likely be a pain to implement, I've just
removed `COMPOSE_MAX_WORKERS` for now. We'll implement it later if we
decide we need it.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/const.py           |  1 -
 compose/utils.py           | 37 +++++++++++++++++++++----------------
 docs/reference/overview.md |  6 ------
 requirements.txt           |  1 -
 setup.py                   |  1 -
 5 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/compose/const.py b/compose/const.py
index 479b6af4..709c3a10 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -1,5 +1,4 @@
 
-DEFAULT_MAX_WORKERS = 20
 DEFAULT_TIMEOUT = 10
 LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
 LABEL_ONE_OFF = 'com.docker.compose.oneoff'
diff --git a/compose/utils.py b/compose/utils.py
index c3316ccd..b6ee63d0 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -2,13 +2,11 @@ import codecs
 import hashlib
 import json
 import logging
-import os
 import sys
 
 from docker.errors import APIError
-import concurrent.futures
-
-from .const import DEFAULT_MAX_WORKERS
+from Queue import Queue, Empty
+from threading import Thread
 
 
 log = logging.getLogger(__name__)
@@ -18,7 +16,6 @@ def parallel_execute(command, containers, doing_msg, done_msg, **options):
     """
     Execute a given command upon a list of containers in parallel.
     """
-    max_workers = os.environ.get('COMPOSE_MAX_WORKERS', DEFAULT_MAX_WORKERS)
     stream = codecs.getwriter('utf-8')(sys.stdout)
     lines = []
     errors = {}
@@ -26,25 +23,33 @@ def parallel_execute(command, containers, doing_msg, done_msg, **options):
     for container in containers:
         write_out_msg(stream, lines, container.name, doing_msg)
 
+    q = Queue()
+
     def container_command_execute(container, command, **options):
         try:
             getattr(container, command)(**options)
         except APIError as e:
             errors[container.name] = e.explanation
+        q.put(container)
 
-    with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
-        future_container = {
-            executor.submit(
-                container_command_execute,
-                container,
-                command,
-                **options
-            ): container for container in containers
-        }
+    for container in containers:
+        t = Thread(
+            target=container_command_execute,
+            args=(container, command),
+            kwargs=options,
+        )
+        t.daemon = True
+        t.start()
 
-        for future in concurrent.futures.as_completed(future_container):
-            container = future_container[future]
+    done = 0
+
+    while done < len(containers):
+        try:
+            container = q.get(timeout=1)
             write_out_msg(stream, lines, container.name, done_msg)
+            done += 1
+        except Empty:
+            pass
 
     if errors:
         for container in errors:
diff --git a/docs/reference/overview.md b/docs/reference/overview.md
index 561069df..458dea40 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/overview.md
@@ -44,12 +44,6 @@ the `docker` daemon.
 
 Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TLS verification. Defaults to `~/.docker`.
 
-### COMPOSE\_MAX\_WORKERS
-
-Configures the maximum number of worker threads to be used when executing
-commands in parallel. Only a subset of commands execute in parallel, `stop`,
-`kill` and `rm`.
-
 
 
 
diff --git a/requirements.txt b/requirements.txt
index dce58301..fc5b6848 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,6 @@ PyYAML==3.10
 docker-py==1.3.0
 dockerpty==0.3.4
 docopt==0.6.1
-futures==3.0.3
 requests==2.6.1
 six==1.7.3
 texttable==0.8.2
diff --git a/setup.py b/setup.py
index 6ce7da44..d0ec1067 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,6 @@ install_requires = [
     'docker-py >= 1.3.0, < 1.4',
     'dockerpty >= 0.3.4, < 0.4',
     'six >= 1.3.0, < 2',
-    'futures >= 3.0.3',
 ]
 
 

From 5c29ded6acaf09943e395472b6fb2ee095546f43 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 17 Jul 2015 17:40:14 +0100
Subject: [PATCH 0131/1265] Parallelise scale

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/service.py | 61 ++++++++++++++++++++++++++--------------------
 compose/utils.py   | 45 ++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 27 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 006696c2..cda68b7f 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -24,7 +24,7 @@ from .const import (
 from .container import Container
 from .legacy import check_for_legacy_containers
 from .progress_stream import stream_output, StreamOutputError
-from .utils import json_hash
+from .utils import json_hash, parallel_create_execute, parallel_execute
 
 log = logging.getLogger(__name__)
 
@@ -162,36 +162,43 @@ class Service(object):
                      'for this service are created on a single host, the port will clash.'
                      % self.name)
 
-        # Create enough containers
-        containers = self.containers(stopped=True)
-        while len(containers) < desired_num:
-            containers.append(self.create_container())
+        def create_and_start(number):
+            container = self.create_container(number=number, quiet=True)
+            container.start()
+            return container
 
-        running_containers = []
-        stopped_containers = []
-        for c in containers:
-            if c.is_running:
-                running_containers.append(c)
-            else:
-                stopped_containers.append(c)
-        running_containers.sort(key=lambda c: c.number)
-        stopped_containers.sort(key=lambda c: c.number)
+        msgs = {'doing': 'Creating', 'done': 'Started'}
 
-        # Stop containers
-        while len(running_containers) > desired_num:
-            c = running_containers.pop()
-            log.info("Stopping %s..." % c.name)
-            c.stop(timeout=timeout)
-            stopped_containers.append(c)
+        running_containers = self.containers(stopped=False)
+        num_running = len(running_containers)
 
-        # Start containers
-        while len(running_containers) < desired_num:
-            c = stopped_containers.pop(0)
-            log.info("Starting %s..." % c.name)
-            self.start_container(c)
-            running_containers.append(c)
+        if desired_num == num_running:
+            # do nothing as we already have the desired number
+            log.info('Desired container number already achieved')
+            return
 
-        self.remove_stopped()
+        if desired_num > num_running:
+            num_to_create = desired_num - num_running
+            next_number = self._next_container_number()
+            container_numbers = [
+                number for number in range(
+                    next_number, next_number + num_to_create
+                )
+            ]
+            parallel_create_execute(create_and_start, container_numbers, msgs)
+
+        if desired_num < num_running:
+            sorted_running_containers = sorted(running_containers, key=attrgetter('number'))
+
+            if desired_num < num_running:
+                # count number of running containers.
+                num_to_stop = num_running - desired_num
+
+                containers_to_stop = sorted_running_containers[-num_to_stop:]
+                # TODO: refactor these out?
+                parallel_execute("stop", containers_to_stop, "Stopping", "Stopped")
+                parallel_execute("remove", containers_to_stop, "Removing", "Removed")
+        # self.remove_stopped()
 
     def remove_stopped(self, **options):
         for c in self.containers(stopped=True):
diff --git a/compose/utils.py b/compose/utils.py
index b6ee63d0..af6aa902 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -12,6 +12,51 @@ from threading import Thread
 log = logging.getLogger(__name__)
 
 
+def parallel_create_execute(create_function, container_numbers, msgs={}, **options):
+    """
+    Parallel container creation by calling the create_function for each new container
+    number passed in.
+    """
+    stream = codecs.getwriter('utf-8')(sys.stdout)
+    lines = []
+    errors = {}
+
+    for number in container_numbers:
+        write_out_msg(stream, lines, number, msgs['doing'])
+
+    q = Queue()
+
+    def inner_call_function(create_function, number):
+        try:
+            container = create_function(number)
+        except APIError as e:
+            errors[number] = e.explanation
+        q.put(container)
+
+    for number in container_numbers:
+        t = Thread(
+            target=inner_call_function,
+            args=(create_function, number),
+            kwargs=options,
+        )
+        t.daemon = True
+        t.start()
+
+    done = 0
+    total_to_create = len(container_numbers)
+    while done < total_to_create:
+        try:
+            container = q.get(timeout=1)
+            write_out_msg(stream, lines, container.name, msgs['done'])
+            done += 1
+        except Empty:
+            pass
+
+    if errors:
+        for number in errors:
+            stream.write("ERROR: for {}  {} \n".format(number, errors[number]))
+
+
 def parallel_execute(command, containers, doing_msg, done_msg, **options):
     """
     Execute a given command upon a list of containers in parallel.

From d1fdf1b809609abf22d27bff57b54658e0e4125d Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 20 Jul 2015 17:18:39 +0100
Subject: [PATCH 0132/1265] Update bash and zsh completion for --force-recrate

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 contrib/completion/bash/docker-compose | 2 +-
 contrib/completion/zsh/_docker-compose | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index b785a992..133b9fc3 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -315,7 +315,7 @@ _docker-compose_up() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--allow-insecure-ssl -d --help --no-build --no-color --no-deps --no-recreate --timeout -t --x-smart-recreate" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--allow-insecure-ssl -d --help --no-build --no-color --no-deps --no-recreate --force-recreate --timeout -t" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_all
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index e2e5b8f9..2893c3fc 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -253,9 +253,9 @@ __docker-compose_subcommand () {
                 '--no-color[Produce monochrome output.]' \
                 "--no-deps[Don't start linked services.]" \
                 "--no-recreate[If containers already exist, don't recreate them.]" \
+                "--force-recreate[Recreate containers even if their configuration and image haven't changed]" \
                 "--no-build[Don't build an image, even if it's missing]" \
                 '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
-                "--x-smart-recreate[Only recreate containers whose configuration or image needs to be updated. (EXPERIMENTAL)]" \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
         (version)

From 04b7490ef2156ace9905074de317fb525114e216 Mon Sep 17 00:00:00 2001
From: Christoph Witzany <christoph@web.crofting.com>
Date: Tue, 21 Jul 2015 11:53:44 +0200
Subject: [PATCH 0133/1265] Fix required version of websockets-client

Signed-off-by: Christoph Witzany <christoph@web.crofting.com>
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index d0ec1067..0979b2f2 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ install_requires = [
     'PyYAML >= 3.10, < 4',
     'requests >= 2.6.1, < 2.7',
     'texttable >= 0.8.1, < 0.9',
-    'websocket-client >= 0.11.0, < 1.0',
+    'websocket-client >= 0.32.0, < 1.0',
     'docker-py >= 1.3.0, < 1.4',
     'dockerpty >= 0.3.4, < 0.4',
     'six >= 1.3.0, < 2',

From 38a6209acd5eb65db2fdf8fa6eb77dacbf05e731 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 21 Jul 2015 11:07:20 +0100
Subject: [PATCH 0134/1265] Stop printing a stack trace when there's an error
 when pulling

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 58b22530..df40ee93 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -16,6 +16,7 @@ from ..const import DEFAULT_TIMEOUT
 from ..project import NoSuchService, ConfigurationError
 from ..service import BuildError, NeedsBuildError
 from ..config import parse_environment
+from ..progress_stream import StreamOutputError
 from .command import Command
 from .docopt_command import NoSuchCommand
 from .errors import UserError
@@ -48,6 +49,9 @@ def main():
     except BuildError as e:
         log.error("Service '%s' failed to build: %s" % (e.service.name, e.reason))
         sys.exit(1)
+    except StreamOutputError as e:
+        log.error(e)
+        sys.exit(1)
     except NeedsBuildError as e:
         log.error("Service '%s' needs to be built, but --no-build was passed." % e.service.name)
         sys.exit(1)

From da650e9cfdb8f67f7e14592930bc6e8a904f0d85 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 21 Jul 2015 11:56:59 +0100
Subject: [PATCH 0135/1265] Refactor parallel execute

Refactored parallel execute and execute create into a single function
parallel_execute that can now handle both cases. This helps untangle it
from being so tightly coupled to the container.

Updated all the relevant operations to use the refactored function.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/project.py | 21 ++++++++--
 compose/service.py | 39 +++++++++++-------
 compose/utils.py   | 99 ++++++++++++++--------------------------------
 3 files changed, 72 insertions(+), 87 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index 541ff3ff..c5028492 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -198,15 +198,30 @@ class Project(object):
             service.start(**options)
 
     def stop(self, service_names=None, **options):
-        parallel_execute("stop", self.containers(service_names), "Stopping", "Stopped", **options)
+        parallel_execute(
+            objects=self.containers(service_names),
+            obj_callable=lambda c: c.stop(**options),
+            msg_index=lambda c: c.name,
+            msg="Stopping"
+        )
 
     def kill(self, service_names=None, **options):
-        parallel_execute("kill", self.containers(service_names), "Killing", "Killed", **options)
+        parallel_execute(
+            objects=self.containers(service_names),
+            obj_callable=lambda c: c.kill(**options),
+            msg_index=lambda c: c.name,
+            msg="Killing"
+        )
 
     def remove_stopped(self, service_names=None, **options):
         all_containers = self.containers(service_names, stopped=True)
         stopped_containers = [c for c in all_containers if not c.is_running]
-        parallel_execute("remove", stopped_containers, "Removing", "Removed", **options)
+        parallel_execute(
+            objects=stopped_containers,
+            obj_callable=lambda c: c.remove(**options),
+            msg_index=lambda c: c.name,
+            msg="Removing"
+        )
 
     def restart(self, service_names=None, **options):
         for service in self.get_services(service_names):
diff --git a/compose/service.py b/compose/service.py
index cda68b7f..abb7536c 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -24,7 +24,7 @@ from .const import (
 from .container import Container
 from .legacy import check_for_legacy_containers
 from .progress_stream import stream_output, StreamOutputError
-from .utils import json_hash, parallel_create_execute, parallel_execute
+from .utils import json_hash, parallel_execute
 
 log = logging.getLogger(__name__)
 
@@ -162,13 +162,11 @@ class Service(object):
                      'for this service are created on a single host, the port will clash.'
                      % self.name)
 
-        def create_and_start(number):
-            container = self.create_container(number=number, quiet=True)
+        def create_and_start(service, number):
+            container = service.create_container(number=number, quiet=True)
             container.start()
             return container
 
-        msgs = {'doing': 'Creating', 'done': 'Started'}
-
         running_containers = self.containers(stopped=False)
         num_running = len(running_containers)
 
@@ -185,20 +183,31 @@ class Service(object):
                     next_number, next_number + num_to_create
                 )
             ]
-            parallel_create_execute(create_and_start, container_numbers, msgs)
+
+            parallel_execute(
+                objects=container_numbers,
+                obj_callable=lambda n: create_and_start(service=self, number=n),
+                msg_index=lambda n: n,
+                msg="Creating and starting"
+            )
 
         if desired_num < num_running:
+            num_to_stop = num_running - desired_num
             sorted_running_containers = sorted(running_containers, key=attrgetter('number'))
+            containers_to_stop = sorted_running_containers[-num_to_stop:]
 
-            if desired_num < num_running:
-                # count number of running containers.
-                num_to_stop = num_running - desired_num
-
-                containers_to_stop = sorted_running_containers[-num_to_stop:]
-                # TODO: refactor these out?
-                parallel_execute("stop", containers_to_stop, "Stopping", "Stopped")
-                parallel_execute("remove", containers_to_stop, "Removing", "Removed")
-        # self.remove_stopped()
+            parallel_execute(
+                objects=containers_to_stop,
+                obj_callable=lambda c: c.stop(timeout=timeout),
+                msg_index=lambda c: c.name,
+                msg="Stopping"
+            )
+            parallel_execute(
+                objects=containers_to_stop,
+                obj_callable=lambda c: c.remove(),
+                msg_index=lambda c: c.name,
+                msg="Removing"
+            )
 
     def remove_stopped(self, **options):
         for c in self.containers(stopped=True):
diff --git a/compose/utils.py b/compose/utils.py
index af6aa902..ff3096fd 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -12,114 +12,75 @@ from threading import Thread
 log = logging.getLogger(__name__)
 
 
-def parallel_create_execute(create_function, container_numbers, msgs={}, **options):
+def parallel_execute(objects, obj_callable, msg_index, msg):
     """
-    Parallel container creation by calling the create_function for each new container
-    number passed in.
+    For a given list of objects, call the callable passing in the first
+    object we give it.
     """
     stream = codecs.getwriter('utf-8')(sys.stdout)
     lines = []
     errors = {}
 
-    for number in container_numbers:
-        write_out_msg(stream, lines, number, msgs['doing'])
+    for obj in objects:
+        write_out_msg(stream, lines, msg_index(obj), msg)
 
     q = Queue()
 
-    def inner_call_function(create_function, number):
+    def inner_execute_function(an_callable, parameter, msg_index):
         try:
-            container = create_function(number)
+            result = an_callable(parameter)
         except APIError as e:
-            errors[number] = e.explanation
-        q.put(container)
+            errors[msg_index] = e.explanation
+            result = "error"
+        q.put((msg_index, result))
 
-    for number in container_numbers:
+    for an_object in objects:
         t = Thread(
-            target=inner_call_function,
-            args=(create_function, number),
-            kwargs=options,
+            target=inner_execute_function,
+            args=(obj_callable, an_object, msg_index(an_object)),
         )
         t.daemon = True
         t.start()
 
     done = 0
-    total_to_create = len(container_numbers)
-    while done < total_to_create:
+    total_to_execute = len(objects)
+
+    while done < total_to_execute:
         try:
-            container = q.get(timeout=1)
-            write_out_msg(stream, lines, container.name, msgs['done'])
+            msg_index, result = q.get(timeout=1)
+            if result == 'error':
+                write_out_msg(stream, lines, msg_index, msg, status='error')
+            else:
+                write_out_msg(stream, lines, msg_index, msg)
             done += 1
         except Empty:
             pass
 
     if errors:
-        for number in errors:
-            stream.write("ERROR: for {}  {} \n".format(number, errors[number]))
+        for error in errors:
+            stream.write("ERROR: for {}  {} \n".format(error, errors[error]))
 
 
-def parallel_execute(command, containers, doing_msg, done_msg, **options):
-    """
-    Execute a given command upon a list of containers in parallel.
-    """
-    stream = codecs.getwriter('utf-8')(sys.stdout)
-    lines = []
-    errors = {}
-
-    for container in containers:
-        write_out_msg(stream, lines, container.name, doing_msg)
-
-    q = Queue()
-
-    def container_command_execute(container, command, **options):
-        try:
-            getattr(container, command)(**options)
-        except APIError as e:
-            errors[container.name] = e.explanation
-        q.put(container)
-
-    for container in containers:
-        t = Thread(
-            target=container_command_execute,
-            args=(container, command),
-            kwargs=options,
-        )
-        t.daemon = True
-        t.start()
-
-    done = 0
-
-    while done < len(containers):
-        try:
-            container = q.get(timeout=1)
-            write_out_msg(stream, lines, container.name, done_msg)
-            done += 1
-        except Empty:
-            pass
-
-    if errors:
-        for container in errors:
-            stream.write("ERROR: for {}  {} \n".format(container, errors[container]))
-
-
-def write_out_msg(stream, lines, container_name, msg):
+def write_out_msg(stream, lines, msg_index, msg, status="done"):
     """
     Using special ANSI code characters we can write out the msg over the top of
     a previous status message, if it exists.
     """
-    if container_name in lines:
-        position = lines.index(container_name)
+    obj_index = msg_index
+    if msg_index in lines:
+        position = lines.index(obj_index)
         diff = len(lines) - position
         # move up
         stream.write("%c[%dA" % (27, diff))
         # erase
         stream.write("%c[2K\r" % 27)
-        stream.write("{}: {} \n".format(container_name, msg))
+        stream.write("{} {}... {}\n".format(msg, obj_index, status))
         # move back down
         stream.write("%c[%dB" % (27, diff))
     else:
         diff = 0
-        lines.append(container_name)
-        stream.write("{}: {}... \r\n".format(container_name, msg))
+        lines.append(obj_index)
+        stream.write("{} {}... \r\n".format(msg, obj_index))
 
     stream.flush()
 

From 41406cdd686f28aae4297a0f998444a45c34331e Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Tue, 21 Jul 2015 15:37:55 +0100
Subject: [PATCH 0136/1265] Update roadmap with state convergence

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 ROADMAP.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index a74a781e..67903492 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -4,9 +4,12 @@
 
 Over time we will extend Compose's remit to cover test, staging and production environments. This is not a simple task, and will take many incremental improvements such as:
 
-- Compose’s brute-force “delete and recreate everything” approach is great for dev and testing, but it not sufficient for production environments. You should be able to define a "desired" state that Compose will intelligently converge to.
-- It should be possible to partially modify the config file for different environments (dev/test/staging/prod), passing in e.g. custom ports or volume mount paths. ([#426](https://github.com/docker/fig/issues/426))
+- Compose currently will attempt to get your application into the correct state when running `up`, but it has a number of shortcomings:
+  - It should roll back to a known good state if it fails.
+  - It should allow a user to check the actions it is about to perform before running them.
+- It should be possible to partially modify the config file for different environments (dev/test/staging/prod), passing in e.g. custom ports or volume mount paths. ([#1377](https://github.com/docker/compose/issues/1377))
 - Compose should recommend a technique for zero-downtime deploys.
+- It should be possible to continuously attempt to keep an application in the correct state, instead of just performing `up` a single time.
 
 ## Integration with Swarm
 

From e1c1a4c0aa670f28ef335c31d1d0ace9824a047c Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 21 Jul 2015 14:59:32 +0100
Subject: [PATCH 0137/1265] Scale restarts stopped containers

This is existing behaviour and should be kept.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/service.py | 44 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index abb7536c..8908d4c7 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -176,6 +176,30 @@ class Service(object):
             return
 
         if desired_num > num_running:
+            # we need to start/create until we have desired_num
+            all_containers = self.containers(stopped=True)
+
+            if num_running != len(all_containers):
+                # we have some stopped containers, let's start them up again
+                stopped_containers = sorted([c for c in all_containers if not c.is_running], key=attrgetter('number'))
+
+                num_stopped = len(stopped_containers)
+
+                if num_stopped + num_running > desired_num:
+                    num_to_start = desired_num - num_running
+                    containers_to_start = stopped_containers[:num_to_start]
+                else:
+                    containers_to_start = stopped_containers
+
+                parallel_execute(
+                    objects=containers_to_start,
+                    obj_callable=lambda c: c.start(),
+                    msg_index=lambda c: c.name,
+                    msg="Starting"
+                )
+
+                num_running += len(containers_to_start)
+
             num_to_create = desired_num - num_running
             next_number = self._next_container_number()
             container_numbers = [
@@ -202,18 +226,18 @@ class Service(object):
                 msg_index=lambda c: c.name,
                 msg="Stopping"
             )
-            parallel_execute(
-                objects=containers_to_stop,
-                obj_callable=lambda c: c.remove(),
-                msg_index=lambda c: c.name,
-                msg="Removing"
-            )
+
+        self.remove_stopped()
 
     def remove_stopped(self, **options):
-        for c in self.containers(stopped=True):
-            if not c.is_running:
-                log.info("Removing %s..." % c.name)
-                c.remove(**options)
+        containers = [c for c in self.containers(stopped=True) if not c.is_running]
+
+        parallel_execute(
+            objects=containers,
+            obj_callable=lambda c: c.remove(**options),
+            msg_index=lambda c: c.name,
+            msg="Removing"
+        )
 
     def create_container(self,
                          one_off=False,

From 233c509f715415a461d908b636a33dc737acd6a7 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 21 Jul 2015 15:56:37 +0100
Subject: [PATCH 0138/1265] Remove logging test

It doesn't do much other than cause the remainder of the test suite to
generate lots of junk output.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/unit/cli_test.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 7f06f5e3..3f500032 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -1,13 +1,11 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
-import logging
 import os
 from .. import unittest
 
 import docker
 import mock
 
-from compose.cli import main
 from compose.cli.docopt_command import NoSuchCommand
 from compose.cli.main import TopLevelCommand
 from compose.service import Service
@@ -88,11 +86,6 @@ class CLITestCase(unittest.TestCase):
         with self.assertRaises(NoSuchCommand):
             TopLevelCommand().dispatch(['help', 'nonexistent'], None)
 
-    def test_setup_logging(self):
-        main.setup_logging()
-        self.assertEqual(logging.getLogger().level, logging.DEBUG)
-        self.assertEqual(logging.getLogger('requests').propagate, False)
-
     @mock.patch('compose.cli.main.dockerpty', autospec=True)
     def test_run_with_environment_merged_with_options_list(self, mock_dockerpty):
         command = TopLevelCommand()

From 1739448402e2122a1ecb017dd2a9400df80a18f3 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 22 Jul 2015 15:39:56 +0100
Subject: [PATCH 0139/1265] Don't use custom name for one-off containers

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py                | 6 ++++--
 tests/integration/service_test.py | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 0e67e826..c1907f37 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -577,8 +577,10 @@ class Service(object):
             for k in DOCKER_CONFIG_KEYS if k in self.options)
         container_options.update(override_options)
 
-        container_options['name'] = self.custom_container_name() \
-            or self.get_container_name(number, one_off)
+        if self.custom_container_name() and not one_off:
+            container_options['name'] = self.custom_container_name()
+        else:
+            container_options['name'] = self.get_container_name(number, one_off)
 
         if add_config_hash:
             config_hash = self.config_hash()
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index dbb97d8f..9f8f1682 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -706,6 +706,9 @@ class ServiceTest(DockerClientTestCase):
         container = create_and_start_container(service)
         self.assertEqual(container.name, 'my-web-container')
 
+        one_off_container = service.create_container(one_off=True)
+        self.assertNotEqual(one_off_container.name, 'my-web-container')
+
     def test_log_drive_invalid(self):
         service = self.create_service('web', log_driver='xxx')
         self.assertRaises(ValueError, lambda: create_and_start_container(service))

From ef44c46c72cf5c12cd145712758764b5dd61620c Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@alunduil.com>
Date: Wed, 22 Jul 2015 19:35:08 -0500
Subject: [PATCH 0140/1265] add all completions to sdist

The zsh completion was recently added but missed from the sdist.  This
includes all completions that might be added at any point.

Signed-off-by: Alex Brandt <alunduil@alunduil.com>
---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 2acd5ab6..6c756417 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,7 +4,7 @@ include requirements.txt
 include requirements-dev.txt
 include tox.ini
 include *.md
-include contrib/completion/bash/docker-compose
+recursive-include contrib/completion *
 recursive-include tests *
 global-exclude *.pyc
 global-exclude *.pyo

From 119901c19b8c6a20e0113c84d9f5a3aac06310d6 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 22 Jul 2015 18:06:43 +0100
Subject: [PATCH 0141/1265] Improve test coverage for scale

Also includes tiny amount of code cleanup, being explicit with imports.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/integration/service_test.py | 124 ++++++++++++++++++++++++++++--
 1 file changed, 119 insertions(+), 5 deletions(-)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index dbb97d8f..97c06a9d 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -4,10 +4,10 @@ import os
 from os import path
 
 from docker.errors import APIError
-import mock
+from mock import patch
 import tempfile
 import shutil
-import six
+from six import StringIO, text_type
 
 from compose import __version__
 from compose.const import (
@@ -221,7 +221,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertTrue(path.basename(actual_host_path) == path.basename(host_path),
                         msg=("Last component differs: %s, %s" % (actual_host_path, host_path)))
 
-    @mock.patch.dict(os.environ)
+    @patch.dict(os.environ)
     def test_create_container_with_home_and_env_var_in_volume_path(self):
         os.environ['VOLUME_NAME'] = 'my-volume'
         os.environ['HOME'] = '/tmp/home-dir'
@@ -469,7 +469,7 @@ class ServiceTest(DockerClientTestCase):
         with open(os.path.join(base_dir, b'foo\xE2bar'), 'w') as f:
             f.write("hello world\n")
 
-        self.create_service('web', build=six.text_type(base_dir)).build()
+        self.create_service('web', build=text_type(base_dir)).build()
         self.assertEqual(len(self.client.images(name='composetest_web')), 1)
 
     def test_start_container_stays_unpriviliged(self):
@@ -549,6 +549,120 @@ class ServiceTest(DockerClientTestCase):
         service.scale(0)
         self.assertEqual(len(service.containers()), 0)
 
+    @patch('sys.stdout', new_callable=StringIO)
+    def test_scale_with_stopped_containers(self, mock_stdout):
+        """
+        Given there are some stopped containers and scale is called with a
+        desired number that is the same as the number of stopped containers,
+        test that those containers are restarted and not removed/recreated.
+        """
+        service = self.create_service('web')
+        next_number = service._next_container_number()
+        valid_numbers = [next_number, next_number + 1]
+        service.create_container(number=next_number, quiet=True)
+        service.create_container(number=next_number + 1, quiet=True)
+
+        for container in service.containers():
+            self.assertFalse(container.is_running)
+
+        service.scale(2)
+
+        self.assertEqual(len(service.containers()), 2)
+        for container in service.containers():
+            self.assertTrue(container.is_running)
+            self.assertTrue(container.number in valid_numbers)
+
+        captured_output = mock_stdout.getvalue()
+        self.assertNotIn('Creating', captured_output)
+        self.assertIn('Starting', captured_output)
+
+    @patch('sys.stdout', new_callable=StringIO)
+    def test_scale_with_stopped_containers_and_needing_creation(self, mock_stdout):
+        """
+        Given there are some stopped containers and scale is called with a
+        desired number that is greater than the number of stopped containers,
+        test that those containers are restarted and required number are created.
+        """
+        service = self.create_service('web')
+        next_number = service._next_container_number()
+        service.create_container(number=next_number, quiet=True)
+
+        for container in service.containers():
+            self.assertFalse(container.is_running)
+
+        service.scale(2)
+
+        self.assertEqual(len(service.containers()), 2)
+        for container in service.containers():
+            self.assertTrue(container.is_running)
+
+        captured_output = mock_stdout.getvalue()
+        self.assertIn('Creating', captured_output)
+        self.assertIn('Starting', captured_output)
+
+    @patch('sys.stdout', new_callable=StringIO)
+    def test_scale_with_api_returns_errors(self, mock_stdout):
+        """
+        Test that when scaling if the API returns an error, that error is handled
+        and the remaining threads continue.
+        """
+        service = self.create_service('web')
+        next_number = service._next_container_number()
+        service.create_container(number=next_number, quiet=True)
+
+        with patch(
+            'compose.container.Container.create',
+                side_effect=APIError(message="testing", response={}, explanation="Boom")):
+
+            service.scale(3)
+
+        self.assertEqual(len(service.containers()), 1)
+        self.assertTrue(service.containers()[0].is_running)
+        self.assertIn("ERROR: for 2  Boom", mock_stdout.getvalue())
+
+    @patch('compose.service.log')
+    def test_scale_with_desired_number_already_achieved(self, mock_log):
+        """
+        Test that calling scale with a desired number that is equal to the
+        number of containers already running results in no change.
+        """
+        service = self.create_service('web')
+        next_number = service._next_container_number()
+        container = service.create_container(number=next_number, quiet=True)
+        container.start()
+
+        self.assertTrue(container.is_running)
+        self.assertEqual(len(service.containers()), 1)
+
+        service.scale(1)
+
+        self.assertEqual(len(service.containers()), 1)
+        container.inspect()
+        self.assertTrue(container.is_running)
+
+        captured_output = mock_log.info.call_args[0]
+        self.assertIn('Desired container number already achieved', captured_output)
+
+    @patch('compose.service.log')
+    def test_scale_with_custom_container_name_outputs_warning(self, mock_log):
+        """
+        Test that calling scale on a service that has a custom container name
+        results in warning output.
+        """
+        service = self.create_service('web', container_name='custom-container')
+
+        self.assertEqual(service.custom_container_name(), 'custom-container')
+
+        service.scale(3)
+
+        captured_output = mock_log.warn.call_args[0][0]
+
+        self.assertEqual(len(service.containers()), 1)
+        self.assertIn(
+            "Remove the custom name to scale the service.",
+            captured_output
+        )
+
     def test_scale_sets_ports(self):
         service = self.create_service('web', ports=['8000'])
         service.scale(2)
@@ -650,7 +764,7 @@ class ServiceTest(DockerClientTestCase):
         for k, v in {'ONE': '1', 'TWO': '2', 'THREE': '3', 'FOO': 'baz', 'DOO': 'dah'}.items():
             self.assertEqual(env[k], v)
 
-    @mock.patch.dict(os.environ)
+    @patch.dict(os.environ)
     def test_resolve_env(self):
         os.environ['FILE_DEF'] = 'E1'
         os.environ['FILE_DEF_EMPTY'] = 'E2'

From 2c8aade13e886e450e7226340c115a4641c07586 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 22 Jul 2015 18:07:56 +0100
Subject: [PATCH 0142/1265] Space for errors

It was harder to see when there are errors if they came straight after
the other output. Putting a newline in there gives it a bit of visual
room.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/utils.py b/compose/utils.py
index ff3096fd..4c7f94c5 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -57,6 +57,7 @@ def parallel_execute(objects, obj_callable, msg_index, msg):
             pass
 
     if errors:
+        stream.write("\n")
         for error in errors:
             stream.write("ERROR: for {}  {} \n".format(error, errors[error]))
 

From f4dac02947ec87e71ef648635bcf0dce541a9b2e Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 23 Jul 2015 10:56:15 +0100
Subject: [PATCH 0143/1265] Update docker-py to 1.3.1

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index fc5b6848..f9cec837 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 PyYAML==3.10
-docker-py==1.3.0
+docker-py==1.3.1
 dockerpty==0.3.4
 docopt==0.6.1
 requests==2.6.1
diff --git a/setup.py b/setup.py
index 0979b2f2..9bca4752 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.7',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.3.0, < 1.4',
+    'docker-py >= 1.3.1, < 1.4',
     'dockerpty >= 0.3.4, < 0.4',
     'six >= 1.3.0, < 2',
 ]

From 04a773f1c88059192521c62df9870654ea153510 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 20 Jul 2015 17:13:09 +0100
Subject: [PATCH 0144/1265] Deprecate --allow-insecure-ssl

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py                    | 29 ++++++++++++++------------
 compose/project.py                     |  6 ++----
 compose/service.py                     | 16 ++++----------
 contrib/completion/bash/docker-compose |  6 +++---
 contrib/completion/zsh/_docker-compose |  3 ---
 docs/reference/pull.md                 |  3 ---
 docs/reference/run.md                  |  2 --
 docs/reference/up.md                   |  2 --
 tests/integration/state_test.py        |  2 --
 tests/unit/service_test.py             | 21 +------------------
 10 files changed, 26 insertions(+), 64 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index df40ee93..56f6c050 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -26,6 +26,11 @@ from .utils import yesno, get_version_info
 
 log = logging.getLogger(__name__)
 
+INSECURE_SSL_WARNING = """
+Warning: --allow-insecure-ssl is deprecated and has no effect.
+It will be removed in a future version of Compose.
+"""
+
 
 def main():
     setup_logging()
@@ -232,13 +237,13 @@ class TopLevelCommand(Command):
         Usage: pull [options] [SERVICE...]
 
         Options:
-            --allow-insecure-ssl    Allow insecure connections to the docker
-                                    registry
+            --allow-insecure-ssl    Deprecated - no effect.
         """
-        insecure_registry = options['--allow-insecure-ssl']
+        if options['--allow-insecure-ssl']:
+            log.warn(INSECURE_SSL_WARNING)
+
         project.pull(
             service_names=options['SERVICE'],
-            insecure_registry=insecure_registry
         )
 
     def rm(self, project, options):
@@ -280,8 +285,7 @@ class TopLevelCommand(Command):
         Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]
 
         Options:
-            --allow-insecure-ssl  Allow insecure connections to the docker
-                                  registry
+            --allow-insecure-ssl  Deprecated - no effect.
             -d                    Detached mode: Run container in the background, print
                                   new container name.
             --entrypoint CMD      Override the entrypoint of the image.
@@ -296,7 +300,8 @@ class TopLevelCommand(Command):
         """
         service = project.get_service(options['SERVICE'])
 
-        insecure_registry = options['--allow-insecure-ssl']
+        if options['--allow-insecure-ssl']:
+            log.warn(INSECURE_SSL_WARNING)
 
         if not options['--no-deps']:
             deps = service.get_linked_names()
@@ -306,7 +311,6 @@ class TopLevelCommand(Command):
                     service_names=deps,
                     start_deps=True,
                     allow_recreate=False,
-                    insecure_registry=insecure_registry,
                 )
 
         tty = True
@@ -344,7 +348,6 @@ class TopLevelCommand(Command):
             container = service.create_container(
                 quiet=True,
                 one_off=True,
-                insecure_registry=insecure_registry,
                 **container_options
             )
         except APIError as e:
@@ -453,8 +456,7 @@ class TopLevelCommand(Command):
         Usage: up [options] [SERVICE...]
 
         Options:
-            --allow-insecure-ssl   Allow insecure connections to the docker
-                                   registry
+            --allow-insecure-ssl   Deprecated - no effect.
             -d                     Detached mode: Run containers in the background,
                                    print new container names.
             --no-color             Produce monochrome output.
@@ -468,7 +470,9 @@ class TopLevelCommand(Command):
                                    when attached or when containers are already
                                    running. (default: 10)
         """
-        insecure_registry = options['--allow-insecure-ssl']
+        if options['--allow-insecure-ssl']:
+            log.warn(INSECURE_SSL_WARNING)
+
         detached = options['-d']
 
         monochrome = options['--no-color']
@@ -487,7 +491,6 @@ class TopLevelCommand(Command):
             start_deps=start_deps,
             allow_recreate=allow_recreate,
             force_recreate=force_recreate,
-            insecure_registry=insecure_registry,
             do_build=not options['--no-build'],
             timeout=timeout
         )
diff --git a/compose/project.py b/compose/project.py
index c5028492..2667855d 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -239,7 +239,6 @@ class Project(object):
            start_deps=True,
            allow_recreate=True,
            force_recreate=False,
-           insecure_registry=False,
            do_build=True,
            timeout=DEFAULT_TIMEOUT):
 
@@ -262,7 +261,6 @@ class Project(object):
             for service in services
             for container in service.execute_convergence_plan(
                 plans[service.name],
-                insecure_registry=insecure_registry,
                 do_build=do_build,
                 timeout=timeout
             )
@@ -302,9 +300,9 @@ class Project(object):
 
         return plans
 
-    def pull(self, service_names=None, insecure_registry=False):
+    def pull(self, service_names=None):
         for service in self.get_services(service_names, include_deps=True):
-            service.pull(insecure_registry=insecure_registry)
+            service.pull()
 
     def containers(self, service_names=None, stopped=False, one_off=False):
         if service_names:
diff --git a/compose/service.py b/compose/service.py
index c1907f37..b9b4ed3e 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -247,7 +247,6 @@ class Service(object):
 
     def create_container(self,
                          one_off=False,
-                         insecure_registry=False,
                          do_build=True,
                          previous_container=None,
                          number=None,
@@ -259,7 +258,6 @@ class Service(object):
         """
         self.ensure_image_exists(
             do_build=do_build,
-            insecure_registry=insecure_registry,
         )
 
         container_options = self._get_container_create_options(
@@ -275,8 +273,7 @@ class Service(object):
         return Container.create(self.client, **container_options)
 
     def ensure_image_exists(self,
-                            do_build=True,
-                            insecure_registry=False):
+                            do_build=True):
 
         try:
             self.image()
@@ -290,7 +287,7 @@ class Service(object):
             else:
                 raise NeedsBuildError(self)
         else:
-            self.pull(insecure_registry=insecure_registry)
+            self.pull()
 
     def image(self):
         try:
@@ -360,14 +357,12 @@ class Service(object):
 
     def execute_convergence_plan(self,
                                  plan,
-                                 insecure_registry=False,
                                  do_build=True,
                                  timeout=DEFAULT_TIMEOUT):
         (action, containers) = plan
 
         if action == 'create':
             container = self.create_container(
-                insecure_registry=insecure_registry,
                 do_build=do_build,
             )
             self.start_container(container)
@@ -378,7 +373,6 @@ class Service(object):
             return [
                 self.recreate_container(
                     c,
-                    insecure_registry=insecure_registry,
                     timeout=timeout
                 )
                 for c in containers
@@ -401,7 +395,6 @@ class Service(object):
 
     def recreate_container(self,
                            container,
-                           insecure_registry=False,
                            timeout=DEFAULT_TIMEOUT):
         """Recreate a container.
 
@@ -426,7 +419,6 @@ class Service(object):
             '%s_%s' % (container.short_id, container.name))
 
         new_container = self.create_container(
-            insecure_registry=insecure_registry,
             do_build=False,
             previous_container=container,
             number=container.labels.get(LABEL_CONTAINER_NUMBER),
@@ -761,7 +753,7 @@ class Service(object):
                 return True
         return False
 
-    def pull(self, insecure_registry=False):
+    def pull(self):
         if 'image' not in self.options:
             return
 
@@ -772,7 +764,7 @@ class Service(object):
             repo,
             tag=tag,
             stream=True,
-            insecure_registry=insecure_registry)
+        )
         stream_output(output, sys.stdout)
 
 
diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 133b9fc3..e7d8cb3f 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -195,7 +195,7 @@ _docker-compose_ps() {
 _docker-compose_pull() {
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--allow-insecure-ssl --help" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_from_image
@@ -248,7 +248,7 @@ _docker-compose_run() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--allow-insecure-ssl -d --entrypoint -e --help --no-deps --rm --service-ports -T --user -u" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "-d --entrypoint -e --help --no-deps --rm --service-ports -T --user -u" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_all
@@ -315,7 +315,7 @@ _docker-compose_up() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--allow-insecure-ssl -d --help --no-build --no-color --no-deps --no-recreate --force-recreate --timeout -t" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "-d --help --no-build --no-color --no-deps --no-recreate --force-recreate --timeout -t" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_all
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 2893c3fc..9af21a98 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -202,7 +202,6 @@ __docker-compose_subcommand () {
             ;;
         (pull)
             _arguments \
-                '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \
                 '--help[Print usage]' \
                 '*:services:__docker-compose_services_from_image' && ret=0
             ;;
@@ -215,7 +214,6 @@ __docker-compose_subcommand () {
             ;;
         (run)
             _arguments \
-                '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \
                 '-d[Detached mode: Run container in the background, print new container name.]' \
                 '--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
                 '*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
@@ -247,7 +245,6 @@ __docker-compose_subcommand () {
             ;;
         (up)
             _arguments \
-                '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \
                 '-d[Detached mode: Run containers in the background, print new container names.]' \
                 '--help[Print usage]' \
                 '--no-color[Produce monochrome output.]' \
diff --git a/docs/reference/pull.md b/docs/reference/pull.md
index 571d3872..ac22010e 100644
--- a/docs/reference/pull.md
+++ b/docs/reference/pull.md
@@ -12,9 +12,6 @@ parent = "smn_compose_cli"
 
 ```
 Usage: pull [options] [SERVICE...]
-
-Options:
---allow-insecure-ssl    Allow insecure connections to the docker registry
 ```
 
 Pulls service images.
\ No newline at end of file
diff --git a/docs/reference/run.md b/docs/reference/run.md
index 78ec20fc..b07ddd06 100644
--- a/docs/reference/run.md
+++ b/docs/reference/run.md
@@ -14,8 +14,6 @@ parent = "smn_compose_cli"
 Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]
 
 Options:
---allow-insecure-ssl  Allow insecure connections to the docker
-                          registry
 -d                    Detached mode: Run container in the background, print
                           new container name.
 --entrypoint CMD      Override the entrypoint of the image.
diff --git a/docs/reference/up.md b/docs/reference/up.md
index 8fe4fad5..441d7f9c 100644
--- a/docs/reference/up.md
+++ b/docs/reference/up.md
@@ -14,8 +14,6 @@ parent = "smn_compose_cli"
 Usage: up [options] [SERVICE...]
 
 Options:
---allow-insecure-ssl   Allow insecure connections to the docker
-                       registry
 -d                     Detached mode: Run containers in the background,
                        print new container names.
 --no-color             Produce monochrome output.
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index 63027586..b124b19f 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -155,7 +155,6 @@ class ProjectWithDependenciesTest(ProjectTestCase):
 def converge(service,
              allow_recreate=True,
              force_recreate=False,
-             insecure_registry=False,
              do_build=True):
     """
     If a container for this service doesn't exist, create and start one. If there are
@@ -168,7 +167,6 @@ def converge(service,
 
     return service.execute_convergence_plan(
         plan,
-        insecure_registry=insecure_registry,
         do_build=do_build,
         timeout=1,
     )
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 104a90d5..bc6b9e48 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -229,11 +229,10 @@ class ServiceTest(unittest.TestCase):
     @mock.patch('compose.service.log', autospec=True)
     def test_pull_image(self, mock_log):
         service = Service('foo', client=self.mock_client, image='someimage:sometag')
-        service.pull(insecure_registry=True)
+        service.pull()
         self.mock_client.pull.assert_called_once_with(
             'someimage',
             tag='sometag',
-            insecure_registry=True,
             stream=True)
         mock_log.info.assert_called_once_with('Pulling foo (someimage:sometag)...')
 
@@ -243,26 +242,8 @@ class ServiceTest(unittest.TestCase):
         self.mock_client.pull.assert_called_once_with(
             'ababab',
             tag='latest',
-            insecure_registry=False,
             stream=True)
 
-    def test_create_container_from_insecure_registry(self):
-        service = Service('foo', client=self.mock_client, image='someimage:sometag')
-        images = []
-
-        def pull(repo, tag=None, insecure_registry=False, **kwargs):
-            self.assertEqual('someimage', repo)
-            self.assertEqual('sometag', tag)
-            self.assertTrue(insecure_registry)
-            images.append({'Id': 'abc123'})
-            return []
-
-        service.image = lambda *args, **kwargs: mock_get_image(images)
-        self.mock_client.pull = pull
-
-        service.create_container(insecure_registry=True)
-        self.assertEqual(1, len(images))
-
     @mock.patch('compose.service.Container', autospec=True)
     def test_recreate_container(self, _):
         mock_container = mock.create_autospec(Container)

From 227435f6135ffc9609e70a9fb3a7cfbc3502f43c Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 20 Jul 2015 16:23:25 +0100
Subject: [PATCH 0145/1265] Update CHANGES.md and install.md for latest stable
 version

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 CHANGES.md      | 32 ++++++++++++++++++++++++++++++++
 docs/install.md |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 78e629b8..38a54324 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,38 @@
 Change log
 ==========
 
+1.3.3 (2015-07-15)
+------------------
+
+Two regressions have been fixed:
+
+- When stopping containers gracefully, Compose was setting the timeout to 0, effectively forcing a SIGKILL every time.
+- Compose would sometimes crash depending on the formatting of container data returned from the Docker API.
+
+1.3.2 (2015-07-14)
+------------------
+
+The following bugs have been fixed:
+
+- When there were one-off containers created by running `docker-compose run` on an older version of Compose, `docker-compose run` would fail with a name collision. Compose now shows an error if you have leftover containers of this type lying around, and tells you how to remove them.
+- Compose was not reading Docker authentication config files created in the new location, `~/docker/config.json`, and authentication against private registries would therefore fail.
+- When a container had a pseudo-TTY attached, its output in `docker-compose up` would be truncated.
+- `docker-compose up --x-smart-recreate` would sometimes fail when an image tag was updated.
+- `docker-compose up` would sometimes create two containers with the same numeric suffix.
+- `docker-compose rm` and `docker-compose ps` would sometimes list services that aren't part of the current project (though no containers were erroneously removed).
+- Some `docker-compose` commands would not show an error if invalid service names were passed in.
+
+Thanks @dano, @josephpage, @kevinsimper, @lieryan, @phemmer, @soulrebel and @sschepens!
+
+1.3.1 (2015-06-21)
+------------------
+
+The following bugs have been fixed:
+
+- `docker-compose build` would always attempt to pull the base image before building.
+- `docker-compose help migrate-to-labels` failed with an error.
+- If no network mode was specified, Compose would set it to "bridge", rather than allowing the Docker daemon to use its configured default network mode.
+
 1.3.0 (2015-06-18)
 ------------------
 
diff --git a/docs/install.md b/docs/install.md
index 80a377db..dad6efd5 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -27,7 +27,7 @@ First, install Docker version 1.6 or greater:
 
 To install Compose, run the following commands:
 
-    curl -L https://github.com/docker/compose/releases/download/1.2.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+    curl -L https://github.com/docker/compose/releases/download/1.3.3/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
     chmod +x /usr/local/bin/docker-compose
 
 > Note: If you get a "Permission denied" error, your `/usr/local/bin` directory probably isn't writable and you'll need to install Compose as the superuser. Run `sudo -i`, then the two commands above, then `exit`.

From 7eabc06df5ca4a1c2ad372ee8e87012de5429f05 Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Sun, 19 Jul 2015 14:39:25 -0700
Subject: [PATCH 0146/1265] Updating build so that contributors can build
 public docs Changed base image

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/Dockerfile           | 16 +++++-----
 docs/pre-process.sh       | 61 +++++++++++++++++++++++++++++++++++++++
 docs/reference/build.md   |  1 +
 docs/reference/help.md    |  1 +
 docs/reference/kill.md    |  1 +
 docs/reference/logs.md    |  1 +
 docs/reference/port.md    |  1 +
 docs/reference/ps.md      |  1 +
 docs/reference/pull.md    |  1 +
 docs/reference/restart.md |  1 +
 docs/reference/rm.md      |  1 +
 docs/reference/run.md     |  1 +
 docs/reference/start.md   |  1 +
 docs/reference/stop.md    |  1 +
 docs/reference/up.md      |  1 +
 15 files changed, 83 insertions(+), 7 deletions(-)
 create mode 100755 docs/pre-process.sh

diff --git a/docs/Dockerfile b/docs/Dockerfile
index d6864c2d..d9add75c 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -6,6 +6,14 @@ COPY . /src
 
 COPY . /docs/content/compose/
 
+RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/docker
+RUN svn checkout https://github.com/docker/swarm/trunk/docs /docs/content/swarm
+RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine
+RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content/registry
+RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content/tutorials
+RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content
+
+
 # Sed to process GitHub Markdown
 # 1-2 Remove comment code from metadata block
 # 3 Change ](/word to ](/project/ in links
@@ -15,10 +23,4 @@ COPY . /docs/content/compose/
 # 7 Change ](../../ to ](/project/ --> not implemented
 # 
 # 
-RUN find /docs/content/compose -type f -name "*.md" -exec sed -i.old \
-    -e '/^<!.*metadata]>/g' \
-    -e '/^<!.*end-metadata.*>/g' \
-    -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/compose\//g' \
-    -e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/compose\/\2/g' \
-    -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g'  \
-    -e 's/\(\][(]\)\(\.\.\/\)/\1\/compose\//g' {} \;
+RUN /src/pre-process.sh /docs
diff --git a/docs/pre-process.sh b/docs/pre-process.sh
new file mode 100755
index 00000000..75e9611f
--- /dev/null
+++ b/docs/pre-process.sh
@@ -0,0 +1,61 @@
+#!/bin/bash -e
+
+# Populate an array with just docker dirs and one with content dirs
+docker_dir=(`ls -d /docs/content/docker/*`)
+content_dir=(`ls -d /docs/content/*`)
+
+# Loop content not of docker/
+#
+# Sed to process GitHub Markdown
+# 1-2 Remove comment code from metadata block
+# 3 Remove .md extension from link text
+# 4 Change ](/ to ](/project/ in links
+# 5 Change ](word) to ](/project/word)
+# 6 Change ](../../ to ](/project/
+# 7 Change ](../ to ](/project/word)
+# 
+for i in "${content_dir[@]}"
+do
+   :
+   case $i in
+      "/docs/content/windows")
+      ;;
+      "/docs/content/mac")
+      ;;
+      "/docs/content/linux")
+      ;;
+      "/docs/content/docker")
+         y=${i##*/}
+         find $i -type f -name "*.md" -exec sed -i.old \
+         -e '/^<!.*metadata]>/g' \
+         -e '/^<!.*end-metadata.*>/g' {} \;
+      ;;
+      *)
+        y=${i##*/}
+        find $i -type f -name "*.md" -exec sed -i.old \
+        -e '/^<!.*metadata]>/g' \
+        -e '/^<!.*end-metadata.*>/g' \
+        -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/'$y'\//g' \
+        -e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/'$y'\/\2/g' \
+        -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g'  \
+        -e 's/\(\][(]\)\(\.\/\)/\1\/'$y'\//g' \
+        -e 's/\(\][(]\)\(\.\.\/\.\.\/\)/\1\/'$y'\//g' \
+        -e 's/\(\][(]\)\(\.\.\/\)/\1\/'$y'\//g' {} \;
+      ;;
+      esac
+done
+
+#
+#  Move docker directories to content
+#
+for i in "${docker_dir[@]}"
+do
+   :
+    if [ -d $i ]    
+      then
+        mv $i /docs/content/ 
+      fi
+done
+
+rm -rf /docs/content/docker
+
diff --git a/docs/reference/build.md b/docs/reference/build.md
index b2b01511..b6e27bb2 100644
--- a/docs/reference/build.md
+++ b/docs/reference/build.md
@@ -4,6 +4,7 @@ title = "build"
 description = "build"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  build"]
 [menu.main]
+identifier="build.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->
diff --git a/docs/reference/help.md b/docs/reference/help.md
index 229ac5de..613708ed 100644
--- a/docs/reference/help.md
+++ b/docs/reference/help.md
@@ -4,6 +4,7 @@ title = "help"
 description = "help"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  help"]
 [menu.main]
+identifier="help.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->
diff --git a/docs/reference/kill.md b/docs/reference/kill.md
index c7160874..e5dd0573 100644
--- a/docs/reference/kill.md
+++ b/docs/reference/kill.md
@@ -4,6 +4,7 @@ title = "kill"
 description = "Forces running containers to stop."
 keywords = ["fig, composition, compose, docker, orchestration, cli,  kill"]
 [menu.main]
+identifier="kill.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->
diff --git a/docs/reference/logs.md b/docs/reference/logs.md
index 87f93727..5b241ea7 100644
--- a/docs/reference/logs.md
+++ b/docs/reference/logs.md
@@ -4,6 +4,7 @@ title = "logs"
 description = "Displays log output from services."
 keywords = ["fig, composition, compose, docker, orchestration, cli,  logs"]
 [menu.main]
+identifier="logs.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->
diff --git a/docs/reference/port.md b/docs/reference/port.md
index 4745c92d..76f93f23 100644
--- a/docs/reference/port.md
+++ b/docs/reference/port.md
@@ -4,6 +4,7 @@ title = "port"
 description = "Prints the public port for a port binding.s"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  port"]
 [menu.main]
+identifier="port.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->
diff --git a/docs/reference/ps.md b/docs/reference/ps.md
index b271376f..546d68e7 100644
--- a/docs/reference/ps.md
+++ b/docs/reference/ps.md
@@ -4,6 +4,7 @@ title = "ps"
 description = "Lists containers."
 keywords = ["fig, composition, compose, docker, orchestration, cli,  ps"]
 [menu.main]
+identifier="ps.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->
diff --git a/docs/reference/pull.md b/docs/reference/pull.md
index ac22010e..e5b5d166 100644
--- a/docs/reference/pull.md
+++ b/docs/reference/pull.md
@@ -4,6 +4,7 @@ title = "pull"
 description = "Pulls service images."
 keywords = ["fig, composition, compose, docker, orchestration, cli,  pull"]
 [menu.main]
+identifier="pull.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->
diff --git a/docs/reference/restart.md b/docs/reference/restart.md
index 9b570082..bbd4a68b 100644
--- a/docs/reference/restart.md
+++ b/docs/reference/restart.md
@@ -4,6 +4,7 @@ title = "restart"
 description = "Restarts Docker Compose services."
 keywords = ["fig, composition, compose, docker, orchestration, cli,  restart"]
 [menu.main]
+identifier="restart.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->
diff --git a/docs/reference/rm.md b/docs/reference/rm.md
index 0a4ba5b6..2ed959e4 100644
--- a/docs/reference/rm.md
+++ b/docs/reference/rm.md
@@ -4,6 +4,7 @@ title = "rm"
 description = "Removes stopped service containers."
 keywords = ["fig, composition, compose, docker, orchestration, cli,  rm"]
 [menu.main]
+identifier="rm.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->
diff --git a/docs/reference/run.md b/docs/reference/run.md
index b07ddd06..5ea9a61b 100644
--- a/docs/reference/run.md
+++ b/docs/reference/run.md
@@ -4,6 +4,7 @@ title = "run"
 description = "Runs a one-off command on a service."
 keywords = ["fig, composition, compose, docker, orchestration, cli,  run"]
 [menu.main]
+identifier="run.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->
diff --git a/docs/reference/start.md b/docs/reference/start.md
index 69d853f9..f0bdd5a9 100644
--- a/docs/reference/start.md
+++ b/docs/reference/start.md
@@ -4,6 +4,7 @@ title = "start"
 description = "Starts existing containers for a service."
 keywords = ["fig, composition, compose, docker, orchestration, cli,  start"]
 [menu.main]
+identifier="start.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->
diff --git a/docs/reference/stop.md b/docs/reference/stop.md
index 8ff92129..ec7e6688 100644
--- a/docs/reference/stop.md
+++ b/docs/reference/stop.md
@@ -4,6 +4,7 @@ title = "stop"
 description = "Stops running containers without removing them. "
 keywords = ["fig, composition, compose, docker, orchestration, cli, stop"]
 [menu.main]
+identifier="stop.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->
diff --git a/docs/reference/up.md b/docs/reference/up.md
index 441d7f9c..966aff1e 100644
--- a/docs/reference/up.md
+++ b/docs/reference/up.md
@@ -4,6 +4,7 @@ title = "up"
 description = "Builds, (re)creates, starts, and attaches to containers for a service."
 keywords = ["fig, composition, compose, docker, orchestration, cli,  up"]
 [menu.main]
+identifier="up.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->

From 430ba8cda34107237d6cdca6fdc8ecbda9e0fbc6 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 28 Jul 2015 15:06:22 +0100
Subject: [PATCH 0147/1265] Remove custom docs script

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/docs | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100755 script/docs

diff --git a/script/docs b/script/docs
deleted file mode 100755
index 31c58861..00000000
--- a/script/docs
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-set -ex
-
-# import the existing docs build cmds from docker/docker
-DOCSPORT=8000
-GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
-DOCKER_DOCS_IMAGE="compose-docs$GIT_BRANCH"
-DOCKER_RUN_DOCS="docker run --rm -it -e NOCACHE"
-
-docker build -t "$DOCKER_DOCS_IMAGE" -f docs/Dockerfile .
-$DOCKER_RUN_DOCS -p $DOCSPORT:8000 "$DOCKER_DOCS_IMAGE" mkdocs serve

From b08e23d3519125f512cd9a6aff0f01e363d42ea1 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 28 Jul 2015 15:31:18 +0100
Subject: [PATCH 0148/1265] Add hint about OS X binary compatibility

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/install.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/install.md b/docs/install.md
index dad6efd5..38302485 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -35,6 +35,8 @@ To install Compose, run the following commands:
 Optionally, you can also install [command completion](completion.md) for the
 bash and zsh shell.
 
+> **Note:** Some older Mac OS X CPU architectures are incompatible with the binary. If you receive an "Illegal instruction: 4" error after installing, you should install using the `pip` command instead.
+
 Compose is available for OS X and 64-bit Linux. If you're on another platform,
 Compose can also be installed as a Python package:
 

From fc203d643aa9a69c835aebee0de9b17851ef7a58 Mon Sep 17 00:00:00 2001
From: Reilly Herrewig-Pope <reilly.herrewigpope@mandiant.com>
Date: Tue, 28 Jul 2015 14:12:20 -0400
Subject: [PATCH 0149/1265] Allow API version specification via env var

Hard-coding the API version to '1.18' with the docker-py constructor will
cause the docker-py logic at
https://github.com/docker/docker-py/blob/master/docker/client.py#L143-L146
to always fail, which will cause authentication issues if you're using a
remote daemon using API version 1.19 - regardless of the API version of
the registry.

Allow the user to set the API version via an environment variable. If
the variable is not present, it will still default to '1.18' like it
does today.

Signed-off-by: Reilly Herrewig-Pope <reilly.herrewigpope@mandiant.com>
---
 compose/cli/docker_client.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index e513182f..adee9365 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -14,6 +14,8 @@ def docker_client():
         cert_path = os.path.join(os.environ.get('HOME', ''), '.docker')
 
     base_url = os.environ.get('DOCKER_HOST')
+    api_version = os.environ.get('COMPOSE_API_VERSION', '1.18')
+
     tls_config = None
 
     if os.environ.get('DOCKER_TLS_VERIFY', '') != '':
@@ -32,4 +34,4 @@ def docker_client():
         )
 
     timeout = int(os.environ.get('DOCKER_CLIENT_TIMEOUT', 60))
-    return Client(base_url=base_url, tls=tls_config, version='1.18', timeout=timeout)
+    return Client(base_url=base_url, tls=tls_config, version=api_version, timeout=timeout)

From 118a389646a68b914a2de0efb763d6d71868d951 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 28 Jul 2015 14:51:27 +0100
Subject: [PATCH 0150/1265] Update API version to 1.19

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 Dockerfile                        | 6 ++----
 compose/cli/docker_client.py      | 2 +-
 docs/install.md                   | 2 +-
 tests/integration/service_test.py | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 738e0b99..a0e7f14f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,16 +48,14 @@ RUN set -ex; \
     rm -rf pip-7.0.1; \
     rm pip-7.0.1.tar.gz
 
-ENV ALL_DOCKER_VERSIONS 1.6.2 1.7.1
+ENV ALL_DOCKER_VERSIONS 1.7.1
 
 RUN set -ex; \
-    curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.2 -o /usr/local/bin/docker-1.6.2; \
-    chmod +x /usr/local/bin/docker-1.6.2; \
     curl https://get.docker.com/builds/Linux/x86_64/docker-1.7.1 -o /usr/local/bin/docker-1.7.1; \
     chmod +x /usr/local/bin/docker-1.7.1
 
 # Set the default Docker to be run
-RUN ln -s /usr/local/bin/docker-1.6.2 /usr/local/bin/docker
+RUN ln -s /usr/local/bin/docker-1.7.1 /usr/local/bin/docker
 
 RUN useradd -d /home/user -m -s /bin/bash user
 WORKDIR /code/
diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index adee9365..244bcbef 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -14,7 +14,7 @@ def docker_client():
         cert_path = os.path.join(os.environ.get('HOME', ''), '.docker')
 
     base_url = os.environ.get('DOCKER_HOST')
-    api_version = os.environ.get('COMPOSE_API_VERSION', '1.18')
+    api_version = os.environ.get('COMPOSE_API_VERSION', '1.19')
 
     tls_config = None
 
diff --git a/docs/install.md b/docs/install.md
index 38302485..adb32fd5 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -17,7 +17,7 @@ Compose with a `curl` command.
 
 ## Install Docker
 
-First, install Docker version 1.6 or greater:
+First, install Docker version 1.7.1 or greater:
 
 - [Instructions for Mac OS X](http://docs.docker.com/installation/mac/)
 - [Instructions for Ubuntu](http://docs.docker.com/installation/ubuntulinux/)
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 60e2eed1..a901fc59 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -121,7 +121,7 @@ class ServiceTest(DockerClientTestCase):
         service = self.create_service('db', cpu_shares=73)
         container = service.create_container()
         service.start_container(container)
-        self.assertEqual(container.inspect()['Config']['CpuShares'], 73)
+        self.assertEqual(container.get('HostConfig.CpuShares'), 73)
 
     def test_build_extra_hosts(self):
         # string
@@ -183,7 +183,7 @@ class ServiceTest(DockerClientTestCase):
         service = self.create_service('db', cpuset='0')
         container = service.create_container()
         service.start_container(container)
-        self.assertEqual(container.inspect()['Config']['Cpuset'], '0')
+        self.assertEqual(container.get('HostConfig.CpusetCpus'), '0')
 
     def test_create_container_with_read_only_root_fs(self):
         read_only = True

From 976887250708fe1ad4f8c478cc5781c04655b92b Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 29 Jul 2015 18:04:19 +0100
Subject: [PATCH 0151/1265] Fix "Duplicate volume mount" error when config has
 trailing slashes

When an image declares a volume such as `/var/lib/mysql`, and a Compose
file has a line like `./data:/var/lib/mysql/` (note the trailing slash),
Compose creates duplicate volume binds when *recreating* the container.
(The first container is created without a hitch, but contains multiple
entries in its "Volumes" config.)

Fixed by normalizing all paths in volumes config.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py                | 12 +++++++----
 tests/integration/service_test.py | 34 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index b9b4ed3e..2e0490a5 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -3,6 +3,7 @@ from __future__ import absolute_import
 from collections import namedtuple
 import logging
 import re
+import os
 import sys
 from operator import attrgetter
 
@@ -848,12 +849,15 @@ def parse_volume_spec(volume_config):
                           "external:internal[:mode]" % volume_config)
 
     if len(parts) == 1:
-        return VolumeSpec(None, parts[0], 'rw')
+        external = None
+        internal = os.path.normpath(parts[0])
+    else:
+        external = os.path.normpath(parts[0])
+        internal = os.path.normpath(parts[1])
 
-    if len(parts) == 2:
-        parts.append('rw')
+    mode = parts[2] if len(parts) == 3 else 'rw'
 
-    return VolumeSpec(*parts)
+    return VolumeSpec(external, internal, mode)
 
 
 # Ports
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index a901fc59..b975fc00 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -221,6 +221,40 @@ class ServiceTest(DockerClientTestCase):
         self.assertTrue(path.basename(actual_host_path) == path.basename(host_path),
                         msg=("Last component differs: %s, %s" % (actual_host_path, host_path)))
 
+    def test_duplicate_volume_trailing_slash(self):
+        """
+        When an image specifies a volume, and the Compose file specifies a host path
+        but adds a trailing slash, make sure that we don't create duplicate binds.
+        """
+        host_path = '/tmp/data'
+        container_path = '/data'
+        volumes = ['{}:{}/'.format(host_path, container_path)]
+
+        tmp_container = self.client.create_container(
+            'busybox', 'true',
+            volumes={container_path: {}},
+            labels={'com.docker.compose.test_image': 'true'},
+        )
+        image = self.client.commit(tmp_container)['Id']
+
+        service = self.create_service('db', image=image, volumes=volumes)
+        old_container = create_and_start_container(service)
+
+        self.assertEqual(
+            old_container.get('Config.Volumes'),
+            {container_path: {}},
+        )
+
+        service = self.create_service('db', image=image, volumes=volumes)
+        new_container = service.recreate_container(old_container)
+
+        self.assertEqual(
+            new_container.get('Config.Volumes'),
+            {container_path: {}},
+        )
+
+        self.assertEqual(service.containers(stopped=False), [new_container])
+
     @patch.dict(os.environ)
     def test_create_container_with_home_and_env_var_in_volume_path(self):
         os.environ['VOLUME_NAME'] = 'my-volume'

From 03c3d4c768198bea7eedcde79c01177441e8a0c1 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 22 Jul 2015 15:09:24 +0100
Subject: [PATCH 0152/1265] generator -> iterator

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/multiplexer.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/compose/cli/multiplexer.py b/compose/cli/multiplexer.py
index 849dbd66..02e39aa1 100644
--- a/compose/cli/multiplexer.py
+++ b/compose/cli/multiplexer.py
@@ -13,8 +13,13 @@ STOP = object()
 
 
 class Multiplexer(object):
-    def __init__(self, generators):
-        self.generators = generators
+    """
+    Create a single iterator from several iterators by running all of them in
+    parallel and yielding results as they come in.
+    """
+
+    def __init__(self, iterators):
+        self.iterators = iterators
         self.queue = Queue()
 
     def loop(self):
@@ -31,12 +36,12 @@ class Multiplexer(object):
                 pass
 
     def _init_readers(self):
-        for generator in self.generators:
-            t = Thread(target=_enqueue_output, args=(generator, self.queue))
+        for iterator in self.iterators:
+            t = Thread(target=_enqueue_output, args=(iterator, self.queue))
             t.daemon = True
             t.start()
 
 
-def _enqueue_output(generator, queue):
-    for item in generator:
+def _enqueue_output(iterator, queue):
+    for item in iterator:
         queue.put(item)

From 27378704df946bd4f3bd994f750916c04e0dc139 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 22 Jul 2015 14:09:12 +0100
Subject: [PATCH 0153/1265] Isolate STOP logic in multiplexer module

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/log_printer.py | 3 +--
 compose/cli/multiplexer.py | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index ce7e1065..9c5d35e1 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -4,7 +4,7 @@ import sys
 
 from itertools import cycle
 
-from .multiplexer import Multiplexer, STOP
+from .multiplexer import Multiplexer
 from . import colors
 from .utils import split_buffer
 
@@ -61,7 +61,6 @@ class LogPrinter(object):
 
         exit_code = container.wait()
         yield color_fn("%s exited with code %s\n" % (container.name, exit_code))
-        yield STOP
 
     def _generate_prefix(self, container):
         """
diff --git a/compose/cli/multiplexer.py b/compose/cli/multiplexer.py
index 02e39aa1..ab7482e1 100644
--- a/compose/cli/multiplexer.py
+++ b/compose/cli/multiplexer.py
@@ -45,3 +45,5 @@ class Multiplexer(object):
 def _enqueue_output(iterator, queue):
     for item in iterator:
         queue.put(item)
+
+    queue.put(STOP)

From a9942b512a4fc6b04c334c821804a955a6c45ec0 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 22 Jul 2015 14:08:46 +0100
Subject: [PATCH 0154/1265] Wait for all containers to exit when running 'up'
 interactively

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/multiplexer.py     |  7 +++----
 tests/unit/multiplexer_test.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 tests/unit/multiplexer_test.py

diff --git a/compose/cli/multiplexer.py b/compose/cli/multiplexer.py
index ab7482e1..34b55133 100644
--- a/compose/cli/multiplexer.py
+++ b/compose/cli/multiplexer.py
@@ -7,8 +7,6 @@ except ImportError:
     from queue import Queue, Empty  # Python 3.x
 
 
-# Yield STOP from an input generator to stop the
-# top-level loop without processing any more input.
 STOP = object()
 
 
@@ -20,16 +18,17 @@ class Multiplexer(object):
 
     def __init__(self, iterators):
         self.iterators = iterators
+        self._num_running = len(iterators)
         self.queue = Queue()
 
     def loop(self):
         self._init_readers()
 
-        while True:
+        while self._num_running > 0:
             try:
                 item = self.queue.get(timeout=0.1)
                 if item is STOP:
-                    break
+                    self._num_running -= 1
                 else:
                     yield item
             except Empty:
diff --git a/tests/unit/multiplexer_test.py b/tests/unit/multiplexer_test.py
new file mode 100644
index 00000000..100b8f0c
--- /dev/null
+++ b/tests/unit/multiplexer_test.py
@@ -0,0 +1,28 @@
+import unittest
+
+from compose.cli.multiplexer import Multiplexer
+
+
+class MultiplexerTest(unittest.TestCase):
+    def test_no_iterators(self):
+        mux = Multiplexer([])
+        self.assertEqual([], list(mux.loop()))
+
+    def test_empty_iterators(self):
+        mux = Multiplexer([
+            (x for x in []),
+            (x for x in []),
+        ])
+
+        self.assertEqual([], list(mux.loop()))
+
+    def test_aggregates_output(self):
+        mux = Multiplexer([
+            (x for x in [0, 2, 4]),
+            (x for x in [1, 3, 5]),
+        ])
+
+        self.assertEqual(
+            [0, 1, 2, 3, 4, 5],
+            sorted(list(mux.loop())),
+        )

From 80d90a745ad9816817a14f4aa35c3d9a1a2136b4 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 22 Jul 2015 14:47:59 +0100
Subject: [PATCH 0155/1265] Make sure an exception in any iterator gets raised
 in the main thread

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/multiplexer.py
---
 compose/cli/multiplexer.py     | 16 +++++++++++-----
 tests/unit/multiplexer_test.py | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/compose/cli/multiplexer.py b/compose/cli/multiplexer.py
index 34b55133..955af632 100644
--- a/compose/cli/multiplexer.py
+++ b/compose/cli/multiplexer.py
@@ -26,7 +26,11 @@ class Multiplexer(object):
 
         while self._num_running > 0:
             try:
-                item = self.queue.get(timeout=0.1)
+                item, exception = self.queue.get(timeout=0.1)
+
+                if exception:
+                    raise exception
+
                 if item is STOP:
                     self._num_running -= 1
                 else:
@@ -42,7 +46,9 @@ class Multiplexer(object):
 
 
 def _enqueue_output(iterator, queue):
-    for item in iterator:
-        queue.put(item)
-
-    queue.put(STOP)
+    try:
+        for item in iterator:
+            queue.put((item, None))
+        queue.put((STOP, None))
+    except Exception as e:
+        queue.put((None, e))
diff --git a/tests/unit/multiplexer_test.py b/tests/unit/multiplexer_test.py
index 100b8f0c..d565d39d 100644
--- a/tests/unit/multiplexer_test.py
+++ b/tests/unit/multiplexer_test.py
@@ -26,3 +26,20 @@ class MultiplexerTest(unittest.TestCase):
             [0, 1, 2, 3, 4, 5],
             sorted(list(mux.loop())),
         )
+
+    def test_exception(self):
+        class Problem(Exception):
+            pass
+
+        def problematic_iterator():
+            yield 0
+            yield 2
+            raise Problem(":(")
+
+        mux = Multiplexer([
+            problematic_iterator(),
+            (x for x in [1, 3, 5]),
+        ])
+
+        with self.assertRaises(Problem):
+            list(mux.loop())

From 27bd987f286209737c665dd355535e76d1e4e71e Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 30 Jul 2015 10:31:54 +0100
Subject: [PATCH 0156/1265] Add test for trailing slash volume copying bug

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/integration/service_test.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index b975fc00..abab7c57 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -221,6 +221,18 @@ class ServiceTest(DockerClientTestCase):
         self.assertTrue(path.basename(actual_host_path) == path.basename(host_path),
                         msg=("Last component differs: %s, %s" % (actual_host_path, host_path)))
 
+    def test_recreate_preserves_volume_with_trailing_slash(self):
+        """
+        When the Compose file specifies a trailing slash in the container path, make
+        sure we copy the volume over when recreating.
+        """
+        service = self.create_service('data', volumes=['/data/'])
+        old_container = create_and_start_container(service)
+        volume_path = old_container.get('Volumes')['/data']
+
+        new_container = service.recreate_container(old_container)
+        self.assertEqual(new_container.get('Volumes')['/data'], volume_path)
+
     def test_duplicate_volume_trailing_slash(self):
         """
         When an image specifies a volume, and the Compose file specifies a host path

From 1a9ddf645d69cca77b88b4a0c6a38e5c2c841566 Mon Sep 17 00:00:00 2001
From: David BF <burretfresket@gmail.com>
Date: Fri, 31 Jul 2015 14:26:42 +0200
Subject: [PATCH 0157/1265] Remove useless postgres 'port' configuration

Signed-off-by: David BF <burretfresket@gmail.com>
---
 docs/rails.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/rails.md b/docs/rails.md
index 7394aadc..9ce6c4a6 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -40,8 +40,6 @@ Finally, `docker-compose.yml` is where the magic happens. This file describes th
 
     db:
       image: postgres
-      ports:
-        - "5432"
     web:
       build: .
       command: bundle exec rails s -p 3000 -b '0.0.0.0'

From a68ee0d9c2d3969e161ca973cfbe3e62bcb3dd2e Mon Sep 17 00:00:00 2001
From: Luke Marsden <luke@clusterhq.com>
Date: Wed, 3 Jun 2015 12:21:29 +0100
Subject: [PATCH 0158/1265] Support volume_driver in compose

* Add support for volume_driver parameter in compose yml
* Don't expand volume host paths if a volume_driver is specified
  (i.e., disable compose feature "relative to absolute path
  transformation" when volume drivers are in use, since volume drivers
  can use name where host path is normally specified; this is a
  heuristic)

Signed-off-by: Luke Marsden <luke@clusterhq.com>
---
 compose/config.py                 |  3 ++-
 docs/yml.md                       | 10 +++++++++-
 tests/integration/service_test.py |  6 ++++++
 tests/unit/config_test.py         | 16 ++++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/compose/config.py b/compose/config.py
index 064dadae..af898396 100644
--- a/compose/config.py
+++ b/compose/config.py
@@ -43,6 +43,7 @@ DOCKER_CONFIG_KEYS = [
     'stdin_open',
     'tty',
     'user',
+    'volume_driver',
     'volumes',
     'volumes_from',
     'working_dir',
@@ -251,7 +252,7 @@ def process_container_options(service_dict, working_dir=None):
     if 'memswap_limit' in service_dict and 'mem_limit' not in service_dict:
         raise ConfigurationError("Invalid 'memswap_limit' configuration for %s service: when defining 'memswap_limit' you must set 'mem_limit' as well" % service_dict['name'])
 
-    if 'volumes' in service_dict:
+    if 'volumes' in service_dict and service_dict.get('volume_driver') is None:
         service_dict['volumes'] = resolve_volume_paths(service_dict['volumes'], working_dir=working_dir)
 
     if 'build' in service_dict:
diff --git a/docs/yml.md b/docs/yml.md
index f92b5682..f89d107b 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -134,6 +134,12 @@ Mount paths as volumes, optionally specifying a path on the host machine
      - cache/:/tmp/cache
      - ~/configs:/etc/configs/:ro
 
+You can mount a relative path on the host, which will expand relative to
+the directory of the Compose configuration file being used.
+
+> Note: No path expansion will be done if you have also specified a
+> `volume_driver`.
+
 ### volumes_from
 
 Mount all of the volumes from another service or container.
@@ -333,7 +339,7 @@ Override the default labeling scheme for each container.
         - label:user:USER
         - label:role:ROLE
 
-### working\_dir, entrypoint, user, hostname, domainname, mac\_address, mem\_limit, memswap\_limit, privileged, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only 
+### working\_dir, entrypoint, user, hostname, domainname, mac\_address, mem\_limit, memswap\_limit, privileged, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only, volume\_driver
 
 Each of these is a single value, analogous to its
 [docker run](https://docs.docker.com/reference/run/) counterpart.
@@ -360,6 +366,8 @@ Each of these is a single value, analogous to its
     tty: true
     read_only: true
 
+    volume_driver: mydriver
+```
 
 ## Compose documentation
 
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index abab7c57..8856d024 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -117,6 +117,12 @@ class ServiceTest(DockerClientTestCase):
         service.start_container(container)
         self.assertIn('/var/db', container.get('Volumes'))
 
+    def test_create_container_with_volume_driver(self):
+        service = self.create_service('db', volume_driver='foodriver')
+        container = service.create_container()
+        service.start_container(container)
+        self.assertEqual('foodriver', container.get('Config.VolumeDriver'))
+
     def test_create_container_with_cpu_shares(self):
         service = self.create_service('db', cpu_shares=73)
         container = service.create_container()
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 281717db..a2c17d72 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -72,6 +72,22 @@ class VolumePathTest(unittest.TestCase):
         d = make_service_dict('foo', {'volumes': ['~:/container/path']}, working_dir='.')
         self.assertEqual(d['volumes'], ['/home/user:/container/path'])
 
+    def test_named_volume_with_driver(self):
+        d = make_service_dict('foo', {
+            'volumes': ['namedvolume:/data'],
+            'volume_driver': 'foodriver',
+        }, working_dir='.')
+        self.assertEqual(d['volumes'], ['namedvolume:/data'])
+
+    @mock.patch.dict(os.environ)
+    def test_named_volume_with_special_chars(self):
+        os.environ['NAME'] = 'surprise!'
+        d = make_service_dict('foo', {
+            'volumes': ['~/${NAME}:/data'],
+            'volume_driver': 'foodriver',
+        }, working_dir='.')
+        self.assertEqual(d['volumes'], ['~/${NAME}:/data'])
+
 
 class MergePathMappingTest(object):
     def config_name(self):

From 92ef1f57022008d0bb5ed47971bccb83ed07afa4 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 28 Jul 2015 16:48:38 +0100
Subject: [PATCH 0159/1265] Make compose.config a proper module

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/__init__.py     | 10 ++++++++++
 compose/{ => config}/config.py |  0
 tests/integration/testcases.py |  2 +-
 tests/unit/config_test.py      |  2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 compose/config/__init__.py
 rename compose/{ => config}/config.py (100%)

diff --git a/compose/config/__init__.py b/compose/config/__init__.py
new file mode 100644
index 00000000..3907e5b6
--- /dev/null
+++ b/compose/config/__init__.py
@@ -0,0 +1,10 @@
+from .config import (
+    DOCKER_CONFIG_KEYS,
+    ConfigDetails,
+    ConfigurationError,
+    find,
+    load,
+    parse_environment,
+    merge_environment,
+    get_service_name_from_net,
+)  # flake8: noqa
diff --git a/compose/config.py b/compose/config/config.py
similarity index 100%
rename from compose/config.py
rename to compose/config/config.py
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 2a7c0a44..a7929088 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
 from compose.service import Service
-from compose.config import ServiceLoader
+from compose.config.config import ServiceLoader
 from compose.const import LABEL_PROJECT
 from compose.cli.docker_client import docker_client
 from compose.progress_stream import stream_output
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index a2c17d72..3ee754e3 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -4,7 +4,7 @@ import shutil
 import tempfile
 from .. import unittest
 
-from compose import config
+from compose.config import config
 
 
 def make_service_dict(name, service_dict, working_dir):

From 31ac3ce22a381061b13046a4231161ed5c1a9eb3 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 28 Jul 2015 18:05:39 +0100
Subject: [PATCH 0160/1265] Split out compose.config.errors

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py | 36 ++++++------------------------------
 compose/config/errors.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100644 compose/config/errors.py

diff --git a/compose/config/config.py b/compose/config/config.py
index af898396..d3696782 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -8,6 +8,12 @@ import six
 
 from compose.cli.utils import find_candidates_in_parent_dirs
 
+from .errors import (
+    ConfigurationError,
+    CircularReference,
+    ComposeFileNotFound,
+)
+
 
 DOCKER_CONFIG_KEYS = [
     'cap_add',
@@ -536,33 +542,3 @@ def load_yaml(filename):
             return yaml.safe_load(fh)
     except IOError as e:
         raise ConfigurationError(six.text_type(e))
-
-
-class ConfigurationError(Exception):
-    def __init__(self, msg):
-        self.msg = msg
-
-    def __str__(self):
-        return self.msg
-
-
-class CircularReference(ConfigurationError):
-    def __init__(self, trail):
-        self.trail = trail
-
-    @property
-    def msg(self):
-        lines = [
-            "{} in {}".format(service_name, filename)
-            for (filename, service_name) in self.trail
-        ]
-        return "Circular reference:\n  {}".format("\n  extends ".join(lines))
-
-
-class ComposeFileNotFound(ConfigurationError):
-    def __init__(self, supported_filenames):
-        super(ComposeFileNotFound, self).__init__("""
-        Can't find a suitable configuration file in this directory or any parent. Are you in the right directory?
-
-        Supported filenames: %s
-        """ % ", ".join(supported_filenames))
diff --git a/compose/config/errors.py b/compose/config/errors.py
new file mode 100644
index 00000000..037b7ec8
--- /dev/null
+++ b/compose/config/errors.py
@@ -0,0 +1,28 @@
+class ConfigurationError(Exception):
+    def __init__(self, msg):
+        self.msg = msg
+
+    def __str__(self):
+        return self.msg
+
+
+class CircularReference(ConfigurationError):
+    def __init__(self, trail):
+        self.trail = trail
+
+    @property
+    def msg(self):
+        lines = [
+            "{} in {}".format(service_name, filename)
+            for (filename, service_name) in self.trail
+        ]
+        return "Circular reference:\n  {}".format("\n  extends ".join(lines))
+
+
+class ComposeFileNotFound(ConfigurationError):
+    def __init__(self, supported_filenames):
+        super(ComposeFileNotFound, self).__init__("""
+        Can't find a suitable configuration file in this directory or any parent. Are you in the right directory?
+
+        Supported filenames: %s
+        """ % ", ".join(supported_filenames))

From 8b5bd945d0883ef71b87ca80e75c57e2636183a9 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 24 Jul 2015 15:58:18 +0100
Subject: [PATCH 0161/1265] Interpolate environment variables

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py                      |  9 ++-
 compose/config/interpolation.py               | 69 +++++++++++++++++
 docs/yml.md                                   | 31 ++++++++
 .../docker-compose.yml                        | 17 +++++
 .../docker-compose.yml                        |  5 ++
 tests/integration/cli_test.py                 | 15 ++++
 tests/integration/service_test.py             | 18 -----
 tests/unit/config_test.py                     | 75 +++++++++++++++----
 tests/unit/interpolation_test.py              | 31 ++++++++
 9 files changed, 235 insertions(+), 35 deletions(-)
 create mode 100644 compose/config/interpolation.py
 create mode 100644 tests/fixtures/environment-interpolation/docker-compose.yml
 create mode 100644 tests/fixtures/volume-path-interpolation/docker-compose.yml
 create mode 100644 tests/unit/interpolation_test.py

diff --git a/compose/config/config.py b/compose/config/config.py
index d3696782..4d3f5fae 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -8,6 +8,7 @@ import six
 
 from compose.cli.utils import find_candidates_in_parent_dirs
 
+from .interpolation import interpolate_environment_variables
 from .errors import (
     ConfigurationError,
     CircularReference,
@@ -132,11 +133,11 @@ def get_config_path(base_dir):
 
 def load(config_details):
     dictionary, working_dir, filename = config_details
+    dictionary = interpolate_environment_variables(dictionary)
+
     service_dicts = []
 
     for service_name, service_dict in list(dictionary.items()):
-        if not isinstance(service_dict, dict):
-            raise ConfigurationError('Service "%s" doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.' % service_name)
         loader = ServiceLoader(working_dir=working_dir, filename=filename)
         service_dict = loader.make_service_dict(service_name, service_dict)
         validate_paths(service_dict)
@@ -429,9 +430,9 @@ def resolve_volume_paths(volumes, working_dir=None):
 
 def resolve_volume_path(volume, working_dir):
     container_path, host_path = split_path_mapping(volume)
-    container_path = os.path.expanduser(os.path.expandvars(container_path))
+    container_path = os.path.expanduser(container_path)
     if host_path is not None:
-        host_path = os.path.expanduser(os.path.expandvars(host_path))
+        host_path = os.path.expanduser(host_path)
         return "%s:%s" % (expand_path(working_dir, host_path), container_path)
     else:
         return container_path
diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
new file mode 100644
index 00000000..0d4b9641
--- /dev/null
+++ b/compose/config/interpolation.py
@@ -0,0 +1,69 @@
+import os
+from string import Template
+from collections import defaultdict
+
+import six
+
+from .errors import ConfigurationError
+
+
+def interpolate_environment_variables(config):
+    return dict(
+        (service_name, process_service(service_name, service_dict))
+        for (service_name, service_dict) in config.items()
+    )
+
+
+def process_service(service_name, service_dict):
+    if not isinstance(service_dict, dict):
+        raise ConfigurationError(
+            'Service "%s" doesn\'t have any configuration options. '
+            'All top level keys in your docker-compose.yml must map '
+            'to a dictionary of configuration options.' % service_name
+        )
+
+    return dict(
+        (key, interpolate_value(service_name, key, val))
+        for (key, val) in service_dict.items()
+    )
+
+
+def interpolate_value(service_name, config_key, value):
+    try:
+        return recursive_interpolate(value)
+    except InvalidInterpolation as e:
+        raise ConfigurationError(
+            'Invalid interpolation format for "{config_key}" option '
+            'in service "{service_name}": "{string}"'
+            .format(
+                config_key=config_key,
+                service_name=service_name,
+                string=e.string,
+            )
+        )
+
+
+def recursive_interpolate(obj):
+    if isinstance(obj, six.string_types):
+        return interpolate(obj, os.environ)
+    elif isinstance(obj, dict):
+        return dict(
+            (key, recursive_interpolate(val))
+            for (key, val) in obj.items()
+        )
+    elif isinstance(obj, list):
+        return map(recursive_interpolate, obj)
+    else:
+        return obj
+
+
+def interpolate(string, mapping):
+    try:
+        return Template(string).substitute(defaultdict(lambda: "", mapping))
+    except ValueError:
+        raise InvalidInterpolation(string)
+
+
+class InvalidInterpolation(Exception):
+    def __init__(self, string):
+        self.string = string
diff --git a/docs/yml.md b/docs/yml.md
index f89d107b..18551bf2 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -19,6 +19,10 @@ As with `docker run`, options specified in the Dockerfile (e.g., `CMD`,
 `EXPOSE`, `VOLUME`, `ENV`) are respected by default - you don't need to
 specify them again in `docker-compose.yml`.
 
+Values for configuration options can contain environment variables, e.g. 
+`image: postgres:${POSTGRES_VERSION}`. For more details, see the section on
+[variable substitution](#variable-substitution).
+
 ### image
 
 Tag or partial image ID. Can be local or remote - Compose will attempt to
@@ -369,6 +373,33 @@ Each of these is a single value, analogous to its
     volume_driver: mydriver
 ```
 
+## Variable substitution
+
+Your configuration options can contain environment variables. Compose uses the
+variable values from the shell environment in which `docker-compose` is run. For
+example, suppose the shell contains `POSTGRES_VERSION=9.3` and you supply this
+configuration:
+
+    db:
+      image: "postgres:${POSTGRES_VERSION}"
+
+When you run `docker-compose up` with this configuration, Compose looks for the
+`POSTGRES_VERSION` environment variable in the shell and substitutes its value
+in. For this example, Compose resolves the `image` to `postgres:9.3` before
+running the configuration.
+
+If an environment variable is not set, Compose substitutes with an empty
+string. In the example above, if `POSTGRES_VERSION` is not set, the value for
+the `image` option is `postgres:`.
+
+Both `$VARIABLE` and `${VARIABLE}` syntax are supported. Extended shell-style
+features, such as `${VARIABLE-default}` and `${VARIABLE/foo/bar}`, are not
+supported.
+
+If you need to put a literal dollar sign in a configuration value, use a double
+dollar sign (`$$`).
+
+
 ## Compose documentation
 
 - [User guide](/)
diff --git a/tests/fixtures/environment-interpolation/docker-compose.yml b/tests/fixtures/environment-interpolation/docker-compose.yml
new file mode 100644
index 00000000..7ed43a81
--- /dev/null
+++ b/tests/fixtures/environment-interpolation/docker-compose.yml
@@ -0,0 +1,17 @@
+web:
+  # unbracketed name
+  image: $IMAGE
+
+  # array element
+  ports:
+    - "${HOST_PORT}:8000"
+
+  # dictionary item value
+  labels:
+    mylabel: "${LABEL_VALUE}"
+
+  # unset value
+  hostname: "host-${UNSET_VALUE}"
+
+  # escaped interpolation
+  command: "$${ESCAPED}"
diff --git a/tests/fixtures/volume-path-interpolation/docker-compose.yml b/tests/fixtures/volume-path-interpolation/docker-compose.yml
new file mode 100644
index 00000000..6d4e236a
--- /dev/null
+++ b/tests/fixtures/volume-path-interpolation/docker-compose.yml
@@ -0,0 +1,5 @@
+test:
+  image: busybox
+  command: top
+  volumes:
+    - "~/${VOLUME_NAME}:/container-path"
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index f3b3b9f5..0e86c279 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -488,6 +488,21 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(containers), 1)
         self.assertIn("FOO=1", containers[0].get('Config.Env'))
 
+    @patch.dict(os.environ)
+    def test_home_and_env_var_in_volume_path(self):
+        os.environ['VOLUME_NAME'] = 'my-volume'
+        os.environ['HOME'] = '/tmp/home-dir'
+        expected_host_path = os.path.join(os.environ['HOME'], os.environ['VOLUME_NAME'])
+
+        self.command.base_dir = 'tests/fixtures/volume-path-interpolation'
+        self.command.dispatch(['up', '-d'], None)
+
+        container = self.project.containers(stopped=True)[0]
+        actual_host_path = container.get('Volumes')['/container-path']
+        components = actual_host_path.split('/')
+        self.assertTrue(components[-2:] == ['home-dir', 'my-volume'],
+                        msg="Last two components differ: %s, %s" % (actual_host_path, expected_host_path))
+
     def test_up_with_extends(self):
         self.command.base_dir = 'tests/fixtures/extends'
         self.command.dispatch(['up', '-d'], None)
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 8856d024..9bdc12f9 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -273,24 +273,6 @@ class ServiceTest(DockerClientTestCase):
 
         self.assertEqual(service.containers(stopped=False), [new_container])
 
-    @patch.dict(os.environ)
-    def test_create_container_with_home_and_env_var_in_volume_path(self):
-        os.environ['VOLUME_NAME'] = 'my-volume'
-        os.environ['HOME'] = '/tmp/home-dir'
-        expected_host_path = os.path.join(os.environ['HOME'], os.environ['VOLUME_NAME'])
-
-        host_path = '~/${VOLUME_NAME}'
-        container_path = '/container-path'
-
-        service = self.create_service('db', volumes=['%s:%s' % (host_path, container_path)])
-        container = service.create_container()
-        service.start_container(container)
-
-        actual_host_path = container.get('Volumes')[container_path]
-        components = actual_host_path.split('/')
-        self.assertTrue(components[-2:] == ['home-dir', 'my-volume'],
-                        msg="Last two components differ: %s, %s" % (actual_host_path, expected_host_path))
-
     def test_create_container_with_volumes_from(self):
         volume_service = self.create_service('data')
         volume_container_1 = volume_service.create_container()
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 3ee754e3..b1c22235 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -59,11 +59,56 @@ class ConfigTest(unittest.TestCase):
         make_service_dict('foo', {'ports': ['8000']}, 'tests/')
 
 
-class VolumePathTest(unittest.TestCase):
+class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)
-    def test_volume_binding_with_environ(self):
+    def test_config_file_with_environment_variable(self):
+        os.environ.update(
+            IMAGE="busybox",
+            HOST_PORT="80",
+            LABEL_VALUE="myvalue",
+        )
+
+        service_dicts = config.load(
+            config.find('tests/fixtures/environment-interpolation', None),
+        )
+
+        self.assertEqual(service_dicts, [
+            {
+                'name': 'web',
+                'image': 'busybox',
+                'ports': ['80:8000'],
+                'labels': {'mylabel': 'myvalue'},
+                'hostname': 'host-',
+                'command': '${ESCAPED}',
+            }
+        ])
+
+    @mock.patch.dict(os.environ)
+    def test_invalid_interpolation(self):
+        with self.assertRaises(config.ConfigurationError) as cm:
+            config.load(
+                config.ConfigDetails(
+                    {'web': {'image': '${'}},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+
+        self.assertIn('Invalid', cm.exception.msg)
+        self.assertIn('for "image" option', cm.exception.msg)
+        self.assertIn('in service "web"', cm.exception.msg)
+        self.assertIn('"${"', cm.exception.msg)
+
+    @mock.patch.dict(os.environ)
+    def test_volume_binding_with_environment_variable(self):
         os.environ['VOLUME_PATH'] = '/host/path'
-        d = make_service_dict('foo', {'volumes': ['${VOLUME_PATH}:/container/path']}, working_dir='.')
+        d = config.load(
+            config.ConfigDetails(
+                config={'foo': {'volumes': ['${VOLUME_PATH}:/container/path']}},
+                working_dir='.',
+                filename=None,
+            )
+        )[0]
         self.assertEqual(d['volumes'], ['/host/path:/container/path'])
 
     @mock.patch.dict(os.environ)
@@ -400,18 +445,22 @@ class EnvTest(unittest.TestCase):
         os.environ['HOSTENV'] = '/tmp'
         os.environ['CONTAINERENV'] = '/host/tmp'
 
-        service_dict = make_service_dict(
-            'foo',
-            {'volumes': ['$HOSTENV:$CONTAINERENV']},
-            working_dir="tests/fixtures/env"
-        )
+        service_dict = config.load(
+            config.ConfigDetails(
+                config={'foo': {'volumes': ['$HOSTENV:$CONTAINERENV']}},
+                working_dir="tests/fixtures/env",
+                filename=None,
+            )
+        )[0]
         self.assertEqual(set(service_dict['volumes']), set(['/tmp:/host/tmp']))
 
-        service_dict = make_service_dict(
-            'foo',
-            {'volumes': ['/opt${HOSTENV}:/opt${CONTAINERENV}']},
-            working_dir="tests/fixtures/env"
-        )
+        service_dict = config.load(
+            config.ConfigDetails(
+                config={'foo': {'volumes': ['/opt${HOSTENV}:/opt${CONTAINERENV}']}},
+                working_dir="tests/fixtures/env",
+                filename=None,
+            )
+        )[0]
         self.assertEqual(set(service_dict['volumes']), set(['/opt/tmp:/opt/host/tmp']))
 
 
diff --git a/tests/unit/interpolation_test.py b/tests/unit/interpolation_test.py
new file mode 100644
index 00000000..96c6f9b3
--- /dev/null
+++ b/tests/unit/interpolation_test.py
@@ -0,0 +1,31 @@
+import unittest
+
+from compose.config.interpolation import interpolate, InvalidInterpolation
+
+
+class InterpolationTest(unittest.TestCase):
+    def test_valid_interpolations(self):
+        self.assertEqual(interpolate('$foo', dict(foo='hi')), 'hi')
+        self.assertEqual(interpolate('${foo}', dict(foo='hi')), 'hi')
+
+        self.assertEqual(interpolate('${subject} love you', dict(subject='i')), 'i love you')
+        self.assertEqual(interpolate('i ${verb} you', dict(verb='love')), 'i love you')
+        self.assertEqual(interpolate('i love ${object}', dict(object='you')), 'i love you')
+
+    def test_empty_value(self):
+        self.assertEqual(interpolate('${foo}', dict(foo='')), '')
+
+    def test_unset_value(self):
+        self.assertEqual(interpolate('${foo}', dict()), '')
+
+    def test_escaped_interpolation(self):
+        self.assertEqual(interpolate('$${foo}', dict(foo='hi')), '${foo}')
+
+    def test_invalid_strings(self):
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('${', dict()))
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('$}', dict()))
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('${}', dict()))
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('${ }', dict()))
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('${ foo}', dict()))
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('${foo }', dict()))
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('${foo!}', dict()))

From ee6ff294a273d07e157af68f0b5f97f36b957676 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 6 Aug 2015 11:31:42 +0100
Subject: [PATCH 0162/1265] Show a warning when a variable is unset

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/interpolation.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index 0d4b9641..d33e93be 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -1,11 +1,13 @@
 import os
 from string import Template
-from collections import defaultdict
 
 import six
 
 from .errors import ConfigurationError
 
+import logging
+log = logging.getLogger(__name__)
+
 
 def interpolate_environment_variables(config):
     return dict(
@@ -59,11 +61,26 @@ def recursive_interpolate(obj):
 
 def interpolate(string, mapping):
     try:
-        return Template(string).substitute(defaultdict(lambda: "", mapping))
+        return Template(string).substitute(BlankDefaultDict(mapping))
     except ValueError:
         raise InvalidInterpolation(string)
 
 
+class BlankDefaultDict(dict):
+    def __init__(self, mapping):
+        super(BlankDefaultDict, self).__init__(mapping)
+
+    def __getitem__(self, key):
+        try:
+            return super(BlankDefaultDict, self).__getitem__(key)
+        except KeyError:
+            log.warn(
+                "The {} variable is not set. Substituting a blank string."
+                .format(key)
+            )
+            return ""
+
+
 class InvalidInterpolation(Exception):
     def __init__(self, string):
         self.string = string

From 4f1429869462f61fd307ec63552b290e50b53882 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 6 Aug 2015 14:45:35 +0100
Subject: [PATCH 0163/1265] Abort tests if daemon fails to start

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/wrapdocker | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/script/wrapdocker b/script/wrapdocker
index 2e07bdad..119e88df 100755
--- a/script/wrapdocker
+++ b/script/wrapdocker
@@ -8,9 +8,16 @@ fi
 # delete it so that docker can start.
 rm -rf /var/run/docker.pid
 docker -d $DOCKER_DAEMON_ARGS &>/var/log/docker.log &
+docker_pid=$!
 
 >&2 echo "Waiting for Docker to start..."
 while ! docker ps &>/dev/null; do
+    if ! kill -0 "$docker_pid" &>/dev/null; then
+        >&2 echo "Docker failed to start"
+        cat /var/log/docker.log
+        exit 1
+    fi
+
     sleep 1
 done
 

From fdaa5f2cde7e0721f26ca4e95cbb8f53402be4a7 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 6 Aug 2015 16:14:37 +0100
Subject: [PATCH 0164/1265] Update volume tests for clarity

- Better method names.

- Environment variable syntax in volume paths, even when a driver is
  specified, now *will* be processed (the test wasn't testing it
  properly). However, `~` will still *not* expand to the user's home
  directory.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/unit/config_test.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index b1c22235..00462020 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -117,7 +117,7 @@ class InterpolationTest(unittest.TestCase):
         d = make_service_dict('foo', {'volumes': ['~:/container/path']}, working_dir='.')
         self.assertEqual(d['volumes'], ['/home/user:/container/path'])
 
-    def test_named_volume_with_driver(self):
+    def test_named_volume_with_driver_does_not_expand(self):
         d = make_service_dict('foo', {
             'volumes': ['namedvolume:/data'],
             'volume_driver': 'foodriver',
@@ -125,13 +125,13 @@ class InterpolationTest(unittest.TestCase):
         self.assertEqual(d['volumes'], ['namedvolume:/data'])
 
     @mock.patch.dict(os.environ)
-    def test_named_volume_with_special_chars(self):
+    def test_home_directory_with_driver_does_not_expand(self):
         os.environ['NAME'] = 'surprise!'
         d = make_service_dict('foo', {
-            'volumes': ['~/${NAME}:/data'],
+            'volumes': ['~:/data'],
             'volume_driver': 'foodriver',
         }, working_dir='.')
-        self.assertEqual(d['volumes'], ['~/${NAME}:/data'])
+        self.assertEqual(d['volumes'], ['~:/data'])
 
 
 class MergePathMappingTest(object):

From da36ee7cbcaf2051fc0829f273c01517bd7d9bc2 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 27 Jul 2015 15:15:07 +0100
Subject: [PATCH 0165/1265] Perform schema validation

Define a schema that we can pass to jsonschema to validate against the
config a user has supplied. This will help catch a wide variety of common
errors that occur.

If the config does not pass schema validation then it raises an exception
and prints out human readable reasons.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py                      |  43 ++++---
 compose/schema.json                           |  79 ++++++++++++
 compose/service.py                            |   6 -
 requirements.txt                              |   1 +
 setup.py                                      |   1 +
 .../fixtures/extends/specify-file-as-self.yml |   1 +
 tests/unit/config_test.py                     | 118 +++++++++++-------
 tests/unit/service_test.py                    |   1 -
 8 files changed, 175 insertions(+), 75 deletions(-)
 create mode 100644 compose/schema.json

diff --git a/compose/config/config.py b/compose/config/config.py
index 4d3f5fae..1e793d9f 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -3,6 +3,8 @@ import os
 import sys
 import yaml
 from collections import namedtuple
+import json
+import jsonschema
 
 import six
 
@@ -131,13 +133,31 @@ def get_config_path(base_dir):
     return os.path.join(path, winner)
 
 
+def validate_against_schema(config):
+    config_source_dir = os.path.dirname(os.path.abspath(__file__))
+    schema_file = os.path.join(config_source_dir, "schema.json")
+
+    with open(schema_file, "r") as schema_fh:
+        schema = json.load(schema_fh)
+
+    validation_output = jsonschema.Draft4Validator(schema)
+
+    errors = [error.message for error in sorted(validation_output.iter_errors(config), key=str)]
+    if errors:
+        raise ConfigurationError("Validation failed, reason(s): {}".format("\n".join(errors)))
+
+
 def load(config_details):
-    dictionary, working_dir, filename = config_details
-    dictionary = interpolate_environment_variables(dictionary)
+    config, working_dir, filename = config_details
+    config = interpolate_environment_variables(config)
 
     service_dicts = []
 
-    for service_name, service_dict in list(dictionary.items()):
+    validate_against_schema(config)
+
+    for service_name, service_dict in list(config.items()):
+        if not isinstance(service_dict, dict):
+            raise ConfigurationError('Service "%s" doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.' % service_name)
         loader = ServiceLoader(working_dir=working_dir, filename=filename)
         service_dict = loader.make_service_dict(service_name, service_dict)
         validate_paths(service_dict)
@@ -210,25 +230,11 @@ class ServiceLoader(object):
     def validate_extends_options(self, service_name, extends_options):
         error_prefix = "Invalid 'extends' configuration for %s:" % service_name
 
-        if not isinstance(extends_options, dict):
-            raise ConfigurationError("%s must be a dictionary" % error_prefix)
-
-        if 'service' not in extends_options:
-            raise ConfigurationError(
-                "%s you need to specify a service, e.g. 'service: web'" % error_prefix
-            )
-
         if 'file' not in extends_options and self.filename is None:
             raise ConfigurationError(
                 "%s you need to specify a 'file', e.g. 'file: something.yml'" % error_prefix
             )
 
-        for k, _ in extends_options.items():
-            if k not in ['file', 'service']:
-                raise ConfigurationError(
-                    "%s unsupported configuration option '%s'" % (error_prefix, k)
-                )
-
         return extends_options
 
 
@@ -256,9 +262,6 @@ def process_container_options(service_dict, working_dir=None):
 
     service_dict = service_dict.copy()
 
-    if 'memswap_limit' in service_dict and 'mem_limit' not in service_dict:
-        raise ConfigurationError("Invalid 'memswap_limit' configuration for %s service: when defining 'memswap_limit' you must set 'mem_limit' as well" % service_dict['name'])
-
     if 'volumes' in service_dict and service_dict.get('volume_driver') is None:
         service_dict['volumes'] = resolve_volume_paths(service_dict['volumes'], working_dir=working_dir)
 
diff --git a/compose/schema.json b/compose/schema.json
new file mode 100644
index 00000000..7c7e2d09
--- /dev/null
+++ b/compose/schema.json
@@ -0,0 +1,79 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+
+  "patternProperties": {
+    "^[a-zA-Z0-9._-]+$": {
+      "$ref": "#/definitions/service"
+    }
+  },
+
+  "definitions": {
+    "service": {
+      "type": "object",
+
+      "properties": {
+        "build": {"type": "string"},
+        "env_file": {"$ref": "#/definitions/string_or_list"},
+        "environment": {
+          "oneOf": [
+            {"type": "object"},
+            {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
+          ]
+        },
+        "image": {"type": "string"},
+        "mem_limit": {"type": "number"},
+        "memswap_limit": {"type": "number"},
+
+        "extends": {
+          "type": "object",
+
+          "properties": {
+            "service": {"type": "string"},
+            "file": {"type": "string"}
+          },
+          "required": ["service"],
+          "additionalProperties": false
+        }
+
+      },
+
+      "anyOf": [
+        {
+          "required": ["build"],
+          "not": {"required": ["image"]}
+        },
+        {
+          "required": ["image"],
+          "not": {"required": ["build"]}
+        },
+        {
+          "required": ["extends"],
+          "not": {"required": ["build", "image"]}
+        }
+      ],
+
+      "dependencies": {
+        "memswap_limit": ["mem_limit"]
+      }
+
+    },
+
+    "string_or_list": {
+      "oneOf": [
+        {"type": "string"},
+        {"$ref": "#/definitions/list_of_strings"}
+      ]
+    },
+
+    "list_of_strings": {
+      "type": "array",
+      "items": {"type": "string"},
+      "uniqueItems": true
+    }
+
+  },
+
+  "additionalProperties": false
+}
diff --git a/compose/service.py b/compose/service.py
index 2e0490a5..c72365cf 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -82,14 +82,8 @@ ConvergencePlan = namedtuple('ConvergencePlan', 'action containers')
 
 class Service(object):
     def __init__(self, name, client=None, project='default', links=None, external_links=None, volumes_from=None, net=None, **options):
-        if not re.match('^%s+$' % VALID_NAME_CHARS, name):
-            raise ConfigError('Invalid service name "%s" - only %s are allowed' % (name, VALID_NAME_CHARS))
         if not re.match('^%s+$' % VALID_NAME_CHARS, project):
             raise ConfigError('Invalid project name "%s" - only %s are allowed' % (project, VALID_NAME_CHARS))
-        if 'image' in options and 'build' in options:
-            raise ConfigError('Service %s has both an image and build path specified. A service can either be built to image or use an existing image, not both.' % name)
-        if 'image' not in options and 'build' not in options:
-            raise ConfigError('Service %s has neither an image nor a build path specified. Exactly one must be provided.' % name)
 
         self.name = name
         self.client = client
diff --git a/requirements.txt b/requirements.txt
index f9cec837..64168768 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 PyYAML==3.10
+jsonschema==2.5.1
 docker-py==1.3.1
 dockerpty==0.3.4
 docopt==0.6.1
diff --git a/setup.py b/setup.py
index 9bca4752..1f9c981d 100644
--- a/setup.py
+++ b/setup.py
@@ -33,6 +33,7 @@ install_requires = [
     'docker-py >= 1.3.1, < 1.4',
     'dockerpty >= 0.3.4, < 0.4',
     'six >= 1.3.0, < 2',
+    'jsonschema >= 2.5.1, < 3',
 ]
 
 
diff --git a/tests/fixtures/extends/specify-file-as-self.yml b/tests/fixtures/extends/specify-file-as-self.yml
index 7e249976..c24f10bc 100644
--- a/tests/fixtures/extends/specify-file-as-self.yml
+++ b/tests/fixtures/extends/specify-file-as-self.yml
@@ -12,5 +12,6 @@ web:
   environment:
     - "BAZ=3"
 otherweb:
+  image: busybox
   environment:
     - "YEP=1"
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 00462020..3ed394a9 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -20,10 +20,10 @@ class ConfigTest(unittest.TestCase):
             config.ConfigDetails(
                 {
                     'foo': {'image': 'busybox'},
-                    'bar': {'environment': ['FOO=1']},
+                    'bar': {'image': 'busybox', 'environment': ['FOO=1']},
                 },
-                'working_dir',
-                'filename.yml'
+                'tests/fixtures/extends',
+                'common.yml'
             )
         )
 
@@ -32,13 +32,14 @@ class ConfigTest(unittest.TestCase):
             sorted([
                 {
                     'name': 'bar',
+                    'image': 'busybox',
                     'environment': {'FOO': '1'},
                 },
                 {
                     'name': 'foo',
                     'image': 'busybox',
                 }
-            ])
+            ], key=lambda d: d['name'])
         )
 
     def test_load_throws_error_when_not_dict(self):
@@ -327,23 +328,26 @@ class MemoryOptionsTest(unittest.TestCase):
         When you set a 'memswap_limit' it is invalid config unless you also set
         a mem_limit
         """
-        with self.assertRaises(config.ConfigurationError):
-            make_service_dict(
-                'foo', {
-                    'memswap_limit': 2000000,
-                },
-                'tests/'
+        with self.assertRaisesRegexp(config.ConfigurationError, "u'mem_limit' is a dependency of u'memswap_limit'"):
+            config.load(
+                config.ConfigDetails(
+                    {
+                        'foo': {'image': 'busybox', 'memswap_limit': 2000000},
+                    },
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
             )
 
     def test_validation_with_correct_memswap_values(self):
-        service_dict = make_service_dict(
-            'foo', {
-                'mem_limit': 1000000,
-                'memswap_limit': 2000000,
-            },
-            'tests/'
+        service_dict = config.load(
+            config.ConfigDetails(
+                {'foo': {'image': 'busybox', 'mem_limit': 1000000, 'memswap_limit': 2000000}},
+                'tests/fixtures/extends',
+                'common.yml'
+            )
         )
-        self.assertEqual(service_dict['memswap_limit'], 2000000)
+        self.assertEqual(service_dict[0]['memswap_limit'], 2000000)
 
 
 class EnvTest(unittest.TestCase):
@@ -528,6 +532,7 @@ class ExtendsTest(unittest.TestCase):
             {
                 'environment':
                 {'YEP': '1'},
+                'image': 'busybox',
                 'name': 'otherweb'
             },
             {
@@ -553,36 +558,47 @@ class ExtendsTest(unittest.TestCase):
             )
 
     def test_extends_validation_empty_dictionary(self):
-        dictionary = {'extends': None}
-
-        def load_config():
-            return make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
-
-        self.assertRaisesRegexp(config.ConfigurationError, 'dictionary', load_config)
-
-        dictionary['extends'] = {}
-        self.assertRaises(config.ConfigurationError, load_config)
+        with self.assertRaisesRegexp(config.ConfigurationError, 'service'):
+            config.load(
+                config.ConfigDetails(
+                    {
+                        'web': {'image': 'busybox', 'extends': {}},
+                    },
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
+            )
 
     def test_extends_validation_missing_service_key(self):
-        dictionary = {'extends': {'file': 'common.yml'}}
-
-        def load_config():
-            return make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
-
-        self.assertRaisesRegexp(config.ConfigurationError, 'service', load_config)
+        with self.assertRaisesRegexp(config.ConfigurationError, "u'service' is a required property"):
+            config.load(
+                config.ConfigDetails(
+                    {
+                        'web': {'image': 'busybox', 'extends': {'file': 'common.yml'}},
+                    },
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
+            )
 
     def test_extends_validation_invalid_key(self):
-        dictionary = {
-            'extends':
-            {
-                'service': 'web', 'file': 'common.yml', 'what': 'is this'
-            }
-        }
-
-        def load_config():
-            return make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
-
-        self.assertRaisesRegexp(config.ConfigurationError, 'what', load_config)
+        with self.assertRaisesRegexp(config.ConfigurationError, "'rogue_key' was unexpected"):
+            config.load(
+                config.ConfigDetails(
+                    {
+                        'web': {
+                            'image': 'busybox',
+                            'extends': {
+                                'file': 'common.yml',
+                                'service': 'web',
+                                'rogue_key': 'is not allowed'
+                            }
+                        },
+                    },
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
+            )
 
     def test_extends_validation_no_file_key_no_filename_set(self):
         dictionary = {'extends': {'service': 'web'}}
@@ -593,12 +609,18 @@ class ExtendsTest(unittest.TestCase):
         self.assertRaisesRegexp(config.ConfigurationError, 'file', load_config)
 
     def test_extends_validation_valid_config(self):
-        dictionary = {'extends': {'service': 'web', 'file': 'common.yml'}}
+        service = config.load(
+            config.ConfigDetails(
+                {
+                    'web': {'image': 'busybox', 'extends': {'service': 'web', 'file': 'common.yml'}},
+                },
+                'tests/fixtures/extends',
+                'common.yml'
+            )
+        )
 
-        def load_config():
-            return make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
-
-        self.assertIsInstance(load_config(), dict)
+        self.assertEquals(len(service), 1)
+        self.assertIsInstance(service[0], dict)
 
     def test_extends_file_defaults_to_self(self):
         """
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index bc6b9e48..aa348466 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -49,7 +49,6 @@ class ServiceTest(unittest.TestCase):
         Service('.__.', image='foo')
 
     def test_project_validation(self):
-        self.assertRaises(ConfigError, lambda: Service('bar'))
         self.assertRaises(ConfigError, lambda: Service(name='foo', project='>', image='foo'))
 
         Service(name='foo', project='bar.bar__', image='foo')

From 76e6029f2132cfd531d069e57bb2e33060e84eb5 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 29 Jul 2015 16:09:33 +0100
Subject: [PATCH 0166/1265] Replace service tests with config tests

We validate the config against our schema before a service is created
so checking whether a service name is valid at time of instantiation of
the Service class is not needed.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/unit/config_test.py  | 21 +++++++++++++++++++++
 tests/unit/service_test.py | 19 -------------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 3ed394a9..f06cbab6 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -59,6 +59,27 @@ class ConfigTest(unittest.TestCase):
         )
         make_service_dict('foo', {'ports': ['8000']}, 'tests/')
 
+    def test_config_invalid_service_names(self):
+        with self.assertRaises(config.ConfigurationError):
+            for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
+                config.load(
+                    config.ConfigDetails(
+                        {invalid_name: {'image': 'busybox'}},
+                        'working_dir',
+                        'filename.yml'
+                    )
+                )
+
+    def test_config_valid_service_names(self):
+        for valid_name in ['_', '-', '.__.', '_what-up.', 'what_.up----', 'whatup']:
+            config.load(
+                config.ConfigDetails(
+                    {valid_name: {'image': 'busybox'}},
+                    'tests/fixtures/extends',
+                    'common.yml'
+                )
+            )
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index aa348466..a99197e6 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -29,25 +29,6 @@ class ServiceTest(unittest.TestCase):
     def setUp(self):
         self.mock_client = mock.create_autospec(docker.Client)
 
-    def test_name_validations(self):
-        self.assertRaises(ConfigError, lambda: Service(name='', image='foo'))
-
-        self.assertRaises(ConfigError, lambda: Service(name=' ', image='foo'))
-        self.assertRaises(ConfigError, lambda: Service(name='/', image='foo'))
-        self.assertRaises(ConfigError, lambda: Service(name='!', image='foo'))
-        self.assertRaises(ConfigError, lambda: Service(name='\xe2', image='foo'))
-
-        Service('a', image='foo')
-        Service('foo', image='foo')
-        Service('foo-bar', image='foo')
-        Service('foo.bar', image='foo')
-        Service('foo_bar', image='foo')
-        Service('_', image='foo')
-        Service('___', image='foo')
-        Service('-', image='foo')
-        Service('--', image='foo')
-        Service('.__.', image='foo')
-
     def test_project_validation(self):
         self.assertRaises(ConfigError, lambda: Service(name='foo', project='>', image='foo'))
 

From 6c7c5985465d63a70e579ed3e253ca8d0f5d4b06 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 29 Jul 2015 16:37:11 +0100
Subject: [PATCH 0167/1265] Format validation of ports

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py  | 26 ++++++++++++++++++++++++--
 compose/schema.json       | 11 +++++++++++
 tests/unit/config_test.py | 22 ++++++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 1e793d9f..6cffa2fe 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -4,7 +4,7 @@ import sys
 import yaml
 from collections import namedtuple
 import json
-import jsonschema
+from jsonschema import Draft4Validator, FormatChecker, ValidationError
 
 import six
 
@@ -133,6 +133,28 @@ def get_config_path(base_dir):
     return os.path.join(path, winner)
 
 
+@FormatChecker.cls_checks(format="ports", raises=ValidationError("Ports is incorrectly formatted."))
+def format_ports(instance):
+    def _is_valid(port):
+        if ':' in port or '/' in port:
+            return True
+        try:
+            int(port)
+            return True
+        except ValueError:
+            return False
+        return False
+
+    if isinstance(instance, list):
+        for port in instance:
+            if not _is_valid(port):
+                return False
+        return True
+    elif isinstance(instance, str):
+        return _is_valid(instance)
+    return False
+
+
 def validate_against_schema(config):
     config_source_dir = os.path.dirname(os.path.abspath(__file__))
     schema_file = os.path.join(config_source_dir, "schema.json")
@@ -140,7 +162,7 @@ def validate_against_schema(config):
     with open(schema_file, "r") as schema_fh:
         schema = json.load(schema_fh)
 
-    validation_output = jsonschema.Draft4Validator(schema)
+    validation_output = Draft4Validator(schema, format_checker=FormatChecker(["ports"]))
 
     errors = [error.message for error in sorted(validation_output.iter_errors(config), key=str)]
     if errors:
diff --git a/compose/schema.json b/compose/schema.json
index 7c7e2d09..bf43ca36 100644
--- a/compose/schema.json
+++ b/compose/schema.json
@@ -14,6 +14,17 @@
       "type": "object",
 
       "properties": {
+        "ports": {
+          "oneOf": [
+            {"type": "string", "format": "ports"},
+            {
+              "type": "array",
+              "items": {"type": "string"},
+              "uniqueItems": true,
+              "format": "ports"
+            }
+          ]
+        },
         "build": {"type": "string"},
         "env_file": {"$ref": "#/definitions/string_or_list"},
         "environment": {
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index f06cbab6..f7e949d3 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -80,6 +80,28 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_config_invalid_ports_format_validation(self):
+        with self.assertRaises(config.ConfigurationError):
+            for invalid_ports in [{"1": "8000"}, "whatport"]:
+                config.load(
+                    config.ConfigDetails(
+                        {'web': {'image': 'busybox', 'ports': invalid_ports}},
+                        'working_dir',
+                        'filename.yml'
+                    )
+                )
+
+    def test_config_valid_ports_format_validation(self):
+        valid_ports = [["8000", "9000"], "625", "8000:8050", ["8000/8050"]]
+        for ports in valid_ports:
+            config.load(
+                config.ConfigDetails(
+                    {'web': {'image': 'busybox', 'ports': ports}},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)

From 98c7a7da6110e72540810e888eec9d42c8172f9d Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 30 Jul 2015 10:53:41 +0100
Subject: [PATCH 0168/1265] Order properties alphabetically

Improves readability.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/schema.json | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/compose/schema.json b/compose/schema.json
index bf43ca36..3e719fc4 100644
--- a/compose/schema.json
+++ b/compose/schema.json
@@ -14,28 +14,15 @@
       "type": "object",
 
       "properties": {
-        "ports": {
-          "oneOf": [
-            {"type": "string", "format": "ports"},
-            {
-              "type": "array",
-              "items": {"type": "string"},
-              "uniqueItems": true,
-              "format": "ports"
-            }
-          ]
-        },
         "build": {"type": "string"},
         "env_file": {"$ref": "#/definitions/string_or_list"},
+
         "environment": {
           "oneOf": [
             {"type": "object"},
             {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
           ]
         },
-        "image": {"type": "string"},
-        "mem_limit": {"type": "number"},
-        "memswap_limit": {"type": "number"},
 
         "extends": {
           "type": "object",
@@ -46,6 +33,22 @@
           },
           "required": ["service"],
           "additionalProperties": false
+        },
+
+        "image": {"type": "string"},
+        "mem_limit": {"type": "number"},
+        "memswap_limit": {"type": "number"},
+
+        "ports": {
+          "oneOf": [
+            {"type": "string", "format": "ports"},
+            {
+              "type": "array",
+              "items": {"type": "string"},
+              "uniqueItems": true,
+              "format": "ports"
+            }
+          ]
         }
 
       },

From 8d6694085d8e9a80223b6473e1f9a1939b3ef936 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 30 Jul 2015 17:11:28 +0100
Subject: [PATCH 0169/1265] Include remaining valid config properties

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py |  5 ----
 compose/schema.json      | 59 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 6cffa2fe..27f845b7 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -525,11 +525,6 @@ def parse_labels(labels):
     if isinstance(labels, dict):
         return labels
 
-    raise ConfigurationError(
-        "labels \"%s\" must be a list or mapping" %
-        labels
-    )
-
 
 def split_label(label):
     if '=' in label:
diff --git a/compose/schema.json b/compose/schema.json
index 3e719fc4..258f44cc 100644
--- a/compose/schema.json
+++ b/compose/schema.json
@@ -15,6 +15,19 @@
 
       "properties": {
         "build": {"type": "string"},
+        "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "command": {"$ref": "#/definitions/string_or_list"},
+        "container_name": {"type": "string"},
+        "cpu_shares": {"type": "string"},
+        "cpuset": {"type": "string"},
+        "detach": {"type": "boolean"},
+        "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "dns": {"$ref": "#/definitions/string_or_list"},
+        "dns_search": {"$ref": "#/definitions/string_or_list"},
+        "dockerfile": {"type": "string"},
+        "domainname": {"type": "string"},
+        "entrypoint": {"type": "string"},
         "env_file": {"$ref": "#/definitions/string_or_list"},
 
         "environment": {
@@ -24,6 +37,8 @@
           ]
         },
 
+        "expose": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+
         "extends": {
           "type": "object",
 
@@ -35,9 +50,29 @@
           "additionalProperties": false
         },
 
+        "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
+        "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "hostname": {"type": "string"},
         "image": {"type": "string"},
+        "labels": {"$ref": "#/definitions/list_or_dict"},
+        "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "log_driver": {"type": "string"},
+
+        "log_opt": {
+          "type": "object",
+
+          "properties": {
+            "address": {"type": "string"}
+          },
+          "required": ["address"]
+        },
+
+        "mac_address": {"type": "string"},
         "mem_limit": {"type": "number"},
         "memswap_limit": {"type": "number"},
+        "name": {"type": "string"},
+        "net": {"type": "string"},
+        "pid": {"type": "string"},
 
         "ports": {
           "oneOf": [
@@ -49,8 +84,18 @@
               "format": "ports"
             }
           ]
-        }
+        },
 
+        "privileged": {"type": "string"},
+        "read_only": {"type": "boolean"},
+        "restart": {"type": "string"},
+        "security_opt": {"type": "string"},
+        "stdin_open": {"type": "string"},
+        "tty": {"type": "string"},
+        "user": {"type": "string"},
+        "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "volumes_from": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "working_dir": {"type": "string"}
       },
 
       "anyOf": [
@@ -70,8 +115,8 @@
 
       "dependencies": {
         "memswap_limit": ["mem_limit"]
-      }
-
+      },
+      "additionalProperties": false
     },
 
     "string_or_list": {
@@ -85,9 +130,15 @@
       "type": "array",
       "items": {"type": "string"},
       "uniqueItems": true
+    },
+
+    "list_or_dict": {
+      "oneOf": [
+        {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        {"type": "object"}
+      ]
     }
 
   },
-
   "additionalProperties": false
 }

From d8aee782c876e1e6aa1d31ebaaf4fe566018fc26 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 4 Aug 2015 17:43:33 +0100
Subject: [PATCH 0170/1265] Error handling

jsonschema provides a rich error tree of info, by parsing each error
we can pull out relevant info and re-write the error messages.

This covers current error handling behaviour.

This includes new error handling behaviour for types and formatting of
the ports field.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py  | 78 ++++++++++++++++++++++++++++++++++++++-
 compose/service.py        |  4 +-
 tests/unit/config_test.py |  6 ++-
 3 files changed, 81 insertions(+), 7 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 27f845b7..f2a89699 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -18,6 +18,8 @@ from .errors import (
 )
 
 
+VALID_NAME_CHARS = '[a-zA-Z0-9\._\-]'
+
 DOCKER_CONFIG_KEYS = [
     'cap_add',
     'cap_drop',
@@ -155,6 +157,77 @@ def format_ports(instance):
     return False
 
 
+def get_unsupported_config_msg(service_name, error_key):
+    msg = "Unsupported config option for '{}' service: '{}'".format(service_name, error_key)
+    if error_key in DOCKER_CONFIG_HINTS:
+        msg += " (did you mean '{}'?)".format(DOCKER_CONFIG_HINTS[error_key])
+    return msg
+
+
+def process_errors(errors):
+    """
+    jsonschema gives us an error tree full of information to explain what has
+    gone wrong. Process each error and pull out relevant information and re-write
+    helpful error messages that are relevant.
+    """
+    def _parse_key_from_error_msg(error):
+        return error.message.split("'")[1]
+
+    root_msgs = []
+    invalid_keys = []
+    required = []
+    type_errors = []
+
+    for error in errors:
+        # handle root level errors
+        if len(error.path) == 0:
+            if error.validator == 'type':
+                msg = "Top level object needs to be a dictionary. Check your .yml file that you have defined a service at the top level."
+                root_msgs.append(msg)
+            elif error.validator == 'additionalProperties':
+                invalid_service_name = _parse_key_from_error_msg(error)
+                msg = "Invalid service name '{}' - only {} characters are allowed".format(invalid_service_name, VALID_NAME_CHARS)
+                root_msgs.append(msg)
+            else:
+                root_msgs.append(error.message)
+
+        else:
+            # handle service level errors
+            service_name = error.path[0]
+
+            if error.validator == 'additionalProperties':
+                invalid_config_key = _parse_key_from_error_msg(error)
+                invalid_keys.append(get_unsupported_config_msg(service_name, invalid_config_key))
+            elif error.validator == 'anyOf':
+                if 'image' in error.instance and 'build' in error.instance:
+                    required.append("Service '{}' has both an image and build path specified. A service can either be built to image or use an existing image, not both.".format(service_name))
+                elif 'image' not in error.instance and 'build' not in error.instance:
+                    required.append("Service '{}' has neither an image nor a build path specified. Exactly one must be provided.".format(service_name))
+                else:
+                    required.append(error.message)
+            elif error.validator == 'type':
+                msg = "a"
+                if error.validator_value == "array":
+                    msg = "an"
+
+                try:
+                    config_key = error.path[1]
+                    type_errors.append("Service '{}' has an invalid value for '{}', it should be {} {}".format(service_name, config_key, msg, error.validator_value))
+                except IndexError:
+                    config_key = error.path[0]
+                    root_msgs.append("Service '{}' doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.'".format(config_key))
+            elif error.validator == 'required':
+                config_key = error.path[1]
+                required.append("Service '{}' option '{}' is invalid, {}".format(service_name, config_key, error.message))
+            elif error.validator == 'dependencies':
+                dependency_key = error.validator_value.keys()[0]
+                required_keys = ",".join(error.validator_value[dependency_key])
+                required.append("Invalid '{}' configuration for '{}' service: when defining '{}' you must set '{}' as well".format(
+                    dependency_key, service_name, dependency_key, required_keys))
+
+    return "\n".join(root_msgs + invalid_keys + required + type_errors)
+
+
 def validate_against_schema(config):
     config_source_dir = os.path.dirname(os.path.abspath(__file__))
     schema_file = os.path.join(config_source_dir, "schema.json")
@@ -164,9 +237,10 @@ def validate_against_schema(config):
 
     validation_output = Draft4Validator(schema, format_checker=FormatChecker(["ports"]))
 
-    errors = [error.message for error in sorted(validation_output.iter_errors(config), key=str)]
+    errors = [error for error in sorted(validation_output.iter_errors(config), key=str)]
     if errors:
-        raise ConfigurationError("Validation failed, reason(s): {}".format("\n".join(errors)))
+        error_msg = process_errors(errors)
+        raise ConfigurationError("Validation failed, reason(s):\n{}".format(error_msg))
 
 
 def load(config_details):
diff --git a/compose/service.py b/compose/service.py
index c72365cf..103840c3 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -12,7 +12,7 @@ from docker.errors import APIError
 from docker.utils import create_host_config, LogConfig
 
 from . import __version__
-from .config import DOCKER_CONFIG_KEYS, merge_environment
+from .config import DOCKER_CONFIG_KEYS, merge_environment, VALID_NAME_CHARS
 from .const import (
     DEFAULT_TIMEOUT,
     LABEL_CONTAINER_NUMBER,
@@ -49,8 +49,6 @@ DOCKER_START_KEYS = [
     'security_opt',
 ]
 
-VALID_NAME_CHARS = '[a-zA-Z0-9\._\-]'
-
 
 class BuildError(Exception):
     def __init__(self, service, reason):
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index f7e949d3..c0ccead8 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -371,7 +371,8 @@ class MemoryOptionsTest(unittest.TestCase):
         When you set a 'memswap_limit' it is invalid config unless you also set
         a mem_limit
         """
-        with self.assertRaisesRegexp(config.ConfigurationError, "u'mem_limit' is a dependency of u'memswap_limit'"):
+        expected_error_msg = "Invalid 'memswap_limit' configuration for 'foo' service: when defining 'memswap_limit' you must set 'mem_limit' as well"
+        with self.assertRaisesRegexp(config.ConfigurationError, expected_error_msg):
             config.load(
                 config.ConfigDetails(
                     {
@@ -625,7 +626,8 @@ class ExtendsTest(unittest.TestCase):
             )
 
     def test_extends_validation_invalid_key(self):
-        with self.assertRaisesRegexp(config.ConfigurationError, "'rogue_key' was unexpected"):
+        expected_error_msg = "Unsupported config option for 'web' service: 'rogue_key'"
+        with self.assertRaisesRegexp(config.ConfigurationError, expected_error_msg):
             config.load(
                 config.ConfigDetails(
                     {

From ea3608e1f4c5894ebbdc21fddeab4746deda05d8 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 5 Aug 2015 12:33:28 +0100
Subject: [PATCH 0171/1265] Improve test coverage for validation

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/unit/config_test.py | 50 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index c0ccead8..15657f87 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -102,6 +102,56 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_config_hint(self):
+        expected_error_msg = "(did you mean 'privileged'?)"
+        with self.assertRaisesRegexp(config.ConfigurationError, expected_error_msg):
+            config.load(
+                config.ConfigDetails(
+                    {
+                        'foo': {'image': 'busybox', 'privilige': 'something'},
+                    },
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
+            )
+
+    def test_invalid_config_build_and_image_specified(self):
+        expected_error_msg = "Service 'foo' has both an image and build path specified."
+        with self.assertRaisesRegexp(config.ConfigurationError, expected_error_msg):
+            config.load(
+                config.ConfigDetails(
+                    {
+                        'foo': {'image': 'busybox', 'build': '.'},
+                    },
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
+            )
+
+    def test_invalid_config_type_should_be_an_array(self):
+        expected_error_msg = "Service 'foo' has an invalid value for 'links', it should be an array"
+        with self.assertRaisesRegexp(config.ConfigurationError, expected_error_msg):
+            config.load(
+                config.ConfigDetails(
+                    {
+                        'foo': {'image': 'busybox', 'links': 'an_link'},
+                    },
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
+            )
+
+    def test_invalid_config_not_a_dictionary(self):
+        expected_error_msg = "Top level object needs to be a dictionary."
+        with self.assertRaisesRegexp(config.ConfigurationError, expected_error_msg):
+            config.load(
+                config.ConfigDetails(
+                    ['foo', 'lol'],
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
+            )
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)

From 0557b5dce6cbebe7bc24f415f4138d487524319b Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 5 Aug 2015 15:28:05 +0100
Subject: [PATCH 0172/1265] Remove dead code

These functions weren't being called by anything.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index f2a89699..31e5e916 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -252,8 +252,6 @@ def load(config_details):
     validate_against_schema(config)
 
     for service_name, service_dict in list(config.items()):
-        if not isinstance(service_dict, dict):
-            raise ConfigurationError('Service "%s" doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.' % service_name)
         loader = ServiceLoader(working_dir=working_dir, filename=filename)
         service_dict = loader.make_service_dict(service_name, service_dict)
         validate_paths(service_dict)
@@ -427,18 +425,6 @@ def merge_environment(base, override):
     return env
 
 
-def parse_links(links):
-    return dict(parse_link(l) for l in links)
-
-
-def parse_link(link):
-    if ':' in link:
-        source, alias = link.split(':', 1)
-        return (alias, source)
-    else:
-        return (link, link)
-
-
 def get_env_files(options, working_dir=None):
     if 'env_file' not in options:
         return {}

From 2e428f94ca3e0333a5b8b6469cb6fd528041cbe7 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 6 Aug 2015 16:56:45 +0100
Subject: [PATCH 0173/1265] Refactor validation out

Move validation out into its own file without causing circular
import errors.

Fix some of the tests to import from the right place.

Also fix tests that were not using valid test data, as the validation
schema is now firing telling you that you couldn't "just" have this
dict without a build/image config key.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py         | 145 ++-----------------------------
 compose/{ => config}/schema.json |   0
 compose/config/validation.py     | 134 ++++++++++++++++++++++++++++
 compose/service.py               |   3 +-
 tests/unit/config_test.py        |  50 +++++------
 5 files changed, 165 insertions(+), 167 deletions(-)
 rename compose/{ => config}/schema.json (100%)
 create mode 100644 compose/config/validation.py

diff --git a/compose/config/config.py b/compose/config/config.py
index 31e5e916..c1cfdb73 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -3,9 +3,6 @@ import os
 import sys
 import yaml
 from collections import namedtuple
-import json
-from jsonschema import Draft4Validator, FormatChecker, ValidationError
-
 import six
 
 from compose.cli.utils import find_candidates_in_parent_dirs
@@ -16,10 +13,9 @@ from .errors import (
     CircularReference,
     ComposeFileNotFound,
 )
+from .validation import validate_against_schema
 
 
-VALID_NAME_CHARS = '[a-zA-Z0-9\._\-]'
-
 DOCKER_CONFIG_KEYS = [
     'cap_add',
     'cap_drop',
@@ -69,22 +65,6 @@ ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
     'name',
 ]
 
-DOCKER_CONFIG_HINTS = {
-    'cpu_share': 'cpu_shares',
-    'add_host': 'extra_hosts',
-    'hosts': 'extra_hosts',
-    'extra_host': 'extra_hosts',
-    'device': 'devices',
-    'link': 'links',
-    'memory_swap': 'memswap_limit',
-    'port': 'ports',
-    'privilege': 'privileged',
-    'priviliged': 'privileged',
-    'privilige': 'privileged',
-    'volume': 'volumes',
-    'workdir': 'working_dir',
-}
-
 
 SUPPORTED_FILENAMES = [
     'docker-compose.yml',
@@ -135,122 +115,18 @@ def get_config_path(base_dir):
     return os.path.join(path, winner)
 
 
-@FormatChecker.cls_checks(format="ports", raises=ValidationError("Ports is incorrectly formatted."))
-def format_ports(instance):
-    def _is_valid(port):
-        if ':' in port or '/' in port:
-            return True
-        try:
-            int(port)
-            return True
-        except ValueError:
-            return False
-        return False
-
-    if isinstance(instance, list):
-        for port in instance:
-            if not _is_valid(port):
-                return False
-        return True
-    elif isinstance(instance, str):
-        return _is_valid(instance)
-    return False
-
-
-def get_unsupported_config_msg(service_name, error_key):
-    msg = "Unsupported config option for '{}' service: '{}'".format(service_name, error_key)
-    if error_key in DOCKER_CONFIG_HINTS:
-        msg += " (did you mean '{}'?)".format(DOCKER_CONFIG_HINTS[error_key])
-    return msg
-
-
-def process_errors(errors):
-    """
-    jsonschema gives us an error tree full of information to explain what has
-    gone wrong. Process each error and pull out relevant information and re-write
-    helpful error messages that are relevant.
-    """
-    def _parse_key_from_error_msg(error):
-        return error.message.split("'")[1]
-
-    root_msgs = []
-    invalid_keys = []
-    required = []
-    type_errors = []
-
-    for error in errors:
-        # handle root level errors
-        if len(error.path) == 0:
-            if error.validator == 'type':
-                msg = "Top level object needs to be a dictionary. Check your .yml file that you have defined a service at the top level."
-                root_msgs.append(msg)
-            elif error.validator == 'additionalProperties':
-                invalid_service_name = _parse_key_from_error_msg(error)
-                msg = "Invalid service name '{}' - only {} characters are allowed".format(invalid_service_name, VALID_NAME_CHARS)
-                root_msgs.append(msg)
-            else:
-                root_msgs.append(error.message)
-
-        else:
-            # handle service level errors
-            service_name = error.path[0]
-
-            if error.validator == 'additionalProperties':
-                invalid_config_key = _parse_key_from_error_msg(error)
-                invalid_keys.append(get_unsupported_config_msg(service_name, invalid_config_key))
-            elif error.validator == 'anyOf':
-                if 'image' in error.instance and 'build' in error.instance:
-                    required.append("Service '{}' has both an image and build path specified. A service can either be built to image or use an existing image, not both.".format(service_name))
-                elif 'image' not in error.instance and 'build' not in error.instance:
-                    required.append("Service '{}' has neither an image nor a build path specified. Exactly one must be provided.".format(service_name))
-                else:
-                    required.append(error.message)
-            elif error.validator == 'type':
-                msg = "a"
-                if error.validator_value == "array":
-                    msg = "an"
-
-                try:
-                    config_key = error.path[1]
-                    type_errors.append("Service '{}' has an invalid value for '{}', it should be {} {}".format(service_name, config_key, msg, error.validator_value))
-                except IndexError:
-                    config_key = error.path[0]
-                    root_msgs.append("Service '{}' doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.'".format(config_key))
-            elif error.validator == 'required':
-                config_key = error.path[1]
-                required.append("Service '{}' option '{}' is invalid, {}".format(service_name, config_key, error.message))
-            elif error.validator == 'dependencies':
-                dependency_key = error.validator_value.keys()[0]
-                required_keys = ",".join(error.validator_value[dependency_key])
-                required.append("Invalid '{}' configuration for '{}' service: when defining '{}' you must set '{}' as well".format(
-                    dependency_key, service_name, dependency_key, required_keys))
-
-    return "\n".join(root_msgs + invalid_keys + required + type_errors)
-
-
-def validate_against_schema(config):
-    config_source_dir = os.path.dirname(os.path.abspath(__file__))
-    schema_file = os.path.join(config_source_dir, "schema.json")
-
-    with open(schema_file, "r") as schema_fh:
-        schema = json.load(schema_fh)
-
-    validation_output = Draft4Validator(schema, format_checker=FormatChecker(["ports"]))
-
-    errors = [error for error in sorted(validation_output.iter_errors(config), key=str)]
-    if errors:
-        error_msg = process_errors(errors)
-        raise ConfigurationError("Validation failed, reason(s):\n{}".format(error_msg))
-
-
 def load(config_details):
     config, working_dir, filename = config_details
+    if not isinstance(config, dict):
+        raise ConfigurationError(
+            "Top level object needs to be a dictionary. Check your .yml file that you have defined a service at the top level."
+        )
+
     config = interpolate_environment_variables(config)
+    validate_against_schema(config)
 
     service_dicts = []
 
-    validate_against_schema(config)
-
     for service_name, service_dict in list(config.items()):
         loader = ServiceLoader(working_dir=working_dir, filename=filename)
         service_dict = loader.make_service_dict(service_name, service_dict)
@@ -347,13 +223,6 @@ def validate_extended_service_dict(service_dict, filename, service):
 
 
 def process_container_options(service_dict, working_dir=None):
-    for k in service_dict:
-        if k not in ALLOWED_KEYS:
-            msg = "Unsupported config option for %s service: '%s'" % (service_dict['name'], k)
-            if k in DOCKER_CONFIG_HINTS:
-                msg += " (did you mean '%s'?)" % DOCKER_CONFIG_HINTS[k]
-            raise ConfigurationError(msg)
-
     service_dict = service_dict.copy()
 
     if 'volumes' in service_dict and service_dict.get('volume_driver') is None:
diff --git a/compose/schema.json b/compose/config/schema.json
similarity index 100%
rename from compose/schema.json
rename to compose/config/schema.json
diff --git a/compose/config/validation.py b/compose/config/validation.py
new file mode 100644
index 00000000..ba5803de
--- /dev/null
+++ b/compose/config/validation.py
@@ -0,0 +1,134 @@
+import os
+
+import json
+from jsonschema import Draft4Validator, FormatChecker, ValidationError
+
+from .errors import ConfigurationError
+
+
+DOCKER_CONFIG_HINTS = {
+    'cpu_share': 'cpu_shares',
+    'add_host': 'extra_hosts',
+    'hosts': 'extra_hosts',
+    'extra_host': 'extra_hosts',
+    'device': 'devices',
+    'link': 'links',
+    'memory_swap': 'memswap_limit',
+    'port': 'ports',
+    'privilege': 'privileged',
+    'priviliged': 'privileged',
+    'privilige': 'privileged',
+    'volume': 'volumes',
+    'workdir': 'working_dir',
+}
+
+
+VALID_NAME_CHARS = '[a-zA-Z0-9\._\-]'
+
+
+@FormatChecker.cls_checks(format="ports", raises=ValidationError("Ports is incorrectly formatted."))
+def format_ports(instance):
+    def _is_valid(port):
+        if ':' in port or '/' in port:
+            return True
+        try:
+            int(port)
+            return True
+        except ValueError:
+            return False
+        return False
+
+    if isinstance(instance, list):
+        for port in instance:
+            if not _is_valid(port):
+                return False
+        return True
+    elif isinstance(instance, str):
+        return _is_valid(instance)
+    return False
+
+
+def get_unsupported_config_msg(service_name, error_key):
+    msg = "Unsupported config option for '{}' service: '{}'".format(service_name, error_key)
+    if error_key in DOCKER_CONFIG_HINTS:
+        msg += " (did you mean '{}'?)".format(DOCKER_CONFIG_HINTS[error_key])
+    return msg
+
+
+def process_errors(errors):
+    """
+    jsonschema gives us an error tree full of information to explain what has
+    gone wrong. Process each error and pull out relevant information and re-write
+    helpful error messages that are relevant.
+    """
+    def _parse_key_from_error_msg(error):
+        return error.message.split("'")[1]
+
+    root_msgs = []
+    invalid_keys = []
+    required = []
+    type_errors = []
+
+    for error in errors:
+        # handle root level errors
+        if len(error.path) == 0:
+            if error.validator == 'type':
+                msg = "Top level object needs to be a dictionary. Check your .yml file that you have defined a service at the top level."
+                root_msgs.append(msg)
+            elif error.validator == 'additionalProperties':
+                invalid_service_name = _parse_key_from_error_msg(error)
+                msg = "Invalid service name '{}' - only {} characters are allowed".format(invalid_service_name, VALID_NAME_CHARS)
+                root_msgs.append(msg)
+            else:
+                root_msgs.append(error.message)
+
+        else:
+            # handle service level errors
+            service_name = error.path[0]
+
+            if error.validator == 'additionalProperties':
+                invalid_config_key = _parse_key_from_error_msg(error)
+                invalid_keys.append(get_unsupported_config_msg(service_name, invalid_config_key))
+            elif error.validator == 'anyOf':
+                if 'image' in error.instance and 'build' in error.instance:
+                    required.append("Service '{}' has both an image and build path specified. A service can either be built to image or use an existing image, not both.".format(service_name))
+                elif 'image' not in error.instance and 'build' not in error.instance:
+                    required.append("Service '{}' has neither an image nor a build path specified. Exactly one must be provided.".format(service_name))
+                else:
+                    required.append(error.message)
+            elif error.validator == 'type':
+                msg = "a"
+                if error.validator_value == "array":
+                    msg = "an"
+
+                try:
+                    config_key = error.path[1]
+                    type_errors.append("Service '{}' has an invalid value for '{}', it should be {} {}".format(service_name, config_key, msg, error.validator_value))
+                except IndexError:
+                    config_key = error.path[0]
+                    root_msgs.append("Service '{}' doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.'".format(config_key))
+            elif error.validator == 'required':
+                config_key = error.path[1]
+                required.append("Service '{}' option '{}' is invalid, {}".format(service_name, config_key, error.message))
+            elif error.validator == 'dependencies':
+                dependency_key = error.validator_value.keys()[0]
+                required_keys = ",".join(error.validator_value[dependency_key])
+                required.append("Invalid '{}' configuration for '{}' service: when defining '{}' you must set '{}' as well".format(
+                    dependency_key, service_name, dependency_key, required_keys))
+
+    return "\n".join(root_msgs + invalid_keys + required + type_errors)
+
+
+def validate_against_schema(config):
+    config_source_dir = os.path.dirname(os.path.abspath(__file__))
+    schema_file = os.path.join(config_source_dir, "schema.json")
+
+    with open(schema_file, "r") as schema_fh:
+        schema = json.load(schema_fh)
+
+    validation_output = Draft4Validator(schema, format_checker=FormatChecker(["ports"]))
+
+    errors = [error for error in sorted(validation_output.iter_errors(config), key=str)]
+    if errors:
+        error_msg = process_errors(errors)
+        raise ConfigurationError("Validation failed, reason(s):\n{}".format(error_msg))
diff --git a/compose/service.py b/compose/service.py
index 103840c3..9b5e5928 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -12,7 +12,7 @@ from docker.errors import APIError
 from docker.utils import create_host_config, LogConfig
 
 from . import __version__
-from .config import DOCKER_CONFIG_KEYS, merge_environment, VALID_NAME_CHARS
+from .config import DOCKER_CONFIG_KEYS, merge_environment
 from .const import (
     DEFAULT_TIMEOUT,
     LABEL_CONTAINER_NUMBER,
@@ -26,6 +26,7 @@ from .container import Container
 from .legacy import check_for_legacy_containers
 from .progress_stream import stream_output, StreamOutputError
 from .utils import json_hash, parallel_execute
+from .config.validation import VALID_NAME_CHARS
 
 log = logging.getLogger(__name__)
 
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 15657f87..9f690f11 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -5,6 +5,7 @@ import tempfile
 from .. import unittest
 
 from compose.config import config
+from compose.config.errors import ConfigurationError
 
 
 def make_service_dict(name, service_dict, working_dir):
@@ -43,7 +44,7 @@ class ConfigTest(unittest.TestCase):
         )
 
     def test_load_throws_error_when_not_dict(self):
-        with self.assertRaises(config.ConfigurationError):
+        with self.assertRaises(ConfigurationError):
             config.load(
                 config.ConfigDetails(
                     {'web': 'busybox:latest'},
@@ -52,15 +53,8 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-    def test_config_validation(self):
-        self.assertRaises(
-            config.ConfigurationError,
-            lambda: make_service_dict('foo', {'port': ['8000']}, 'tests/')
-        )
-        make_service_dict('foo', {'ports': ['8000']}, 'tests/')
-
     def test_config_invalid_service_names(self):
-        with self.assertRaises(config.ConfigurationError):
+        with self.assertRaises(ConfigurationError):
             for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
                 config.load(
                     config.ConfigDetails(
@@ -81,7 +75,7 @@ class ConfigTest(unittest.TestCase):
             )
 
     def test_config_invalid_ports_format_validation(self):
-        with self.assertRaises(config.ConfigurationError):
+        with self.assertRaises(ConfigurationError):
             for invalid_ports in [{"1": "8000"}, "whatport"]:
                 config.load(
                     config.ConfigDetails(
@@ -104,7 +98,7 @@ class ConfigTest(unittest.TestCase):
 
     def test_config_hint(self):
         expected_error_msg = "(did you mean 'privileged'?)"
-        with self.assertRaisesRegexp(config.ConfigurationError, expected_error_msg):
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 config.ConfigDetails(
                     {
@@ -117,7 +111,7 @@ class ConfigTest(unittest.TestCase):
 
     def test_invalid_config_build_and_image_specified(self):
         expected_error_msg = "Service 'foo' has both an image and build path specified."
-        with self.assertRaisesRegexp(config.ConfigurationError, expected_error_msg):
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 config.ConfigDetails(
                     {
@@ -130,7 +124,7 @@ class ConfigTest(unittest.TestCase):
 
     def test_invalid_config_type_should_be_an_array(self):
         expected_error_msg = "Service 'foo' has an invalid value for 'links', it should be an array"
-        with self.assertRaisesRegexp(config.ConfigurationError, expected_error_msg):
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 config.ConfigDetails(
                     {
@@ -143,7 +137,7 @@ class ConfigTest(unittest.TestCase):
 
     def test_invalid_config_not_a_dictionary(self):
         expected_error_msg = "Top level object needs to be a dictionary."
-        with self.assertRaisesRegexp(config.ConfigurationError, expected_error_msg):
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 config.ConfigDetails(
                     ['foo', 'lol'],
@@ -198,7 +192,7 @@ class InterpolationTest(unittest.TestCase):
         os.environ['VOLUME_PATH'] = '/host/path'
         d = config.load(
             config.ConfigDetails(
-                config={'foo': {'volumes': ['${VOLUME_PATH}:/container/path']}},
+                config={'foo': {'build': '.', 'volumes': ['${VOLUME_PATH}:/container/path']}},
                 working_dir='.',
                 filename=None,
             )
@@ -422,7 +416,7 @@ class MemoryOptionsTest(unittest.TestCase):
         a mem_limit
         """
         expected_error_msg = "Invalid 'memswap_limit' configuration for 'foo' service: when defining 'memswap_limit' you must set 'mem_limit' as well"
-        with self.assertRaisesRegexp(config.ConfigurationError, expected_error_msg):
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 config.ConfigDetails(
                     {
@@ -465,7 +459,7 @@ class EnvTest(unittest.TestCase):
         self.assertEqual(config.parse_environment(environment), environment)
 
     def test_parse_environment_invalid(self):
-        with self.assertRaises(config.ConfigurationError):
+        with self.assertRaises(ConfigurationError):
             config.parse_environment('a=b')
 
     def test_parse_environment_empty(self):
@@ -519,7 +513,7 @@ class EnvTest(unittest.TestCase):
     def test_env_nonexistent_file(self):
         options = {'env_file': 'nonexistent.env'}
         self.assertRaises(
-            config.ConfigurationError,
+            ConfigurationError,
             lambda: make_service_dict('foo', options, 'tests/fixtures/env'),
         )
 
@@ -545,7 +539,7 @@ class EnvTest(unittest.TestCase):
 
         service_dict = config.load(
             config.ConfigDetails(
-                config={'foo': {'volumes': ['$HOSTENV:$CONTAINERENV']}},
+                config={'foo': {'build': '.', 'volumes': ['$HOSTENV:$CONTAINERENV']}},
                 working_dir="tests/fixtures/env",
                 filename=None,
             )
@@ -554,7 +548,7 @@ class EnvTest(unittest.TestCase):
 
         service_dict = config.load(
             config.ConfigDetails(
-                config={'foo': {'volumes': ['/opt${HOSTENV}:/opt${CONTAINERENV}']}},
+                config={'foo': {'build': '.', 'volumes': ['/opt${HOSTENV}:/opt${CONTAINERENV}']}},
                 working_dir="tests/fixtures/env",
                 filename=None,
             )
@@ -652,7 +646,7 @@ class ExtendsTest(unittest.TestCase):
             )
 
     def test_extends_validation_empty_dictionary(self):
-        with self.assertRaisesRegexp(config.ConfigurationError, 'service'):
+        with self.assertRaisesRegexp(ConfigurationError, 'service'):
             config.load(
                 config.ConfigDetails(
                     {
@@ -664,7 +658,7 @@ class ExtendsTest(unittest.TestCase):
             )
 
     def test_extends_validation_missing_service_key(self):
-        with self.assertRaisesRegexp(config.ConfigurationError, "u'service' is a required property"):
+        with self.assertRaisesRegexp(ConfigurationError, "u'service' is a required property"):
             config.load(
                 config.ConfigDetails(
                     {
@@ -677,7 +671,7 @@ class ExtendsTest(unittest.TestCase):
 
     def test_extends_validation_invalid_key(self):
         expected_error_msg = "Unsupported config option for 'web' service: 'rogue_key'"
-        with self.assertRaisesRegexp(config.ConfigurationError, expected_error_msg):
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 config.ConfigDetails(
                     {
@@ -701,7 +695,7 @@ class ExtendsTest(unittest.TestCase):
         def load_config():
             return make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
 
-        self.assertRaisesRegexp(config.ConfigurationError, 'file', load_config)
+        self.assertRaisesRegexp(ConfigurationError, 'file', load_config)
 
     def test_extends_validation_valid_config(self):
         service = config.load(
@@ -750,19 +744,19 @@ class ExtendsTest(unittest.TestCase):
                 }
             }, '.')
 
-        with self.assertRaisesRegexp(config.ConfigurationError, 'links'):
+        with self.assertRaisesRegexp(ConfigurationError, 'links'):
             other_config = {'web': {'links': ['db']}}
 
             with mock.patch.object(config, 'load_yaml', return_value=other_config):
                 print load_config()
 
-        with self.assertRaisesRegexp(config.ConfigurationError, 'volumes_from'):
+        with self.assertRaisesRegexp(ConfigurationError, 'volumes_from'):
             other_config = {'web': {'volumes_from': ['db']}}
 
             with mock.patch.object(config, 'load_yaml', return_value=other_config):
                 print load_config()
 
-        with self.assertRaisesRegexp(config.ConfigurationError, 'net'):
+        with self.assertRaisesRegexp(ConfigurationError, 'net'):
             other_config = {'web': {'net': 'container:db'}}
 
             with mock.patch.object(config, 'load_yaml', return_value=other_config):
@@ -804,7 +798,7 @@ class BuildPathTest(unittest.TestCase):
         self.abs_context_path = os.path.join(os.getcwd(), 'tests/fixtures/build-ctx')
 
     def test_nonexistent_path(self):
-        with self.assertRaises(config.ConfigurationError):
+        with self.assertRaises(ConfigurationError):
             config.load(
                 config.ConfigDetails(
                     {

From df74b131ff8ca8f6055a1e16d4e9c7ff56462370 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 7 Aug 2015 15:26:26 +0100
Subject: [PATCH 0174/1265] Use split_port for ports format check

Rather than implement the logic a second time, use docker-py
split_port function to test if the ports is valid.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/schema.json   | 13 ++++---------
 compose/config/validation.py | 24 ++++++------------------
 tests/unit/config_test.py    |  4 ++--
 3 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/compose/config/schema.json b/compose/config/schema.json
index 258f44cc..74f5edbb 100644
--- a/compose/config/schema.json
+++ b/compose/config/schema.json
@@ -75,15 +75,10 @@
         "pid": {"type": "string"},
 
         "ports": {
-          "oneOf": [
-            {"type": "string", "format": "ports"},
-            {
-              "type": "array",
-              "items": {"type": "string"},
-              "uniqueItems": true,
-              "format": "ports"
-            }
-          ]
+          "type": "array",
+          "items": {"type": "string"},
+          "uniqueItems": true,
+          "format": "ports"
         },
 
         "privileged": {"type": "string"},
diff --git a/compose/config/validation.py b/compose/config/validation.py
index ba5803de..15e0754c 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -1,5 +1,6 @@
 import os
 
+from docker.utils.ports import split_port
 import json
 from jsonschema import Draft4Validator, FormatChecker, ValidationError
 
@@ -26,26 +27,13 @@ DOCKER_CONFIG_HINTS = {
 VALID_NAME_CHARS = '[a-zA-Z0-9\._\-]'
 
 
-@FormatChecker.cls_checks(format="ports", raises=ValidationError("Ports is incorrectly formatted."))
+@FormatChecker.cls_checks(format="ports", raises=ValidationError("Invalid port formatting, it should be '[[remote_ip:]remote_port:]port[/protocol]'"))
 def format_ports(instance):
-    def _is_valid(port):
-        if ':' in port or '/' in port:
-            return True
-        try:
-            int(port)
-            return True
-        except ValueError:
-            return False
+    try:
+        split_port(instance)
+    except ValueError:
         return False
-
-    if isinstance(instance, list):
-        for port in instance:
-            if not _is_valid(port):
-                return False
-        return True
-    elif isinstance(instance, str):
-        return _is_valid(instance)
-    return False
+    return True
 
 
 def get_unsupported_config_msg(service_name, error_key):
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 9f690f11..4e982bb4 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -76,7 +76,7 @@ class ConfigTest(unittest.TestCase):
 
     def test_config_invalid_ports_format_validation(self):
         with self.assertRaises(ConfigurationError):
-            for invalid_ports in [{"1": "8000"}, "whatport"]:
+            for invalid_ports in [{"1": "8000"}, "whatport", "625", "8000:8050"]:
                 config.load(
                     config.ConfigDetails(
                         {'web': {'image': 'busybox', 'ports': invalid_ports}},
@@ -86,7 +86,7 @@ class ConfigTest(unittest.TestCase):
                 )
 
     def test_config_valid_ports_format_validation(self):
-        valid_ports = [["8000", "9000"], "625", "8000:8050", ["8000/8050"]]
+        valid_ports = [["8000", "9000"], ["8000/8050"], ["8000"]]
         for ports in valid_ports:
             config.load(
                 config.ConfigDetails(

From 297941e460bbd1556e4fa5b81ee5816f3f4b0773 Mon Sep 17 00:00:00 2001
From: Yuval Kohavi <yuval.kohavi@gmail.com>
Date: Mon, 6 Jul 2015 12:15:50 -0400
Subject: [PATCH 0175/1265] rebasing port range changes

Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
---
 compose/service.py                            |  47 ++-----
 .../ports-composefile/docker-compose.yml      |   1 +
 tests/integration/cli_test.py                 |   5 +-
 tests/unit/service_test.py                    | 127 ++++--------------
 4 files changed, 40 insertions(+), 140 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 2e0490a5..07f268c2 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -10,6 +10,7 @@ from operator import attrgetter
 import six
 from docker.errors import APIError
 from docker.utils import create_host_config, LogConfig
+from docker.utils.ports import build_port_bindings, split_port
 
 from . import __version__
 from .config import DOCKER_CONFIG_KEYS, merge_environment
@@ -599,13 +600,13 @@ class Service(object):
         if 'ports' in container_options or 'expose' in self.options:
             ports = []
             all_ports = container_options.get('ports', []) + self.options.get('expose', [])
-            for port in all_ports:
-                port = str(port)
-                if ':' in port:
-                    port = port.split(':')[-1]
-                if '/' in port:
-                    port = tuple(port.split('/'))
-                ports.append(port)
+            for port_range in all_ports:
+                internal_range, _ = split_port(port_range)
+                for port in internal_range:
+                    port = str(port)
+                    if '/' in port:
+                        port = tuple(port.split('/'))
+                    ports.append(port)
             container_options['ports'] = ports
 
         override_options['binds'] = merge_volume_bindings(
@@ -859,38 +860,6 @@ def parse_volume_spec(volume_config):
 
     return VolumeSpec(external, internal, mode)
 
-
-# Ports
-
-
-def build_port_bindings(ports):
-    port_bindings = {}
-    for port in ports:
-        internal_port, external = split_port(port)
-        if internal_port in port_bindings:
-            port_bindings[internal_port].append(external)
-        else:
-            port_bindings[internal_port] = [external]
-    return port_bindings
-
-
-def split_port(port):
-    parts = str(port).split(':')
-    if not 1 <= len(parts) <= 3:
-        raise ConfigError('Invalid port "%s", should be '
-                          '[[remote_ip:]remote_port:]port[/protocol]' % port)
-
-    if len(parts) == 1:
-        internal_port, = parts
-        return internal_port, None
-    if len(parts) == 2:
-        external_port, internal_port = parts
-        return internal_port, external_port
-
-    external_ip, external_port, internal_port = parts
-    return internal_port, (external_ip, external_port or None)
-
-
 # Labels
 
 
diff --git a/tests/fixtures/ports-composefile/docker-compose.yml b/tests/fixtures/ports-composefile/docker-compose.yml
index 9496ee08..c213068d 100644
--- a/tests/fixtures/ports-composefile/docker-compose.yml
+++ b/tests/fixtures/ports-composefile/docker-compose.yml
@@ -5,3 +5,4 @@ simple:
   ports:
     - '3000'
     - '49152:3001'
+    - '49153-49154:3002-3003'
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 0e86c279..e844fa2a 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -334,6 +334,7 @@ class CLITestCase(DockerClientTestCase):
         # get port information
         port_random = container.get_local_port(3000)
         port_assigned = container.get_local_port(3001)
+        port_range = container.get_local_port(3002), container.get_local_port(3003)
 
         # close all one off containers we just created
         container.stop()
@@ -342,6 +343,8 @@ class CLITestCase(DockerClientTestCase):
         self.assertNotEqual(port_random, None)
         self.assertIn("0.0.0.0", port_random)
         self.assertEqual(port_assigned, "0.0.0.0:49152")
+        self.assertEqual(port_range[0], "0.0.0.0:49153")
+        self.assertEqual(port_range[1], "0.0.0.0:49154")
 
     def test_rm(self):
         service = self.project.get_service('simple')
@@ -456,7 +459,7 @@ class CLITestCase(DockerClientTestCase):
 
         self.assertEqual(get_port(3000), container.get_local_port(3000))
         self.assertEqual(get_port(3001), "0.0.0.0:49152")
-        self.assertEqual(get_port(3002), "")
+        self.assertEqual(get_port(3002), "0.0.0.0:49153")
 
     def test_port_with_scale(self):
 
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index bc6b9e48..151fcee9 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -5,7 +5,6 @@ from .. import unittest
 import mock
 
 import docker
-from docker.utils import LogConfig
 
 from compose.service import Service
 from compose.container import Container
@@ -13,14 +12,11 @@ from compose.const import LABEL_SERVICE, LABEL_PROJECT, LABEL_ONE_OFF
 from compose.service import (
     ConfigError,
     NeedsBuildError,
-    NoSuchImageError,
-    build_port_bindings,
     build_volume_binding,
     get_container_data_volumes,
     merge_volume_bindings,
     parse_repository_tag,
     parse_volume_spec,
-    split_port,
 )
 
 
@@ -108,48 +104,6 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(service._get_volumes_from(), [container_id])
         from_service.create_container.assert_called_once_with()
 
-    def test_split_port_with_host_ip(self):
-        internal_port, external_port = split_port("127.0.0.1:1000:2000")
-        self.assertEqual(internal_port, "2000")
-        self.assertEqual(external_port, ("127.0.0.1", "1000"))
-
-    def test_split_port_with_protocol(self):
-        internal_port, external_port = split_port("127.0.0.1:1000:2000/udp")
-        self.assertEqual(internal_port, "2000/udp")
-        self.assertEqual(external_port, ("127.0.0.1", "1000"))
-
-    def test_split_port_with_host_ip_no_port(self):
-        internal_port, external_port = split_port("127.0.0.1::2000")
-        self.assertEqual(internal_port, "2000")
-        self.assertEqual(external_port, ("127.0.0.1", None))
-
-    def test_split_port_with_host_port(self):
-        internal_port, external_port = split_port("1000:2000")
-        self.assertEqual(internal_port, "2000")
-        self.assertEqual(external_port, "1000")
-
-    def test_split_port_no_host_port(self):
-        internal_port, external_port = split_port("2000")
-        self.assertEqual(internal_port, "2000")
-        self.assertEqual(external_port, None)
-
-    def test_split_port_invalid(self):
-        with self.assertRaises(ConfigError):
-            split_port("0.0.0.0:1000:2000:tcp")
-
-    def test_build_port_bindings_with_one_port(self):
-        port_bindings = build_port_bindings(["127.0.0.1:1000:1000"])
-        self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
-
-    def test_build_port_bindings_with_matching_internal_ports(self):
-        port_bindings = build_port_bindings(["127.0.0.1:1000:1000", "127.0.0.1:2000:1000"])
-        self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])
-
-    def test_build_port_bindings_with_nonmatching_internal_ports(self):
-        port_bindings = build_port_bindings(["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
-        self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
-        self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])
-
     def test_split_domainname_none(self):
         service = Service('foo', image='foo', hostname='name', client=self.mock_client)
         self.mock_client.containers.return_value = []
@@ -157,23 +111,6 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(opts['hostname'], 'name', 'hostname')
         self.assertFalse('domainname' in opts, 'domainname')
 
-    def test_memory_swap_limit(self):
-        service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, mem_limit=1000000000, memswap_limit=2000000000)
-        self.mock_client.containers.return_value = []
-        opts = service._get_container_create_options({'some': 'overrides'}, 1)
-        self.assertEqual(opts['memswap_limit'], 2000000000)
-        self.assertEqual(opts['mem_limit'], 1000000000)
-
-    def test_log_opt(self):
-        log_opt = {'address': 'tcp://192.168.0.42:123'}
-        service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, log_driver='syslog', log_opt=log_opt)
-        self.mock_client.containers.return_value = []
-        opts = service._get_container_create_options({'some': 'overrides'}, 1)
-
-        self.assertIsInstance(opts['host_config']['LogConfig'], LogConfig)
-        self.assertEqual(opts['host_config']['LogConfig'].type, 'syslog')
-        self.assertEqual(opts['host_config']['LogConfig'].config, log_opt)
-
     def test_split_domainname_fqdn(self):
         service = Service(
             'foo',
@@ -229,10 +166,11 @@ class ServiceTest(unittest.TestCase):
     @mock.patch('compose.service.log', autospec=True)
     def test_pull_image(self, mock_log):
         service = Service('foo', client=self.mock_client, image='someimage:sometag')
-        service.pull()
+        service.pull(insecure_registry=True)
         self.mock_client.pull.assert_called_once_with(
             'someimage',
             tag='sometag',
+            insecure_registry=True,
             stream=True)
         mock_log.info.assert_called_once_with('Pulling foo (someimage:sometag)...')
 
@@ -242,8 +180,26 @@ class ServiceTest(unittest.TestCase):
         self.mock_client.pull.assert_called_once_with(
             'ababab',
             tag='latest',
+            insecure_registry=False,
             stream=True)
 
+    def test_create_container_from_insecure_registry(self):
+        service = Service('foo', client=self.mock_client, image='someimage:sometag')
+        images = []
+
+        def pull(repo, tag=None, insecure_registry=False, **kwargs):
+            self.assertEqual('someimage', repo)
+            self.assertEqual('sometag', tag)
+            self.assertTrue(insecure_registry)
+            images.append({'Id': 'abc123'})
+            return []
+
+        service.image = lambda: images[0] if images else None
+        self.mock_client.pull = pull
+
+        service.create_container(insecure_registry=True)
+        self.assertEqual(1, len(images))
+
     @mock.patch('compose.service.Container', autospec=True)
     def test_recreate_container(self, _):
         mock_container = mock.create_autospec(Container)
@@ -287,7 +243,7 @@ class ServiceTest(unittest.TestCase):
             images.append({'Id': 'abc123'})
             return []
 
-        service.image = lambda *args, **kwargs: mock_get_image(images)
+        service.image = lambda: images[0] if images else None
         self.mock_client.pull = pull
 
         service.create_container()
@@ -297,7 +253,7 @@ class ServiceTest(unittest.TestCase):
         service = Service('foo', client=self.mock_client, build='.')
 
         images = []
-        service.image = lambda *args, **kwargs: mock_get_image(images)
+        service.image = lambda *args, **kwargs: images[0] if images else None
         service.build = lambda: images.append({'Id': 'abc123'})
 
         service.create_container(do_build=True)
@@ -312,7 +268,7 @@ class ServiceTest(unittest.TestCase):
 
     def test_create_container_no_build_but_needs_build(self):
         service = Service('foo', client=self.mock_client, build='.')
-        service.image = lambda *args, **kwargs: mock_get_image([])
+        service.image = lambda: None
 
         with self.assertRaises(NeedsBuildError):
             service.create_container(do_build=False)
@@ -329,13 +285,6 @@ class ServiceTest(unittest.TestCase):
         self.assertFalse(self.mock_client.build.call_args[1]['pull'])
 
 
-def mock_get_image(images):
-    if images:
-        return images[0]
-    else:
-        raise NoSuchImageError()
-
-
 class ServiceVolumesTest(unittest.TestCase):
 
     def setUp(self):
@@ -353,13 +302,14 @@ class ServiceVolumesTest(unittest.TestCase):
         spec = parse_volume_spec('external:interval:ro')
         self.assertEqual(spec, ('external', 'interval', 'ro'))
 
-        spec = parse_volume_spec('external:interval:z')
-        self.assertEqual(spec, ('external', 'interval', 'z'))
-
     def test_parse_volume_spec_too_many_parts(self):
         with self.assertRaises(ConfigError):
             parse_volume_spec('one:two:three:four')
 
+    def test_parse_volume_bad_mode(self):
+        with self.assertRaises(ConfigError):
+            parse_volume_spec('one:two:notrw')
+
     def test_build_volume_binding(self):
         binding = build_volume_binding(parse_volume_spec('/outside:/inside'))
         self.assertEqual(binding, ('/inside', '/outside:/inside:rw'))
@@ -488,26 +438,3 @@ class ServiceVolumesTest(unittest.TestCase):
             create_options['host_config']['Binds'],
             ['/mnt/sda1/host/path:/data:rw'],
         )
-
-    def test_create_with_special_volume_mode(self):
-        self.mock_client.inspect_image.return_value = {'Id': 'imageid'}
-
-        create_calls = []
-
-        def create_container(*args, **kwargs):
-            create_calls.append((args, kwargs))
-            return {'Id': 'containerid'}
-
-        self.mock_client.create_container = create_container
-
-        volumes = ['/tmp:/foo:z']
-
-        Service(
-            'web',
-            client=self.mock_client,
-            image='busybox',
-            volumes=volumes,
-        ).create_container()
-
-        self.assertEqual(len(create_calls), 1)
-        self.assertEqual(create_calls[0][1]['host_config']['Binds'], volumes)

From 0fdd977b06f95d3eadf04aa975ade85b8cc00e5f Mon Sep 17 00:00:00 2001
From: Yuval Kohavi <yuval.kohavi@gmail.com>
Date: Tue, 28 Jul 2015 17:00:24 -0400
Subject: [PATCH 0176/1265] fixed merge issue from previous commit

Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
---
 tests/unit/service_test.py | 83 +++++++++++++++++++++++++-------------
 1 file changed, 56 insertions(+), 27 deletions(-)

diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 151fcee9..77a8138d 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -5,6 +5,7 @@ from .. import unittest
 import mock
 
 import docker
+from docker.utils import LogConfig
 
 from compose.service import Service
 from compose.container import Container
@@ -12,6 +13,7 @@ from compose.const import LABEL_SERVICE, LABEL_PROJECT, LABEL_ONE_OFF
 from compose.service import (
     ConfigError,
     NeedsBuildError,
+    NoSuchImageError,
     build_volume_binding,
     get_container_data_volumes,
     merge_volume_bindings,
@@ -111,6 +113,23 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(opts['hostname'], 'name', 'hostname')
         self.assertFalse('domainname' in opts, 'domainname')
 
+    def test_memory_swap_limit(self):
+        service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, mem_limit=1000000000, memswap_limit=2000000000)
+        self.mock_client.containers.return_value = []
+        opts = service._get_container_create_options({'some': 'overrides'}, 1)
+        self.assertEqual(opts['memswap_limit'], 2000000000)
+        self.assertEqual(opts['mem_limit'], 1000000000)
+
+    def test_log_opt(self):
+        log_opt = {'address': 'tcp://192.168.0.42:123'}
+        service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, log_driver='syslog', log_opt=log_opt)
+        self.mock_client.containers.return_value = []
+        opts = service._get_container_create_options({'some': 'overrides'}, 1)
+
+        self.assertIsInstance(opts['host_config']['LogConfig'], LogConfig)
+        self.assertEqual(opts['host_config']['LogConfig'].type, 'syslog')
+        self.assertEqual(opts['host_config']['LogConfig'].config, log_opt)
+
     def test_split_domainname_fqdn(self):
         service = Service(
             'foo',
@@ -166,11 +185,10 @@ class ServiceTest(unittest.TestCase):
     @mock.patch('compose.service.log', autospec=True)
     def test_pull_image(self, mock_log):
         service = Service('foo', client=self.mock_client, image='someimage:sometag')
-        service.pull(insecure_registry=True)
+        service.pull()
         self.mock_client.pull.assert_called_once_with(
             'someimage',
             tag='sometag',
-            insecure_registry=True,
             stream=True)
         mock_log.info.assert_called_once_with('Pulling foo (someimage:sometag)...')
 
@@ -180,26 +198,8 @@ class ServiceTest(unittest.TestCase):
         self.mock_client.pull.assert_called_once_with(
             'ababab',
             tag='latest',
-            insecure_registry=False,
             stream=True)
 
-    def test_create_container_from_insecure_registry(self):
-        service = Service('foo', client=self.mock_client, image='someimage:sometag')
-        images = []
-
-        def pull(repo, tag=None, insecure_registry=False, **kwargs):
-            self.assertEqual('someimage', repo)
-            self.assertEqual('sometag', tag)
-            self.assertTrue(insecure_registry)
-            images.append({'Id': 'abc123'})
-            return []
-
-        service.image = lambda: images[0] if images else None
-        self.mock_client.pull = pull
-
-        service.create_container(insecure_registry=True)
-        self.assertEqual(1, len(images))
-
     @mock.patch('compose.service.Container', autospec=True)
     def test_recreate_container(self, _):
         mock_container = mock.create_autospec(Container)
@@ -243,7 +243,7 @@ class ServiceTest(unittest.TestCase):
             images.append({'Id': 'abc123'})
             return []
 
-        service.image = lambda: images[0] if images else None
+        service.image = lambda *args, **kwargs: mock_get_image(images)
         self.mock_client.pull = pull
 
         service.create_container()
@@ -253,7 +253,7 @@ class ServiceTest(unittest.TestCase):
         service = Service('foo', client=self.mock_client, build='.')
 
         images = []
-        service.image = lambda *args, **kwargs: images[0] if images else None
+        service.image = lambda *args, **kwargs: mock_get_image(images)
         service.build = lambda: images.append({'Id': 'abc123'})
 
         service.create_container(do_build=True)
@@ -268,7 +268,7 @@ class ServiceTest(unittest.TestCase):
 
     def test_create_container_no_build_but_needs_build(self):
         service = Service('foo', client=self.mock_client, build='.')
-        service.image = lambda: None
+        service.image = lambda *args, **kwargs: mock_get_image([])
 
         with self.assertRaises(NeedsBuildError):
             service.create_container(do_build=False)
@@ -285,6 +285,13 @@ class ServiceTest(unittest.TestCase):
         self.assertFalse(self.mock_client.build.call_args[1]['pull'])
 
 
+def mock_get_image(images):
+    if images:
+        return images[0]
+    else:
+        raise NoSuchImageError()
+
+
 class ServiceVolumesTest(unittest.TestCase):
 
     def setUp(self):
@@ -302,14 +309,13 @@ class ServiceVolumesTest(unittest.TestCase):
         spec = parse_volume_spec('external:interval:ro')
         self.assertEqual(spec, ('external', 'interval', 'ro'))
 
+        spec = parse_volume_spec('external:interval:z')
+        self.assertEqual(spec, ('external', 'interval', 'z'))
+
     def test_parse_volume_spec_too_many_parts(self):
         with self.assertRaises(ConfigError):
             parse_volume_spec('one:two:three:four')
 
-    def test_parse_volume_bad_mode(self):
-        with self.assertRaises(ConfigError):
-            parse_volume_spec('one:two:notrw')
-
     def test_build_volume_binding(self):
         binding = build_volume_binding(parse_volume_spec('/outside:/inside'))
         self.assertEqual(binding, ('/inside', '/outside:/inside:rw'))
@@ -438,3 +444,26 @@ class ServiceVolumesTest(unittest.TestCase):
             create_options['host_config']['Binds'],
             ['/mnt/sda1/host/path:/data:rw'],
         )
+
+    def test_create_with_special_volume_mode(self):
+        self.mock_client.inspect_image.return_value = {'Id': 'imageid'}
+
+        create_calls = []
+
+        def create_container(*args, **kwargs):
+            create_calls.append((args, kwargs))
+            return {'Id': 'containerid'}
+
+        self.mock_client.create_container = create_container
+
+        volumes = ['/tmp:/foo:z']
+
+        Service(
+            'web',
+            client=self.mock_client,
+            image='busybox',
+            volumes=volumes,
+        ).create_container()
+
+        self.assertEqual(len(create_calls), 1)
+        self.assertEqual(create_calls[0][1]['host_config']['Binds'], volumes)

From 557cbb616c887d35c0c79e2ed2a79c0344f58de4 Mon Sep 17 00:00:00 2001
From: Yuval Kohavi <yuval.kohavi@gmail.com>
Date: Tue, 28 Jul 2015 17:26:32 -0400
Subject: [PATCH 0177/1265] ports documentation

Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
---
 docs/yml.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/yml.md b/docs/yml.md
index 18551bf2..17dbc59a 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -106,7 +106,7 @@ An entry with the ip address and hostname will be created in `/etc/hosts` inside
 ### ports
 
 Expose ports. Either specify both ports (`HOST:CONTAINER`), or just the container
-port (a random host port will be chosen).
+port (a random host port will be chosen). You can specify a port range instead of a single port (`START-END`). If you use a range for the container ports, you may specify a range for the host ports as well. both ranges must be of equal size.
 
 > **Note:** When mapping ports in the `HOST:CONTAINER` format, you may experience
 > erroneous results when using a container port lower than 60, because YAML will
@@ -115,9 +115,12 @@ port (a random host port will be chosen).
 
     ports:
      - "3000"
+     - "3000-3005"
      - "8000:8000"
+     - "9090-9091:8080-8081"
      - "49100:22"
      - "127.0.0.1:8001:8001"
+     - "127.0.0.1:5000-5010:5000-5010"
 
 ### expose
 
@@ -410,3 +413,4 @@ dollar sign (`$$`).
 - [Command line reference](cli.md)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)
+

From d1455acb6469f1a36376f5f765ed5188336673ee Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 7 Aug 2015 16:30:00 +0100
Subject: [PATCH 0178/1265] Update docs inline with feedback

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/yml.md | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/docs/yml.md b/docs/yml.md
index 17dbc59a..10550042 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -105,13 +105,25 @@ An entry with the ip address and hostname will be created in `/etc/hosts` inside
 
 ### ports
 
-Expose ports. Either specify both ports (`HOST:CONTAINER`), or just the container
-port (a random host port will be chosen). You can specify a port range instead of a single port (`START-END`). If you use a range for the container ports, you may specify a range for the host ports as well. both ranges must be of equal size.
+Makes an exposed port accessible on a host and the port is available to
+any client that can reach that host. Docker binds the exposed port to a random
+port on the host within an *ephemeral port range* defined by
+`/proc/sys/net/ipv4/ip_local_port_range`. You can also map to a specific port or range of ports.
 
-> **Note:** When mapping ports in the `HOST:CONTAINER` format, you may experience
-> erroneous results when using a container port lower than 60, because YAML will
-> parse numbers in the format `xx:yy` as sexagesimal (base 60). For this reason,
-> we recommend always explicitly specifying your port mappings as strings.
+Acceptable formats for the `ports` value are:
+
+* `containerPort`
+* `ip:hostPort:containerPort`
+* `ip::containerPort`
+* `hostPort:containerPort`
+
+You can specify a range for both the `hostPort` and the `containerPort` values.
+When specifying ranges, the container port values in the range must match the
+number of host port values in the range, for example,
+`1234-1236:1234-1236/tcp`. Once a host is running, use the 'docker-compose port' command
+to see the actual mapping.
+
+The following configuration shows examples of the port formats in use:
 
     ports:
      - "3000"
@@ -122,6 +134,13 @@ port (a random host port will be chosen). You can specify a port range instead o
      - "127.0.0.1:8001:8001"
      - "127.0.0.1:5000-5010:5000-5010"
 
+
+When mapping ports, in the `hostPort:containerPort` format, you may
+experience erroneous results when using a container port lower than 60. This
+happens because YAML parses numbers in the format `xx:yy` as sexagesimal (base
+60). To avoid this problem, always explicitly specify your port
+mappings as strings.
+
 ### expose
 
 Expose ports without publishing them to the host machine - they'll only be

From 11adca9324b417729d8eafdab1852767455f8cca Mon Sep 17 00:00:00 2001
From: Veres Lajos <vlajos@gmail.com>
Date: Fri, 7 Aug 2015 21:59:14 +0100
Subject: [PATCH 0179/1265] typofix - https://github.com/vlajos/misspell_fixer

Signed-off-by: Veres Lajos <vlajos@gmail.com>
---
 tests/unit/config_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 00462020..2cd3e005 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -9,7 +9,7 @@ from compose.config import config
 
 def make_service_dict(name, service_dict, working_dir):
     """
-    Test helper function to contruct a ServiceLoader
+    Test helper function to construct a ServiceLoader
     """
     return config.ServiceLoader(working_dir=working_dir).make_service_dict(name, service_dict)
 

From 7c128b46a1daff8e333ecdd611eaf0c6e42bb197 Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Wed, 5 Aug 2015 10:38:40 -0700
Subject: [PATCH 0180/1265] - Closes #1811 for Toolbox - Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/install.md | 78 +++++++++++++++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 29 deletions(-)

diff --git a/docs/install.md b/docs/install.md
index adb32fd5..fa367919 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -12,50 +12,67 @@ weight=4
 
 # Install Docker Compose
 
-To install Compose, you'll need to install Docker first. You'll then install
-Compose with a `curl` command. 
+You can run Compose on OS X and 64-bit Linux.  It is currently not supported on
+the Windows operating system. To install Compose, you'll need to install Docker
+first. 
 
-## Install Docker
+Depending on how your system is configured, you may require `sudo` access to
+install Compose. If your system requires `sudo`, you will receive "Permission
+denied" errors when installing Compose. If this is the case for you, preface the
+install commands with `sudo` to install.
 
-First, install Docker version 1.7.1 or greater:
+To install Compose, do the following:
 
-- [Instructions for Mac OS X](http://docs.docker.com/installation/mac/)
-- [Instructions for Ubuntu](http://docs.docker.com/installation/ubuntulinux/)
-- [Instructions for other systems](http://docs.docker.com/installation/)
+1. Install Docker Engine version 1.7.1 or greater:
 
-## Install Compose
+     * <a href="https://docs.docker.com/installation/mac/" target="_blank">Mac OS X installation</a> (installs both Engine and Compose)
+     
+     * <a href="https://docs.docker.com/installation/ubuntulinux/" target="_blank">Ubuntu installation</a>
+     
+     * <a href="https://docs.docker.com/installation/" target="_blank">other system installations</a>
+ 
+2. Mac OS X users are done installing. Others should continue to the next step.
+   
+3. Go to the <a href="https://github.com/docker/compose/releases" target="_blank">repository release page</a>.
 
-To install Compose, run the following commands:
+4. Enter the `curl` command in your termial.
 
-    curl -L https://github.com/docker/compose/releases/download/1.3.3/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
-    chmod +x /usr/local/bin/docker-compose
+     The command has the following format:
 
-> Note: If you get a "Permission denied" error, your `/usr/local/bin` directory probably isn't writable and you'll need to install Compose as the superuser. Run `sudo -i`, then the two commands above, then `exit`.
+        curl -L https://github.com/docker/compose/releases/download/VERSION_NUM/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+   
+     If you have problems installing with `curl`, you can use `pip` instead: `pip install -U docker-compose`
+      
+4. Apply executable permissions to the binary:
 
-Optionally, you can also install [command completion](completion.md) for the
-bash and zsh shell.
+        $ chmod +x /usr/local/bin/docker-compose
 
-> **Note:** Some older Mac OS X CPU architectures are incompatible with the binary. If you receive an "Illegal instruction: 4" error after installing, you should install using the `pip` command instead.
+5.  Optionally, install [command completion](completion.md) for the
+`bash` and `zsh` shell.
 
-Compose is available for OS X and 64-bit Linux. If you're on another platform,
-Compose can also be installed as a Python package:
+6. Test the installation.
 
-    $ sudo pip install -U docker-compose
+        $ docker-compose --version
+        docker-compose version: 1.4.0
 
-No further steps are required; Compose should now be successfully installed.
-You can test the installation by running `docker-compose --version`.
+## Upgrading
 
-### Upgrading
+If you're upgrading from Compose 1.2 or earlier, you'll need to remove or migrate
+your existing containers after upgrading Compose. This is because, as of version
+1.3, Compose uses Docker labels to keep track of containers, and so they need to
+be recreated with labels added.
 
-If you're coming from Compose 1.2 or earlier, you'll need to remove or migrate your existing containers after upgrading Compose. This is because, as of version 1.3, Compose uses Docker labels to keep track of containers, and so they need to be recreated with labels added.
+If Compose detects containers that were created without labels, it will refuse
+to run so that you don't end up with two sets of them. If you want to keep using
+your existing containers (for example, because they have data volumes you want
+to preserve) you can migrate them with the following command:
 
-If Compose detects containers that were created without labels, it will refuse to run so that you don't end up with two sets of them. If you want to keep using your existing containers (for example, because they have data volumes you want to preserve) you can migrate them with the following command:
+    $ docker-compose migrate-to-labels
 
-    docker-compose migrate-to-labels
+Alternatively, if you're not worried about keeping them, you can remove them &endash;
+Compose will just create new ones.
 
-Alternatively, if you're not worried about keeping them, you can remove them - Compose will just create new ones.
-
-    docker rm -f myapp_web_1 myapp_db_1 ...
+    $ docker rm -f -v myapp_web_1 myapp_db_1 ...
 
 
 ## Uninstallation
@@ -69,10 +86,13 @@ To uninstall Docker Compose if you installed using `pip`:
 
     $ pip uninstall docker-compose
     
-> Note: If you get a "Permission denied" error using either of the above methods, you probably do not have the proper permissions to remove `docker-compose`.  To force the removal, prepend `sudo` to either of the above commands and run again.
+>**Note**: If you get a "Permission denied" error using either of the above
+>methods, you probably do not have the proper permissions to remove
+>`docker-compose`.  To force the removal, prepend `sudo` to either of the above
+>commands and run again.
 
 
-## Compose documentation
+## Where to go next
 
 - [User guide](/)
 - [Get started with Django](django.md)

From 4390362366babb04b0b68759814206d2faff2b63 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 5 Aug 2015 15:39:07 +0100
Subject: [PATCH 0181/1265] Test against Docker 1.8.0 RC3

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a0e7f14f..7c048232 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,11 +48,13 @@ RUN set -ex; \
     rm -rf pip-7.0.1; \
     rm pip-7.0.1.tar.gz
 
-ENV ALL_DOCKER_VERSIONS 1.7.1
+ENV ALL_DOCKER_VERSIONS 1.7.1 1.8.0-rc3
 
 RUN set -ex; \
     curl https://get.docker.com/builds/Linux/x86_64/docker-1.7.1 -o /usr/local/bin/docker-1.7.1; \
-    chmod +x /usr/local/bin/docker-1.7.1
+    chmod +x /usr/local/bin/docker-1.7.1; \
+    curl https://test.docker.com/builds/Linux/x86_64/docker-1.8.0-rc3 -o /usr/local/bin/docker-1.8.0-rc3; \
+    chmod +x /usr/local/bin/docker-1.8.0-rc3
 
 # Set the default Docker to be run
 RUN ln -s /usr/local/bin/docker-1.7.1 /usr/local/bin/docker

From dfa4bf4452584f1a2533254231b862d521d75f85 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 10 Aug 2015 16:00:45 +0100
Subject: [PATCH 0182/1265] Ignore containers that don't have a name

If a container is in the process of being removed, or removal has
failed, it can sometimes appear in the output of GET /containers/json
but not have a 'Name' key. In that case, rather than crashing, we can
ignore it.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/container.py             |  6 +++++-
 compose/project.py               |  4 ++--
 compose/service.py               | 11 ++++++-----
 tests/integration/legacy_test.py | 17 ++++++++++++++---
 tests/unit/project_test.py       | 25 +++++++++++++++++++++++++
 tests/unit/service_test.py       | 12 ++++++++++++
 6 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/compose/container.py b/compose/container.py
index 71951497..40aea98a 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -22,10 +22,14 @@ class Container(object):
         """
         Construct a container object from the output of GET /containers/json.
         """
+        name = get_container_name(dictionary)
+        if name is None:
+            return None
+
         new_dictionary = {
             'Id': dictionary['Id'],
             'Image': dictionary['Image'],
-            'Name': '/' + get_container_name(dictionary),
+            'Name': '/' + name,
         }
         return cls(client, new_dictionary, **kwargs)
 
diff --git a/compose/project.py b/compose/project.py
index 2667855d..6d86a4a8 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -310,11 +310,11 @@ class Project(object):
         else:
             service_names = self.service_names
 
-        containers = [
+        containers = filter(None, [
             Container.from_ps(self.client, container)
             for container in self.client.containers(
                 all=stopped,
-                filters={'label': self.labels(one_off=one_off)})]
+                filters={'label': self.labels(one_off=one_off)})])
 
         def matches_service_names(container):
             return container.labels.get(LABEL_SERVICE) in service_names
diff --git a/compose/service.py b/compose/service.py
index 2e0490a5..2cdd6c9b 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -101,11 +101,11 @@ class Service(object):
         self.options = options
 
     def containers(self, stopped=False, one_off=False):
-        containers = [
+        containers = filter(None, [
             Container.from_ps(self.client, container)
             for container in self.client.containers(
                 all=stopped,
-                filters={'label': self.labels(one_off=one_off)})]
+                filters={'label': self.labels(one_off=one_off)})])
 
         if not containers:
             check_for_legacy_containers(
@@ -494,12 +494,13 @@ class Service(object):
     # TODO: this would benefit from github.com/docker/docker/pull/11943
     # to remove the need to inspect every container
     def _next_container_number(self, one_off=False):
-        numbers = [
-            Container.from_ps(self.client, container).number
+        containers = filter(None, [
+            Container.from_ps(self.client, container)
             for container in self.client.containers(
                 all=True,
                 filters={'label': self.labels(one_off=one_off)})
-        ]
+        ])
+        numbers = [c.number for c in containers]
         return 1 if not numbers else max(numbers) + 1
 
     def _get_links(self, link_to_self):
diff --git a/tests/integration/legacy_test.py b/tests/integration/legacy_test.py
index f79089b2..9913bbb0 100644
--- a/tests/integration/legacy_test.py
+++ b/tests/integration/legacy_test.py
@@ -65,7 +65,7 @@ class UtilitiesTestCase(unittest.TestCase):
             legacy.is_valid_name("composetest_web_lol_1", one_off=True),
         )
 
-    def test_get_legacy_containers_no_labels(self):
+    def test_get_legacy_containers(self):
         client = Mock()
         client.containers.return_value = [
             {
@@ -74,12 +74,23 @@ class UtilitiesTestCase(unittest.TestCase):
                 "Name": "composetest_web_1",
                 "Labels": None,
             },
+            {
+                "Id": "ghi789",
+                "Image": "def456",
+                "Name": None,
+                "Labels": None,
+            },
+            {
+                "Id": "jkl012",
+                "Image": "def456",
+                "Labels": None,
+            },
         ]
 
-        containers = list(legacy.get_legacy_containers(
-            client, "composetest", ["web"]))
+        containers = legacy.get_legacy_containers(client, "composetest", ["web"])
 
         self.assertEqual(len(containers), 1)
+        self.assertEqual(containers[0].id, 'abc123')
 
 
 class LegacyTestCase(DockerClientTestCase):
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 39ad30a1..93bf12ff 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -3,6 +3,7 @@ from .. import unittest
 from compose.service import Service
 from compose.project import Project
 from compose.container import Container
+from compose.const import LABEL_SERVICE
 
 import mock
 import docker
@@ -260,3 +261,27 @@ class ProjectTest(unittest.TestCase):
 
         service = project.get_service('test')
         self.assertEqual(service._get_net(), 'container:' + container_name)
+
+    def test_container_without_name(self):
+        self.mock_client.containers.return_value = [
+            {'Image': 'busybox:latest', 'Id': '1', 'Name': '1'},
+            {'Image': 'busybox:latest', 'Id': '2', 'Name': None},
+            {'Image': 'busybox:latest', 'Id': '3'},
+        ]
+        self.mock_client.inspect_container.return_value = {
+            'Id': '1',
+            'Config': {
+                'Labels': {
+                    LABEL_SERVICE: 'web',
+                },
+            },
+        }
+        project = Project.from_dicts(
+            'test',
+            [{
+                'name': 'web',
+                'image': 'busybox:latest',
+            }],
+            self.mock_client,
+        )
+        self.assertEqual([c.id for c in project.containers()], ['1'])
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index bc6b9e48..0e274a35 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -76,6 +76,18 @@ class ServiceTest(unittest.TestCase):
             all=False,
             filters={'label': expected_labels})
 
+    def test_container_without_name(self):
+        self.mock_client.containers.return_value = [
+            {'Image': 'foo', 'Id': '1', 'Name': '1'},
+            {'Image': 'foo', 'Id': '2', 'Name': None},
+            {'Image': 'foo', 'Id': '3'},
+        ]
+        service = Service('db', self.mock_client, 'myproject', image='foo')
+
+        self.assertEqual([c.id for c in service.containers()], ['1'])
+        self.assertEqual(service._next_container_number(), 2)
+        self.assertEqual(service.get_container(1).id, '1')
+
     def test_get_volumes_from_container(self):
         container_id = 'aabbccddee'
         service = Service(

From 7f90e9592a55f198ecd89799ee2bb7579d5b7aae Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 10 Aug 2015 18:05:09 +0100
Subject: [PATCH 0183/1265] Use overlay driver in tests

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/wrapdocker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/wrapdocker b/script/wrapdocker
index 119e88df..3e669b5d 100755
--- a/script/wrapdocker
+++ b/script/wrapdocker
@@ -7,7 +7,7 @@ fi
 # If a pidfile is still around (for example after a container restart),
 # delete it so that docker can start.
 rm -rf /var/run/docker.pid
-docker -d $DOCKER_DAEMON_ARGS &>/var/log/docker.log &
+docker -d --storage-driver="overlay" &>/var/log/docker.log &
 docker_pid=$!
 
 >&2 echo "Waiting for Docker to start..."

From 46e8e4322aa694f176c3fec5e705c5c40c704824 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 10 Aug 2015 13:41:11 +0100
Subject: [PATCH 0184/1265] Show a warning when a relative path is specified
 without "./"

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py  | 29 +++++++++++++++++++++----
 docs/yml.md               |  5 +++--
 tests/unit/config_test.py | 45 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 4d3f5fae..73516a21 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -90,6 +90,13 @@ SUPPORTED_FILENAMES = [
 ]
 
 
+PATH_START_CHARS = [
+    '/',
+    '.',
+    '~',
+]
+
+
 log = logging.getLogger(__name__)
 
 
@@ -260,7 +267,7 @@ def process_container_options(service_dict, working_dir=None):
         raise ConfigurationError("Invalid 'memswap_limit' configuration for %s service: when defining 'memswap_limit' you must set 'mem_limit' as well" % service_dict['name'])
 
     if 'volumes' in service_dict and service_dict.get('volume_driver') is None:
-        service_dict['volumes'] = resolve_volume_paths(service_dict['volumes'], working_dir=working_dir)
+        service_dict['volumes'] = resolve_volume_paths(service_dict, working_dir=working_dir)
 
     if 'build' in service_dict:
         service_dict['build'] = resolve_build_path(service_dict['build'], working_dir=working_dir)
@@ -421,17 +428,31 @@ def env_vars_from_file(filename):
     return env
 
 
-def resolve_volume_paths(volumes, working_dir=None):
+def resolve_volume_paths(service_dict, working_dir=None):
     if working_dir is None:
         raise Exception("No working_dir passed to resolve_volume_paths()")
 
-    return [resolve_volume_path(v, working_dir) for v in volumes]
+    return [
+        resolve_volume_path(v, working_dir, service_dict['name'])
+        for v in service_dict['volumes']
+    ]
 
 
-def resolve_volume_path(volume, working_dir):
+def resolve_volume_path(volume, working_dir, service_name):
     container_path, host_path = split_path_mapping(volume)
     container_path = os.path.expanduser(container_path)
+
     if host_path is not None:
+        if not any(host_path.startswith(c) for c in PATH_START_CHARS):
+            log.warn(
+                'Warning: the mapping "{0}" in the volumes config for '
+                'service "{1}" is ambiguous. In a future version of Docker, '
+                'it will designate a "named" volume '
+                '(see https://github.com/docker/docker/pull/14242). '
+                'To prevent unexpected behaviour, change it to "./{0}"'
+                .format(volume, service_name)
+            )
+
         host_path = os.path.expanduser(host_path)
         return "%s:%s" % (expand_path(working_dir, host_path), container_path)
     else:
diff --git a/docs/yml.md b/docs/yml.md
index 18551bf2..6ac1ce62 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -135,11 +135,12 @@ Mount paths as volumes, optionally specifying a path on the host machine
 
     volumes:
      - /var/lib/mysql
-     - cache/:/tmp/cache
+     - ./cache:/tmp/cache
      - ~/configs:/etc/configs/:ro
 
 You can mount a relative path on the host, which will expand relative to
-the directory of the Compose configuration file being used.
+the directory of the Compose configuration file being used. Relative paths
+should always begin with `.` or `..`.
 
 > Note: No path expansion will be done if you have also specified a
 > `volume_driver`.
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 00462020..a181e79e 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -117,6 +117,51 @@ class InterpolationTest(unittest.TestCase):
         d = make_service_dict('foo', {'volumes': ['~:/container/path']}, working_dir='.')
         self.assertEqual(d['volumes'], ['/home/user:/container/path'])
 
+    @mock.patch.dict(os.environ)
+    def test_volume_binding_with_local_dir_name_raises_warning(self):
+        def make_dict(**config):
+            make_service_dict('foo', config, working_dir='.')
+
+        with mock.patch('compose.config.config.log.warn') as warn:
+            make_dict(volumes=['/container/path'])
+            self.assertEqual(0, warn.call_count)
+
+            make_dict(volumes=['/data:/container/path'])
+            self.assertEqual(0, warn.call_count)
+
+            make_dict(volumes=['.:/container/path'])
+            self.assertEqual(0, warn.call_count)
+
+            make_dict(volumes=['..:/container/path'])
+            self.assertEqual(0, warn.call_count)
+
+            make_dict(volumes=['./data:/container/path'])
+            self.assertEqual(0, warn.call_count)
+
+            make_dict(volumes=['../data:/container/path'])
+            self.assertEqual(0, warn.call_count)
+
+            make_dict(volumes=['.profile:/container/path'])
+            self.assertEqual(0, warn.call_count)
+
+            make_dict(volumes=['~:/container/path'])
+            self.assertEqual(0, warn.call_count)
+
+            make_dict(volumes=['~/data:/container/path'])
+            self.assertEqual(0, warn.call_count)
+
+            make_dict(volumes=['~tmp:/container/path'])
+            self.assertEqual(0, warn.call_count)
+
+            make_dict(volumes=['data:/container/path'], volume_driver='mydriver')
+            self.assertEqual(0, warn.call_count)
+
+            make_dict(volumes=['data:/container/path'])
+            self.assertEqual(1, warn.call_count)
+            warning = warn.call_args[0][0]
+            self.assertIn('"data:/container/path"', warning)
+            self.assertIn('"./data:/container/path"', warning)
+
     def test_named_volume_with_driver_does_not_expand(self):
         d = make_service_dict('foo', {
             'volumes': ['namedvolume:/data'],

From b4872de2135a41481f3cbfe97c75126b26c11929 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 10 Aug 2015 14:55:33 +0100
Subject: [PATCH 0185/1265] Allow integer value for ports

While it was intended as a positive to be stricter in validation
it would in fact break backwards compatibility, which we do not
want to be doing.

Consider re-visiting this later and include a deprecation warning if
we want to be stricter.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/schema.json   | 20 ++++++++++++++++----
 compose/config/validation.py |  7 +++++++
 tests/unit/config_test.py    |  7 ++++---
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/compose/config/schema.json b/compose/config/schema.json
index 74f5edbb..24fd53d1 100644
--- a/compose/config/schema.json
+++ b/compose/config/schema.json
@@ -75,10 +75,22 @@
         "pid": {"type": "string"},
 
         "ports": {
-          "type": "array",
-          "items": {"type": "string"},
-          "uniqueItems": true,
-          "format": "ports"
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {"type": "string"},
+              "uniqueItems": true,
+              "format": "ports"
+            },
+            {
+              "type": "string",
+              "format": "ports"
+            },
+            {
+              "type": "number",
+              "format": "ports"
+            }
+          ]
         },
 
         "privileged": {"type": "string"},
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 15e0754c..3f46632b 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -84,6 +84,13 @@ def process_errors(errors):
                     required.append("Service '{}' has neither an image nor a build path specified. Exactly one must be provided.".format(service_name))
                 else:
                     required.append(error.message)
+            elif error.validator == 'oneOf':
+                config_key = error.path[1]
+                valid_types = [context.validator_value for context in error.context]
+                valid_type_msg = " or ".join(valid_types)
+                type_errors.append("Service '{}' configuration key '{}' contains an invalid type, it should be either {}".format(
+                    service_name, config_key, valid_type_msg)
+                )
             elif error.validator == 'type':
                 msg = "a"
                 if error.validator_value == "array":
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 4e982bb4..b4d2ce82 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -75,8 +75,9 @@ class ConfigTest(unittest.TestCase):
             )
 
     def test_config_invalid_ports_format_validation(self):
-        with self.assertRaises(ConfigurationError):
-            for invalid_ports in [{"1": "8000"}, "whatport", "625", "8000:8050"]:
+        expected_error_msg = "Service 'web' configuration key 'ports' contains an invalid type"
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            for invalid_ports in [{"1": "8000"}, False, 0]:
                 config.load(
                     config.ConfigDetails(
                         {'web': {'image': 'busybox', 'ports': invalid_ports}},
@@ -86,7 +87,7 @@ class ConfigTest(unittest.TestCase):
                 )
 
     def test_config_valid_ports_format_validation(self):
-        valid_ports = [["8000", "9000"], ["8000/8050"], ["8000"]]
+        valid_ports = [["8000", "9000"], ["8000/8050"], ["8000"], "8000", 8000]
         for ports in valid_ports:
             config.load(
                 config.ConfigDetails(

From ece6a7271259f6d72586eaa066ebb3034e62ff79 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 10 Aug 2015 15:33:47 +0100
Subject: [PATCH 0186/1265] Clean error.message

Unfortunately the way that jsonschema is calling %r on its property
and then encoding the complete message means I've had to do this
manual way of removing the literal string prefix, u'.

eg:

key = 'extends'
message = "Invalid value for %r" % key
error.message = message.encode("utf-8")"

results in:

"Invalid value for u'extends'"

Performing a replace to strip out the extra "u'", does not change the
encoding of the string, it is at this point the character u followed
by a '.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/validation.py | 9 ++++++---
 tests/unit/config_test.py    | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 3f46632b..7347c012 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -52,6 +52,9 @@ def process_errors(errors):
     def _parse_key_from_error_msg(error):
         return error.message.split("'")[1]
 
+    def _clean_error_message(message):
+        return message.replace("u'", "'")
+
     root_msgs = []
     invalid_keys = []
     required = []
@@ -68,7 +71,7 @@ def process_errors(errors):
                 msg = "Invalid service name '{}' - only {} characters are allowed".format(invalid_service_name, VALID_NAME_CHARS)
                 root_msgs.append(msg)
             else:
-                root_msgs.append(error.message)
+                root_msgs.append(_clean_error_message(error.message))
 
         else:
             # handle service level errors
@@ -83,7 +86,7 @@ def process_errors(errors):
                 elif 'image' not in error.instance and 'build' not in error.instance:
                     required.append("Service '{}' has neither an image nor a build path specified. Exactly one must be provided.".format(service_name))
                 else:
-                    required.append(error.message)
+                    required.append(_clean_error_message(error.message))
             elif error.validator == 'oneOf':
                 config_key = error.path[1]
                 valid_types = [context.validator_value for context in error.context]
@@ -104,7 +107,7 @@ def process_errors(errors):
                     root_msgs.append("Service '{}' doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.'".format(config_key))
             elif error.validator == 'required':
                 config_key = error.path[1]
-                required.append("Service '{}' option '{}' is invalid, {}".format(service_name, config_key, error.message))
+                required.append("Service '{}' option '{}' is invalid, {}".format(service_name, config_key, _clean_error_message(error.message)))
             elif error.validator == 'dependencies':
                 dependency_key = error.validator_value.keys()[0]
                 required_keys = ",".join(error.validator_value[dependency_key])
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index b4d2ce82..e023153a 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -659,7 +659,7 @@ class ExtendsTest(unittest.TestCase):
             )
 
     def test_extends_validation_missing_service_key(self):
-        with self.assertRaisesRegexp(ConfigurationError, "u'service' is a required property"):
+        with self.assertRaisesRegexp(ConfigurationError, "'service' is a required property"):
             config.load(
                 config.ConfigDetails(
                     {

From e0675b50c0fa0cc737bfd814d45e495e3d7eaba6 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 10 Aug 2015 16:18:21 +0100
Subject: [PATCH 0187/1265] Retrieve sub property keys

The validation message was confusing by displaying only 1 level of
property of the service, even if the error was another level down.

Eg. if the 'files' property of 'extends' was the incorrect format,
it was displaying 'an invalid value for 'extends'', rather than
correctly retrieving 'files'.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/validation.py | 14 ++++++++------
 tests/unit/config_test.py    | 21 ++++++++++++++++++++-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 7347c012..aa2e0fcf 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -99,12 +99,14 @@ def process_errors(errors):
                 if error.validator_value == "array":
                     msg = "an"
 
-                try:
-                    config_key = error.path[1]
-                    type_errors.append("Service '{}' has an invalid value for '{}', it should be {} {}".format(service_name, config_key, msg, error.validator_value))
-                except IndexError:
-                    config_key = error.path[0]
-                    root_msgs.append("Service '{}' doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.'".format(config_key))
+                # pop the service name off our path
+                error.path.popleft()
+
+                if len(error.path) > 0:
+                    config_key = " ".join(["'%s'" % k for k in error.path])
+                    type_errors.append("Service '{}' configuration key {} contains an invalid type, it should be {} {}".format(service_name, config_key, msg, error.validator_value))
+                else:
+                    root_msgs.append("Service '{}' doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.'".format(service_name))
             elif error.validator == 'required':
                 config_key = error.path[1]
                 required.append("Service '{}' option '{}' is invalid, {}".format(service_name, config_key, _clean_error_message(error.message)))
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index e023153a..0ea375db 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -124,7 +124,7 @@ class ConfigTest(unittest.TestCase):
             )
 
     def test_invalid_config_type_should_be_an_array(self):
-        expected_error_msg = "Service 'foo' has an invalid value for 'links', it should be an array"
+        expected_error_msg = "Service 'foo' configuration key 'links' contains an invalid type, it should be an array"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 config.ConfigDetails(
@@ -690,6 +690,25 @@ class ExtendsTest(unittest.TestCase):
                 )
             )
 
+    def test_extends_validation_sub_property_key(self):
+        expected_error_msg = "Service 'web' configuration key 'extends' 'file' contains an invalid type"
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            config.load(
+                config.ConfigDetails(
+                    {
+                        'web': {
+                            'image': 'busybox',
+                            'extends': {
+                                'file': 1,
+                                'service': 'web',
+                            }
+                        },
+                    },
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
+            )
+
     def test_extends_validation_no_file_key_no_filename_set(self):
         dictionary = {'extends': {'service': 'web'}}
 

From df14a4384d44f6a27063de08e66d25854509f8d3 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 10 Aug 2015 16:57:32 +0100
Subject: [PATCH 0188/1265] Catch non-unique errors

When a schema type is set as unique, we should display the validation
error to indicate that non-unique values have been provided for a key.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/validation.py | 10 +++++++++-
 tests/unit/config_test.py    | 13 +++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index aa2e0fcf..07b542a1 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -59,6 +59,7 @@ def process_errors(errors):
     invalid_keys = []
     required = []
     type_errors = []
+    other_errors = []
 
     for error in errors:
         # handle root level errors
@@ -115,8 +116,15 @@ def process_errors(errors):
                 required_keys = ",".join(error.validator_value[dependency_key])
                 required.append("Invalid '{}' configuration for '{}' service: when defining '{}' you must set '{}' as well".format(
                     dependency_key, service_name, dependency_key, required_keys))
+            else:
+                # pop the service name off our path
+                error.path.popleft()
 
-    return "\n".join(root_msgs + invalid_keys + required + type_errors)
+                config_key = " ".join(["'%s'" % k for k in error.path])
+                err_msg = "Service '{}' configuration key {} value {}".format(service_name, config_key, error.message)
+                other_errors.append(err_msg)
+
+    return "\n".join(root_msgs + invalid_keys + required + type_errors + other_errors)
 
 
 def validate_against_schema(config):
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 0ea375db..f35010c6 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -147,6 +147,19 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_invalid_config_not_unique_items(self):
+        expected_error_msg = "has non-unique elements"
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            config.load(
+                config.ConfigDetails(
+                    {
+                        'web': {'build': '.', 'devices': ['/dev/foo:/dev/foo', '/dev/foo:/dev/foo']}
+                    },
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
+            )
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)

From 68de84a0bfeb60c4660f110cde850ac17ce3672a Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 10 Aug 2015 17:12:37 +0100
Subject: [PATCH 0189/1265] Clean up error.path handling

Tiny bit of refactoring to make it clearer and only pop service_name
once.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/validation.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 07b542a1..946acf14 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -78,6 +78,9 @@ def process_errors(errors):
             # handle service level errors
             service_name = error.path[0]
 
+            # pop the service name off our path
+            error.path.popleft()
+
             if error.validator == 'additionalProperties':
                 invalid_config_key = _parse_key_from_error_msg(error)
                 invalid_keys.append(get_unsupported_config_msg(service_name, invalid_config_key))
@@ -89,7 +92,7 @@ def process_errors(errors):
                 else:
                     required.append(_clean_error_message(error.message))
             elif error.validator == 'oneOf':
-                config_key = error.path[1]
+                config_key = error.path[0]
                 valid_types = [context.validator_value for context in error.context]
                 valid_type_msg = " or ".join(valid_types)
                 type_errors.append("Service '{}' configuration key '{}' contains an invalid type, it should be either {}".format(
@@ -100,16 +103,13 @@ def process_errors(errors):
                 if error.validator_value == "array":
                     msg = "an"
 
-                # pop the service name off our path
-                error.path.popleft()
-
                 if len(error.path) > 0:
                     config_key = " ".join(["'%s'" % k for k in error.path])
                     type_errors.append("Service '{}' configuration key {} contains an invalid type, it should be {} {}".format(service_name, config_key, msg, error.validator_value))
                 else:
                     root_msgs.append("Service '{}' doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.'".format(service_name))
             elif error.validator == 'required':
-                config_key = error.path[1]
+                config_key = error.path[0]
                 required.append("Service '{}' option '{}' is invalid, {}".format(service_name, config_key, _clean_error_message(error.message)))
             elif error.validator == 'dependencies':
                 dependency_key = error.validator_value.keys()[0]
@@ -117,9 +117,6 @@ def process_errors(errors):
                 required.append("Invalid '{}' configuration for '{}' service: when defining '{}' you must set '{}' as well".format(
                     dependency_key, service_name, dependency_key, required_keys))
             else:
-                # pop the service name off our path
-                error.path.popleft()
-
                 config_key = " ".join(["'%s'" % k for k in error.path])
                 err_msg = "Service '{}' configuration key {} value {}".format(service_name, config_key, error.message)
                 other_errors.append(err_msg)

From f8efb54c80ed661538f06ecea7c1329925442b3a Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 11 Aug 2015 13:06:32 +0100
Subject: [PATCH 0190/1265] Handle $ref defined types errors

We use $ref in the schema to allow us to specify multiple type, eg
command, it can be a string or a list of strings.

It required some extra parsing to retrieve a helpful type to display
in our error message rather than 'string or string'. Which while
correct, is not helpful. We value helpful.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/validation.py | 16 ++++++++++++++--
 tests/unit/config_test.py    | 13 +++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 946acf14..36fd03b5 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -55,6 +55,16 @@ def process_errors(errors):
     def _clean_error_message(message):
         return message.replace("u'", "'")
 
+    def _parse_valid_types_from_schema(schema):
+        """
+        Our defined types using $ref in the schema require some extra parsing
+        retrieve a helpful type for error message display.
+        """
+        if '$ref' in schema:
+            return schema['$ref'].replace("#/definitions/", "").replace("_", " ")
+        else:
+            return str(schema['type'])
+
     root_msgs = []
     invalid_keys = []
     required = []
@@ -93,9 +103,11 @@ def process_errors(errors):
                     required.append(_clean_error_message(error.message))
             elif error.validator == 'oneOf':
                 config_key = error.path[0]
-                valid_types = [context.validator_value for context in error.context]
+
+                valid_types = [_parse_valid_types_from_schema(schema) for schema in error.schema['oneOf']]
                 valid_type_msg = " or ".join(valid_types)
-                type_errors.append("Service '{}' configuration key '{}' contains an invalid type, it should be either {}".format(
+
+                type_errors.append("Service '{}' configuration key '{}' contains an invalid type, valid types are {}".format(
                     service_name, config_key, valid_type_msg)
                 )
             elif error.validator == 'type':
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index f35010c6..1948e218 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -160,6 +160,19 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_invalid_list_of_strings_format(self):
+        expected_error_msg = "'command' contains an invalid type, valid types are string or list of strings"
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            config.load(
+                config.ConfigDetails(
+                    {
+                        'web': {'build': '.', 'command': [1]}
+                    },
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
+            )
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)

From 982a8456352e2e22ac2297ddf128ddb9fb51d6ed Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 11 Aug 2015 14:17:30 +0100
Subject: [PATCH 0191/1265] Fix mem_limit and memswap_limit regression

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py         | 4 ++++
 tests/unit/service_test.py | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 2cdd6c9b..ab7d154e 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -42,6 +42,8 @@ DOCKER_START_KEYS = [
     'net',
     'log_driver',
     'log_opt',
+    'mem_limit',
+    'memswap_limit',
     'pid',
     'privileged',
     'restart',
@@ -684,6 +686,8 @@ class Service(object):
             restart_policy=restart,
             cap_add=cap_add,
             cap_drop=cap_drop,
+            mem_limit=options.get('mem_limit'),
+            memswap_limit=options.get('memswap_limit'),
             log_config=log_config,
             extra_hosts=extra_hosts,
             read_only=read_only,
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 0e274a35..7e5266dd 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -173,8 +173,8 @@ class ServiceTest(unittest.TestCase):
         service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, mem_limit=1000000000, memswap_limit=2000000000)
         self.mock_client.containers.return_value = []
         opts = service._get_container_create_options({'some': 'overrides'}, 1)
-        self.assertEqual(opts['memswap_limit'], 2000000000)
-        self.assertEqual(opts['mem_limit'], 1000000000)
+        self.assertEqual(opts['host_config']['MemorySwap'], 2000000000)
+        self.assertEqual(opts['host_config']['Memory'], 1000000000)
 
     def test_log_opt(self):
         log_opt = {'address': 'tcp://192.168.0.42:123'}

From 810bb702495f1d6d15008ed0cf87956b863a7ad7 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 11 Aug 2015 16:31:56 +0100
Subject: [PATCH 0192/1265] Include schema in manifest

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index 6c756417..7d48d347 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include requirements.txt
 include requirements-dev.txt
 include tox.ini
 include *.md
+include compose/config/schema.json
 recursive-include contrib/completion *
 recursive-include tests *
 global-exclude *.pyc

From d454a584da288b5cc4ecc30d85f57a02931dac69 Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Tue, 11 Aug 2015 09:38:49 -0700
Subject: [PATCH 0193/1265] Fixing links after crawl

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/completion.md      |  2 +-
 docs/django.md          |  2 +-
 docs/env.md             |  2 +-
 docs/extends.md         |  4 ++--
 docs/index.md           |  4 ++--
 docs/install.md         |  2 +-
 docs/production.md      | 10 +++++-----
 docs/rails.md           |  2 +-
 docs/reference/index.md |  2 +-
 docs/wordpress.md       |  2 +-
 docs/yml.md             |  2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/docs/completion.md b/docs/completion.md
index 41ef88e6..7b8a6733 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -64,6 +64,6 @@ Enjoy working with Compose faster and with less typos!
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
-- [Command line reference](cli.md)
+- [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
diff --git a/docs/django.md b/docs/django.md
index 71df4e11..7e476b35 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -129,7 +129,7 @@ example, run `docker-compose up` and in another terminal run:
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
-- [Command line reference](cli.md)
+- [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)
diff --git a/docs/env.md b/docs/env.md
index afeb829e..8ead34f0 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -44,6 +44,6 @@ Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
-- [Command line reference](cli.md)
+- [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose command line completion](completion.md)
diff --git a/docs/extends.md b/docs/extends.md
index 7a92b771..18a072a8 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -78,7 +78,7 @@ For full details on how to use `extends`, refer to the [reference](#reference).
 ### Example use case
 
 In this example, you’ll repurpose the example app from the [quick start
-guide](index.md). (If you're not familiar with Compose, it's recommended that
+guide](/). (If you're not familiar with Compose, it's recommended that
 you go through the quick start first.) This example assumes you want to use
 Compose both to develop an application locally and then deploy it to a
 production environment.
@@ -358,6 +358,6 @@ locally-defined bindings taking precedence:
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
-- [Command line reference](cli.md)
+- [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose command line completion](completion.md)
diff --git a/docs/index.md b/docs/index.md
index 6d949f88..872b0158 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -53,7 +53,7 @@ Compose has commands for managing the whole lifecycle of your application:
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
-- [Command line reference](cli.md)
+- [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)
@@ -201,7 +201,7 @@ At this point, you have seen the basics of how Compose works.
 
 - Next, try the quick start guide for [Django](django.md),
   [Rails](rails.md), or [Wordpress](wordpress.md).
-- See the reference guides for complete details on the [commands](cli.md), the
+- See the reference guides for complete details on the [commands](/reference), the
   [configuration file](yml.md) and [environment variables](env.md).
 
 ## Release Notes
diff --git a/docs/install.md b/docs/install.md
index fa367919..d71aa080 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -98,7 +98,7 @@ To uninstall Docker Compose if you installed using `pip`:
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
-- [Command line reference](cli.md)
+- [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)
diff --git a/docs/production.md b/docs/production.md
index 294f3c4e..60051136 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -15,8 +15,7 @@ weight=1
 While **Compose is not yet considered production-ready**, if you'd like to experiment and learn more about using it in production deployments, this guide
 can help.
 The project is actively working towards becoming
-production-ready; to learn more about the progress being made, check out the
-[roadmap](https://github.com/docker/compose/blob/master/ROADMAP.md) for details
+production-ready; to learn more about the progress being made, check out the <a href="https://github.com/docker/compose/blob/master/ROADMAP.md">roadmap</a> for details
 on how it's coming along and what still needs to be done.
 
 When deploying to production, you'll almost certainly want to make changes to
@@ -80,8 +79,9 @@ system, exposes the same API as a single Docker host, which means you can use
 Compose against a Swarm instance and run your apps across multiple hosts.
 
 Compose/Swarm integration is still in the experimental stage, and Swarm is still
-in beta, but if you'd like to explore and experiment, check out the
-[integration guide](https://github.com/docker/compose/blob/master/SWARM.md).
+in beta, but if you'd like to explore and experiment, check out the <a
+href="https://github.com/docker/compose/blob/master/SWARM.md">integration
+guide</a>.
 
 ## Compose documentation
 
@@ -89,7 +89,7 @@ in beta, but if you'd like to explore and experiment, check out the
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
-- [Command line reference](cli.md)
+- [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)
diff --git a/docs/rails.md b/docs/rails.md
index 9ce6c4a6..b73be90c 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -127,7 +127,7 @@ That's it. Your app should now be running on port 3000 on your Docker daemon. If
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
-- [Command line reference](cli.md)
+- [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)
diff --git a/docs/reference/index.md b/docs/reference/index.md
index 3d3d55d8..5651e5bf 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -13,7 +13,7 @@ parent = "smn_compose_ref"
 
 The following pages describe the usage information for the [docker-compose](/reference/docker-compose.md) subcommands. You can also see this information by running `docker-compose [SUBCOMMAND] --help` from the command line.
 
-* [build](/reference/reference/build.md)
+* [build](/reference/build.md)
 * [help](/reference/help.md)
 * [kill](/reference/kill.md)          
 * [ps](/reference/ps.md)
diff --git a/docs/wordpress.md b/docs/wordpress.md
index eda755c1..8440fdbb 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -117,7 +117,7 @@ database containers. If you're using [Docker Machine](https://docs.docker.com/ma
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
-- [Command line reference](cli.md)
+- [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)
diff --git a/docs/yml.md b/docs/yml.md
index 6ac1ce62..8e7cf3bb 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -408,6 +408,6 @@ dollar sign (`$$`).
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
-- [Command line reference](cli.md)
+- [Command line reference](/reference)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)

From 192dda4140f592a5db53f44cb5cd8d5b1a3f0ca1 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 11 Aug 2015 18:41:21 +0100
Subject: [PATCH 0194/1265] Bump 1.5.0dev

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 CHANGES.md          | 39 +++++++++++++++++++++++++++++++++++++++
 compose/__init__.py |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 38a54324..88e725da 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,45 @@
 Change log
 ==========
 
+1.4.0 (2015-08-04)
+------------------
+
+-   By default, `docker-compose up` now only recreates containers for services whose configuration has changed since they were created. This should result in a dramatic speed-up for many applications.
+
+    The experimental `--x-smart-recreate` flag which introduced this feature in Compose 1.3.0 has been removed, and a `--force-recreate` flag has been added for when you want to recreate everything.
+
+-   Several of Compose's commands - `scale`, `stop`, `kill` and `rm` - now perform actions on multiple containers in parallel, rather than in sequence, which will run much faster on larger applications.
+
+-   You can now specify a custom name for a service's container with `container_name`. Because Docker container names must be unique, this means you can't scale the service beyond one container.
+
+-   You no longer have to specify a `file` option when using `extends` - it will default to the current file.
+
+-   Service names can now contain dots, dashes and underscores.
+
+-   Compose can now read YAML configuration from standard input, rather than from a file, by specifying `-` as the filename. This makes it easier to generate configuration dynamically:
+
+        $ echo 'redis: {"image": "redis"}' | docker-compose --file - up
+
+-   There's a new `docker-compose version` command which prints extended information about Compose's bundled dependencies.
+
+-   `docker-compose.yml` now supports `log_opt` as well as `log_driver`, allowing you to pass extra configuration to a service's logging driver.
+
+-   `docker-compose.yml` now supports `memswap_limit`, similar to `docker run --memory-swap`.
+
+-   When mounting volumes with the `volumes` option, you can now pass in any mode supported by the daemon, not just `:ro` or `:rw`. For example, SELinux users can pass `:z` or `:Z`.
+
+-   You can now specify a custom volume driver with the `volume_driver` option in `docker-compose.yml`, much like `docker run --volume-driver`.
+
+-   A bug has been fixed where Compose would fail to pull images from private registries serving plain (unsecured) HTTP. The `--allow-insecure-ssl` flag, which was previously used to work around this issue, has been deprecated and now has no effect.
+
+-   A bug has been fixed where `docker-compose build` would fail if the build depended on a private Hub image or an image from a private registry.
+
+-   A bug has been fixed where Compose would crash if there were containers which the Docker daemon had not finished removing.
+
+-   Two bugs have been fixed where Compose would sometimes fail with a "Duplicate bind mount" error, or fail to attach volumes to a container, if there was a volume path specified in `docker-compose.yml` with a trailing slash.
+
+Thanks @mnowster, @dnephin, @ekristen, @funkyfuture, @jeffk and @lukemarsden!
+
 1.3.3 (2015-07-15)
 ------------------
 
diff --git a/compose/__init__.py b/compose/__init__.py
index 0d464ee8..e3ace983 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '1.4.0dev'
+__version__ = '1.5.0dev'

From 5e2ecff8a15f592b755bb1fffba69992cda450d9 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 12 Aug 2015 15:19:28 +0100
Subject: [PATCH 0195/1265] Fix ports validation

I had misunderstood the valid formats allowed for ports. They must
always be in a list.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/schema.json | 30 ++++++++++++++----------------
 tests/unit/config_test.py  |  4 ++--
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/compose/config/schema.json b/compose/config/schema.json
index 24fd53d1..b615aa20 100644
--- a/compose/config/schema.json
+++ b/compose/config/schema.json
@@ -75,22 +75,20 @@
         "pid": {"type": "string"},
 
         "ports": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {"type": "string"},
-              "uniqueItems": true,
-              "format": "ports"
-            },
-            {
-              "type": "string",
-              "format": "ports"
-            },
-            {
-              "type": "number",
-              "format": "ports"
-            }
-          ]
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "type": "string",
+                "format": "ports"
+              },
+              {
+                "type": "number",
+                "format": "ports"
+              }
+            ]
+          },
+          "uniqueItems": true
         },
 
         "privileged": {"type": "string"},
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 44d757d6..136a1183 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -77,7 +77,7 @@ class ConfigTest(unittest.TestCase):
     def test_config_invalid_ports_format_validation(self):
         expected_error_msg = "Service 'web' configuration key 'ports' contains an invalid type"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
-            for invalid_ports in [{"1": "8000"}, False, 0]:
+            for invalid_ports in [{"1": "8000"}, False, 0, "8000", 8000, ["8000", "8000"]]:
                 config.load(
                     config.ConfigDetails(
                         {'web': {'image': 'busybox', 'ports': invalid_ports}},
@@ -87,7 +87,7 @@ class ConfigTest(unittest.TestCase):
                 )
 
     def test_config_valid_ports_format_validation(self):
-        valid_ports = [["8000", "9000"], ["8000/8050"], ["8000"], "8000", 8000]
+        valid_ports = [["8000", "9000"], ["8000/8050"], ["8000"], [8000], ["49153-49154:3002-3003"]]
         for ports in valid_ports:
             config.load(
                 config.ConfigDetails(

From bcb977425b74fcea8c8b4ff91295b535fc0e58ea Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 12 Aug 2015 15:36:10 +0100
Subject: [PATCH 0196/1265] Only use overlay driver in CI

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/ci            | 1 +
 script/test-versions | 1 +
 script/wrapdocker    | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/script/ci b/script/ci
index 2e4ec919..b4975487 100755
--- a/script/ci
+++ b/script/ci
@@ -9,6 +9,7 @@
 set -e
 
 export DOCKER_VERSIONS=all
+export DOCKER_DAEMON_ARGS="--storage-driver=overlay"
 . script/test-versions
 
 >&2 echo "Building Linux binary"
diff --git a/script/test-versions b/script/test-versions
index 9e81a515..ae9620e3 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -21,6 +21,7 @@ for version in $DOCKER_VERSIONS; do
     --volume="/var/lib/docker" \
     --volume="${COVERAGE_DIR:-$(pwd)/coverage-html}:/code/coverage-html" \
     -e "DOCKER_VERSION=$version" \
+    -e "DOCKER_DAEMON_ARGS" \
     --entrypoint="script/dind" \
     "$TAG" \
     script/wrapdocker nosetests --with-coverage --cover-branches --cover-package=compose --cover-erase --cover-html-dir=coverage-html --cover-html "$@"
diff --git a/script/wrapdocker b/script/wrapdocker
index 3e669b5d..ab89f5ed 100755
--- a/script/wrapdocker
+++ b/script/wrapdocker
@@ -7,7 +7,9 @@ fi
 # If a pidfile is still around (for example after a container restart),
 # delete it so that docker can start.
 rm -rf /var/run/docker.pid
-docker -d --storage-driver="overlay" &>/var/log/docker.log &
+docker_command="docker -d $DOCKER_DAEMON_ARGS"
+>&2 echo "Starting Docker with: $docker_command"
+$docker_command &>/var/log/docker.log &
 docker_pid=$!
 
 >&2 echo "Waiting for Docker to start..."

From 4c65891db10250705015407cb914b40d6eaa3378 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 7 Aug 2015 15:04:30 +0100
Subject: [PATCH 0197/1265] Avoid duplicate warnings if an unset env variable
 is used multiple times

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/interpolation.py  | 38 ++++++++++++++++++--------------
 tests/unit/config_test.py        | 24 ++++++++++++++++++++
 tests/unit/interpolation_test.py | 31 +++++++++++++-------------
 3 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index d33e93be..8ebcc875 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -10,13 +10,15 @@ log = logging.getLogger(__name__)
 
 
 def interpolate_environment_variables(config):
+    mapping = BlankDefaultDict(os.environ)
+
     return dict(
-        (service_name, process_service(service_name, service_dict))
+        (service_name, process_service(service_name, service_dict, mapping))
         for (service_name, service_dict) in config.items()
     )
 
 
-def process_service(service_name, service_dict):
+def process_service(service_name, service_dict, mapping):
     if not isinstance(service_dict, dict):
         raise ConfigurationError(
             'Service "%s" doesn\'t have any configuration options. '
@@ -25,14 +27,14 @@ def process_service(service_name, service_dict):
         )
 
     return dict(
-        (key, interpolate_value(service_name, key, val))
+        (key, interpolate_value(service_name, key, val, mapping))
         for (key, val) in service_dict.items()
     )
 
 
-def interpolate_value(service_name, config_key, value):
+def interpolate_value(service_name, config_key, value, mapping):
     try:
-        return recursive_interpolate(value)
+        return recursive_interpolate(value, mapping)
     except InvalidInterpolation as e:
         raise ConfigurationError(
             'Invalid interpolation format for "{config_key}" option '
@@ -45,39 +47,43 @@ def interpolate_value(service_name, config_key, value):
         )
 
 
-def recursive_interpolate(obj):
+def recursive_interpolate(obj, mapping):
     if isinstance(obj, six.string_types):
-        return interpolate(obj, os.environ)
+        return interpolate(obj, mapping)
     elif isinstance(obj, dict):
         return dict(
-            (key, recursive_interpolate(val))
+            (key, recursive_interpolate(val, mapping))
             for (key, val) in obj.items()
         )
     elif isinstance(obj, list):
-        return map(recursive_interpolate, obj)
+        return [recursive_interpolate(val, mapping) for val in obj]
     else:
         return obj
 
 
 def interpolate(string, mapping):
     try:
-        return Template(string).substitute(BlankDefaultDict(mapping))
+        return Template(string).substitute(mapping)
     except ValueError:
         raise InvalidInterpolation(string)
 
 
 class BlankDefaultDict(dict):
-    def __init__(self, mapping):
-        super(BlankDefaultDict, self).__init__(mapping)
+    def __init__(self, *args, **kwargs):
+        super(BlankDefaultDict, self).__init__(*args, **kwargs)
+        self.missing_keys = []
 
     def __getitem__(self, key):
         try:
             return super(BlankDefaultDict, self).__getitem__(key)
         except KeyError:
-            log.warn(
-                "The {} variable is not set. Substituting a blank string."
-                .format(key)
-            )
+            if key not in self.missing_keys:
+                log.warn(
+                    "The {} variable is not set. Substituting a blank string."
+                    .format(key)
+                )
+                self.missing_keys.append(key)
+
             return ""
 
 
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 44d757d6..69959979 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -198,6 +198,30 @@ class InterpolationTest(unittest.TestCase):
             }
         ])
 
+    @mock.patch.dict(os.environ)
+    def test_unset_variable_produces_warning(self):
+        os.environ.pop('FOO', None)
+        os.environ.pop('BAR', None)
+        config_details = config.ConfigDetails(
+            config={
+                'web': {
+                    'image': '${FOO}',
+                    'command': '${BAR}',
+                    'entrypoint': '${BAR}',
+                },
+            },
+            working_dir='.',
+            filename=None,
+        )
+
+        with mock.patch('compose.config.interpolation.log') as log:
+            config.load(config_details)
+
+            self.assertEqual(2, log.warn.call_count)
+            warnings = sorted(args[0][0] for args in log.warn.call_args_list)
+            self.assertIn('BAR', warnings[0])
+            self.assertIn('FOO', warnings[1])
+
     @mock.patch.dict(os.environ)
     def test_invalid_interpolation(self):
         with self.assertRaises(config.ConfigurationError) as cm:
diff --git a/tests/unit/interpolation_test.py b/tests/unit/interpolation_test.py
index 96c6f9b3..fb95422b 100644
--- a/tests/unit/interpolation_test.py
+++ b/tests/unit/interpolation_test.py
@@ -1,31 +1,32 @@
 import unittest
 
 from compose.config.interpolation import interpolate, InvalidInterpolation
+from compose.config.interpolation import BlankDefaultDict as bddict
 
 
 class InterpolationTest(unittest.TestCase):
     def test_valid_interpolations(self):
-        self.assertEqual(interpolate('$foo', dict(foo='hi')), 'hi')
-        self.assertEqual(interpolate('${foo}', dict(foo='hi')), 'hi')
+        self.assertEqual(interpolate('$foo', bddict(foo='hi')), 'hi')
+        self.assertEqual(interpolate('${foo}', bddict(foo='hi')), 'hi')
 
-        self.assertEqual(interpolate('${subject} love you', dict(subject='i')), 'i love you')
-        self.assertEqual(interpolate('i ${verb} you', dict(verb='love')), 'i love you')
-        self.assertEqual(interpolate('i love ${object}', dict(object='you')), 'i love you')
+        self.assertEqual(interpolate('${subject} love you', bddict(subject='i')), 'i love you')
+        self.assertEqual(interpolate('i ${verb} you', bddict(verb='love')), 'i love you')
+        self.assertEqual(interpolate('i love ${object}', bddict(object='you')), 'i love you')
 
     def test_empty_value(self):
-        self.assertEqual(interpolate('${foo}', dict(foo='')), '')
+        self.assertEqual(interpolate('${foo}', bddict(foo='')), '')
 
     def test_unset_value(self):
-        self.assertEqual(interpolate('${foo}', dict()), '')
+        self.assertEqual(interpolate('${foo}', bddict()), '')
 
     def test_escaped_interpolation(self):
-        self.assertEqual(interpolate('$${foo}', dict(foo='hi')), '${foo}')
+        self.assertEqual(interpolate('$${foo}', bddict(foo='hi')), '${foo}')
 
     def test_invalid_strings(self):
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('${', dict()))
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('$}', dict()))
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('${}', dict()))
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('${ }', dict()))
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('${ foo}', dict()))
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('${foo }', dict()))
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('${foo!}', dict()))
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('${', bddict()))
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('$}', bddict()))
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('${}', bddict()))
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('${ }', bddict()))
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('${ foo}', bddict()))
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('${foo }', bddict()))
+        self.assertRaises(InvalidInterpolation, lambda: interpolate('${foo!}', bddict()))

From f1eef7b416b1ebe4e0e26e6179a5df02343348f1 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 12 Aug 2015 16:31:37 +0100
Subject: [PATCH 0198/1265] Fill out release process documentation

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 RELEASE_PROCESS.md | 147 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 121 insertions(+), 26 deletions(-)

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index 86522faa..e81a55ec 100644
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -1,36 +1,131 @@
-# Building a Compose release
+Building a Compose release
+==========================
 
-## Building binaries
+## To get started with a new release
 
-`script/build-linux` builds the Linux binary inside a Docker container:
+1.  Create a `bump-$VERSION` branch off master:
 
-    $ script/build-linux
+        git checkout -b bump-$VERSION master
 
-`script/build-osx` builds the Mac OS X binary inside a virtualenv:
+2.  Merge in the `release` branch on the upstream repo, discarding its tree entirely:
 
-    $ script/build-osx
+        git fetch origin
+        git merge --strategy=ours origin/release
 
-For official releases, you should build inside a Mountain Lion VM for proper
-compatibility. Run the this script first to prepare the environment before
-building - it will use Homebrew to make sure Python is installed and
-up-to-date.
+3.  Update the version in `docs/install.md` and `compose/__init__.py`.
 
-    $ script/prepare-osx
+    If the next release will be an RC, append `rcN`, e.g. `1.4.0rc1`.
 
-## Release process
+4.  Write release notes in `CHANGES.md`.
 
-1. Open pull request that:
- - Updates the version in `compose/__init__.py`
- - Updates the binary URL in `docs/install.md`
- - Adds release notes to `CHANGES.md`
-2. Create unpublished GitHub release with release notes
-3. Build Linux version on any Docker host with `script/build-linux` and attach
-   to release
-4. Build OS X version on Mountain Lion with `script/build-osx` and attach to
-   release as `docker-compose-Darwin-x86_64` and `docker-compose-Linux-x86_64`.
-5. Publish GitHub release, creating tag
-6. Update website with `script/deploy-docs`
-7. Upload PyPi package
+5.   Add a bump commit:
 
-        $ git checkout $VERSION
-        $ python setup.py sdist upload
+        git commit -am "Bump $VERSION"
+
+6.   Push the bump branch to your fork:
+
+        git push --set-upstream $USERNAME bump-$VERSION
+
+7.  Open a PR from the bump branch against the `release` branch on the upstream repo, **not** against master.
+
+## When a PR is merged into master that we want in the release
+
+1.  Check out the bump branch:
+
+        git checkout bump-$VERSION
+
+2.   Cherry-pick the merge commit, fixing any conflicts if necessary:
+
+        git cherry-pick -xm1 $MERGE_COMMIT_HASH
+
+3.  Add a signoff (it’s missing from merge commits):
+
+        git commit --amend --signoff
+
+4.  Move the bump commit back to the tip of the branch:
+
+        git rebase --interactive $PARENT_OF_BUMP_COMMIT
+
+5.  Force-push the bump branch to your fork:
+
+        git push --force $USERNAME bump-$VERSION
+
+## To release a version (whether RC or stable)
+
+1.  Check that CI is passing on the bump PR.
+
+2.  Check out the bump branch:
+
+        git checkout bump-$VERSION
+
+3.  Build the Linux binary:
+
+        script/build-linux
+
+4.  Build the Mac binary in a Mountain Lion VM:
+
+        script/prepare-osx
+        script/build-osx
+
+5.  Test the binaries and/or get some other people to test them.
+
+6.  Create a tag:
+
+        TAG=$VERSION # or $VERSION-rcN, if it's an RC
+        git tag $TAG
+
+7.  Push the tag to the upstream repo:
+
+        git push git@github.com:docker/compose.git $TAG
+
+8.  Create a release from the tag on GitHub.
+
+9.  Paste in installation instructions and release notes.
+
+10.  Attach the binaries.
+
+11. Don’t publish it just yet!
+
+12. Upload the latest version to PyPi:
+
+        python setup.py sdist upload
+
+13. Check that the pip package installs and runs (best done in a virtualenv):
+
+        pip install -U docker-compose==$TAG
+        docker-compose version
+
+14. Publish the release on GitHub.
+
+15. Check that both binaries download (following the install instructions) and run.
+
+16. Email maintainers@dockerproject.org and engineering@docker.com about the new release.
+
+## If it’s a stable release (not an RC)
+
+1. Merge the bump PR.
+
+2. Make sure `origin/release` is updated locally:
+
+        git fetch origin
+
+3. Update the `docs` branch on the upstream repo:
+
+        git push git@github.com:docker/compose.git origin/release:docs
+
+4. Let the docs team know that it’s been updated so they can publish it.
+
+5. Close the release’s milestone.
+
+## If it’s a minor release (1.x.0), rather than a patch release (1.x.y)
+
+1. Open a PR against `master` to:
+
+    - update `CHANGELOG.md` to bring it in line with `release`
+    - bump the version in `compose/__init__.py` to the *next* minor version number with `dev` appended. For example, if you just released `1.4.0`, update it to `1.5.0dev`.
+
+2. Get the PR merged.
+
+## Finally
+
+1. Celebrate, however you’d like.

From 440099754d9eb45b953c3db3baecf8219e2a8e1c Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 12 Aug 2015 17:29:33 +0100
Subject: [PATCH 0199/1265] memory values can be strings or numbers

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/schema.json | 14 ++++++++++++--
 tests/unit/config_test.py  | 10 ++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/compose/config/schema.json b/compose/config/schema.json
index b615aa20..073a0da6 100644
--- a/compose/config/schema.json
+++ b/compose/config/schema.json
@@ -68,8 +68,18 @@
         },
 
         "mac_address": {"type": "string"},
-        "mem_limit": {"type": "number"},
-        "memswap_limit": {"type": "number"},
+        "mem_limit": {
+          "oneOf": [
+            {"type": "number"},
+            {"type": "string"}
+          ]
+        },
+        "memswap_limit": {
+          "oneOf": [
+            {"type": "number"},
+            {"type": "string"}
+          ]
+        },
         "name": {"type": "string"},
         "net": {"type": "string"},
         "pid": {"type": "string"},
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index c8a2d0db..861d36bd 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -533,6 +533,16 @@ class MemoryOptionsTest(unittest.TestCase):
         )
         self.assertEqual(service_dict[0]['memswap_limit'], 2000000)
 
+    def test_memswap_can_be_a_string(self):
+        service_dict = config.load(
+            config.ConfigDetails(
+                {'foo': {'image': 'busybox', 'mem_limit': "1G", 'memswap_limit': "512M"}},
+                'tests/fixtures/extends',
+                'common.yml'
+            )
+        )
+        self.assertEqual(service_dict[0]['memswap_limit'], "512M")
+
 
 class EnvTest(unittest.TestCase):
     def test_parse_environment_as_list(self):

From ff87ceabbd4dcc7f0876f4bef03c4587327fa36b Mon Sep 17 00:00:00 2001
From: Karol Duleba <mr.fuxi@gmail.com>
Date: Fri, 7 Aug 2015 13:42:37 +0100
Subject: [PATCH 0200/1265] Allow manual port mapping when using "run" command.
 Fixes #1709

Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
---
 compose/cli/main.py                    | 12 +++++++-
 contrib/completion/bash/docker-compose |  2 +-
 contrib/completion/zsh/_docker-compose |  1 +
 docs/reference/run.md                  |  5 ++++
 tests/integration/cli_test.py          | 38 ++++++++++++++++++++++++++
 tests/unit/cli_test.py                 | 31 +++++++++++++++++++++
 6 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 56f6c050..6c2a8edb 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -282,7 +282,7 @@ class TopLevelCommand(Command):
         running. If you do not want to start linked services, use
         `docker-compose run --no-deps SERVICE COMMAND [ARGS...]`.
 
-        Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]
+        Usage: run [options] [-p PORT...] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]
 
         Options:
             --allow-insecure-ssl  Deprecated - no effect.
@@ -293,6 +293,7 @@ class TopLevelCommand(Command):
             -u, --user=""         Run as specified username or uid
             --no-deps             Don't start linked services.
             --rm                  Remove container after run. Ignored in detached mode.
+            -p, --publish=[]      Publish a container's port(s) to the host
             --service-ports       Run command with the service's ports enabled and mapped
                                   to the host.
             -T                    Disable pseudo-tty allocation. By default `docker-compose run`
@@ -344,6 +345,15 @@ class TopLevelCommand(Command):
         if not options['--service-ports']:
             container_options['ports'] = []
 
+        if options['--publish']:
+            container_options['ports'] = options.get('--publish')
+
+        if options['--publish'] and options['--service-ports']:
+            raise UserError(
+                'Service port mapping and manual port mapping '
+                'can not be used togather'
+            )
+
         try:
             container = service.create_container(
                 quiet=True,
diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index e7d8cb3f..128428d9 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -248,7 +248,7 @@ _docker-compose_run() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "-d --entrypoint -e --help --no-deps --rm --service-ports -T --user -u" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "-d --entrypoint -e --help --no-deps --rm --service-ports --publish -p -T --user -u" -- "$cur" ) )
 			;;
 		*)
 			__docker-compose_services_all
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 9af21a98..9ac7e756 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -221,6 +221,7 @@ __docker-compose_subcommand () {
                 '(-u --user)'{-u,--user=-}'[Run as specified username or uid]:username or uid:_users' \
                 "--no-deps[Don't start linked services.]" \
                 '--rm[Remove container after run. Ignored in detached mode.]' \
+                "--publish[Run command with manually mapped container's port(s) to the host.]" \
                 "--service-ports[Run command with the service's ports enabled and mapped to the host.]" \
                 '-T[Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.]' \
                 '(-):services:__docker-compose_services' \
diff --git a/docs/reference/run.md b/docs/reference/run.md
index 5ea9a61b..93ae0212 100644
--- a/docs/reference/run.md
+++ b/docs/reference/run.md
@@ -22,6 +22,7 @@ Options:
 -u, --user=""         Run as specified username or uid
 --no-deps             Don't start linked services.
 --rm                  Remove container after run. Ignored in detached mode.
+-p, --publish=[]      Publish a container's port(s) to the host
 --service-ports       Run command with the service's ports enabled and mapped to the host.
 -T                    Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.
 ```
@@ -38,6 +39,10 @@ The second difference is the `docker-compose run` command does not create any of
 
     $ docker-compose run --service-ports web python manage.py shell
 
+Alternatively manual port mapping can be specified. Same as when running Docker's `run` command - using `--publish` or `-p` options:
+
+    $ docker-compose run --publish 8080:80 -p 2022:22 -p 127.0.0.1:2021:21 web python manage.py shell
+
 If you start a service configured with links, the `run` command first checks to see if the linked service is running and starts the service if it is stopped.  Once all the linked services are running, the `run` executes the command you passed it.  So, for example, you could run:
 
     $ docker-compose run db psql -h db -U docker
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 0e86c279..ce497c82 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -343,6 +343,44 @@ class CLITestCase(DockerClientTestCase):
         self.assertIn("0.0.0.0", port_random)
         self.assertEqual(port_assigned, "0.0.0.0:49152")
 
+    @patch('dockerpty.start')
+    def test_run_service_with_explicitly_maped_ports(self, __):
+
+        # create one off container
+        self.command.base_dir = 'tests/fixtures/ports-composefile'
+        self.command.dispatch(['run', '-d', '-p', '30000:3000', '--publish', '30001:3001', 'simple'], None)
+        container = self.project.get_service('simple').containers(one_off=True)[0]
+
+        # get port information
+        port_short = container.get_local_port(3000)
+        port_full = container.get_local_port(3001)
+
+        # close all one off containers we just created
+        container.stop()
+
+        # check the ports
+        self.assertEqual(port_short, "0.0.0.0:30000")
+        self.assertEqual(port_full, "0.0.0.0:30001")
+
+    @patch('dockerpty.start')
+    def test_run_service_with_explicitly_maped_ip_ports(self, __):
+
+        # create one off container
+        self.command.base_dir = 'tests/fixtures/ports-composefile'
+        self.command.dispatch(['run', '-d', '-p', '127.0.0.1:30000:3000', '--publish', '127.0.0.1:30001:3001', 'simple'], None)
+        container = self.project.get_service('simple').containers(one_off=True)[0]
+
+        # get port information
+        port_short = container.get_local_port(3000)
+        port_full = container.get_local_port(3001)
+
+        # close all one off containers we just created
+        container.stop()
+
+        # check the ports
+        self.assertEqual(port_short, "127.0.0.1:30000")
+        self.assertEqual(port_full, "127.0.0.1:30001")
+
     def test_rm(self):
         service = self.project.get_service('simple')
         service.create_container()
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 3f500032..e11f6f14 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -7,6 +7,7 @@ import docker
 import mock
 
 from compose.cli.docopt_command import NoSuchCommand
+from compose.cli.errors import UserError
 from compose.cli.main import TopLevelCommand
 from compose.service import Service
 
@@ -108,6 +109,7 @@ class CLITestCase(unittest.TestCase):
             '-T': None,
             '--entrypoint': None,
             '--service-ports': None,
+            '--publish': [],
             '--rm': None,
         })
 
@@ -136,6 +138,7 @@ class CLITestCase(unittest.TestCase):
             '-T': None,
             '--entrypoint': None,
             '--service-ports': None,
+            '--publish': [],
             '--rm': None,
         })
         _, _, call_kwargs = mock_client.create_container.mock_calls[0]
@@ -160,7 +163,35 @@ class CLITestCase(unittest.TestCase):
             '-T': None,
             '--entrypoint': None,
             '--service-ports': None,
+            '--publish': [],
             '--rm': True,
         })
         _, _, call_kwargs = mock_client.create_container.mock_calls[0]
         self.assertFalse('RestartPolicy' in call_kwargs['host_config'])
+
+    def test_command_manula_and_service_ports_together(self):
+        command = TopLevelCommand()
+        mock_client = mock.create_autospec(docker.Client)
+        mock_project = mock.Mock(client=mock_client)
+        mock_project.get_service.return_value = Service(
+            'service',
+            client=mock_client,
+            restart='always',
+            image='someimage',
+        )
+
+        with self.assertRaises(UserError):
+            command.run(mock_project, {
+                'SERVICE': 'service',
+                'COMMAND': None,
+                '-e': [],
+                '--user': None,
+                '--no-deps': None,
+                '--allow-insecure-ssl': None,
+                '-d': True,
+                '-T': None,
+                '--entrypoint': None,
+                '--service-ports': True,
+                '--publish': ['80:80'],
+                '--rm': None,
+            })

From 2e7f08c2ef28c375329ab32952b30fe116dadeed Mon Sep 17 00:00:00 2001
From: Karol Duleba <mr.fuxi@gmail.com>
Date: Mon, 10 Aug 2015 23:16:55 +0100
Subject: [PATCH 0201/1265] Raise configuration error when trying to extend
 service that does not exist. Fixes #1826

Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
---
 compose/config/config.py                       | 10 +++++++++-
 tests/fixtures/extends/nonexistent-service.yml |  4 ++++
 tests/unit/config_test.py                      |  5 +++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 tests/fixtures/extends/nonexistent-service.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index b5646a47..44c401d4 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -186,8 +186,16 @@ class ServiceLoader(object):
             already_seen=other_already_seen,
         )
 
+        base_service = extends_options['service']
         other_config = load_yaml(other_config_path)
-        other_service_dict = other_config[extends_options['service']]
+
+        if base_service not in other_config:
+            msg = (
+                "Cannot extend service '%s' in %s: Service not found"
+            ) % (base_service, other_config_path)
+            raise ConfigurationError(msg)
+
+        other_service_dict = other_config[base_service]
         other_loader.detect_cycle(extends_options['service'])
         other_service_dict = other_loader.make_service_dict(
             service_dict['name'],
diff --git a/tests/fixtures/extends/nonexistent-service.yml b/tests/fixtures/extends/nonexistent-service.yml
new file mode 100644
index 00000000..e9e17f1b
--- /dev/null
+++ b/tests/fixtures/extends/nonexistent-service.yml
@@ -0,0 +1,4 @@
+web:
+  image: busybox
+  extends:
+    service: foo
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 861d36bd..3e3e9e34 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -917,6 +917,11 @@ class ExtendsTest(unittest.TestCase):
             },
         ])
 
+    def test_load_throws_error_when_base_service_does_not_exist(self):
+        err_msg = r'''Cannot extend service 'foo' in .*: Service not found'''
+        with self.assertRaisesRegexp(ConfigurationError, err_msg):
+            load_from_filename('tests/fixtures/extends/nonexistent-service.yml')
+
 
 class BuildPathTest(unittest.TestCase):
     def setUp(self):

From 67995ab9e37cda9c60fd40f96cb77d41bf21de0e Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 12 Aug 2015 17:09:48 +0100
Subject: [PATCH 0202/1265] Pre-process validation steps

In order to validate a service name that has been specified as an
integer we need to run that as a pre-process validation step
*before* we pass the config to be validated against the schema.

It is not possible to validate it *in* the schema, it causes a
type error. Even though a number is a valid service name, it
must be a cast as a string within the yaml to avoid type error.

Taken this opportunity to move the code design in a direction
towards:

1. pre-process
2. validate
3. construct

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py     | 27 +++++++++++++++++++--------
 compose/config/validation.py | 24 ++++++++++++++++++++++++
 tests/unit/config_test.py    | 11 +++++++++++
 3 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index b5646a47..239bbf5e 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -13,7 +13,11 @@ from .errors import (
     CircularReference,
     ComposeFileNotFound,
 )
-from .validation import validate_against_schema
+from .validation import (
+    validate_against_schema,
+    validate_service_names,
+    validate_top_level_object
+)
 
 
 DOCKER_CONFIG_KEYS = [
@@ -122,19 +126,26 @@ def get_config_path(base_dir):
     return os.path.join(path, winner)
 
 
+@validate_top_level_object
+@validate_service_names
+def pre_process_config(config):
+    """
+    Pre validation checks and processing of the config file to interpolate env
+    vars returning a config dict ready to be tested against the schema.
+    """
+    config = interpolate_environment_variables(config)
+    return config
+
+
 def load(config_details):
     config, working_dir, filename = config_details
-    if not isinstance(config, dict):
-        raise ConfigurationError(
-            "Top level object needs to be a dictionary. Check your .yml file that you have defined a service at the top level."
-        )
 
-    config = interpolate_environment_variables(config)
-    validate_against_schema(config)
+    processed_config = pre_process_config(config)
+    validate_against_schema(processed_config)
 
     service_dicts = []
 
-    for service_name, service_dict in list(config.items()):
+    for service_name, service_dict in list(processed_config.items()):
         loader = ServiceLoader(working_dir=working_dir, filename=filename)
         service_dict = loader.make_service_dict(service_name, service_dict)
         validate_paths(service_dict)
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 36fd03b5..26f3ca8e 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -1,3 +1,4 @@
+from functools import wraps
 import os
 
 from docker.utils.ports import split_port
@@ -36,6 +37,29 @@ def format_ports(instance):
     return True
 
 
+def validate_service_names(func):
+    @wraps(func)
+    def func_wrapper(config):
+        for service_name in config.keys():
+            if type(service_name) is int:
+                raise ConfigurationError(
+                    "Service name: {} needs to be a string, eg '{}'".format(service_name, service_name)
+                )
+        return func(config)
+    return func_wrapper
+
+
+def validate_top_level_object(func):
+    @wraps(func)
+    def func_wrapper(config):
+        if not isinstance(config, dict):
+            raise ConfigurationError(
+                "Top level object needs to be a dictionary. Check your .yml file that you have defined a service at the top level."
+            )
+        return func(config)
+    return func_wrapper
+
+
 def get_unsupported_config_msg(service_name, error_key):
     msg = "Unsupported config option for '{}' service: '{}'".format(service_name, error_key)
     if error_key in DOCKER_CONFIG_HINTS:
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index c8a2d0db..553e85be 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -64,6 +64,17 @@ class ConfigTest(unittest.TestCase):
                     )
                 )
 
+    def test_config_integer_service_name_raise_validation_error(self):
+        expected_error_msg = "Service name: 1 needs to be a string, eg '1'"
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            config.load(
+                config.ConfigDetails(
+                    {1: {'image': 'busybox'}},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+
     def test_config_valid_service_names(self):
         for valid_name in ['_', '-', '.__.', '_what-up.', 'what_.up----', 'whatup']:
             config.load(

From 530d20db6d7929b3d73fb08956c3b4f29520d1bd Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 14 Aug 2015 11:15:22 +0100
Subject: [PATCH 0203/1265] Fix volume path warning

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index b5646a47..e5b80c01 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -399,12 +399,12 @@ def resolve_volume_path(volume, working_dir, service_name):
     if host_path is not None:
         if not any(host_path.startswith(c) for c in PATH_START_CHARS):
             log.warn(
-                'Warning: the mapping "{0}" in the volumes config for '
-                'service "{1}" is ambiguous. In a future version of Docker, '
+                'Warning: the mapping "{0}:{1}" in the volumes config for '
+                'service "{2}" is ambiguous. In a future version of Docker, '
                 'it will designate a "named" volume '
                 '(see https://github.com/docker/docker/pull/14242). '
-                'To prevent unexpected behaviour, change it to "./{0}"'
-                .format(volume, service_name)
+                'To prevent unexpected behaviour, change it to "./{0}:{1}"'
+                .format(host_path, container_path, service_name)
             )
 
         host_path = os.path.expanduser(host_path)

From 478054af4775d6f78fcca4b479f91bf569ff04f7 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 11 Aug 2015 15:01:11 +0100
Subject: [PATCH 0204/1265] Rename CHANGES.md to CHANGELOG.md

To align with the docker/docker repo.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 CHANGELOG.md | 414 ++++++++++++++++++++++++++++++++++++++++++++++++++
 CHANGES.md   | 415 +--------------------------------------------------
 2 files changed, 415 insertions(+), 414 deletions(-)
 create mode 100644 CHANGELOG.md
 mode change 100644 => 120000 CHANGES.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..88e725da
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,414 @@
+Change log
+==========
+
+1.4.0 (2015-08-04)
+------------------
+
+-   By default, `docker-compose up` now only recreates containers for services whose configuration has changed since they were created. This should result in a dramatic speed-up for many applications.
+
+    The experimental `--x-smart-recreate` flag which introduced this feature in Compose 1.3.0 has been removed, and a `--force-recreate` flag has been added for when you want to recreate everything.
+
+-   Several of Compose's commands - `scale`, `stop`, `kill` and `rm` - now perform actions on multiple containers in parallel, rather than in sequence, which will run much faster on larger applications.
+
+-   You can now specify a custom name for a service's container with `container_name`. Because Docker container names must be unique, this means you can't scale the service beyond one container.
+
+-   You no longer have to specify a `file` option when using `extends` - it will default to the current file.
+
+-   Service names can now contain dots, dashes and underscores.
+
+-   Compose can now read YAML configuration from standard input, rather than from a file, by specifying `-` as the filename. This makes it easier to generate configuration dynamically:
+
+        $ echo 'redis: {"image": "redis"}' | docker-compose --file - up
+
+-   There's a new `docker-compose version` command which prints extended information about Compose's bundled dependencies.
+
+-   `docker-compose.yml` now supports `log_opt` as well as `log_driver`, allowing you to pass extra configuration to a service's logging driver.
+
+-   `docker-compose.yml` now supports `memswap_limit`, similar to `docker run --memory-swap`.
+
+-   When mounting volumes with the `volumes` option, you can now pass in any mode supported by the daemon, not just `:ro` or `:rw`. For example, SELinux users can pass `:z` or `:Z`.
+
+-   You can now specify a custom volume driver with the `volume_driver` option in `docker-compose.yml`, much like `docker run --volume-driver`.
+
+-   A bug has been fixed where Compose would fail to pull images from private registries serving plain (unsecured) HTTP. The `--allow-insecure-ssl` flag, which was previously used to work around this issue, has been deprecated and now has no effect.
+
+-   A bug has been fixed where `docker-compose build` would fail if the build depended on a private Hub image or an image from a private registry.
+
+-   A bug has been fixed where Compose would crash if there were containers which the Docker daemon had not finished removing.
+
+-   Two bugs have been fixed where Compose would sometimes fail with a "Duplicate bind mount" error, or fail to attach volumes to a container, if there was a volume path specified in `docker-compose.yml` with a trailing slash.
+
+Thanks @mnowster, @dnephin, @ekristen, @funkyfuture, @jeffk and @lukemarsden!
+
+1.3.3 (2015-07-15)
+------------------
+
+Two regressions have been fixed:
+
+- When stopping containers gracefully, Compose was setting the timeout to 0, effectively forcing a SIGKILL every time.
+- Compose would sometimes crash depending on the formatting of container data returned from the Docker API.
+
+1.3.2 (2015-07-14)
+------------------
+
+The following bugs have been fixed:
+
+- When there were one-off containers created by running `docker-compose run` on an older version of Compose, `docker-compose run` would fail with a name collision. Compose now shows an error if you have leftover containers of this type lying around, and tells you how to remove them.
+- Compose was not reading Docker authentication config files created in the new location, `~/docker/config.json`, and authentication against private registries would therefore fail.
+- When a container had a pseudo-TTY attached, its output in `docker-compose up` would be truncated.
+- `docker-compose up --x-smart-recreate` would sometimes fail when an image tag was updated.
+- `docker-compose up` would sometimes create two containers with the same numeric suffix.
+- `docker-compose rm` and `docker-compose ps` would sometimes list services that aren't part of the current project (though no containers were erroneously removed).
+- Some `docker-compose` commands would not show an error if invalid service names were passed in.
+
+Thanks @dano, @josephpage, @kevinsimper, @lieryan, @phemmer, @soulrebel and @sschepens!
+
+1.3.1 (2015-06-21)
+------------------
+
+The following bugs have been fixed:
+
+- `docker-compose build` would always attempt to pull the base image before building.
+- `docker-compose help migrate-to-labels` failed with an error.
+- If no network mode was specified, Compose would set it to "bridge", rather than allowing the Docker daemon to use its configured default network mode.
+
+1.3.0 (2015-06-18)
+------------------
+
+Firstly, two important notes:
+
+- **This release contains breaking changes, and you will need to either remove or migrate your existing containers before running your app** - see the [upgrading section of the install docs](https://github.com/docker/compose/blob/1.3.0rc1/docs/install.md#upgrading) for details.
+
+- Compose now requires Docker 1.6.0 or later.
+
+We've done a lot of work in this release to remove hacks and make Compose more stable:
+
+- Compose now uses container labels, rather than names, to keep track of containers. This makes Compose both faster and easier to integrate with your own tools.
+
+- Compose no longer uses "intermediate containers" when recreating containers for a service. This makes `docker-compose up` less complex and more resilient to failure.
+
+There are some new features:
+
+- `docker-compose up` has an **experimental** new behaviour: it will only recreate containers for services whose configuration has changed in `docker-compose.yml`. This will eventually become the default, but for now you can take it for a spin:
+
+        $ docker-compose up --x-smart-recreate
+
+- When invoked in a subdirectory of a project, `docker-compose` will now climb up through parent directories until it finds a `docker-compose.yml`.
+
+Several new configuration keys have been added to `docker-compose.yml`:
+
+- `dockerfile`, like `docker build --file`, lets you specify an alternate Dockerfile to use with `build`.
+- `labels`, like `docker run --labels`, lets you add custom metadata to containers.
+- `extra_hosts`, like `docker run --add-host`, lets you add entries to a container's `/etc/hosts` file.
+- `pid: host`, like `docker run --pid=host`, lets you reuse the same PID namespace as the host machine.
+- `cpuset`, like `docker run --cpuset-cpus`, lets you specify which CPUs to allow execution in.
+- `read_only`, like `docker run --read-only`, lets you mount a container's filesystem as read-only.
+- `security_opt`, like `docker run --security-opt`, lets you specify [security options](https://docs.docker.com/reference/run/#security-configuration).
+- `log_driver`, like `docker run --log-driver`, lets you specify a [log driver](https://docs.docker.com/reference/run/#logging-drivers-log-driver).
+
+Many bugs have been fixed, including the following:
+
+- The output of `docker-compose run` was sometimes truncated, especially when running under Jenkins.
+- A service's volumes would sometimes not update after volume configuration was changed in `docker-compose.yml`.
+- Authenticating against third-party registries would sometimes fail.
+- `docker-compose run --rm` would fail to remove the container if the service had a `restart` policy in place.
+- `docker-compose scale` would refuse to scale a service beyond 1 container if it exposed a specific port number on the host.
+- Compose would refuse to create multiple volume entries with the same host path.
+
+Thanks @ahromis, @albers, @aleksandr-vin, @antoineco, @ccverak, @chernjie, @dnephin, @edmorley, @fordhurley, @josephpage, @KyleJamesWalker, @lsowen, @mchasal, @noironetworks, @sdake, @sdurrheimer, @sherter, @stephenlawrence, @thaJeztah, @thieman, @turtlemonvh, @twhiteman, @vdemeester, @xuxinkun and @zwily!
+
+1.2.0 (2015-04-16)
+------------------
+
+- `docker-compose.yml` now supports an `extends` option, which enables a service to inherit configuration from another service in another configuration file. This is really good for sharing common configuration between apps, or for configuring the same app for different environments. Here's the [documentation](https://github.com/docker/compose/blob/master/docs/yml.md#extends).
+
+- When using Compose with a Swarm cluster, containers that depend on one another will be co-scheduled on the same node. This means that most Compose apps will now work out of the box, as long as they don't use `build`.
+
+- Repeated invocations of `docker-compose up` when using Compose with a Swarm cluster now work reliably.
+
+- Directories passed to `build`, filenames passed to `env_file` and volume host paths passed to `volumes` are now treated as relative to the *directory of the configuration file*, not the directory that `docker-compose` is being run in. In the majority of cases, those are the same, but if you use the `-f|--file` argument to specify a configuration file in another directory, **this is a breaking change**.
+
+- A service can now share another service's network namespace with `net: container:<service>`.
+
+- `volumes_from` and `net: container:<service>` entries are taken into account when resolving dependencies, so `docker-compose up <service>` will correctly start all dependencies of `<service>`.
+
+- `docker-compose run` now accepts a `--user` argument to specify a user to run the command as, just like `docker run`.
+
+- The `up`, `stop` and `restart` commands now accept a `--timeout` (or `-t`) argument to specify how long to wait when attempting to gracefully stop containers, just like `docker stop`.
+
+- `docker-compose rm` now accepts `-f` as a shorthand for `--force`, just like `docker rm`.
+
+Thanks, @abesto, @albers, @alunduil, @dnephin, @funkyfuture, @gilclark, @IanVS, @KingsleyKelly, @knutwalker, @thaJeztah and @vmalloc!
+
+1.1.0 (2015-02-25)
+------------------
+
+Fig has been renamed to Docker Compose, or just Compose for short. This has several implications for you:
+
+- The command you type is now `docker-compose`, not `fig`.
+- You should rename your fig.yml to docker-compose.yml.
+- If you’re installing via PyPi, the package is now `docker-compose`, so install it with `pip install docker-compose`.
+
+Besides that, there’s a lot of new stuff in this release:
+
+- We’ve made a few small changes to ensure that Compose will work with Swarm, Docker’s new clustering tool (https://github.com/docker/swarm). Eventually you'll be able to point Compose at a Swarm cluster instead of a standalone Docker host and it’ll run your containers on the cluster with no extra work from you. As Swarm is still developing, integration is rough and lots of Compose features don't work yet.
+
+- `docker-compose run` now has a `--service-ports` flag for exposing ports on the given service. This is useful for e.g. running your webapp with an interactive debugger.
+
+- You can now link to containers outside your app with the `external_links` option in docker-compose.yml.
+
+- You can now prevent `docker-compose up` from automatically building images with the `--no-build` option. This will make fewer API calls and run faster.
+
+- If you don’t specify a tag when using the `image` key, Compose will default to the `latest` tag, rather than pulling all tags.
+
+- `docker-compose kill` now supports the `-s` flag, allowing you to specify the exact signal you want to send to a service’s containers.
+
+- docker-compose.yml now has an `env_file` key, analogous to `docker run --env-file`, letting you specify multiple environment variables in a separate file. This is great if you have a lot of them, or if you want to keep sensitive information out of version control.
+
+- docker-compose.yml now supports the `dns_search`, `cap_add`, `cap_drop`, `cpu_shares` and `restart` options, analogous to `docker run`’s `--dns-search`, `--cap-add`, `--cap-drop`, `--cpu-shares` and `--restart` options.
+
+- Compose now ships with Bash tab completion - see the installation and usage docs at https://github.com/docker/compose/blob/1.1.0/docs/completion.md
+
+- A number of bugs have been fixed - see the milestone for details: https://github.com/docker/compose/issues?q=milestone%3A1.1.0+
+
+Thanks @dnephin, @squebe, @jbalonso, @raulcd, @benlangfield, @albers, @ggtools, @bersace, @dtenenba, @petercv, @drewkett, @TFenby, @paulRbr, @Aigeruth and @salehe!
+
+1.0.1 (2014-11-04)
+------------------
+
+ - Added an `--allow-insecure-ssl` option to allow `fig up`, `fig run` and `fig pull` to pull from insecure registries.
+ - Fixed `fig run` not showing output in Jenkins.
+ - Fixed a bug where Fig couldn't build Dockerfiles with ADD statements pointing at URLs.
+
+1.0.0 (2014-10-16)
+------------------
+
+The highlights:
+
+ - [Fig has joined Docker.](https://www.orchardup.com/blog/orchard-is-joining-docker) Fig will continue to be maintained, but we'll also be incorporating the best bits of Fig into Docker itself.
+
+   This means the GitHub repository has moved to [https://github.com/docker/fig](https://github.com/docker/fig) and our IRC channel is now #docker-fig on Freenode.
+
+ - Fig can be used with the [official Docker OS X installer](https://docs.docker.com/installation/mac/). Boot2Docker will mount the home directory from your host machine so volumes work as expected.
+
+ - Fig supports Docker 1.3.
+
+ - It is now possible to connect to the Docker daemon using TLS by using the `DOCKER_CERT_PATH` and `DOCKER_TLS_VERIFY` environment variables.
+
+ - There is a new `fig port` command which outputs the host port binding of a service, in a similar way to `docker port`.
+
+ - There is a new `fig pull` command which pulls the latest images for a service.
+
+ - There is a new `fig restart` command which restarts a service's containers.
+
+ - Fig creates multiple containers in service by appending a number to the service name (e.g. `db_1`, `db_2`, etc). As a convenience, Fig will now give the first container an alias of the service name (e.g. `db`).
+   
+   This link alias is also a valid hostname and added to `/etc/hosts` so you can connect to linked services using their hostname. For example, instead of resolving the environment variables `DB_PORT_5432_TCP_ADDR` and `DB_PORT_5432_TCP_PORT`, you could just use the hostname `db` and port `5432` directly.
+
+ - Volume definitions now support `ro` mode, expanding `~` and expanding environment variables.
+
+ - `.dockerignore` is supported when building.
+
+ - The project name can be set with the `FIG_PROJECT_NAME` environment variable.
+
+ - The `--env` and `--entrypoint` options have been added to `fig run`.
+
+ - The Fig binary for Linux is now linked against an older version of glibc so it works on CentOS 6 and Debian Wheezy.
+
+Other things:
+
+ - `fig ps` now works on Jenkins and makes fewer API calls to the Docker daemon.
+ - `--verbose` displays more useful debugging output.
+ - When starting a service where `volumes_from` points to a service without any containers running, that service will now be started.
+ - Lots of docs improvements. Notably, environment variables are documented and official repositories are used throughout.
+
+Thanks @dnephin, @d11wtq, @marksteve, @rubbish, @jbalonso, @timfreund, @alunduil, @mieciu, @shuron, @moss, @suzaku and @chmouel! Whew.
+
+0.5.2 (2014-07-28)
+------------------
+
+ - Added a `--no-cache` option to `fig build`, which bypasses the cache just like `docker build --no-cache`.
+ - Fixed the `dns:` fig.yml option, which was causing fig to error out.
+ - Fixed a bug where fig couldn't start under Python 2.6.
+ - Fixed a log-streaming bug that occasionally caused fig to exit.
+
+Thanks @dnephin and @marksteve!
+
+
+0.5.1 (2014-07-11)
+------------------
+
+ - If a service has a command defined, `fig run [service]` with no further arguments will run it.
+ - The project name now defaults to the directory containing fig.yml, not the current working directory (if they're different)
+ - `volumes_from` now works properly with containers as well as services
+ - Fixed a race condition when recreating containers in `fig up`
+
+Thanks @ryanbrainard and @d11wtq!
+
+
+0.5.0 (2014-07-11)
+------------------
+
+ - Fig now starts links when you run `fig run` or `fig up`.
+   
+   For example, if you have a `web` service which depends on a `db` service, `fig run web ...` will start the `db` service.
+
+ - Environment variables can now be resolved from the environment that Fig is running in. Just specify it as a blank variable in your `fig.yml` and, if set, it'll be resolved:
+   ```
+   environment:
+     RACK_ENV: development
+     SESSION_SECRET:
+   ```
+
+ - `volumes_from` is now supported in `fig.yml`. All of the volumes from the specified services and containers will be mounted:
+
+   ```
+   volumes_from:
+    - service_name
+    - container_name
+   ```
+
+ - A host address can now be specified in `ports`:
+
+   ```
+   ports:
+    - "0.0.0.0:8000:8000"
+    - "127.0.0.1:8001:8001"
+   ```
+
+ - The `net` and `workdir` options are now supported in `fig.yml`.
+ - The `hostname` option now works in the same way as the Docker CLI, splitting out into a `domainname` option.
+ - TTY behaviour is far more robust, and resizes are supported correctly.
+ - Load YAML files safely.
+
+Thanks to @d11wtq, @ryanbrainard, @rail44, @j0hnsmith, @binarin, @Elemecca, @mozz100 and @marksteve for their help with this release!
+
+
+0.4.2 (2014-06-18)
+------------------
+
+ - Fix various encoding errors when using `fig run`, `fig up` and `fig build`.
+
+0.4.1 (2014-05-08)
+------------------
+
+ - Add support for Docker 0.11.0. (Thanks @marksteve!)
+ - Make project name configurable. (Thanks @jefmathiot!)
+ - Return correct exit code from `fig run`.
+
+0.4.0 (2014-04-29)
+------------------
+
+ - Support Docker 0.9 and 0.10
+ - Display progress bars correctly when pulling images (no more ski slopes)
+ - `fig up` now stops all services when any container exits
+ - Added support for the `privileged` config option in fig.yml (thanks @kvz!)
+ - Shortened and aligned log prefixes in `fig up` output
+ - Only containers started with `fig run` link back to their own service
+ - Handle UTF-8 correctly when streaming `fig build/run/up` output (thanks @mauvm and @shanejonas!)
+ - Error message improvements
+
+0.3.2 (2014-03-05)
+------------------
+
+ - Added an `--rm` option to `fig run`. (Thanks @marksteve!)
+ - Added an `expose` option to `fig.yml`.
+
+0.3.1 (2014-03-04)
+------------------
+
+ - Added contribution instructions. (Thanks @kvz!)
+ - Fixed `fig rm` throwing an error.
+ - Fixed a bug in `fig ps` on Docker 0.8.1 when there is a container with no command.
+
+0.3.0 (2014-03-03)
+------------------
+
+ - We now ship binaries for OS X and Linux. No more having to install with Pip!
+ - Add `-f` flag to specify alternate `fig.yml` files
+ - Add support for custom link names
+ - Fix a bug where recreating would sometimes hang
+ - Update docker-py to support Docker 0.8.0.
+ - Various documentation improvements
+ - Various error message improvements
+
+Thanks @marksteve, @Gazler and @teozkr!
+
+0.2.2 (2014-02-17)
+------------------
+
+ - Resolve dependencies using Cormen/Tarjan topological sort
+ - Fix `fig up` not printing log output
+ - Stop containers in reverse order to starting
+ - Fix scale command not binding ports
+
+Thanks to @barnybug and @dustinlacewell for their work on this release.
+
+0.2.1 (2014-02-04)
+------------------
+
+ - General improvements to error reporting (#77, #79)
+
+0.2.0 (2014-01-31)
+------------------
+
+ - Link services to themselves so run commands can access the running service. (#67)
+ - Much better documentation.
+ - Make service dependency resolution more reliable. (#48)
+ - Load Fig configurations with a `.yaml` extension. (#58)
+
+Big thanks to @cameronmaske, @mrchrisadams and @damianmoore for their help with this release.
+
+0.1.4 (2014-01-27)
+------------------
+
+ - Add a link alias without the project name. This makes the environment variables a little shorter: `REDIS_1_PORT_6379_TCP_ADDR`. (#54)
+
+0.1.3 (2014-01-23)
+------------------
+
+ - Fix ports sometimes being configured incorrectly. (#46)
+ - Fix log output sometimes not displaying. (#47)
+
+0.1.2 (2014-01-22)
+------------------
+
+ - Add `-T` option to `fig run` to disable pseudo-TTY. (#34)
+ - Fix `fig up` requiring the ubuntu image to be pulled to recreate containers. (#33) Thanks @cameronmaske!
+ - Improve reliability, fix arrow keys and fix a race condition in `fig run`. (#34, #39, #40)
+
+0.1.1 (2014-01-17)
+------------------
+
+ - Fix bug where ports were not exposed correctly (#29). Thanks @dustinlacewell!
+
+0.1.0 (2014-01-16)
+------------------
+
+ - Containers are recreated on each `fig up`, ensuring config is up-to-date with `fig.yml` (#2)
+ - Add `fig scale` command (#9)
+ - Use `DOCKER_HOST` environment variable to find Docker daemon, for consistency with the official Docker client (was previously `DOCKER_URL`) (#19)
+ - Truncate long commands in `fig ps` (#18)
+ - Fill out CLI help banners for commands (#15, #16)
+ - Show a friendlier error when `fig.yml` is missing (#4)
+ - Fix bug with `fig build` logging (#3)
+ - Fix bug where builds would time out if a step took a long time without generating output (#6)
+ - Fix bug where streaming container output over the Unix socket raised an error (#7)
+
+Big thanks to @tomstuart, @EnTeQuAk, @schickling, @aronasorman and @GeoffreyPlitt.
+
+0.0.2 (2014-01-02)
+------------------
+
+ - Improve documentation
+ - Try to connect to Docker on `tcp://localdocker:4243` and a UNIX socket in addition to `localhost`.
+ - Improve `fig up` behaviour
+ - Add confirmation prompt to `fig rm`
+ - Add `fig build` command
+
+0.0.1 (2013-12-20)
+------------------
+
+Initial release.
+
+
diff --git a/CHANGES.md b/CHANGES.md
deleted file mode 100644
index 88e725da..00000000
--- a/CHANGES.md
+++ /dev/null
@@ -1,414 +0,0 @@
-Change log
-==========
-
-1.4.0 (2015-08-04)
-------------------
-
--   By default, `docker-compose up` now only recreates containers for services whose configuration has changed since they were created. This should result in a dramatic speed-up for many applications.
-
-    The experimental `--x-smart-recreate` flag which introduced this feature in Compose 1.3.0 has been removed, and a `--force-recreate` flag has been added for when you want to recreate everything.
-
--   Several of Compose's commands - `scale`, `stop`, `kill` and `rm` - now perform actions on multiple containers in parallel, rather than in sequence, which will run much faster on larger applications.
-
--   You can now specify a custom name for a service's container with `container_name`. Because Docker container names must be unique, this means you can't scale the service beyond one container.
-
--   You no longer have to specify a `file` option when using `extends` - it will default to the current file.
-
--   Service names can now contain dots, dashes and underscores.
-
--   Compose can now read YAML configuration from standard input, rather than from a file, by specifying `-` as the filename. This makes it easier to generate configuration dynamically:
-
-        $ echo 'redis: {"image": "redis"}' | docker-compose --file - up
-
--   There's a new `docker-compose version` command which prints extended information about Compose's bundled dependencies.
-
--   `docker-compose.yml` now supports `log_opt` as well as `log_driver`, allowing you to pass extra configuration to a service's logging driver.
-
--   `docker-compose.yml` now supports `memswap_limit`, similar to `docker run --memory-swap`.
-
--   When mounting volumes with the `volumes` option, you can now pass in any mode supported by the daemon, not just `:ro` or `:rw`. For example, SELinux users can pass `:z` or `:Z`.
-
--   You can now specify a custom volume driver with the `volume_driver` option in `docker-compose.yml`, much like `docker run --volume-driver`.
-
--   A bug has been fixed where Compose would fail to pull images from private registries serving plain (unsecured) HTTP. The `--allow-insecure-ssl` flag, which was previously used to work around this issue, has been deprecated and now has no effect.
-
--   A bug has been fixed where `docker-compose build` would fail if the build depended on a private Hub image or an image from a private registry.
-
--   A bug has been fixed where Compose would crash if there were containers which the Docker daemon had not finished removing.
-
--   Two bugs have been fixed where Compose would sometimes fail with a "Duplicate bind mount" error, or fail to attach volumes to a container, if there was a volume path specified in `docker-compose.yml` with a trailing slash.
-
-Thanks @mnowster, @dnephin, @ekristen, @funkyfuture, @jeffk and @lukemarsden!
-
-1.3.3 (2015-07-15)
-------------------
-
-Two regressions have been fixed:
-
-- When stopping containers gracefully, Compose was setting the timeout to 0, effectively forcing a SIGKILL every time.
-- Compose would sometimes crash depending on the formatting of container data returned from the Docker API.
-
-1.3.2 (2015-07-14)
-------------------
-
-The following bugs have been fixed:
-
-- When there were one-off containers created by running `docker-compose run` on an older version of Compose, `docker-compose run` would fail with a name collision. Compose now shows an error if you have leftover containers of this type lying around, and tells you how to remove them.
-- Compose was not reading Docker authentication config files created in the new location, `~/docker/config.json`, and authentication against private registries would therefore fail.
-- When a container had a pseudo-TTY attached, its output in `docker-compose up` would be truncated.
-- `docker-compose up --x-smart-recreate` would sometimes fail when an image tag was updated.
-- `docker-compose up` would sometimes create two containers with the same numeric suffix.
-- `docker-compose rm` and `docker-compose ps` would sometimes list services that aren't part of the current project (though no containers were erroneously removed).
-- Some `docker-compose` commands would not show an error if invalid service names were passed in.
-
-Thanks @dano, @josephpage, @kevinsimper, @lieryan, @phemmer, @soulrebel and @sschepens!
-
-1.3.1 (2015-06-21)
-------------------
-
-The following bugs have been fixed:
-
-- `docker-compose build` would always attempt to pull the base image before building.
-- `docker-compose help migrate-to-labels` failed with an error.
-- If no network mode was specified, Compose would set it to "bridge", rather than allowing the Docker daemon to use its configured default network mode.
-
-1.3.0 (2015-06-18)
-------------------
-
-Firstly, two important notes:
-
-- **This release contains breaking changes, and you will need to either remove or migrate your existing containers before running your app** - see the [upgrading section of the install docs](https://github.com/docker/compose/blob/1.3.0rc1/docs/install.md#upgrading) for details.
-
-- Compose now requires Docker 1.6.0 or later.
-
-We've done a lot of work in this release to remove hacks and make Compose more stable:
-
-- Compose now uses container labels, rather than names, to keep track of containers. This makes Compose both faster and easier to integrate with your own tools.
-
-- Compose no longer uses "intermediate containers" when recreating containers for a service. This makes `docker-compose up` less complex and more resilient to failure.
-
-There are some new features:
-
-- `docker-compose up` has an **experimental** new behaviour: it will only recreate containers for services whose configuration has changed in `docker-compose.yml`. This will eventually become the default, but for now you can take it for a spin:
-
-        $ docker-compose up --x-smart-recreate
-
-- When invoked in a subdirectory of a project, `docker-compose` will now climb up through parent directories until it finds a `docker-compose.yml`.
-
-Several new configuration keys have been added to `docker-compose.yml`:
-
-- `dockerfile`, like `docker build --file`, lets you specify an alternate Dockerfile to use with `build`.
-- `labels`, like `docker run --labels`, lets you add custom metadata to containers.
-- `extra_hosts`, like `docker run --add-host`, lets you add entries to a container's `/etc/hosts` file.
-- `pid: host`, like `docker run --pid=host`, lets you reuse the same PID namespace as the host machine.
-- `cpuset`, like `docker run --cpuset-cpus`, lets you specify which CPUs to allow execution in.
-- `read_only`, like `docker run --read-only`, lets you mount a container's filesystem as read-only.
-- `security_opt`, like `docker run --security-opt`, lets you specify [security options](https://docs.docker.com/reference/run/#security-configuration).
-- `log_driver`, like `docker run --log-driver`, lets you specify a [log driver](https://docs.docker.com/reference/run/#logging-drivers-log-driver).
-
-Many bugs have been fixed, including the following:
-
-- The output of `docker-compose run` was sometimes truncated, especially when running under Jenkins.
-- A service's volumes would sometimes not update after volume configuration was changed in `docker-compose.yml`.
-- Authenticating against third-party registries would sometimes fail.
-- `docker-compose run --rm` would fail to remove the container if the service had a `restart` policy in place.
-- `docker-compose scale` would refuse to scale a service beyond 1 container if it exposed a specific port number on the host.
-- Compose would refuse to create multiple volume entries with the same host path.
-
-Thanks @ahromis, @albers, @aleksandr-vin, @antoineco, @ccverak, @chernjie, @dnephin, @edmorley, @fordhurley, @josephpage, @KyleJamesWalker, @lsowen, @mchasal, @noironetworks, @sdake, @sdurrheimer, @sherter, @stephenlawrence, @thaJeztah, @thieman, @turtlemonvh, @twhiteman, @vdemeester, @xuxinkun and @zwily!
-
-1.2.0 (2015-04-16)
-------------------
-
-- `docker-compose.yml` now supports an `extends` option, which enables a service to inherit configuration from another service in another configuration file. This is really good for sharing common configuration between apps, or for configuring the same app for different environments. Here's the [documentation](https://github.com/docker/compose/blob/master/docs/yml.md#extends).
-
-- When using Compose with a Swarm cluster, containers that depend on one another will be co-scheduled on the same node. This means that most Compose apps will now work out of the box, as long as they don't use `build`.
-
-- Repeated invocations of `docker-compose up` when using Compose with a Swarm cluster now work reliably.
-
-- Directories passed to `build`, filenames passed to `env_file` and volume host paths passed to `volumes` are now treated as relative to the *directory of the configuration file*, not the directory that `docker-compose` is being run in. In the majority of cases, those are the same, but if you use the `-f|--file` argument to specify a configuration file in another directory, **this is a breaking change**.
-
-- A service can now share another service's network namespace with `net: container:<service>`.
-
-- `volumes_from` and `net: container:<service>` entries are taken into account when resolving dependencies, so `docker-compose up <service>` will correctly start all dependencies of `<service>`.
-
-- `docker-compose run` now accepts a `--user` argument to specify a user to run the command as, just like `docker run`.
-
-- The `up`, `stop` and `restart` commands now accept a `--timeout` (or `-t`) argument to specify how long to wait when attempting to gracefully stop containers, just like `docker stop`.
-
-- `docker-compose rm` now accepts `-f` as a shorthand for `--force`, just like `docker rm`.
-
-Thanks, @abesto, @albers, @alunduil, @dnephin, @funkyfuture, @gilclark, @IanVS, @KingsleyKelly, @knutwalker, @thaJeztah and @vmalloc!
-
-1.1.0 (2015-02-25)
-------------------
-
-Fig has been renamed to Docker Compose, or just Compose for short. This has several implications for you:
-
-- The command you type is now `docker-compose`, not `fig`.
-- You should rename your fig.yml to docker-compose.yml.
-- If you’re installing via PyPi, the package is now `docker-compose`, so install it with `pip install docker-compose`.
-
-Besides that, there’s a lot of new stuff in this release:
-
-- We’ve made a few small changes to ensure that Compose will work with Swarm, Docker’s new clustering tool (https://github.com/docker/swarm). Eventually you'll be able to point Compose at a Swarm cluster instead of a standalone Docker host and it’ll run your containers on the cluster with no extra work from you. As Swarm is still developing, integration is rough and lots of Compose features don't work yet.
-
-- `docker-compose run` now has a `--service-ports` flag for exposing ports on the given service. This is useful for e.g. running your webapp with an interactive debugger.
-
-- You can now link to containers outside your app with the `external_links` option in docker-compose.yml.
-
-- You can now prevent `docker-compose up` from automatically building images with the `--no-build` option. This will make fewer API calls and run faster.
-
-- If you don’t specify a tag when using the `image` key, Compose will default to the `latest` tag, rather than pulling all tags.
-
-- `docker-compose kill` now supports the `-s` flag, allowing you to specify the exact signal you want to send to a service’s containers.
-
-- docker-compose.yml now has an `env_file` key, analogous to `docker run --env-file`, letting you specify multiple environment variables in a separate file. This is great if you have a lot of them, or if you want to keep sensitive information out of version control.
-
-- docker-compose.yml now supports the `dns_search`, `cap_add`, `cap_drop`, `cpu_shares` and `restart` options, analogous to `docker run`’s `--dns-search`, `--cap-add`, `--cap-drop`, `--cpu-shares` and `--restart` options.
-
-- Compose now ships with Bash tab completion - see the installation and usage docs at https://github.com/docker/compose/blob/1.1.0/docs/completion.md
-
-- A number of bugs have been fixed - see the milestone for details: https://github.com/docker/compose/issues?q=milestone%3A1.1.0+
-
-Thanks @dnephin, @squebe, @jbalonso, @raulcd, @benlangfield, @albers, @ggtools, @bersace, @dtenenba, @petercv, @drewkett, @TFenby, @paulRbr, @Aigeruth and @salehe!
-
-1.0.1 (2014-11-04)
-------------------
-
- - Added an `--allow-insecure-ssl` option to allow `fig up`, `fig run` and `fig pull` to pull from insecure registries.
- - Fixed `fig run` not showing output in Jenkins.
- - Fixed a bug where Fig couldn't build Dockerfiles with ADD statements pointing at URLs.
-
-1.0.0 (2014-10-16)
-------------------
-
-The highlights:
-
- - [Fig has joined Docker.](https://www.orchardup.com/blog/orchard-is-joining-docker) Fig will continue to be maintained, but we'll also be incorporating the best bits of Fig into Docker itself.
-
-   This means the GitHub repository has moved to [https://github.com/docker/fig](https://github.com/docker/fig) and our IRC channel is now #docker-fig on Freenode.
-
- - Fig can be used with the [official Docker OS X installer](https://docs.docker.com/installation/mac/). Boot2Docker will mount the home directory from your host machine so volumes work as expected.
-
- - Fig supports Docker 1.3.
-
- - It is now possible to connect to the Docker daemon using TLS by using the `DOCKER_CERT_PATH` and `DOCKER_TLS_VERIFY` environment variables.
-
- - There is a new `fig port` command which outputs the host port binding of a service, in a similar way to `docker port`.
-
- - There is a new `fig pull` command which pulls the latest images for a service.
-
- - There is a new `fig restart` command which restarts a service's containers.
-
- - Fig creates multiple containers in service by appending a number to the service name (e.g. `db_1`, `db_2`, etc). As a convenience, Fig will now give the first container an alias of the service name (e.g. `db`).
-   
-   This link alias is also a valid hostname and added to `/etc/hosts` so you can connect to linked services using their hostname. For example, instead of resolving the environment variables `DB_PORT_5432_TCP_ADDR` and `DB_PORT_5432_TCP_PORT`, you could just use the hostname `db` and port `5432` directly.
-
- - Volume definitions now support `ro` mode, expanding `~` and expanding environment variables.
-
- - `.dockerignore` is supported when building.
-
- - The project name can be set with the `FIG_PROJECT_NAME` environment variable.
-
- - The `--env` and `--entrypoint` options have been added to `fig run`.
-
- - The Fig binary for Linux is now linked against an older version of glibc so it works on CentOS 6 and Debian Wheezy.
-
-Other things:
-
- - `fig ps` now works on Jenkins and makes fewer API calls to the Docker daemon.
- - `--verbose` displays more useful debugging output.
- - When starting a service where `volumes_from` points to a service without any containers running, that service will now be started.
- - Lots of docs improvements. Notably, environment variables are documented and official repositories are used throughout.
-
-Thanks @dnephin, @d11wtq, @marksteve, @rubbish, @jbalonso, @timfreund, @alunduil, @mieciu, @shuron, @moss, @suzaku and @chmouel! Whew.
-
-0.5.2 (2014-07-28)
-------------------
-
- - Added a `--no-cache` option to `fig build`, which bypasses the cache just like `docker build --no-cache`.
- - Fixed the `dns:` fig.yml option, which was causing fig to error out.
- - Fixed a bug where fig couldn't start under Python 2.6.
- - Fixed a log-streaming bug that occasionally caused fig to exit.
-
-Thanks @dnephin and @marksteve!
-
-
-0.5.1 (2014-07-11)
-------------------
-
- - If a service has a command defined, `fig run [service]` with no further arguments will run it.
- - The project name now defaults to the directory containing fig.yml, not the current working directory (if they're different)
- - `volumes_from` now works properly with containers as well as services
- - Fixed a race condition when recreating containers in `fig up`
-
-Thanks @ryanbrainard and @d11wtq!
-
-
-0.5.0 (2014-07-11)
-------------------
-
- - Fig now starts links when you run `fig run` or `fig up`.
-   
-   For example, if you have a `web` service which depends on a `db` service, `fig run web ...` will start the `db` service.
-
- - Environment variables can now be resolved from the environment that Fig is running in. Just specify it as a blank variable in your `fig.yml` and, if set, it'll be resolved:
-   ```
-   environment:
-     RACK_ENV: development
-     SESSION_SECRET:
-   ```
-
- - `volumes_from` is now supported in `fig.yml`. All of the volumes from the specified services and containers will be mounted:
-
-   ```
-   volumes_from:
-    - service_name
-    - container_name
-   ```
-
- - A host address can now be specified in `ports`:
-
-   ```
-   ports:
-    - "0.0.0.0:8000:8000"
-    - "127.0.0.1:8001:8001"
-   ```
-
- - The `net` and `workdir` options are now supported in `fig.yml`.
- - The `hostname` option now works in the same way as the Docker CLI, splitting out into a `domainname` option.
- - TTY behaviour is far more robust, and resizes are supported correctly.
- - Load YAML files safely.
-
-Thanks to @d11wtq, @ryanbrainard, @rail44, @j0hnsmith, @binarin, @Elemecca, @mozz100 and @marksteve for their help with this release!
-
-
-0.4.2 (2014-06-18)
-------------------
-
- - Fix various encoding errors when using `fig run`, `fig up` and `fig build`.
-
-0.4.1 (2014-05-08)
-------------------
-
- - Add support for Docker 0.11.0. (Thanks @marksteve!)
- - Make project name configurable. (Thanks @jefmathiot!)
- - Return correct exit code from `fig run`.
-
-0.4.0 (2014-04-29)
-------------------
-
- - Support Docker 0.9 and 0.10
- - Display progress bars correctly when pulling images (no more ski slopes)
- - `fig up` now stops all services when any container exits
- - Added support for the `privileged` config option in fig.yml (thanks @kvz!)
- - Shortened and aligned log prefixes in `fig up` output
- - Only containers started with `fig run` link back to their own service
- - Handle UTF-8 correctly when streaming `fig build/run/up` output (thanks @mauvm and @shanejonas!)
- - Error message improvements
-
-0.3.2 (2014-03-05)
-------------------
-
- - Added an `--rm` option to `fig run`. (Thanks @marksteve!)
- - Added an `expose` option to `fig.yml`.
-
-0.3.1 (2014-03-04)
-------------------
-
- - Added contribution instructions. (Thanks @kvz!)
- - Fixed `fig rm` throwing an error.
- - Fixed a bug in `fig ps` on Docker 0.8.1 when there is a container with no command.
-
-0.3.0 (2014-03-03)
-------------------
-
- - We now ship binaries for OS X and Linux. No more having to install with Pip!
- - Add `-f` flag to specify alternate `fig.yml` files
- - Add support for custom link names
- - Fix a bug where recreating would sometimes hang
- - Update docker-py to support Docker 0.8.0.
- - Various documentation improvements
- - Various error message improvements
-
-Thanks @marksteve, @Gazler and @teozkr!
-
-0.2.2 (2014-02-17)
-------------------
-
- - Resolve dependencies using Cormen/Tarjan topological sort
- - Fix `fig up` not printing log output
- - Stop containers in reverse order to starting
- - Fix scale command not binding ports
-
-Thanks to @barnybug and @dustinlacewell for their work on this release.
-
-0.2.1 (2014-02-04)
-------------------
-
- - General improvements to error reporting (#77, #79)
-
-0.2.0 (2014-01-31)
-------------------
-
- - Link services to themselves so run commands can access the running service. (#67)
- - Much better documentation.
- - Make service dependency resolution more reliable. (#48)
- - Load Fig configurations with a `.yaml` extension. (#58)
-
-Big thanks to @cameronmaske, @mrchrisadams and @damianmoore for their help with this release.
-
-0.1.4 (2014-01-27)
-------------------
-
- - Add a link alias without the project name. This makes the environment variables a little shorter: `REDIS_1_PORT_6379_TCP_ADDR`. (#54)
-
-0.1.3 (2014-01-23)
-------------------
-
- - Fix ports sometimes being configured incorrectly. (#46)
- - Fix log output sometimes not displaying. (#47)
-
-0.1.2 (2014-01-22)
-------------------
-
- - Add `-T` option to `fig run` to disable pseudo-TTY. (#34)
- - Fix `fig up` requiring the ubuntu image to be pulled to recreate containers. (#33) Thanks @cameronmaske!
- - Improve reliability, fix arrow keys and fix a race condition in `fig run`. (#34, #39, #40)
-
-0.1.1 (2014-01-17)
-------------------
-
- - Fix bug where ports were not exposed correctly (#29). Thanks @dustinlacewell!
-
-0.1.0 (2014-01-16)
-------------------
-
- - Containers are recreated on each `fig up`, ensuring config is up-to-date with `fig.yml` (#2)
- - Add `fig scale` command (#9)
- - Use `DOCKER_HOST` environment variable to find Docker daemon, for consistency with the official Docker client (was previously `DOCKER_URL`) (#19)
- - Truncate long commands in `fig ps` (#18)
- - Fill out CLI help banners for commands (#15, #16)
- - Show a friendlier error when `fig.yml` is missing (#4)
- - Fix bug with `fig build` logging (#3)
- - Fix bug where builds would time out if a step took a long time without generating output (#6)
- - Fix bug where streaming container output over the Unix socket raised an error (#7)
-
-Big thanks to @tomstuart, @EnTeQuAk, @schickling, @aronasorman and @GeoffreyPlitt.
-
-0.0.2 (2014-01-02)
-------------------
-
- - Improve documentation
- - Try to connect to Docker on `tcp://localdocker:4243` and a UNIX socket in addition to `localhost`.
- - Improve `fig up` behaviour
- - Add confirmation prompt to `fig rm`
- - Add `fig build` command
-
-0.0.1 (2013-12-20)
-------------------
-
-Initial release.
-
-
diff --git a/CHANGES.md b/CHANGES.md
new file mode 120000
index 00000000..83b69470
--- /dev/null
+++ b/CHANGES.md
@@ -0,0 +1 @@
+CHANGELOG.md
\ No newline at end of file

From 65afce526a83c6654428d0d06e45a25991a755fd Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 14 Aug 2015 12:42:33 +0100
Subject: [PATCH 0205/1265] Test against Docker 1.8.1

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7c048232..ed23e75a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,13 +48,13 @@ RUN set -ex; \
     rm -rf pip-7.0.1; \
     rm pip-7.0.1.tar.gz
 
-ENV ALL_DOCKER_VERSIONS 1.7.1 1.8.0-rc3
+ENV ALL_DOCKER_VERSIONS 1.7.1 1.8.1
 
 RUN set -ex; \
     curl https://get.docker.com/builds/Linux/x86_64/docker-1.7.1 -o /usr/local/bin/docker-1.7.1; \
     chmod +x /usr/local/bin/docker-1.7.1; \
-    curl https://test.docker.com/builds/Linux/x86_64/docker-1.8.0-rc3 -o /usr/local/bin/docker-1.8.0-rc3; \
-    chmod +x /usr/local/bin/docker-1.8.0-rc3
+    curl https://get.docker.com/builds/Linux/x86_64/docker-1.8.1 -o /usr/local/bin/docker-1.8.1; \
+    chmod +x /usr/local/bin/docker-1.8.1
 
 # Set the default Docker to be run
 RUN ln -s /usr/local/bin/docker-1.7.1 /usr/local/bin/docker

From f4a8fda283ee63c524b6929d11c71eac4be3751c Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 17 Aug 2015 16:31:57 +0100
Subject: [PATCH 0206/1265] Handle all exceptions

If we get back an error that wasn't an APIError, it was causing the
thread to hang. This catch all, while I appreciate feels risky to
have a catch all, is better than not catching and silently failing,
with a never ending thread.

If something worse than an APIError has gone wrong, we want to stop
the incredible journey of what we're doing.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/utils.py                  |  7 +++++++
 tests/integration/service_test.py | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/compose/utils.py b/compose/utils.py
index 4c7f94c5..61d6d802 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -32,6 +32,10 @@ def parallel_execute(objects, obj_callable, msg_index, msg):
         except APIError as e:
             errors[msg_index] = e.explanation
             result = "error"
+        except Exception as e:
+            errors[msg_index] = e
+            result = 'unexpected_exception'
+
         q.put((msg_index, result))
 
     for an_object in objects:
@@ -48,6 +52,9 @@ def parallel_execute(objects, obj_callable, msg_index, msg):
     while done < total_to_execute:
         try:
             msg_index, result = q.get(timeout=1)
+
+            if result == 'unexpected_exception':
+                raise errors[msg_index]
             if result == 'error':
                 write_out_msg(stream, lines, msg_index, msg, status='error')
             else:
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 9bdc12f9..050a3bf6 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -654,6 +654,25 @@ class ServiceTest(DockerClientTestCase):
         self.assertTrue(service.containers()[0].is_running)
         self.assertIn("ERROR: for 2  Boom", mock_stdout.getvalue())
 
+    @patch('sys.stdout', new_callable=StringIO)
+    def test_scale_with_api_returns_unexpected_exception(self, mock_stdout):
+        """
+        Test that when scaling if the API returns an error, that is not of type
+        APIError, that error is re-raised.
+        """
+        service = self.create_service('web')
+        next_number = service._next_container_number()
+        service.create_container(number=next_number, quiet=True)
+
+        with patch(
+            'compose.container.Container.create',
+                side_effect=ValueError("BOOM")):
+            with self.assertRaises(ValueError):
+                service.scale(3)
+
+        self.assertEqual(len(service.containers()), 1)
+        self.assertTrue(service.containers()[0].is_running)
+
     @patch('compose.service.log')
     def test_scale_with_desired_number_already_achieved(self, mock_log):
         """

From 18a474211d29a59b9251ce4aa9947bd7d8241114 Mon Sep 17 00:00:00 2001
From: Maxime Horcholle <maxime.horcholle@gmail.com>
Date: Tue, 18 Aug 2015 09:07:15 +0200
Subject: [PATCH 0207/1265] remove extra ```

Signed-off-by: mhor <maxime.horcholle@gmail.com>
---
 docs/yml.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/yml.md b/docs/yml.md
index bec857f8..3e9a35ca 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -394,7 +394,6 @@ Each of these is a single value, analogous to its
     read_only: true
 
     volume_driver: mydriver
-```
 
 ## Variable substitution
 

From 56f03bc20acaffc9b5d4c2a5898ef47126f4df19 Mon Sep 17 00:00:00 2001
From: Karol Duleba <mr.fuxi@gmail.com>
Date: Tue, 18 Aug 2015 21:46:05 +0100
Subject: [PATCH 0208/1265] Allow to specify image by digest. Fixes #1670

Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
---
 compose/service.py                           | 35 +++++++++++++++-----
 docs/yml.md                                  |  3 +-
 tests/fixtures/simple-composefile/digest.yml |  6 ++++
 tests/integration/cli_test.py                |  6 ++++
 tests/unit/service_test.py                   | 26 +++++++++++----
 5 files changed, 60 insertions(+), 16 deletions(-)
 create mode 100644 tests/fixtures/simple-composefile/digest.yml

diff --git a/compose/service.py b/compose/service.py
index 5a79414b..e49acf0c 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -757,9 +757,9 @@ class Service(object):
         if 'image' not in self.options:
             return
 
-        repo, tag = parse_repository_tag(self.options['image'])
+        repo, tag, separator = parse_repository_tag(self.options['image'])
         tag = tag or 'latest'
-        log.info('Pulling %s (%s:%s)...' % (self.name, repo, tag))
+        log.info('Pulling %s (%s%s%s)...' % (self.name, repo, separator, tag))
         output = self.client.pull(
             repo,
             tag=tag,
@@ -780,14 +780,31 @@ def build_container_name(project, service, number, one_off=False):
 
 # Images
 
+def parse_repository_tag(repo_path):
+    """Splits image identification into base image path, tag/digest
+    and it's separator.
 
-def parse_repository_tag(s):
-    if ":" not in s:
-        return s, ""
-    repo, tag = s.rsplit(":", 1)
-    if "/" in tag:
-        return s, ""
-    return repo, tag
+    Example:
+
+    >>> parse_repository_tag('user/repo@sha256:digest')
+    ('user/repo', 'sha256:digest', '@')
+    >>> parse_repository_tag('user/repo:v1')
+    ('user/repo', 'v1', ':')
+    """
+    tag_separator = ":"
+    digest_separator = "@"
+
+    if digest_separator in repo_path:
+        repo, tag = repo_path.rsplit(digest_separator, 1)
+        return repo, tag, digest_separator
+
+    repo, tag = repo_path, ""
+    if tag_separator in repo_path:
+        repo, tag = repo_path.rsplit(tag_separator, 1)
+        if "/" in tag:
+            repo, tag = repo_path, ""
+
+    return repo, tag, tag_separator
 
 
 # Volumes
diff --git a/docs/yml.md b/docs/yml.md
index 3e9a35ca..bad9c9bc 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -25,12 +25,13 @@ Values for configuration options can contain environment variables, e.g.
 
 ### image
 
-Tag or partial image ID. Can be local or remote - Compose will attempt to
+Tag, partial image ID or digest. Can be local or remote - Compose will attempt to
 pull if it doesn't exist locally.
 
     image: ubuntu
     image: orchardup/postgresql
     image: a4bc65fd
+    image: busybox@sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d
 
 ### build
 
diff --git a/tests/fixtures/simple-composefile/digest.yml b/tests/fixtures/simple-composefile/digest.yml
new file mode 100644
index 00000000..08f1d993
--- /dev/null
+++ b/tests/fixtures/simple-composefile/digest.yml
@@ -0,0 +1,6 @@
+simple:
+  image: busybox:latest
+  command: top
+digest:
+  image: busybox@sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d
+  command: top
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index ef789e19..a02e072f 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -88,6 +88,12 @@ class CLITestCase(DockerClientTestCase):
         mock_logging.info.assert_any_call('Pulling simple (busybox:latest)...')
         mock_logging.info.assert_any_call('Pulling another (busybox:latest)...')
 
+    @patch('compose.service.log')
+    def test_pull_with_digest(self, mock_logging):
+        self.command.dispatch(['-f', 'digest.yml', 'pull'], None)
+        mock_logging.info.assert_any_call('Pulling simple (busybox:latest)...')
+        mock_logging.info.assert_any_call('Pulling digest (busybox@sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d)...')
+
     @patch('sys.stdout', new_callable=StringIO)
     def test_build_no_cache(self, mock_stdout):
         self.command.base_dir = 'tests/fixtures/simple-dockerfile'
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index bb68c9aa..8b39a63e 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -192,6 +192,16 @@ class ServiceTest(unittest.TestCase):
             tag='latest',
             stream=True)
 
+    @mock.patch('compose.service.log', autospec=True)
+    def test_pull_image_digest(self, mock_log):
+        service = Service('foo', client=self.mock_client, image='someimage@sha256:1234')
+        service.pull()
+        self.mock_client.pull.assert_called_once_with(
+            'someimage',
+            tag='sha256:1234',
+            stream=True)
+        mock_log.info.assert_called_once_with('Pulling foo (someimage@sha256:1234)...')
+
     @mock.patch('compose.service.Container', autospec=True)
     def test_recreate_container(self, _):
         mock_container = mock.create_autospec(Container)
@@ -217,12 +227,16 @@ class ServiceTest(unittest.TestCase):
         mock_container.stop.assert_called_once_with(timeout=1)
 
     def test_parse_repository_tag(self):
-        self.assertEqual(parse_repository_tag("root"), ("root", ""))
-        self.assertEqual(parse_repository_tag("root:tag"), ("root", "tag"))
-        self.assertEqual(parse_repository_tag("user/repo"), ("user/repo", ""))
-        self.assertEqual(parse_repository_tag("user/repo:tag"), ("user/repo", "tag"))
-        self.assertEqual(parse_repository_tag("url:5000/repo"), ("url:5000/repo", ""))
-        self.assertEqual(parse_repository_tag("url:5000/repo:tag"), ("url:5000/repo", "tag"))
+        self.assertEqual(parse_repository_tag("root"), ("root", "", ":"))
+        self.assertEqual(parse_repository_tag("root:tag"), ("root", "tag", ":"))
+        self.assertEqual(parse_repository_tag("user/repo"), ("user/repo", "", ":"))
+        self.assertEqual(parse_repository_tag("user/repo:tag"), ("user/repo", "tag", ":"))
+        self.assertEqual(parse_repository_tag("url:5000/repo"), ("url:5000/repo", "", ":"))
+        self.assertEqual(parse_repository_tag("url:5000/repo:tag"), ("url:5000/repo", "tag", ":"))
+
+        self.assertEqual(parse_repository_tag("root@sha256:digest"), ("root", "sha256:digest", "@"))
+        self.assertEqual(parse_repository_tag("user/repo@sha256:digest"), ("user/repo", "sha256:digest", "@"))
+        self.assertEqual(parse_repository_tag("url:5000/repo@sha256:digest"), ("url:5000/repo", "sha256:digest", "@"))
 
     @mock.patch('compose.service.Container', autospec=True)
     def test_create_container_latest_is_used_when_no_tag_specified(self, mock_container):

From 61936f6b88e8e859b23dcf933246675185aaeabd Mon Sep 17 00:00:00 2001
From: Joel Hansson <joel.hansson@ecraft.com>
Date: Thu, 20 Aug 2015 16:38:43 +0200
Subject: [PATCH 0209/1265] log_opt: change address to syslog-address

Signed-off-by: Joel Hansson <joel.hansson@ecraft.com>
---
 compose/config/schema.json | 4 ++--
 docs/yml.md                | 2 +-
 tests/unit/service_test.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compose/config/schema.json b/compose/config/schema.json
index 073a0da6..17e1445a 100644
--- a/compose/config/schema.json
+++ b/compose/config/schema.json
@@ -62,9 +62,9 @@
           "type": "object",
 
           "properties": {
-            "address": {"type": "string"}
+            "syslog-address": {"type": "string"}
           },
-          "required": ["address"]
+          "required": ["syslog-address"]
         },
 
         "mac_address": {"type": "string"},
diff --git a/docs/yml.md b/docs/yml.md
index bad9c9bc..96622086 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -301,7 +301,7 @@ Logging options are key value pairs. An example of `syslog` options:
 
     log_driver: "syslog"
     log_opt:
-      address: "tcp://192.168.0.42:123"
+      syslog-address: "tcp://192.168.0.42:123"
 
 ### net
 
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 8b39a63e..2965d6c8 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -113,7 +113,7 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(opts['host_config']['Memory'], 1000000000)
 
     def test_log_opt(self):
-        log_opt = {'address': 'tcp://192.168.0.42:123'}
+        log_opt = {'syslog-address': 'tcp://192.168.0.42:123'}
         service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, log_driver='syslog', log_opt=log_opt)
         self.mock_client.containers.return_value = []
         opts = service._get_container_create_options({'some': 'overrides'}, 1)

From c69987661728528655e06d12a8ab76528590192c Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 20 Aug 2015 16:09:28 +0100
Subject: [PATCH 0210/1265] Set log level to DEBUG when `--verbose` is passed

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 6c2a8edb..cb38f54c 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -25,6 +25,7 @@ from .log_printer import LogPrinter
 from .utils import yesno, get_version_info
 
 log = logging.getLogger(__name__)
+console_handler = logging.StreamHandler(sys.stderr)
 
 INSECURE_SSL_WARNING = """
 Warning: --allow-insecure-ssl is deprecated and has no effect.
@@ -63,9 +64,6 @@ def main():
 
 
 def setup_logging():
-    console_handler = logging.StreamHandler(sys.stderr)
-    console_handler.setFormatter(logging.Formatter())
-    console_handler.setLevel(logging.INFO)
     root_logger = logging.getLogger()
     root_logger.addHandler(console_handler)
     root_logger.setLevel(logging.DEBUG)
@@ -118,6 +116,16 @@ class TopLevelCommand(Command):
         options['version'] = get_version_info('compose')
         return options
 
+    def perform_command(self, options, *args, **kwargs):
+        if options.get('--verbose'):
+            console_handler.setFormatter(logging.Formatter('%(name)s.%(funcName)s: %(message)s'))
+            console_handler.setLevel(logging.DEBUG)
+        else:
+            console_handler.setFormatter(logging.Formatter())
+            console_handler.setLevel(logging.INFO)
+
+        return super(TopLevelCommand, self).perform_command(options, *args, **kwargs)
+
     def build(self, project, options):
         """
         Build or rebuild services.

From 8caaee9eac0032e74b44c8f65bea28fff73630ff Mon Sep 17 00:00:00 2001
From: Joel Hansson <joel.hansson@ecraft.com>
Date: Fri, 21 Aug 2015 08:36:03 +0200
Subject: [PATCH 0211/1265] schema.json: remove specific log_opt properties

Signed-off-by: Joel Hansson <joel.hansson@ecraft.com>
---
 compose/config/schema.json | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/compose/config/schema.json b/compose/config/schema.json
index 17e1445a..8e9b79fb 100644
--- a/compose/config/schema.json
+++ b/compose/config/schema.json
@@ -56,16 +56,9 @@
         "image": {"type": "string"},
         "labels": {"$ref": "#/definitions/list_or_dict"},
         "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+
         "log_driver": {"type": "string"},
-
-        "log_opt": {
-          "type": "object",
-
-          "properties": {
-            "syslog-address": {"type": "string"}
-          },
-          "required": ["syslog-address"]
-        },
+        "log_opt": {"type": "object"},
 
         "mac_address": {"type": "string"},
         "mem_limit": {

From 227584b8640be269f60975d7c7f361e856c9e9f6 Mon Sep 17 00:00:00 2001
From: Frank Sachsenheim <funkyfuture@riseup.net>
Date: Sat, 25 Jul 2015 22:20:58 +0200
Subject: [PATCH 0212/1265] Adds pause and unpause-commands

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
---
 compose/cli/main.py                    | 16 +++++++++++++
 compose/container.py                   | 12 ++++++++++
 compose/project.py                     |  8 +++++++
 compose/service.py                     | 16 +++++++++++--
 contrib/completion/bash/docker-compose | 31 ++++++++++++++++++++++++++
 docs/reference/docker-compose.md       |  2 ++
 docs/reference/pause.md                | 18 +++++++++++++++
 docs/reference/unpause.md              | 18 +++++++++++++++
 tests/integration/cli_test.py          | 11 +++++++++
 tests/integration/project_test.py      | 19 ++++++++++++++--
 10 files changed, 147 insertions(+), 4 deletions(-)
 create mode 100644 docs/reference/pause.md
 create mode 100644 docs/reference/unpause.md

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 6c2a8edb..df0dfe9f 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -172,6 +172,14 @@ class TopLevelCommand(Command):
         print("Attaching to", list_containers(containers))
         LogPrinter(containers, attach_params={'logs': True}, monochrome=monochrome).run()
 
+    def pause(self, project, options):
+        """
+        Pause services.
+
+        Usage: pause [SERVICE...]
+        """
+        project.pause(service_names=options['SERVICE'])
+
     def port(self, project, options):
         """
         Print the public port for a port binding.
@@ -444,6 +452,14 @@ class TopLevelCommand(Command):
         timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
         project.restart(service_names=options['SERVICE'], timeout=timeout)
 
+    def unpause(self, project, options):
+        """
+        Unpause services.
+
+        Usage: unpause [SERVICE...]
+        """
+        project.unpause(service_names=options['SERVICE'])
+
     def up(self, project, options):
         """
         Builds, (re)creates, starts, and attaches to containers for a service.
diff --git a/compose/container.py b/compose/container.py
index 40aea98a..37ed1fe5 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -100,6 +100,8 @@ class Container(object):
 
     @property
     def human_readable_state(self):
+        if self.is_paused:
+            return 'Paused'
         if self.is_running:
             return 'Ghost' if self.get('State.Ghost') else 'Up'
         else:
@@ -119,6 +121,10 @@ class Container(object):
     def is_running(self):
         return self.get('State.Running')
 
+    @property
+    def is_paused(self):
+        return self.get('State.Paused')
+
     def get(self, key):
         """Return a value from the container or None if the value is not set.
 
@@ -142,6 +148,12 @@ class Container(object):
     def stop(self, **options):
         return self.client.stop(self.id, **options)
 
+    def pause(self, **options):
+        return self.client.pause(self.id, **options)
+
+    def unpause(self, **options):
+        return self.client.unpause(self.id, **options)
+
     def kill(self, **options):
         return self.client.kill(self.id, **options)
 
diff --git a/compose/project.py b/compose/project.py
index 6d86a4a8..276afb54 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -205,6 +205,14 @@ class Project(object):
             msg="Stopping"
         )
 
+    def pause(self, service_names=None, **options):
+        for service in reversed(self.get_services(service_names)):
+            service.pause(**options)
+
+    def unpause(self, service_names=None, **options):
+        for service in self.get_services(service_names):
+            service.unpause(**options)
+
     def kill(self, service_names=None, **options):
         parallel_execute(
             objects=self.containers(service_names),
diff --git a/compose/service.py b/compose/service.py
index e49acf0c..28d289ff 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -96,12 +96,14 @@ class Service(object):
         self.net = net or None
         self.options = options
 
-    def containers(self, stopped=False, one_off=False):
+    def containers(self, stopped=False, one_off=False, filters={}):
+        filters.update({'label': self.labels(one_off=one_off)})
+
         containers = filter(None, [
             Container.from_ps(self.client, container)
             for container in self.client.containers(
                 all=stopped,
-                filters={'label': self.labels(one_off=one_off)})])
+                filters=filters)])
 
         if not containers:
             check_for_legacy_containers(
@@ -132,6 +134,16 @@ class Service(object):
             log.info("Stopping %s..." % c.name)
             c.stop(**options)
 
+    def pause(self, **options):
+        for c in self.containers(filters={'status': 'running'}):
+            log.info("Pausing %s..." % c.name)
+            c.pause(**options)
+
+    def unpause(self, **options):
+        for c in self.containers(filters={'status': 'paused'}):
+            log.info("Unpausing %s..." % c.name)
+            c.unpause()
+
     def kill(self, **options):
         for c in self.containers():
             log.info("Killing %s..." % c.name)
diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 66eb6c8b..5692f0e4 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -68,6 +68,11 @@ __docker_compose_services_with() {
 	COMPREPLY=( $(compgen -W "${names[*]}" -- "$cur") )
 }
 
+# The services for which at least one paused container exists
+__docker_compose_services_paused() {
+	__docker_compose_services_with '.State.Paused'
+}
+
 # The services for which at least one running container exists
 __docker_compose_services_running() {
 	__docker_compose_services_with '.State.Running'
@@ -158,6 +163,18 @@ _docker_compose_migrate_to_labels() {
 }
 
 
+_docker_compose_pause() {
+	case "$cur" in
+		-*)
+			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
+			;;
+		*)
+			__docker_compose_services_running
+			;;
+	esac
+}
+
+
 _docker_compose_port() {
 	case "$prev" in
 		--protocol)
@@ -306,6 +323,18 @@ _docker_compose_stop() {
 }
 
 
+_docker_compose_unpause() {
+	case "$cur" in
+		-*)
+			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
+			;;
+		*)
+			__docker_compose_services_paused
+			;;
+	esac
+}
+
+
 _docker_compose_up() {
 	case "$prev" in
 		-t | --timeout)
@@ -343,6 +372,7 @@ _docker_compose() {
 		kill
 		logs
 		migrate-to-labels
+		pause
 		port
 		ps
 		pull
@@ -352,6 +382,7 @@ _docker_compose() {
 		scale
 		start
 		stop
+		unpause
 		up
 		version
 	)
diff --git a/docs/reference/docker-compose.md b/docs/reference/docker-compose.md
index e252da0a..46afba13 100644
--- a/docs/reference/docker-compose.md
+++ b/docs/reference/docker-compose.md
@@ -28,6 +28,7 @@ Commands:
   help               Get help on a command
   kill               Kill containers
   logs               View output from containers
+  pause              Pause services
   port               Print the public port for a port binding
   ps                 List containers
   pull               Pulls service images
@@ -37,6 +38,7 @@ Commands:
   scale              Set number of containers for a service
   start              Start services
   stop               Stop services
+  unpause            Unpause services
   up                 Create and start containers
   migrate-to-labels  Recreate containers to add labels
 ```
diff --git a/docs/reference/pause.md b/docs/reference/pause.md
new file mode 100644
index 00000000..a0ffab03
--- /dev/null
+++ b/docs/reference/pause.md
@@ -0,0 +1,18 @@
+<!--[metadata]>
++++
+title = "pause"
+description = "Pauses running containers for a service."
+keywords = ["fig, composition, compose, docker, orchestration, cli, pause"]
+[menu.main]
+identifier="pause.compose"
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# pause
+
+```
+Usage: pause [SERVICE...]
+```
+
+Pauses running containers of a service. They can be unpaused with `docker-compose unpause`.
diff --git a/docs/reference/unpause.md b/docs/reference/unpause.md
new file mode 100644
index 00000000..6434b09c
--- /dev/null
+++ b/docs/reference/unpause.md
@@ -0,0 +1,18 @@
+<!--[metadata]>
++++
+title = "unpause"
+description = "Unpauses paused containers for a service."
+keywords = ["fig, composition, compose, docker, orchestration, cli, unpause"]
+[menu.main]
+identifier="unpause.compose"
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# pause
+
+```
+Usage: unpause [SERVICE...]
+```
+
+Unpauses paused containers of a service.
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index a02e072f..38f8ee46 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -415,6 +415,17 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(service.containers(stopped=True)), 1)
         self.assertFalse(service.containers(stopped=True)[0].is_running)
 
+    def test_pause_unpause(self):
+        self.command.dispatch(['up', '-d'], None)
+        service = self.project.get_service('simple')
+        self.assertFalse(service.containers()[0].is_paused)
+
+        self.command.dispatch(['pause'], None)
+        self.assertTrue(service.containers()[0].is_paused)
+
+        self.command.dispatch(['unpause'], None)
+        self.assertFalse(service.containers()[0].is_paused)
+
     def test_logs_invalid_service_name(self):
         with self.assertRaises(NoSuchService):
             self.command.dispatch(['logs', 'madeupname'], None)
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 9788c186..ad2fe4fe 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -140,7 +140,7 @@ class ProjectTest(DockerClientTestCase):
         web = project.get_service('web')
         self.assertEqual(web._get_net(), 'container:' + net_container.id)
 
-    def test_start_stop_kill_remove(self):
+    def test_start_pause_unpause_stop_kill_remove(self):
         web = self.create_service('web')
         db = self.create_service('db')
         project = Project('composetest', [web, db], self.client)
@@ -158,7 +158,22 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(set(c.name for c in project.containers()), set([web_container_1.name, web_container_2.name]))
 
         project.start()
-        self.assertEqual(set(c.name for c in project.containers()), set([web_container_1.name, web_container_2.name, db_container.name]))
+        self.assertEqual(set(c.name for c in project.containers()),
+                         set([web_container_1.name, web_container_2.name, db_container.name]))
+
+        project.pause(service_names=['web'])
+        self.assertEqual(set([c.name for c in project.containers() if c.is_paused]),
+                         set([web_container_1.name, web_container_2.name]))
+
+        project.pause()
+        self.assertEqual(set([c.name for c in project.containers() if c.is_paused]),
+                         set([web_container_1.name, web_container_2.name, db_container.name]))
+
+        project.unpause(service_names=['db'])
+        self.assertEqual(len([c.name for c in project.containers() if c.is_paused]), 2)
+
+        project.unpause()
+        self.assertEqual(len([c.name for c in project.containers() if c.is_paused]), 0)
 
         project.stop(service_names=['web'], timeout=1)
         self.assertEqual(set(c.name for c in project.containers()), set([db_container.name]))

From dd738b380b43387724909e3e6caad863c8a9d6e0 Mon Sep 17 00:00:00 2001
From: Frank Sachsenheim <funkyfuture@riseup.net>
Date: Sat, 25 Jul 2015 22:48:55 +0200
Subject: [PATCH 0213/1265] Makes Service.config_hash a property

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
---
 compose/service.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 28d289ff..7df5618c 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -343,7 +343,7 @@ class Service(object):
         config_hash = None
 
         try:
-            config_hash = self.config_hash()
+            config_hash = self.config_hash
         except NoSuchImageError as e:
             log.debug(
                 'Service %s has diverged: %s',
@@ -468,6 +468,7 @@ class Service(object):
             else:
                 numbers.add(c.number)
 
+    @property
     def config_hash(self):
         return json_hash(self.config_dict())
 
@@ -585,7 +586,7 @@ class Service(object):
             container_options['name'] = self.get_container_name(number, one_off)
 
         if add_config_hash:
-            config_hash = self.config_hash()
+            config_hash = self.config_hash
             if 'labels' not in container_options:
                 container_options['labels'] = {}
             container_options['labels'][LABEL_CONFIG_HASH] = config_hash

From a57ce1b1ba18750f6212055566a0f0007e44980e Mon Sep 17 00:00:00 2001
From: Berk Birand <bbirand@users.noreply.github.com>
Date: Mon, 24 Aug 2015 15:10:00 -0400
Subject: [PATCH 0214/1265] Export COMPOSE_FILE

The environment variable is not used by `docker-compose` without the `export` line..

Signed-off-by: Berk Birand <berk@berkbirand.com>
---
 docs/production.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/production.md b/docs/production.md
index 60051136..85f24581 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -40,7 +40,7 @@ For this reason, you'll probably want to define a separate Compose file, say
 Once you've got an alternate configuration file, make Compose use it
 by setting the `COMPOSE_FILE` environment variable:
 
-    $ COMPOSE_FILE=production.yml
+    $ export COMPOSE_FILE=production.yml
     $ docker-compose up -d
 
 > **Note:** You can also use the file for a one-off command without setting

From fae645466115045f3801cd3926afe752c08840ec Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Mon, 24 Aug 2015 15:15:08 -0400
Subject: [PATCH 0215/1265] Add pre-commit hooks

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 .pre-commit-config.yaml | 18 ++++++++++++++++++
 Dockerfile              |  3 +++
 script/test-versions    |  2 +-
 tox.ini                 | 12 +++++++++++-
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..832be6ab
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,18 @@
+- repo: git://github.com/pre-commit/pre-commit-hooks
+  sha: 'v0.4.2'
+  hooks:
+    - id: check-added-large-files
+    - id: check-docstring-first
+    - id: check-merge-conflict
+    - id: check-yaml
+    - id: debug-statements
+    - id: end-of-file-fixer
+    - id: flake8
+    - id: name-tests-test
+      exclude: 'tests/integration/testcases.py'
+    - id: requirements-txt-fixer
+    - id: trailing-whitespace
+- repo: git://github.com/asottile/reorder_python_imports
+  sha: 3d86483455ab5bd06cc1069fdd5ac57be5463f10
+  hooks:
+    - id: reorder-python-imports
diff --git a/Dockerfile b/Dockerfile
index ed23e75a..a4cc99fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,7 @@ RUN set -ex; \
         curl \
         lxc \
         iptables \
+        libsqlite3-dev \
     ; \
     rm -rf /var/lib/apt/lists/*
 
@@ -68,6 +69,8 @@ RUN pip install -r requirements.txt
 ADD requirements-dev.txt /code/
 RUN pip install -r requirements-dev.txt
 
+RUN pip install tox==2.1.1
+
 ADD . /code/
 RUN python setup.py install
 
diff --git a/script/test-versions b/script/test-versions
index ae9620e3..d67a6f5e 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -5,7 +5,7 @@
 set -e
 
 >&2 echo "Running lint checks"
-flake8 compose tests setup.py
+tox -e pre-commit
 
 if [ "$DOCKER_VERSIONS" == "" ]; then
   DOCKER_VERSIONS="default"
diff --git a/tox.ini b/tox.ini
index 33cdee16..3a69c578 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,10 @@
 [tox]
-envlist = py26,py27
+envlist = py27,pre-commit
 
 [testenv]
 usedevelop=True
+passenv =
+    LD_LIBRARY_PATH
 deps =
     -rrequirements.txt
     -rrequirements-dev.txt
@@ -10,6 +12,14 @@ commands =
     nosetests -v {posargs}
     flake8 compose tests setup.py
 
+[testenv:pre-commit]
+skip_install = True
+deps =
+    pre-commit
+commands =
+    pre-commit install
+    pre-commit run --all-files
+
 [flake8]
 # ignore line-length for now
 ignore = E501,E203

From 59d4f304ee3bf4bb20ba0f5e0ad6c4a3ff1568f3 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Mon, 24 Aug 2015 15:25:25 -0400
Subject: [PATCH 0216/1265] Run pre-commit on all files

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 CHANGELOG.md                                  |  6 +--
 README.md                                     |  2 +-
 compose/cli/command.py                        | 21 ++++++----
 compose/cli/docker_client.py                  |  5 ++-
 compose/cli/docopt_command.py                 |  8 ++--
 compose/cli/errors.py                         |  1 +
 compose/cli/formatter.py                      |  4 +-
 compose/cli/log_printer.py                    |  6 +--
 compose/cli/main.py                           | 18 +++++----
 compose/cli/multiplexer.py                    |  1 +
 compose/cli/utils.py                          | 10 +++--
 compose/cli/verbose_proxy.py                  |  3 +-
 compose/config/__init__.py                    | 19 +++++----
 compose/config/config.py                      | 22 +++++-----
 compose/config/interpolation.py               |  3 +-
 compose/config/validation.py                  |  8 ++--
 compose/container.py                          |  8 ++--
 compose/legacy.py                             |  3 +-
 compose/progress_stream.py                    |  2 +-
 compose/project.py                            | 13 ++++--
 compose/service.py                            | 40 ++++++++++---------
 compose/utils.py                              |  5 ++-
 docs/README.md                                | 12 +++---
 docs/index.md                                 |  2 +-
 docs/install.md                               | 16 ++++----
 docs/pre-process.sh                           |  7 ++--
 docs/production.md                            |  1 -
 docs/rails.md                                 |  2 +-
 docs/reference/build.md                       |  2 +-
 docs/reference/docker-compose.md              |  2 +-
 docs/reference/index.md                       |  6 +--
 docs/reference/kill.md                        |  2 +-
 docs/reference/overview.md                    |  2 +-
 docs/reference/port.md                        |  2 +-
 docs/reference/pull.md                        |  2 +-
 docs/reference/run.md                         |  6 +--
 docs/reference/scale.md                       |  2 +-
 docs/wordpress.md                             |  6 +--
 docs/yml.md                                   |  5 +--
 requirements-dev.txt                          |  8 ++--
 requirements.txt                              |  2 +-
 setup.py                                      |  7 +++-
 .../extends/nonexistent-path-base.yml         |  2 +-
 .../extends/nonexistent-path-child.yml        |  2 +-
 .../docker-compose.yaml                       |  2 +-
 tests/integration/cli_test.py                 |  9 +++--
 tests/integration/legacy_test.py              |  4 +-
 tests/integration/project_test.py             |  4 +-
 tests/integration/resilience_test.py          |  4 +-
 tests/integration/service_test.py             | 36 ++++++++---------
 tests/integration/state_test.py               | 12 +++---
 tests/integration/testcases.py                |  9 +++--
 tests/unit/cli/docker_client_test.py          |  5 ++-
 tests/unit/cli/verbose_proxy_test.py          |  4 +-
 tests/unit/cli_test.py                        |  5 ++-
 tests/unit/config_test.py                     |  5 ++-
 tests/unit/container_test.py                  |  4 +-
 tests/unit/interpolation_test.py              |  3 +-
 tests/unit/log_printer_test.py                |  5 ++-
 tests/unit/progress_stream_test.py            |  4 +-
 tests/unit/project_test.py                    | 13 +++---
 tests/unit/service_test.py                    | 31 +++++++-------
 tests/unit/sort_service_test.py               |  3 +-
 tests/unit/split_buffer_test.py               |  5 ++-
 64 files changed, 250 insertions(+), 223 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88e725da..4f18ddbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -202,7 +202,7 @@ The highlights:
  - There is a new `fig restart` command which restarts a service's containers.
 
  - Fig creates multiple containers in service by appending a number to the service name (e.g. `db_1`, `db_2`, etc). As a convenience, Fig will now give the first container an alias of the service name (e.g. `db`).
-   
+
    This link alias is also a valid hostname and added to `/etc/hosts` so you can connect to linked services using their hostname. For example, instead of resolving the environment variables `DB_PORT_5432_TCP_ADDR` and `DB_PORT_5432_TCP_PORT`, you could just use the hostname `db` and port `5432` directly.
 
  - Volume definitions now support `ro` mode, expanding `~` and expanding environment variables.
@@ -250,7 +250,7 @@ Thanks @ryanbrainard and @d11wtq!
 ------------------
 
  - Fig now starts links when you run `fig run` or `fig up`.
-   
+
    For example, if you have a `web` service which depends on a `db` service, `fig run web ...` will start the `db` service.
 
  - Environment variables can now be resolved from the environment that Fig is running in. Just specify it as a blank variable in your `fig.yml` and, if set, it'll be resolved:
@@ -410,5 +410,3 @@ Big thanks to @tomstuart, @EnTeQuAk, @schickling, @aronasorman and @GeoffreyPlit
 ------------------
 
 Initial release.
-
-
diff --git a/README.md b/README.md
index 7121f6a2..69423111 100644
--- a/README.md
+++ b/README.md
@@ -54,4 +54,4 @@ Want to help build Compose? Check out our [contributing documentation](https://g
 Releasing
 ---------
 
-Releases are built by maintainers, following an outline of the [release process](https://github.com/docker/compose/blob/master/RELEASE_PROCESS.md).
\ No newline at end of file
+Releases are built by maintainers, following an outline of the [release process](https://github.com/docker/compose/blob/master/RELEASE_PROCESS.md).
diff --git a/compose/cli/command.py b/compose/cli/command.py
index 204ed527..67176df2 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -1,20 +1,25 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-from requests.exceptions import ConnectionError, SSLError
+from __future__ import unicode_literals
+
 import logging
 import os
 import re
-import six
 
+import six
+from requests.exceptions import ConnectionError
+from requests.exceptions import SSLError
+
+from . import errors
+from . import verbose_proxy
+from .. import __version__
 from .. import config
 from ..project import Project
 from ..service import ConfigError
-from .docopt_command import DocoptCommand
-from .utils import call_silently, is_mac, is_ubuntu
 from .docker_client import docker_client
-from . import verbose_proxy
-from . import errors
-from .. import __version__
+from .docopt_command import DocoptCommand
+from .utils import call_silently
+from .utils import is_mac
+from .utils import is_ubuntu
 
 log = logging.getLogger(__name__)
 
diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 244bcbef..ad67d563 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -1,7 +1,8 @@
+import os
+import ssl
+
 from docker import Client
 from docker import tls
-import ssl
-import os
 
 
 def docker_client():
diff --git a/compose/cli/docopt_command.py b/compose/cli/docopt_command.py
index 6eeb33a3..27f4b2bd 100644
--- a/compose/cli/docopt_command.py
+++ b/compose/cli/docopt_command.py
@@ -1,9 +1,11 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-import sys
+from __future__ import unicode_literals
 
+import sys
 from inspect import getdoc
-from docopt import docopt, DocoptExit
+
+from docopt import docopt
+from docopt import DocoptExit
 
 
 def docopt_full_help(docstring, *args, **kwargs):
diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index 135710d4..0569c1a0 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+
 from textwrap import dedent
 
 
diff --git a/compose/cli/formatter.py b/compose/cli/formatter.py
index b5b0b3c0..9ed52c4a 100644
--- a/compose/cli/formatter.py
+++ b/compose/cli/formatter.py
@@ -1,6 +1,8 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import os
+
 import texttable
 
 
diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 9c5d35e1..ef484ca6 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -1,11 +1,11 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-import sys
+from __future__ import unicode_literals
 
+import sys
 from itertools import cycle
 
-from .multiplexer import Multiplexer
 from . import colors
+from .multiplexer import Multiplexer
 from .utils import split_buffer
 
 
diff --git a/compose/cli/main.py b/compose/cli/main.py
index b95a09c8..890a3c37 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -1,28 +1,32 @@
 from __future__ import print_function
 from __future__ import unicode_literals
-from inspect import getdoc
-from operator import attrgetter
+
 import logging
 import re
 import signal
 import sys
+from inspect import getdoc
+from operator import attrgetter
 
-from docker.errors import APIError
 import dockerpty
+from docker.errors import APIError
 
 from .. import __version__
 from .. import legacy
-from ..const import DEFAULT_TIMEOUT
-from ..project import NoSuchService, ConfigurationError
-from ..service import BuildError, NeedsBuildError
 from ..config import parse_environment
+from ..const import DEFAULT_TIMEOUT
 from ..progress_stream import StreamOutputError
+from ..project import ConfigurationError
+from ..project import NoSuchService
+from ..service import BuildError
+from ..service import NeedsBuildError
 from .command import Command
 from .docopt_command import NoSuchCommand
 from .errors import UserError
 from .formatter import Formatter
 from .log_printer import LogPrinter
-from .utils import yesno, get_version_info
+from .utils import get_version_info
+from .utils import yesno
 
 log = logging.getLogger(__name__)
 console_handler = logging.StreamHandler(sys.stderr)
diff --git a/compose/cli/multiplexer.py b/compose/cli/multiplexer.py
index 955af632..b502c351 100644
--- a/compose/cli/multiplexer.py
+++ b/compose/cli/multiplexer.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+
 from threading import Thread
 
 try:
diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index 7f2ba2e0..1bb497cd 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -1,14 +1,16 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import unicode_literals
 
-from .. import __version__
 import datetime
-from docker import version as docker_py_version
 import os
 import platform
-import subprocess
 import ssl
+import subprocess
+
+from docker import version as docker_py_version
+
+from .. import __version__
 
 
 def yesno(prompt, default=None):
diff --git a/compose/cli/verbose_proxy.py b/compose/cli/verbose_proxy.py
index a548983e..68dfabe5 100644
--- a/compose/cli/verbose_proxy.py
+++ b/compose/cli/verbose_proxy.py
@@ -1,8 +1,7 @@
-
 import functools
-from itertools import chain
 import logging
 import pprint
+from itertools import chain
 
 import six
 
diff --git a/compose/config/__init__.py b/compose/config/__init__.py
index 3907e5b6..de6f10c9 100644
--- a/compose/config/__init__.py
+++ b/compose/config/__init__.py
@@ -1,10 +1,9 @@
-from .config import (
-    DOCKER_CONFIG_KEYS,
-    ConfigDetails,
-    ConfigurationError,
-    find,
-    load,
-    parse_environment,
-    merge_environment,
-    get_service_name_from_net,
-)  # flake8: noqa
+# flake8: noqa
+from .config import ConfigDetails
+from .config import ConfigurationError
+from .config import DOCKER_CONFIG_KEYS
+from .config import find
+from .config import get_service_name_from_net
+from .config import load
+from .config import merge_environment
+from .config import parse_environment
diff --git a/compose/config/config.py b/compose/config/config.py
index b79ef254..ea122bc4 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -1,23 +1,19 @@
 import logging
 import os
 import sys
-import yaml
 from collections import namedtuple
+
 import six
+import yaml
 
-from compose.cli.utils import find_candidates_in_parent_dirs
-
+from .errors import CircularReference
+from .errors import ComposeFileNotFound
+from .errors import ConfigurationError
 from .interpolation import interpolate_environment_variables
-from .errors import (
-    ConfigurationError,
-    CircularReference,
-    ComposeFileNotFound,
-)
-from .validation import (
-    validate_against_schema,
-    validate_service_names,
-    validate_top_level_object
-)
+from .validation import validate_against_schema
+from .validation import validate_service_names
+from .validation import validate_top_level_object
+from compose.cli.utils import find_candidates_in_parent_dirs
 
 
 DOCKER_CONFIG_KEYS = [
diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index 8ebcc875..f870ab4b 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -1,11 +1,10 @@
+import logging
 import os
 from string import Template
 
 import six
 
 from .errors import ConfigurationError
-
-import logging
 log = logging.getLogger(__name__)
 
 
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 26f3ca8e..8911f5ae 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -1,9 +1,11 @@
-from functools import wraps
+import json
 import os
+from functools import wraps
 
 from docker.utils.ports import split_port
-import json
-from jsonschema import Draft4Validator, FormatChecker, ValidationError
+from jsonschema import Draft4Validator
+from jsonschema import FormatChecker
+from jsonschema import ValidationError
 
 from .errors import ConfigurationError
 
diff --git a/compose/container.py b/compose/container.py
index 37ed1fe5..f727c867 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -1,10 +1,12 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
-import six
 from functools import reduce
 
-from .const import LABEL_CONTAINER_NUMBER, LABEL_SERVICE
+import six
+
+from .const import LABEL_CONTAINER_NUMBER
+from .const import LABEL_SERVICE
 
 
 class Container(object):
diff --git a/compose/legacy.py b/compose/legacy.py
index 6fbf74d6..e8f4f957 100644
--- a/compose/legacy.py
+++ b/compose/legacy.py
@@ -2,7 +2,8 @@ import logging
 import re
 
 from .const import LABEL_VERSION
-from .container import get_container_name, Container
+from .container import Container
+from .container import get_container_name
 
 
 log = logging.getLogger(__name__)
diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index 317c6e81..1ccdb861 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -1,6 +1,6 @@
+import codecs
 import json
 import os
-import codecs
 
 
 class StreamOutputError(Exception):
diff --git a/compose/project.py b/compose/project.py
index 276afb54..eb395297 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -1,12 +1,17 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-from functools import reduce
+from __future__ import unicode_literals
+
 import logging
+from functools import reduce
 
 from docker.errors import APIError
 
-from .config import get_service_name_from_net, ConfigurationError
-from .const import DEFAULT_TIMEOUT, LABEL_PROJECT, LABEL_SERVICE, LABEL_ONE_OFF
+from .config import ConfigurationError
+from .config import get_service_name_from_net
+from .const import DEFAULT_TIMEOUT
+from .const import LABEL_ONE_OFF
+from .const import LABEL_PROJECT
+from .const import LABEL_SERVICE
 from .container import Container
 from .legacy import check_for_legacy_containers
 from .service import Service
diff --git a/compose/service.py b/compose/service.py
index 7df5618c..05e546c4 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -1,33 +1,37 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-from collections import namedtuple
+from __future__ import unicode_literals
+
 import logging
-import re
 import os
+import re
 import sys
+from collections import namedtuple
 from operator import attrgetter
 
 import six
 from docker.errors import APIError
-from docker.utils import create_host_config, LogConfig
-from docker.utils.ports import build_port_bindings, split_port
+from docker.utils import create_host_config
+from docker.utils import LogConfig
+from docker.utils.ports import build_port_bindings
+from docker.utils.ports import split_port
 
 from . import __version__
-from .config import DOCKER_CONFIG_KEYS, merge_environment
-from .const import (
-    DEFAULT_TIMEOUT,
-    LABEL_CONTAINER_NUMBER,
-    LABEL_ONE_OFF,
-    LABEL_PROJECT,
-    LABEL_SERVICE,
-    LABEL_VERSION,
-    LABEL_CONFIG_HASH,
-)
+from .config import DOCKER_CONFIG_KEYS
+from .config import merge_environment
+from .config.validation import VALID_NAME_CHARS
+from .const import DEFAULT_TIMEOUT
+from .const import LABEL_CONFIG_HASH
+from .const import LABEL_CONTAINER_NUMBER
+from .const import LABEL_ONE_OFF
+from .const import LABEL_PROJECT
+from .const import LABEL_SERVICE
+from .const import LABEL_VERSION
 from .container import Container
 from .legacy import check_for_legacy_containers
-from .progress_stream import stream_output, StreamOutputError
-from .utils import json_hash, parallel_execute
-from .config.validation import VALID_NAME_CHARS
+from .progress_stream import stream_output
+from .progress_stream import StreamOutputError
+from .utils import json_hash
+from .utils import parallel_execute
 
 log = logging.getLogger(__name__)
 
diff --git a/compose/utils.py b/compose/utils.py
index 61d6d802..bd892267 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -3,10 +3,11 @@ import hashlib
 import json
 import logging
 import sys
+from Queue import Empty
+from Queue import Queue
+from threading import Thread
 
 from docker.errors import APIError
-from Queue import Queue, Empty
-from threading import Thread
 
 
 log = logging.getLogger(__name__)
diff --git a/docs/README.md b/docs/README.md
index 4d646563..8fbad30c 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,8 +1,8 @@
 # Contributing to the Docker Compose documentation
 
-The documentation in this directory is part of the [https://docs.docker.com](https://docs.docker.com) website.  Docker uses [the Hugo static generator](http://gohugo.io/overview/introduction/) to convert project Markdown files to a static HTML site. 
+The documentation in this directory is part of the [https://docs.docker.com](https://docs.docker.com) website.  Docker uses [the Hugo static generator](http://gohugo.io/overview/introduction/) to convert project Markdown files to a static HTML site.
 
-You don't need to be a Hugo expert to contribute to the compose documentation. If you are familiar with Markdown, you can modify the content in the `docs` files.  
+You don't need to be a Hugo expert to contribute to the compose documentation. If you are familiar with Markdown, you can modify the content in the `docs` files.
 
 If you want to add a new file or change the location of the document in the menu, you do need to know a little more.
 
@@ -23,7 +23,7 @@ If you want to add a new file or change the location of the document in the menu
         docker run --rm -it  -e AWS_S3_BUCKET -e NOCACHE -p 8000:8000 -e DOCKERHOST "docs-base:test-tooling" hugo server --port=8000 --baseUrl=192.168.59.103 --bind=0.0.0.0
         ERROR: 2015/06/13 MenuEntry's .Url is deprecated and will be removed in Hugo 0.15. Use .URL instead.
         0 of 4 drafts rendered
-        0 future content 
+        0 future content
         12 pages created
         0 paginator pages created
         0 tags created
@@ -52,7 +52,7 @@ The top of each Docker Compose documentation file contains TOML metadata. The me
     parent="smn_workw_compose"
     weight=2
     +++
-    <![end-metadata]-->  
+    <![end-metadata]-->
 
 The metadata alone has this structure:
 
@@ -64,7 +64,7 @@ The metadata alone has this structure:
     parent="smn_workw_compose"
     weight=2
     +++
-    
+
 The `[menu.main]` section refers to navigation defined [in the main Docker menu](https://github.com/docker/docs-base/blob/hugo/config.toml). This metadata says *add a menu item called* Extending services in Compose *to the menu with the* `smn_workdw_compose` *identifier*.  If you locate the menu in the configuration, you'll find *Create multi-container applications* is the menu title.
 
 You can move an article in the tree by specifying a new parent. You can shift the location of the item by changing its weight.  Higher numbers are heavier and shift the item to the bottom of menu. Low or no numbers shift it up.
@@ -73,5 +73,5 @@ You can move an article in the tree by specifying a new parent. You can shift th
 ## Other key documentation repositories
 
 The `docker/docs-base` repository contains [the Hugo theme and menu configuration](https://github.com/docker/docs-base). If you open the `Dockerfile` you'll see the `make docs` relies on this as a base image for building the Compose documentation.
-    
+
 The `docker/docs.docker.com` repository contains [build system for building the Docker documentation site](https://github.com/docker/docs.docker.com). Fork this repository to build the entire documentation site.
diff --git a/docs/index.md b/docs/index.md
index 872b0158..4342b368 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -161,7 +161,7 @@ Now, when you run `docker-compose up`, Compose will pull a Redis image, build an
     web_1   |  * Running on http://0.0.0.0:5000/
     web_1   |  * Restarting with stat
 
-If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` will tell you its address and you can open `http://MACHINE_VM_IP:5000` in a browser. 
+If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` will tell you its address and you can open `http://MACHINE_VM_IP:5000` in a browser.
 
 If you're not using Boot2docker and are on linux, then the web app should now be listening on port 5000 on your Docker daemon host. If http://0.0.0.0:5000 doesn't resolve, you can also try localhost:5000.
 
diff --git a/docs/install.md b/docs/install.md
index d71aa080..7a2763ed 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -14,7 +14,7 @@ weight=4
 
 You can run Compose on OS X and 64-bit Linux.  It is currently not supported on
 the Windows operating system. To install Compose, you'll need to install Docker
-first. 
+first.
 
 Depending on how your system is configured, you may require `sudo` access to
 install Compose. If your system requires `sudo`, you will receive "Permission
@@ -26,13 +26,13 @@ To install Compose, do the following:
 1. Install Docker Engine version 1.7.1 or greater:
 
      * <a href="https://docs.docker.com/installation/mac/" target="_blank">Mac OS X installation</a> (installs both Engine and Compose)
-     
+
      * <a href="https://docs.docker.com/installation/ubuntulinux/" target="_blank">Ubuntu installation</a>
-     
+
      * <a href="https://docs.docker.com/installation/" target="_blank">other system installations</a>
- 
+
 2. Mac OS X users are done installing. Others should continue to the next step.
-   
+
 3. Go to the <a href="https://github.com/docker/compose/releases" target="_blank">repository release page</a>.
 
 4. Enter the `curl` command in your termial.
@@ -40,9 +40,9 @@ To install Compose, do the following:
      The command has the following format:
 
         curl -L https://github.com/docker/compose/releases/download/VERSION_NUM/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
-   
+
      If you have problems installing with `curl`, you can use `pip` instead: `pip install -U docker-compose`
-      
+
 4. Apply executable permissions to the binary:
 
         $ chmod +x /usr/local/bin/docker-compose
@@ -85,7 +85,7 @@ To uninstall Docker Compose if you installed using `curl`:
 To uninstall Docker Compose if you installed using `pip`:
 
     $ pip uninstall docker-compose
-    
+
 >**Note**: If you get a "Permission denied" error using either of the above
 >methods, you probably do not have the proper permissions to remove
 >`docker-compose`.  To force the removal, prepend `sudo` to either of the above
diff --git a/docs/pre-process.sh b/docs/pre-process.sh
index 75e9611f..f1f6b7fe 100755
--- a/docs/pre-process.sh
+++ b/docs/pre-process.sh
@@ -13,7 +13,7 @@ content_dir=(`ls -d /docs/content/*`)
 # 5 Change ](word) to ](/project/word)
 # 6 Change ](../../ to ](/project/
 # 7 Change ](../ to ](/project/word)
-# 
+#
 for i in "${content_dir[@]}"
 do
    :
@@ -51,11 +51,10 @@ done
 for i in "${docker_dir[@]}"
 do
    :
-    if [ -d $i ]    
+    if [ -d $i ]
       then
-        mv $i /docs/content/ 
+        mv $i /docs/content/
       fi
 done
 
 rm -rf /docs/content/docker
-
diff --git a/docs/production.md b/docs/production.md
index 60051136..3020a0c4 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -93,4 +93,3 @@ guide</a>.
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)
-
diff --git a/docs/rails.md b/docs/rails.md
index b73be90c..186f9b2b 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -117,7 +117,7 @@ Finally, you need to create the database. In another terminal, run:
 
     $ docker-compose run web rake db:create
 
-That's it. Your app should now be running on port 3000 on your Docker daemon. If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` returns the Docker host IP address. 
+That's it. Your app should now be running on port 3000 on your Docker daemon. If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` returns the Docker host IP address.
 
 
 ## More Compose documentation
diff --git a/docs/reference/build.md b/docs/reference/build.md
index b6e27bb2..77d87def 100644
--- a/docs/reference/build.md
+++ b/docs/reference/build.md
@@ -20,4 +20,4 @@ Options:
 
 Services are built once and then tagged as `project_service`, e.g.,
 `composetest_db`. If you change a service's Dockerfile or the contents of its
-build directory, run `docker-compose build` to rebuild it.
\ No newline at end of file
+build directory, run `docker-compose build` to rebuild it.
diff --git a/docs/reference/docker-compose.md b/docs/reference/docker-compose.md
index 46afba13..6c46b31d 100644
--- a/docs/reference/docker-compose.md
+++ b/docs/reference/docker-compose.md
@@ -5,7 +5,7 @@ description = "docker-compose Command Binary"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  docker-compose"]
 [menu.main]
 parent = "smn_compose_cli"
-weight=-2	
+weight=-2
 +++
 <![end-metadata]-->
 
diff --git a/docs/reference/index.md b/docs/reference/index.md
index 5651e5bf..e7a07b09 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -5,7 +5,7 @@ description = "Compose CLI reference"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
 [menu.main]
 identifier = "smn_compose_cli"
-parent = "smn_compose_ref"	
+parent = "smn_compose_ref"
 +++
 <![end-metadata]-->
 
@@ -15,7 +15,7 @@ The following pages describe the usage information for the [docker-compose](/ref
 
 * [build](/reference/build.md)
 * [help](/reference/help.md)
-* [kill](/reference/kill.md)          
+* [kill](/reference/kill.md)
 * [ps](/reference/ps.md)
 * [restart](/reference/restart.md)
 * [run](/reference/run.md)
@@ -23,7 +23,7 @@ The following pages describe the usage information for the [docker-compose](/ref
 * [up](/reference/up.md)
 * [logs](/reference/logs.md)
 * [port](/reference/port.md)
-* [pull](/reference/pull.md) 
+* [pull](/reference/pull.md)
 * [rm](/reference/rm.md)
 * [scale](/reference/scale.md)
 * [stop](/reference/stop.md)
diff --git a/docs/reference/kill.md b/docs/reference/kill.md
index e5dd0573..dc4bf23a 100644
--- a/docs/reference/kill.md
+++ b/docs/reference/kill.md
@@ -21,4 +21,4 @@ Options:
 Forces running containers to stop by sending a `SIGKILL` signal. Optionally the
 signal can be passed, for example:
 
-    $ docker-compose kill -s SIGINT
\ No newline at end of file
+    $ docker-compose kill -s SIGINT
diff --git a/docs/reference/overview.md b/docs/reference/overview.md
index 458dea40..7425aa5e 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/overview.md
@@ -5,7 +5,7 @@ description = "Introduction to the CLI"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
 [menu.main]
 parent = "smn_compose_cli"
-weight=-2	
+weight=-2
 +++
 <![end-metadata]-->
 
diff --git a/docs/reference/port.md b/docs/reference/port.md
index 76f93f23..c946a97d 100644
--- a/docs/reference/port.md
+++ b/docs/reference/port.md
@@ -20,4 +20,4 @@ Options:
                   instances of a service [default: 1]
 ```
 
-Prints the public port for a port binding.
\ No newline at end of file
+Prints the public port for a port binding.
diff --git a/docs/reference/pull.md b/docs/reference/pull.md
index e5b5d166..d655dd93 100644
--- a/docs/reference/pull.md
+++ b/docs/reference/pull.md
@@ -15,4 +15,4 @@ parent = "smn_compose_cli"
 Usage: pull [options] [SERVICE...]
 ```
 
-Pulls service images.
\ No newline at end of file
+Pulls service images.
diff --git a/docs/reference/run.md b/docs/reference/run.md
index 93ae0212..c1efb9a7 100644
--- a/docs/reference/run.md
+++ b/docs/reference/run.md
@@ -27,7 +27,7 @@ Options:
 -T                    Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.
 ```
 
-Runs a one-time command against a service. For example, the following command starts the `web` service and runs `bash` as its command. 
+Runs a one-time command against a service. For example, the following command starts the `web` service and runs `bash` as its command.
 
     $ docker-compose run web bash
 
@@ -52,7 +52,3 @@ This would open up an interactive PostgreSQL shell for the linked `db` container
 If you do not want the `run` command to start linked containers, specify the `--no-deps` flag:
 
     $ docker-compose run --no-deps web python manage.py shell
-
-
-
-
diff --git a/docs/reference/scale.md b/docs/reference/scale.md
index 95418300..75140ee9 100644
--- a/docs/reference/scale.md
+++ b/docs/reference/scale.md
@@ -18,4 +18,4 @@ Sets the number of containers to run for a service.
 
 Numbers are specified as arguments in the form `service=num`. For example:
 
-    $ docker-compose scale web=2 worker=3
\ No newline at end of file
+    $ docker-compose scale web=2 worker=3
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 8440fdbb..ab22e2a0 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -13,7 +13,7 @@ weight=6
 # Quickstart Guide: Compose and Wordpress
 
 You can use Compose to easily run Wordpress in an isolated environment built
-with Docker containers. 
+with Docker containers.
 
 ## Define the project
 
@@ -36,7 +36,7 @@ your Dockerfile should be:
     ADD . /code
 
 This tells Docker how to build an image defining a container that contains PHP
-and Wordpress. 
+and Wordpress.
 
 Next you'll create a `docker-compose.yml` file that will start your web service
 and a separate MySQL instance:
@@ -108,7 +108,7 @@ Second, `router.php` tells PHP's built-in web server how to run Wordpress:
 
 With those four files in place, run `docker-compose up` inside your Wordpress
 directory and it'll pull and build the needed images, and then start the web and
-database containers. If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser. 
+database containers. If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.
 
 ## More Compose documentation
 
diff --git a/docs/yml.md b/docs/yml.md
index 96622086..6fb31a7d 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -19,7 +19,7 @@ As with `docker run`, options specified in the Dockerfile (e.g., `CMD`,
 `EXPOSE`, `VOLUME`, `ENV`) are respected by default - you don't need to
 specify them again in `docker-compose.yml`.
 
-Values for configuration options can contain environment variables, e.g. 
+Values for configuration options can contain environment variables, e.g.
 `image: postgres:${POSTGRES_VERSION}`. For more details, see the section on
 [variable substitution](#variable-substitution).
 
@@ -353,7 +353,7 @@ Custom DNS search domains. Can be a single value or a list.
 
 ### devices
 
-List of device mappings.  Uses the same format as the `--device` docker 
+List of device mappings.  Uses the same format as the `--device` docker
 client create option.
 
     devices:
@@ -433,4 +433,3 @@ dollar sign (`$$`).
 - [Command line reference](/reference)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)
-
diff --git a/requirements-dev.txt b/requirements-dev.txt
index c5d9c106..97fc4fed 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,7 +1,7 @@
+coverage==3.7.1
+flake8==2.3.0
+git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
 mock >= 1.0.1
 nose==1.3.4
-git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
-unittest2==0.8.0
-flake8==2.3.0
 pep8==1.6.1
-coverage==3.7.1
+unittest2==0.8.0
diff --git a/requirements.txt b/requirements.txt
index 64168768..e93db7b3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 PyYAML==3.10
-jsonschema==2.5.1
 docker-py==1.3.1
 dockerpty==0.3.4
 docopt==0.6.1
+jsonschema==2.5.1
 requests==2.6.1
 six==1.7.3
 texttable==0.8.2
diff --git a/setup.py b/setup.py
index 1f9c981d..2f6dad7a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,16 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 from __future__ import absolute_import
-from setuptools import setup, find_packages
+from __future__ import unicode_literals
+
 import codecs
 import os
 import re
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+
 
 def read(*parts):
     path = os.path.join(os.path.dirname(__file__), *parts)
diff --git a/tests/fixtures/extends/nonexistent-path-base.yml b/tests/fixtures/extends/nonexistent-path-base.yml
index 1cf9a304..4e6c82b0 100644
--- a/tests/fixtures/extends/nonexistent-path-base.yml
+++ b/tests/fixtures/extends/nonexistent-path-base.yml
@@ -3,4 +3,4 @@ dnebase:
   command: /bin/true
   environment:
     - FOO=1
-    - BAR=1
\ No newline at end of file
+    - BAR=1
diff --git a/tests/fixtures/extends/nonexistent-path-child.yml b/tests/fixtures/extends/nonexistent-path-child.yml
index aab11459..d3b732f2 100644
--- a/tests/fixtures/extends/nonexistent-path-child.yml
+++ b/tests/fixtures/extends/nonexistent-path-child.yml
@@ -5,4 +5,4 @@ dnechild:
   image: busybox
   command: /bin/true
   environment:
-    - BAR=2
\ No newline at end of file
+    - BAR=2
diff --git a/tests/fixtures/longer-filename-composefile/docker-compose.yaml b/tests/fixtures/longer-filename-composefile/docker-compose.yaml
index b55a9e12..a4eba2d0 100644
--- a/tests/fixtures/longer-filename-composefile/docker-compose.yaml
+++ b/tests/fixtures/longer-filename-composefile/docker-compose.yaml
@@ -1,3 +1,3 @@
 definedinyamlnotyml:
   image: busybox:latest
-  command: top
\ No newline at end of file
+  command: top
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 38f8ee46..8bdcadd5 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -1,15 +1,16 @@
 from __future__ import absolute_import
-from operator import attrgetter
-import sys
+
 import os
 import shlex
+import sys
+from operator import attrgetter
 
-from six import StringIO
 from mock import patch
+from six import StringIO
 
 from .testcases import DockerClientTestCase
-from compose.cli.main import TopLevelCommand
 from compose.cli.errors import UserError
+from compose.cli.main import TopLevelCommand
 from compose.project import NoSuchService
 
 
diff --git a/tests/integration/legacy_test.py b/tests/integration/legacy_test.py
index 9913bbb0..fa983e6d 100644
--- a/tests/integration/legacy_test.py
+++ b/tests/integration/legacy_test.py
@@ -1,11 +1,11 @@
 import unittest
-from mock import Mock
 
 from docker.errors import APIError
+from mock import Mock
 
+from .testcases import DockerClientTestCase
 from compose import legacy
 from compose.project import Project
-from .testcases import DockerClientTestCase
 
 
 class UtilitiesTestCase(unittest.TestCase):
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index ad2fe4fe..51619cb5 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -1,10 +1,10 @@
 from __future__ import unicode_literals
 
+from .testcases import DockerClientTestCase
 from compose import config
 from compose.const import LABEL_PROJECT
-from compose.project import Project
 from compose.container import Container
-from .testcases import DockerClientTestCase
+from compose.project import Project
 
 
 def build_service_dicts(service_config):
diff --git a/tests/integration/resilience_test.py b/tests/integration/resilience_test.py
index e0c76f29..b1faf99d 100644
--- a/tests/integration/resilience_test.py
+++ b/tests/integration/resilience_test.py
@@ -1,10 +1,10 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import mock
 
-from compose.project import Project
 from .testcases import DockerClientTestCase
+from compose.project import Project
 
 
 class ResilienceTest(DockerClientTestCase):
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 050a3bf6..1d53465f 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -1,30 +1,28 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import os
+import shutil
+import tempfile
 from os import path
 
 from docker.errors import APIError
 from mock import patch
-import tempfile
-import shutil
-from six import StringIO, text_type
+from six import StringIO
+from six import text_type
 
-from compose import __version__
-from compose.const import (
-    LABEL_CONTAINER_NUMBER,
-    LABEL_ONE_OFF,
-    LABEL_PROJECT,
-    LABEL_SERVICE,
-    LABEL_VERSION,
-)
-from compose.service import (
-    ConfigError,
-    ConvergencePlan,
-    Service,
-    build_extra_hosts,
-)
-from compose.container import Container
 from .testcases import DockerClientTestCase
+from compose import __version__
+from compose.const import LABEL_CONTAINER_NUMBER
+from compose.const import LABEL_ONE_OFF
+from compose.const import LABEL_PROJECT
+from compose.const import LABEL_SERVICE
+from compose.const import LABEL_VERSION
+from compose.container import Container
+from compose.service import build_extra_hosts
+from compose.service import ConfigError
+from compose.service import ConvergencePlan
+from compose.service import Service
 
 
 def create_and_start_container(service, **override_options):
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index b124b19f..3d4a5b5a 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -1,13 +1,13 @@
 from __future__ import unicode_literals
-import tempfile
-import shutil
-import os
 
-from compose import config
-from compose.project import Project
-from compose.const import LABEL_CONFIG_HASH
+import os
+import shutil
+import tempfile
 
 from .testcases import DockerClientTestCase
+from compose import config
+from compose.const import LABEL_CONFIG_HASH
+from compose.project import Project
 
 
 class ProjectTestCase(DockerClientTestCase):
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index a7929088..e239010e 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -1,11 +1,12 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-from compose.service import Service
+from __future__ import unicode_literals
+
+from .. import unittest
+from compose.cli.docker_client import docker_client
 from compose.config.config import ServiceLoader
 from compose.const import LABEL_PROJECT
-from compose.cli.docker_client import docker_client
 from compose.progress_stream import stream_output
-from .. import unittest
+from compose.service import Service
 
 
 class DockerClientTestCase(unittest.TestCase):
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index 44bdbb29..6c2dc5f8 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -1,11 +1,12 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import os
 
 import mock
-from tests import unittest
 
 from compose.cli import docker_client
+from tests import unittest
 
 
 class DockerClientTestCase(unittest.TestCase):
diff --git a/tests/unit/cli/verbose_proxy_test.py b/tests/unit/cli/verbose_proxy_test.py
index 59417bb3..6036974c 100644
--- a/tests/unit/cli/verbose_proxy_test.py
+++ b/tests/unit/cli/verbose_proxy_test.py
@@ -1,8 +1,8 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-from tests import unittest
+from __future__ import unicode_literals
 
 from compose.cli import verbose_proxy
+from tests import unittest
 
 
 class VerboseProxyTestCase(unittest.TestCase):
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index e11f6f14..35be4e92 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -1,11 +1,12 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import os
-from .. import unittest
 
 import docker
 import mock
 
+from .. import unittest
 from compose.cli.docopt_command import NoSuchCommand
 from compose.cli.errors import UserError
 from compose.cli.main import TopLevelCommand
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index e6117256..3d1a5321 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -1,9 +1,10 @@
-import mock
 import os
 import shutil
 import tempfile
-from .. import unittest
 
+import mock
+
+from .. import unittest
 from compose.config import config
 from compose.config.errors import ConfigurationError
 
diff --git a/tests/unit/container_test.py b/tests/unit/container_test.py
index c537a8cf..e2381c7c 100644
--- a/tests/unit/container_test.py
+++ b/tests/unit/container_test.py
@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
-from .. import unittest
 
-import mock
 import docker
+import mock
 
+from .. import unittest
 from compose.container import Container
 from compose.container import get_container_name
 
diff --git a/tests/unit/interpolation_test.py b/tests/unit/interpolation_test.py
index fb95422b..7444884c 100644
--- a/tests/unit/interpolation_test.py
+++ b/tests/unit/interpolation_test.py
@@ -1,7 +1,8 @@
 import unittest
 
-from compose.config.interpolation import interpolate, InvalidInterpolation
 from compose.config.interpolation import BlankDefaultDict as bddict
+from compose.config.interpolation import interpolate
+from compose.config.interpolation import InvalidInterpolation
 
 
 class InterpolationTest(unittest.TestCase):
diff --git a/tests/unit/log_printer_test.py b/tests/unit/log_printer_test.py
index e40a1f75..bfd16aff 100644
--- a/tests/unit/log_printer_test.py
+++ b/tests/unit/log_printer_test.py
@@ -1,9 +1,10 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import os
 
-from compose.cli.log_printer import LogPrinter
 from .. import unittest
+from compose.cli.log_printer import LogPrinter
 
 
 class LogPrinterTest(unittest.TestCase):
diff --git a/tests/unit/progress_stream_test.py b/tests/unit/progress_stream_test.py
index 317b77e9..5674f4e4 100644
--- a/tests/unit/progress_stream_test.py
+++ b/tests/unit/progress_stream_test.py
@@ -1,10 +1,10 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-from tests import unittest
+from __future__ import unicode_literals
 
 from six import StringIO
 
 from compose import progress_stream
+from tests import unittest
 
 
 class ProgressStreamTestCase(unittest.TestCase):
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 93bf12ff..7d633c95 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -1,12 +1,13 @@
 from __future__ import unicode_literals
-from .. import unittest
-from compose.service import Service
-from compose.project import Project
-from compose.container import Container
-from compose.const import LABEL_SERVICE
 
-import mock
 import docker
+import mock
+
+from .. import unittest
+from compose.const import LABEL_SERVICE
+from compose.container import Container
+from compose.project import Project
+from compose.service import Service
 
 
 class ProjectTest(unittest.TestCase):
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 2965d6c8..12bb4ac2 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -1,25 +1,24 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-
-from .. import unittest
-import mock
+from __future__ import unicode_literals
 
 import docker
+import mock
 from docker.utils import LogConfig
 
-from compose.service import Service
+from .. import unittest
+from compose.const import LABEL_ONE_OFF
+from compose.const import LABEL_PROJECT
+from compose.const import LABEL_SERVICE
 from compose.container import Container
-from compose.const import LABEL_SERVICE, LABEL_PROJECT, LABEL_ONE_OFF
-from compose.service import (
-    ConfigError,
-    NeedsBuildError,
-    NoSuchImageError,
-    build_volume_binding,
-    get_container_data_volumes,
-    merge_volume_bindings,
-    parse_repository_tag,
-    parse_volume_spec,
-)
+from compose.service import build_volume_binding
+from compose.service import ConfigError
+from compose.service import get_container_data_volumes
+from compose.service import merge_volume_bindings
+from compose.service import NeedsBuildError
+from compose.service import NoSuchImageError
+from compose.service import parse_repository_tag
+from compose.service import parse_volume_spec
+from compose.service import Service
 
 
 class ServiceTest(unittest.TestCase):
diff --git a/tests/unit/sort_service_test.py b/tests/unit/sort_service_test.py
index f42a9474..a7e522a1 100644
--- a/tests/unit/sort_service_test.py
+++ b/tests/unit/sort_service_test.py
@@ -1,5 +1,6 @@
-from compose.project import sort_service_dicts, DependencyError
 from .. import unittest
+from compose.project import DependencyError
+from compose.project import sort_service_dicts
 
 
 class SortServiceTest(unittest.TestCase):
diff --git a/tests/unit/split_buffer_test.py b/tests/unit/split_buffer_test.py
index 8eb54177..efd99411 100644
--- a/tests/unit/split_buffer_test.py
+++ b/tests/unit/split_buffer_test.py
@@ -1,7 +1,8 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-from compose.cli.utils import split_buffer
+from __future__ import unicode_literals
+
 from .. import unittest
+from compose.cli.utils import split_buffer
 
 
 class SplitBufferTest(unittest.TestCase):

From 809443d6d03e1ec687c01e546ddd9031b56ce40c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 19 Aug 2014 17:36:46 -0400
Subject: [PATCH 0217/1265] Support python 3

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 Dockerfile                                    |  4 +-
 MANIFEST.in                                   |  2 +-
 compose/cli/log_printer.py                    |  6 ++-
 compose/cli/utils.py                          |  3 +-
 compose/progress_stream.py                    |  9 ++--
 compose/project.py                            |  1 +
 compose/service.py                            |  2 +-
 ...ements-dev.txt => requirements-dev-py2.txt |  0
 requirements-dev-py3.txt                      |  2 +
 setup.py                                      |  5 +-
 tests/__init__.py                             |  5 ++
 tests/integration/cli_test.py                 | 46 +++++++++----------
 tests/integration/service_test.py             | 24 +++++-----
 tests/unit/cli/docker_client_test.py          |  3 +-
 tests/unit/cli/verbose_proxy_test.py          |  7 ++-
 tests/unit/cli_test.py                        |  2 +-
 tests/unit/config_test.py                     | 18 ++++----
 tests/unit/container_test.py                  |  2 +-
 tests/unit/log_printer_test.py                |  9 ++--
 tests/unit/project_test.py                    |  2 +-
 tests/unit/service_test.py                    |  2 +-
 tests/unit/split_buffer_test.py               | 36 +++++++--------
 tox.ini                                       | 23 +++++++++-
 23 files changed, 128 insertions(+), 85 deletions(-)
 rename requirements-dev.txt => requirements-dev-py2.txt (100%)
 create mode 100644 requirements-dev-py3.txt

diff --git a/Dockerfile b/Dockerfile
index a4cc99fe..1986ac5a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,8 +66,8 @@ WORKDIR /code/
 ADD requirements.txt /code/
 RUN pip install -r requirements.txt
 
-ADD requirements-dev.txt /code/
-RUN pip install -r requirements-dev.txt
+ADD requirements-dev-py2.txt /code/
+RUN pip install -r requirements-dev-py2.txt
 
 RUN pip install tox==2.1.1
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 7d48d347..74204859 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,7 @@
 include Dockerfile
 include LICENSE
 include requirements.txt
-include requirements-dev.txt
+include requirements-dev*.txt
 include tox.ini
 include *.md
 include compose/config/schema.json
diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index ef484ca6..c7d0b638 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -4,6 +4,8 @@ from __future__ import unicode_literals
 import sys
 from itertools import cycle
 
+import six
+
 from . import colors
 from .multiplexer import Multiplexer
 from .utils import split_buffer
@@ -20,6 +22,8 @@ class LogPrinter(object):
     def run(self):
         mux = Multiplexer(self.generators)
         for line in mux.loop():
+            if isinstance(line, six.text_type) and not six.PY3:
+                line = line.encode('utf-8')
             self.output.write(line)
 
     def _calculate_prefix_width(self, containers):
@@ -52,7 +56,7 @@ class LogPrinter(object):
         return generators
 
     def _make_log_generator(self, container, color_fn):
-        prefix = color_fn(self._generate_prefix(container)).encode('utf-8')
+        prefix = color_fn(self._generate_prefix(container))
         # Attach to container before log printer starts running
         line_generator = split_buffer(self._attach(container), '\n')
 
diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index 1bb497cd..b6c83f9e 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -9,6 +9,7 @@ import ssl
 import subprocess
 
 from docker import version as docker_py_version
+from six.moves import input
 
 from .. import __version__
 
@@ -23,7 +24,7 @@ def yesno(prompt, default=None):
     Unrecognised input (anything other than "y", "n", "yes",
     "no" or "") will return None.
     """
-    answer = raw_input(prompt).strip().lower()
+    answer = input(prompt).strip().lower()
 
     if answer == "y" or answer == "yes":
         return True
diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index 1ccdb861..582c09fb 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -1,6 +1,7 @@
 import codecs
 import json
-import os
+
+import six
 
 
 class StreamOutputError(Exception):
@@ -8,8 +9,9 @@ class StreamOutputError(Exception):
 
 
 def stream_output(output, stream):
-    is_terminal = hasattr(stream, 'fileno') and os.isatty(stream.fileno())
-    stream = codecs.getwriter('utf-8')(stream)
+    is_terminal = hasattr(stream, 'isatty') and stream.isatty()
+    if not six.PY3:
+        stream = codecs.getwriter('utf-8')(stream)
     all_events = []
     lines = {}
     diff = 0
@@ -55,7 +57,6 @@ def print_output_event(event, stream, is_terminal):
         # erase current line
         stream.write("%c[2K\r" % 27)
         terminator = "\r"
-        pass
     elif 'progressDetail' in event:
         return
 
diff --git a/compose/project.py b/compose/project.py
index eb395297..d14941e7 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -17,6 +17,7 @@ from .legacy import check_for_legacy_containers
 from .service import Service
 from .utils import parallel_execute
 
+
 log = logging.getLogger(__name__)
 
 
diff --git a/compose/service.py b/compose/service.py
index 05e546c4..647516ba 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -724,7 +724,7 @@ class Service(object):
         try:
             all_events = stream_output(build_output, sys.stdout)
         except StreamOutputError as e:
-            raise BuildError(self, unicode(e))
+            raise BuildError(self, six.text_type(e))
 
         # Ensure the HTTP connection is not reused for another
         # streaming command, as the Docker daemon can sometimes
diff --git a/requirements-dev.txt b/requirements-dev-py2.txt
similarity index 100%
rename from requirements-dev.txt
rename to requirements-dev-py2.txt
diff --git a/requirements-dev-py3.txt b/requirements-dev-py3.txt
new file mode 100644
index 00000000..a2ba1c8b
--- /dev/null
+++ b/requirements-dev-py3.txt
@@ -0,0 +1,2 @@
+flake8
+nose >= 1.3.0
diff --git a/setup.py b/setup.py
index 2f6dad7a..b7fd4403 100644
--- a/setup.py
+++ b/setup.py
@@ -48,8 +48,11 @@ tests_require = [
 ]
 
 
-if sys.version_info < (2, 7):
+if sys.version_info < (2, 6):
     tests_require.append('unittest2')
+if sys.version_info[:1] < (3,):
+    tests_require.append('pyinstaller')
+    tests_require.append('mock >= 1.0.1')
 
 
 setup(
diff --git a/tests/__init__.py b/tests/__init__.py
index 08a7865e..d3cfb864 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -4,3 +4,8 @@ if sys.version_info >= (2, 7):
     import unittest  # NOQA
 else:
     import unittest2 as unittest  # NOQA
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock  # NOQA
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 8bdcadd5..609370a3 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -5,9 +5,9 @@ import shlex
 import sys
 from operator import attrgetter
 
-from mock import patch
 from six import StringIO
 
+from .. import mock
 from .testcases import DockerClientTestCase
 from compose.cli.errors import UserError
 from compose.cli.main import TopLevelCommand
@@ -51,13 +51,13 @@ class CLITestCase(DockerClientTestCase):
         self.command.base_dir = old_base_dir
 
     # TODO: address the "Inappropriate ioctl for device" warnings in test output
-    @patch('sys.stdout', new_callable=StringIO)
+    @mock.patch('sys.stdout', new_callable=StringIO)
     def test_ps(self, mock_stdout):
         self.project.get_service('simple').create_container()
         self.command.dispatch(['ps'], None)
         self.assertIn('simplecomposefile_simple_1', mock_stdout.getvalue())
 
-    @patch('sys.stdout', new_callable=StringIO)
+    @mock.patch('sys.stdout', new_callable=StringIO)
     def test_ps_default_composefile(self, mock_stdout):
         self.command.base_dir = 'tests/fixtures/multiple-composefiles'
         self.command.dispatch(['up', '-d'], None)
@@ -68,7 +68,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertIn('multiplecomposefiles_another_1', output)
         self.assertNotIn('multiplecomposefiles_yetanother_1', output)
 
-    @patch('sys.stdout', new_callable=StringIO)
+    @mock.patch('sys.stdout', new_callable=StringIO)
     def test_ps_alternate_composefile(self, mock_stdout):
         config_path = os.path.abspath(
             'tests/fixtures/multiple-composefiles/compose2.yml')
@@ -83,19 +83,19 @@ class CLITestCase(DockerClientTestCase):
         self.assertNotIn('multiplecomposefiles_another_1', output)
         self.assertIn('multiplecomposefiles_yetanother_1', output)
 
-    @patch('compose.service.log')
+    @mock.patch('compose.service.log')
     def test_pull(self, mock_logging):
         self.command.dispatch(['pull'], None)
         mock_logging.info.assert_any_call('Pulling simple (busybox:latest)...')
         mock_logging.info.assert_any_call('Pulling another (busybox:latest)...')
 
-    @patch('compose.service.log')
+    @mock.patch('compose.service.log')
     def test_pull_with_digest(self, mock_logging):
         self.command.dispatch(['-f', 'digest.yml', 'pull'], None)
         mock_logging.info.assert_any_call('Pulling simple (busybox:latest)...')
         mock_logging.info.assert_any_call('Pulling digest (busybox@sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d)...')
 
-    @patch('sys.stdout', new_callable=StringIO)
+    @mock.patch('sys.stdout', new_callable=StringIO)
     def test_build_no_cache(self, mock_stdout):
         self.command.base_dir = 'tests/fixtures/simple-dockerfile'
         self.command.dispatch(['build', 'simple'], None)
@@ -189,7 +189,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertFalse(config['AttachStdout'])
         self.assertFalse(config['AttachStdin'])
 
-    @patch('dockerpty.start')
+    @mock.patch('dockerpty.start')
     def test_run_service_without_links(self, mock_stdout):
         self.command.base_dir = 'tests/fixtures/links-composefile'
         self.command.dispatch(['run', 'console', '/bin/true'], None)
@@ -202,7 +202,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertTrue(config['AttachStdout'])
         self.assertTrue(config['AttachStdin'])
 
-    @patch('dockerpty.start')
+    @mock.patch('dockerpty.start')
     def test_run_service_with_links(self, __):
         self.command.base_dir = 'tests/fixtures/links-composefile'
         self.command.dispatch(['run', 'web', '/bin/true'], None)
@@ -211,14 +211,14 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(db.containers()), 1)
         self.assertEqual(len(console.containers()), 0)
 
-    @patch('dockerpty.start')
+    @mock.patch('dockerpty.start')
     def test_run_with_no_deps(self, __):
         self.command.base_dir = 'tests/fixtures/links-composefile'
         self.command.dispatch(['run', '--no-deps', 'web', '/bin/true'], None)
         db = self.project.get_service('db')
         self.assertEqual(len(db.containers()), 0)
 
-    @patch('dockerpty.start')
+    @mock.patch('dockerpty.start')
     def test_run_does_not_recreate_linked_containers(self, __):
         self.command.base_dir = 'tests/fixtures/links-composefile'
         self.command.dispatch(['up', '-d', 'db'], None)
@@ -234,7 +234,7 @@ class CLITestCase(DockerClientTestCase):
 
         self.assertEqual(old_ids, new_ids)
 
-    @patch('dockerpty.start')
+    @mock.patch('dockerpty.start')
     def test_run_without_command(self, _):
         self.command.base_dir = 'tests/fixtures/commands-composefile'
         self.check_build('tests/fixtures/simple-dockerfile', tag='composetest_test')
@@ -255,7 +255,7 @@ class CLITestCase(DockerClientTestCase):
             [u'/bin/true'],
         )
 
-    @patch('dockerpty.start')
+    @mock.patch('dockerpty.start')
     def test_run_service_with_entrypoint_overridden(self, _):
         self.command.base_dir = 'tests/fixtures/dockerfile_with_entrypoint'
         name = 'service'
@@ -270,7 +270,7 @@ class CLITestCase(DockerClientTestCase):
             [u'/bin/echo', u'helloworld'],
         )
 
-    @patch('dockerpty.start')
+    @mock.patch('dockerpty.start')
     def test_run_service_with_user_overridden(self, _):
         self.command.base_dir = 'tests/fixtures/user-composefile'
         name = 'service'
@@ -281,7 +281,7 @@ class CLITestCase(DockerClientTestCase):
         container = service.containers(stopped=True, one_off=True)[0]
         self.assertEqual(user, container.get('Config.User'))
 
-    @patch('dockerpty.start')
+    @mock.patch('dockerpty.start')
     def test_run_service_with_user_overridden_short_form(self, _):
         self.command.base_dir = 'tests/fixtures/user-composefile'
         name = 'service'
@@ -292,7 +292,7 @@ class CLITestCase(DockerClientTestCase):
         container = service.containers(stopped=True, one_off=True)[0]
         self.assertEqual(user, container.get('Config.User'))
 
-    @patch('dockerpty.start')
+    @mock.patch('dockerpty.start')
     def test_run_service_with_environement_overridden(self, _):
         name = 'service'
         self.command.base_dir = 'tests/fixtures/environment-composefile'
@@ -312,7 +312,7 @@ class CLITestCase(DockerClientTestCase):
         # make sure a value with a = don't crash out
         self.assertEqual('moto=bobo', container.environment['allo'])
 
-    @patch('dockerpty.start')
+    @mock.patch('dockerpty.start')
     def test_run_service_without_map_ports(self, __):
         # create one off container
         self.command.base_dir = 'tests/fixtures/ports-composefile'
@@ -330,7 +330,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_random, None)
         self.assertEqual(port_assigned, None)
 
-    @patch('dockerpty.start')
+    @mock.patch('dockerpty.start')
     def test_run_service_with_map_ports(self, __):
 
         # create one off container
@@ -353,7 +353,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_range[0], "0.0.0.0:49153")
         self.assertEqual(port_range[1], "0.0.0.0:49154")
 
-    @patch('dockerpty.start')
+    @mock.patch('dockerpty.start')
     def test_run_service_with_explicitly_maped_ports(self, __):
 
         # create one off container
@@ -372,7 +372,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_short, "0.0.0.0:30000")
         self.assertEqual(port_full, "0.0.0.0:30001")
 
-    @patch('dockerpty.start')
+    @mock.patch('dockerpty.start')
     def test_run_service_with_explicitly_maped_ip_ports(self, __):
 
         # create one off container
@@ -508,7 +508,7 @@ class CLITestCase(DockerClientTestCase):
         self.command.dispatch(['up', '-d'], None)
         container = self.project.get_service('simple').get_container()
 
-        @patch('sys.stdout', new_callable=StringIO)
+        @mock.patch('sys.stdout', new_callable=StringIO)
         def get_port(number, mock_stdout):
             self.command.dispatch(['port', 'simple', str(number)], None)
             return mock_stdout.getvalue().rstrip()
@@ -525,7 +525,7 @@ class CLITestCase(DockerClientTestCase):
             self.project.containers(service_names=['simple']),
             key=attrgetter('name'))
 
-        @patch('sys.stdout', new_callable=StringIO)
+        @mock.patch('sys.stdout', new_callable=StringIO)
         def get_port(number, mock_stdout, index=None):
             if index is None:
                 self.command.dispatch(['port', 'simple', str(number)], None)
@@ -547,7 +547,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(containers), 1)
         self.assertIn("FOO=1", containers[0].get('Config.Env'))
 
-    @patch.dict(os.environ)
+    @mock.patch.dict(os.environ)
     def test_home_and_env_var_in_volume_path(self):
         os.environ['VOLUME_NAME'] = 'my-volume'
         os.environ['HOME'] = '/tmp/home-dir'
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 1d53465f..fe54d4ae 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -7,10 +7,10 @@ import tempfile
 from os import path
 
 from docker.errors import APIError
-from mock import patch
 from six import StringIO
 from six import text_type
 
+from .. import mock
 from .testcases import DockerClientTestCase
 from compose import __version__
 from compose.const import LABEL_CONTAINER_NUMBER
@@ -460,7 +460,7 @@ class ServiceTest(DockerClientTestCase):
         )
         container = create_and_start_container(service)
         container.wait()
-        self.assertIn('success', container.logs())
+        self.assertIn(b'success', container.logs())
         self.assertEqual(len(self.client.images(name='composetest_test')), 1)
 
     def test_start_container_uses_tagged_image_if_it_exists(self):
@@ -473,7 +473,7 @@ class ServiceTest(DockerClientTestCase):
         )
         container = create_and_start_container(service)
         container.wait()
-        self.assertIn('success', container.logs())
+        self.assertIn(b'success', container.logs())
 
     def test_start_container_creates_ports(self):
         service = self.create_service('web', ports=[8000])
@@ -581,7 +581,7 @@ class ServiceTest(DockerClientTestCase):
         service.scale(0)
         self.assertEqual(len(service.containers()), 0)
 
-    @patch('sys.stdout', new_callable=StringIO)
+    @mock.patch('sys.stdout', new_callable=StringIO)
     def test_scale_with_stopped_containers(self, mock_stdout):
         """
         Given there are some stopped containers and scale is called with a
@@ -608,7 +608,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertNotIn('Creating', captured_output)
         self.assertIn('Starting', captured_output)
 
-    @patch('sys.stdout', new_callable=StringIO)
+    @mock.patch('sys.stdout', new_callable=StringIO)
     def test_scale_with_stopped_containers_and_needing_creation(self, mock_stdout):
         """
         Given there are some stopped containers and scale is called with a
@@ -632,7 +632,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertIn('Creating', captured_output)
         self.assertIn('Starting', captured_output)
 
-    @patch('sys.stdout', new_callable=StringIO)
+    @mock.patch('sys.stdout', new_callable=StringIO)
     def test_scale_with_api_returns_errors(self, mock_stdout):
         """
         Test that when scaling if the API returns an error, that error is handled
@@ -642,7 +642,7 @@ class ServiceTest(DockerClientTestCase):
         next_number = service._next_container_number()
         service.create_container(number=next_number, quiet=True)
 
-        with patch(
+        with mock.patch(
             'compose.container.Container.create',
                 side_effect=APIError(message="testing", response={}, explanation="Boom")):
 
@@ -652,7 +652,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertTrue(service.containers()[0].is_running)
         self.assertIn("ERROR: for 2  Boom", mock_stdout.getvalue())
 
-    @patch('sys.stdout', new_callable=StringIO)
+    @mock.patch('sys.stdout', new_callable=StringIO)
     def test_scale_with_api_returns_unexpected_exception(self, mock_stdout):
         """
         Test that when scaling if the API returns an error, that is not of type
@@ -662,7 +662,7 @@ class ServiceTest(DockerClientTestCase):
         next_number = service._next_container_number()
         service.create_container(number=next_number, quiet=True)
 
-        with patch(
+        with mock.patch(
             'compose.container.Container.create',
                 side_effect=ValueError("BOOM")):
             with self.assertRaises(ValueError):
@@ -671,7 +671,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(len(service.containers()), 1)
         self.assertTrue(service.containers()[0].is_running)
 
-    @patch('compose.service.log')
+    @mock.patch('compose.service.log')
     def test_scale_with_desired_number_already_achieved(self, mock_log):
         """
         Test that calling scale with a desired number that is equal to the
@@ -694,7 +694,7 @@ class ServiceTest(DockerClientTestCase):
         captured_output = mock_log.info.call_args[0]
         self.assertIn('Desired container number already achieved', captured_output)
 
-    @patch('compose.service.log')
+    @mock.patch('compose.service.log')
     def test_scale_with_custom_container_name_outputs_warning(self, mock_log):
         """
         Test that calling scale on a service that has a custom container name
@@ -815,7 +815,7 @@ class ServiceTest(DockerClientTestCase):
         for k, v in {'ONE': '1', 'TWO': '2', 'THREE': '3', 'FOO': 'baz', 'DOO': 'dah'}.items():
             self.assertEqual(env[k], v)
 
-    @patch.dict(os.environ)
+    @mock.patch.dict(os.environ)
     def test_resolve_env(self):
         os.environ['FILE_DEF'] = 'E1'
         os.environ['FILE_DEF_EMPTY'] = 'E2'
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index 6c2dc5f8..5ccde73a 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -3,9 +3,8 @@ from __future__ import unicode_literals
 
 import os
 
-import mock
-
 from compose.cli import docker_client
+from tests import mock
 from tests import unittest
 
 
diff --git a/tests/unit/cli/verbose_proxy_test.py b/tests/unit/cli/verbose_proxy_test.py
index 6036974c..f77568dc 100644
--- a/tests/unit/cli/verbose_proxy_test.py
+++ b/tests/unit/cli/verbose_proxy_test.py
@@ -1,6 +1,8 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import six
+
 from compose.cli import verbose_proxy
 from tests import unittest
 
@@ -8,7 +10,8 @@ from tests import unittest
 class VerboseProxyTestCase(unittest.TestCase):
 
     def test_format_call(self):
-        expected = "(u'arg1', True, key=u'value')"
+        prefix = '' if six.PY3 else 'u'
+        expected = "(%(p)s'arg1', True, key=%(p)s'value')" % dict(p=prefix)
         actual = verbose_proxy.format_call(
             ("arg1", True),
             {'key': 'value'})
@@ -21,7 +24,7 @@ class VerboseProxyTestCase(unittest.TestCase):
         self.assertEqual(expected, actual)
 
     def test_format_return(self):
-        expected = "{u'Id': u'ok'}"
+        expected = repr({'Id': 'ok'})
         actual = verbose_proxy.format_return({'Id': 'ok'}, 2)
         self.assertEqual(expected, actual)
 
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 35be4e92..7d22ad02 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -4,8 +4,8 @@ from __future__ import unicode_literals
 import os
 
 import docker
-import mock
 
+from .. import mock
 from .. import unittest
 from compose.cli.docopt_command import NoSuchCommand
 from compose.cli.errors import UserError
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 3d1a5321..7ecb6c4a 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -1,9 +1,11 @@
+from __future__ import print_function
+
 import os
 import shutil
 import tempfile
+from operator import itemgetter
 
-import mock
-
+from .. import mock
 from .. import unittest
 from compose.config import config
 from compose.config.errors import ConfigurationError
@@ -30,7 +32,7 @@ class ConfigTest(unittest.TestCase):
         )
 
         self.assertEqual(
-            sorted(service_dicts, key=lambda d: d['name']),
+            sorted(service_dicts, key=itemgetter('name')),
             sorted([
                 {
                     'name': 'bar',
@@ -41,7 +43,7 @@ class ConfigTest(unittest.TestCase):
                     'name': 'foo',
                     'image': 'busybox',
                 }
-            ], key=lambda d: d['name'])
+            ], key=itemgetter('name'))
         )
 
     def test_load_throws_error_when_not_dict(self):
@@ -885,24 +887,24 @@ class ExtendsTest(unittest.TestCase):
             other_config = {'web': {'links': ['db']}}
 
             with mock.patch.object(config, 'load_yaml', return_value=other_config):
-                print load_config()
+                print(load_config())
 
         with self.assertRaisesRegexp(ConfigurationError, 'volumes_from'):
             other_config = {'web': {'volumes_from': ['db']}}
 
             with mock.patch.object(config, 'load_yaml', return_value=other_config):
-                print load_config()
+                print(load_config())
 
         with self.assertRaisesRegexp(ConfigurationError, 'net'):
             other_config = {'web': {'net': 'container:db'}}
 
             with mock.patch.object(config, 'load_yaml', return_value=other_config):
-                print load_config()
+                print(load_config())
 
         other_config = {'web': {'net': 'host'}}
 
         with mock.patch.object(config, 'load_yaml', return_value=other_config):
-            print load_config()
+            print(load_config())
 
     def test_volume_path(self):
         dicts = load_from_filename('tests/fixtures/volume-path/docker-compose.yml')
diff --git a/tests/unit/container_test.py b/tests/unit/container_test.py
index e2381c7c..1eba9f65 100644
--- a/tests/unit/container_test.py
+++ b/tests/unit/container_test.py
@@ -1,8 +1,8 @@
 from __future__ import unicode_literals
 
 import docker
-import mock
 
+from .. import mock
 from .. import unittest
 from compose.container import Container
 from compose.container import get_container_name
diff --git a/tests/unit/log_printer_test.py b/tests/unit/log_printer_test.py
index bfd16aff..f3fa64c6 100644
--- a/tests/unit/log_printer_test.py
+++ b/tests/unit/log_printer_test.py
@@ -3,6 +3,8 @@ from __future__ import unicode_literals
 
 import os
 
+import six
+
 from .. import unittest
 from compose.cli.log_printer import LogPrinter
 
@@ -30,16 +32,17 @@ class LogPrinterTest(unittest.TestCase):
         output = self.get_default_output()
         self.assertIn('\033[', output)
 
+    @unittest.skipIf(six.PY3, "Only test unicode in python2")
     def test_unicode(self):
-        glyph = u'\u2022'.encode('utf-8')
+        glyph = u'\u2022'
 
         def reader(*args, **kwargs):
-            yield glyph + b'\n'
+            yield glyph + '\n'
 
         container = MockContainer(reader)
         output = run_log_printer([container])
 
-        self.assertIn(glyph, output)
+        self.assertIn(glyph, output.decode('utf-8'))
 
 
 def run_log_printer(containers, monochrome=False):
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 7d633c95..37ebe514 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -1,8 +1,8 @@
 from __future__ import unicode_literals
 
 import docker
-import mock
 
+from .. import mock
 from .. import unittest
 from compose.const import LABEL_SERVICE
 from compose.container import Container
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 12bb4ac2..3bb3e172 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -2,9 +2,9 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import docker
-import mock
 from docker.utils import LogConfig
 
+from .. import mock
 from .. import unittest
 from compose.const import LABEL_ONE_OFF
 from compose.const import LABEL_PROJECT
diff --git a/tests/unit/split_buffer_test.py b/tests/unit/split_buffer_test.py
index efd99411..11646099 100644
--- a/tests/unit/split_buffer_test.py
+++ b/tests/unit/split_buffer_test.py
@@ -8,38 +8,38 @@ from compose.cli.utils import split_buffer
 class SplitBufferTest(unittest.TestCase):
     def test_single_line_chunks(self):
         def reader():
-            yield b'abc\n'
-            yield b'def\n'
-            yield b'ghi\n'
+            yield 'abc\n'
+            yield 'def\n'
+            yield 'ghi\n'
 
-        self.assert_produces(reader, [b'abc\n', b'def\n', b'ghi\n'])
+        self.assert_produces(reader, ['abc\n', 'def\n', 'ghi\n'])
 
     def test_no_end_separator(self):
         def reader():
-            yield b'abc\n'
-            yield b'def\n'
-            yield b'ghi'
+            yield 'abc\n'
+            yield 'def\n'
+            yield 'ghi'
 
-        self.assert_produces(reader, [b'abc\n', b'def\n', b'ghi'])
+        self.assert_produces(reader, ['abc\n', 'def\n', 'ghi'])
 
     def test_multiple_line_chunk(self):
         def reader():
-            yield b'abc\ndef\nghi'
+            yield 'abc\ndef\nghi'
 
-        self.assert_produces(reader, [b'abc\n', b'def\n', b'ghi'])
+        self.assert_produces(reader, ['abc\n', 'def\n', 'ghi'])
 
     def test_chunked_line(self):
         def reader():
-            yield b'a'
-            yield b'b'
-            yield b'c'
-            yield b'\n'
-            yield b'd'
+            yield 'a'
+            yield 'b'
+            yield 'c'
+            yield '\n'
+            yield 'd'
 
-        self.assert_produces(reader, [b'abc\n', b'd'])
+        self.assert_produces(reader, ['abc\n', 'd'])
 
     def test_preserves_unicode_sequences_within_lines(self):
-        string = u"a\u2022c\n".encode('utf-8')
+        string = u"a\u2022c\n"
 
         def reader():
             yield string
@@ -47,7 +47,7 @@ class SplitBufferTest(unittest.TestCase):
         self.assert_produces(reader, [string])
 
     def assert_produces(self, reader, expectations):
-        split = split_buffer(reader(), b'\n')
+        split = split_buffer(reader(), '\n')
 
         for (actual, expected) in zip(split, expectations):
             self.assertEqual(type(actual), type(expected))
diff --git a/tox.ini b/tox.ini
index 3a69c578..35523a96 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,pre-commit
+envlist = py27,py34,pre-commit
 
 [testenv]
 usedevelop=True
@@ -7,7 +7,6 @@ passenv =
     LD_LIBRARY_PATH
 deps =
     -rrequirements.txt
-    -rrequirements-dev.txt
 commands =
     nosetests -v {posargs}
     flake8 compose tests setup.py
@@ -20,6 +19,26 @@ commands =
     pre-commit install
     pre-commit run --all-files
 
+[testenv:py26]
+deps =
+    {[testenv]deps}
+    -rrequirements-dev-py2.txt
+
+[testenv:py27]
+deps = {[testenv:py26]deps}
+
+[testenv:pypy]
+deps = {[testenv:py26]deps}
+
+[testenv:py33]
+deps =
+    {[testenv]deps}
+    -rrequirements-dev-py3.txt
+
+[testenv:py34]
+deps = {[testenv:py33]deps}
+
+
 [flake8]
 # ignore line-length for now
 ignore = E501,E203

From 9aa61e596e2475fa0bbcf227f2c388f6a9df471a Mon Sep 17 00:00:00 2001
From: funkyfuture <funkyfuture@riseup.net>
Date: Thu, 26 Mar 2015 23:28:02 +0100
Subject: [PATCH 0218/1265] Run tests against Python 2.6, 2.7, 3.3, 3.4 and
 PyPy2

In particular it includes:
- some extension of CONTRIBUTING.md
- one fix for Python 2.6 in tests/integration/cli_test.py
- one fix for Python 3.3 in tests/integration/service_test.py
- removal of unused imports

Make stream_output Python 3-compatible

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
---
 Dockerfile                         | 4 ++--
 compose/container.py               | 7 +++----
 compose/progress_stream.py         | 2 ++
 compose/project.py                 | 2 +-
 requirements-dev.txt               | 2 ++
 script/test-versions               | 2 +-
 setup.py                           | 2 +-
 tests/integration/cli_test.py      | 2 +-
 tests/integration/service_test.py  | 2 +-
 tests/unit/progress_stream_test.py | 1 -
 tox.ini                            | 3 ++-
 11 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 requirements-dev.txt

diff --git a/Dockerfile b/Dockerfile
index 1986ac5a..a4cc99fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,8 +66,8 @@ WORKDIR /code/
 ADD requirements.txt /code/
 RUN pip install -r requirements.txt
 
-ADD requirements-dev-py2.txt /code/
-RUN pip install -r requirements-dev-py2.txt
+ADD requirements-dev.txt /code/
+RUN pip install -r requirements-dev.txt
 
 RUN pip install tox==2.1.1
 
diff --git a/compose/container.py b/compose/container.py
index f727c867..6f426532 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -1,9 +1,8 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-from functools import reduce
-
-import six
+from six import iteritems
+from six.moves import reduce
 
 from .const import LABEL_CONTAINER_NUMBER
 from .const import LABEL_SERVICE
@@ -90,7 +89,7 @@ class Container(object):
                 private=private, **public[0])
 
         return ', '.join(format_port(*item)
-                         for item in sorted(six.iteritems(self.ports)))
+                         for item in sorted(iteritems(self.ports)))
 
     @property
     def labels(self):
diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index 582c09fb..e2300fd4 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -17,6 +17,8 @@ def stream_output(output, stream):
     diff = 0
 
     for chunk in output:
+        if six.PY3 and not isinstance(chunk, str):
+            chunk = chunk.decode('utf-8')
         event = json.loads(chunk)
         all_events.append(event)
 
diff --git a/compose/project.py b/compose/project.py
index d14941e7..cd88b298 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -2,9 +2,9 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import logging
-from functools import reduce
 
 from docker.errors import APIError
+from six.moves import reduce
 
 from .config import ConfigurationError
 from .config import get_service_name_from_net
diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 00000000..cc984225
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,2 @@
+flake8
+tox
diff --git a/script/test-versions b/script/test-versions
index d67a6f5e..e2102e44 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -24,5 +24,5 @@ for version in $DOCKER_VERSIONS; do
     -e "DOCKER_DAEMON_ARGS" \
     --entrypoint="script/dind" \
     "$TAG" \
-    script/wrapdocker nosetests --with-coverage --cover-branches --cover-package=compose --cover-erase --cover-html-dir=coverage-html --cover-html "$@"
+    script/wrapdocker tox "$@"
 done
diff --git a/setup.py b/setup.py
index b7fd4403..cdb5686c 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ tests_require = [
 ]
 
 
-if sys.version_info < (2, 6):
+if sys.version_info < (2, 7):
     tests_require.append('unittest2')
 if sys.version_info[:1] < (3,):
     tests_require.append('pyinstaller')
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 609370a3..9552bf6a 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -275,7 +275,7 @@ class CLITestCase(DockerClientTestCase):
         self.command.base_dir = 'tests/fixtures/user-composefile'
         name = 'service'
         user = 'sshd'
-        args = ['run', '--user={}'.format(user), name]
+        args = ['run', '--user={user}'.format(user=user), name]
         self.command.dispatch(args, None)
         service = self.project.get_service(name)
         container = service.containers(stopped=True, one_off=True)[0]
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index fe54d4ae..effd356d 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -358,7 +358,7 @@ class ServiceTest(DockerClientTestCase):
         )
 
         old_container = create_and_start_container(service)
-        self.assertEqual(old_container.get('Volumes').keys(), ['/data'])
+        self.assertEqual(list(old_container.get('Volumes').keys()), ['/data'])
         volume_path = old_container.get('Volumes')['/data']
 
         new_container, = service.execute_convergence_plan(
diff --git a/tests/unit/progress_stream_test.py b/tests/unit/progress_stream_test.py
index 5674f4e4..e38a7443 100644
--- a/tests/unit/progress_stream_test.py
+++ b/tests/unit/progress_stream_test.py
@@ -8,7 +8,6 @@ from tests import unittest
 
 
 class ProgressStreamTestCase(unittest.TestCase):
-
     def test_stream_output(self):
         output = [
             '{"status": "Downloading", "progressDetail": {"current": '
diff --git a/tox.ini b/tox.ini
index 35523a96..2e3edd2a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ passenv =
 deps =
     -rrequirements.txt
 commands =
-    nosetests -v {posargs}
+    nosetests -v --with-coverage --cover-branches --cover-package=compose --cover-erase --cover-html-dir=coverage-html --cover-html {posargs}
     flake8 compose tests setup.py
 
 [testenv:pre-commit]
@@ -38,6 +38,7 @@ deps =
 [testenv:py34]
 deps = {[testenv:py33]deps}
 
+# TODO pypy3
 
 [flake8]
 # ignore line-length for now

From 2943ac6812bcc8cdcd5b877155cdf69dd08c5b8a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Thu, 2 Jul 2015 22:35:20 -0400
Subject: [PATCH 0219/1265] Cleanup requirements.txt so we don't have to
 maintain separate copies for py2 and py3.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 Dockerfile                           | 14 ++++++++++++++
 MANIFEST.in                          |  2 +-
 compose/container.py                 |  7 ++++---
 compose/project.py                   |  4 ++--
 compose/service.py                   |  8 +++++---
 compose/utils.py                     |  2 +-
 requirements-dev-py2.txt             |  7 -------
 requirements-dev-py3.txt             |  2 --
 requirements-dev.txt                 |  7 +++++--
 script/test-versions                 |  2 +-
 setup.py                             |  3 ---
 tests/integration/resilience_test.py |  3 +--
 tests/integration/service_test.py    |  4 ++--
 tests/unit/service_test.py           |  2 +-
 tox.ini                              | 22 +++++++---------------
 15 files changed, 44 insertions(+), 45 deletions(-)
 delete mode 100644 requirements-dev-py2.txt
 delete mode 100644 requirements-dev-py3.txt

diff --git a/Dockerfile b/Dockerfile
index a4cc99fe..546e28d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,18 @@ RUN set -ex; \
     rm -rf /Python-2.7.9; \
     rm Python-2.7.9.tgz
 
+# Build python 3.4 from source
+RUN set -ex; \
+    curl -LO https://www.python.org/ftp/python/3.4.3/Python-3.4.3.tgz; \
+    tar -xzf Python-3.4.3.tgz; \
+    cd Python-3.4.3; \
+    ./configure --enable-shared; \
+    make; \
+    make install; \
+    cd ..; \
+    rm -rf /Python-3.4.3; \
+    rm Python-3.4.3.tgz
+
 # Make libpython findable
 ENV LD_LIBRARY_PATH /usr/local/lib
 
@@ -63,6 +75,8 @@ RUN ln -s /usr/local/bin/docker-1.7.1 /usr/local/bin/docker
 RUN useradd -d /home/user -m -s /bin/bash user
 WORKDIR /code/
 
+RUN pip install tox
+
 ADD requirements.txt /code/
 RUN pip install -r requirements.txt
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 74204859..7d48d347 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,7 @@
 include Dockerfile
 include LICENSE
 include requirements.txt
-include requirements-dev*.txt
+include requirements-dev.txt
 include tox.ini
 include *.md
 include compose/config/schema.json
diff --git a/compose/container.py b/compose/container.py
index 6f426532..f727c867 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -1,8 +1,9 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-from six import iteritems
-from six.moves import reduce
+from functools import reduce
+
+import six
 
 from .const import LABEL_CONTAINER_NUMBER
 from .const import LABEL_SERVICE
@@ -89,7 +90,7 @@ class Container(object):
                 private=private, **public[0])
 
         return ', '.join(format_port(*item)
-                         for item in sorted(iteritems(self.ports)))
+                         for item in sorted(six.iteritems(self.ports)))
 
     @property
     def labels(self):
diff --git a/compose/project.py b/compose/project.py
index cd88b298..a3127c6c 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -2,9 +2,9 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import logging
+from functools import reduce
 
 from docker.errors import APIError
-from six.moves import reduce
 
 from .config import ConfigurationError
 from .config import get_service_name_from_net
@@ -340,7 +340,7 @@ class Project(object):
                 self.service_names,
             )
 
-        return filter(matches_service_names, containers)
+        return [c for c in containers if matches_service_names(c)]
 
     def _inject_deps(self, acc, service):
         dep_names = service.get_dependency_names()
diff --git a/compose/service.py b/compose/service.py
index 647516ba..d8a26e73 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -709,7 +709,9 @@ class Service(object):
     def build(self, no_cache=False):
         log.info('Building %s...' % self.name)
 
-        path = six.binary_type(self.options['build'])
+        path = self.options['build']
+        if not six.PY3:
+            path = path.encode('utf8')
 
         build_output = self.client.build(
             path=path,
@@ -840,7 +842,7 @@ def merge_volume_bindings(volumes_option, previous_container):
         volume_bindings.update(
             get_container_data_volumes(previous_container, volumes_option))
 
-    return volume_bindings.values()
+    return list(volume_bindings.values())
 
 
 def get_container_data_volumes(container, volumes_option):
@@ -853,7 +855,7 @@ def get_container_data_volumes(container, volumes_option):
     container_volumes = container.get('Volumes') or {}
     image_volumes = container.image_config['ContainerConfig'].get('Volumes') or {}
 
-    for volume in set(volumes_option + image_volumes.keys()):
+    for volume in set(volumes_option + list(image_volumes)):
         volume = parse_volume_spec(volume)
         # No need to preserve host volumes
         if volume.external:
diff --git a/compose/utils.py b/compose/utils.py
index bd892267..0cbefba9 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -97,5 +97,5 @@ def write_out_msg(stream, lines, msg_index, msg, status="done"):
 def json_hash(obj):
     dump = json.dumps(obj, sort_keys=True, separators=(',', ':'))
     h = hashlib.sha256()
-    h.update(dump)
+    h.update(dump.encode('utf8'))
     return h.hexdigest()
diff --git a/requirements-dev-py2.txt b/requirements-dev-py2.txt
deleted file mode 100644
index 97fc4fed..00000000
--- a/requirements-dev-py2.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-coverage==3.7.1
-flake8==2.3.0
-git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
-mock >= 1.0.1
-nose==1.3.4
-pep8==1.6.1
-unittest2==0.8.0
diff --git a/requirements-dev-py3.txt b/requirements-dev-py3.txt
deleted file mode 100644
index a2ba1c8b..00000000
--- a/requirements-dev-py3.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-flake8
-nose >= 1.3.0
diff --git a/requirements-dev.txt b/requirements-dev.txt
index cc984225..9e830733 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,2 +1,5 @@
-flake8
-tox
+flake8==2.3.0
+git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
+mock >= 1.0.1
+nose==1.3.4
+pep8==1.6.1
diff --git a/script/test-versions b/script/test-versions
index e2102e44..f39c17e8 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -24,5 +24,5 @@ for version in $DOCKER_VERSIONS; do
     -e "DOCKER_DAEMON_ARGS" \
     --entrypoint="script/dind" \
     "$TAG" \
-    script/wrapdocker tox "$@"
+    script/wrapdocker tox -e py27,py34 -- "$@"
 done
diff --git a/setup.py b/setup.py
index cdb5686c..33335047 100644
--- a/setup.py
+++ b/setup.py
@@ -41,9 +41,7 @@ install_requires = [
 
 
 tests_require = [
-    'mock >= 1.0.1',
     'nose',
-    'pyinstaller',
     'flake8',
 ]
 
@@ -51,7 +49,6 @@ tests_require = [
 if sys.version_info < (2, 7):
     tests_require.append('unittest2')
 if sys.version_info[:1] < (3,):
-    tests_require.append('pyinstaller')
     tests_require.append('mock >= 1.0.1')
 
 
diff --git a/tests/integration/resilience_test.py b/tests/integration/resilience_test.py
index b1faf99d..82a4680d 100644
--- a/tests/integration/resilience_test.py
+++ b/tests/integration/resilience_test.py
@@ -1,8 +1,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import mock
-
+from .. import mock
 from .testcases import DockerClientTestCase
 from compose.project import Project
 
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index effd356d..f300c6d5 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -363,7 +363,7 @@ class ServiceTest(DockerClientTestCase):
 
         new_container, = service.execute_convergence_plan(
             ConvergencePlan('recreate', [old_container]))
-        self.assertEqual(new_container.get('Volumes').keys(), ['/data'])
+        self.assertEqual(list(new_container.get('Volumes')), ['/data'])
         self.assertEqual(new_container.get('Volumes')['/data'], volume_path)
 
     def test_start_container_passes_through_options(self):
@@ -498,7 +498,7 @@ class ServiceTest(DockerClientTestCase):
         with open(os.path.join(base_dir, 'Dockerfile'), 'w') as f:
             f.write("FROM busybox\n")
 
-        with open(os.path.join(base_dir, b'foo\xE2bar'), 'w') as f:
+        with open(os.path.join(base_dir.encode('utf8'), b'foo\xE2bar'), 'w') as f:
             f.write("hello world\n")
 
         self.create_service('web', build=text_type(base_dir)).build()
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 3bb3e172..f2247527 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -41,7 +41,7 @@ class ServiceTest(unittest.TestCase):
             dict(Name=str(i), Image='foo', Id=i) for i in range(3)
         ]
         service = Service('db', self.mock_client, 'myproject', image='foo')
-        self.assertEqual([c.id for c in service.containers()], range(3))
+        self.assertEqual([c.id for c in service.containers()], list(range(3)))
 
         expected_labels = [
             '{0}=myproject'.format(LABEL_PROJECT),
diff --git a/tox.ini b/tox.ini
index 2e3edd2a..a2bd6b6b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,8 @@ envlist = py27,py34,pre-commit
 usedevelop=True
 passenv =
     LD_LIBRARY_PATH
+setenv =
+    HOME=/tmp
 deps =
     -rrequirements.txt
 commands =
@@ -19,26 +21,16 @@ commands =
     pre-commit install
     pre-commit run --all-files
 
-[testenv:py26]
-deps =
-    {[testenv]deps}
-    -rrequirements-dev-py2.txt
-
 [testenv:py27]
-deps = {[testenv:py26]deps}
-
-[testenv:pypy]
-deps = {[testenv:py26]deps}
-
-[testenv:py33]
 deps =
     {[testenv]deps}
-    -rrequirements-dev-py3.txt
+    -rrequirements-dev.txt
 
 [testenv:py34]
-deps = {[testenv:py33]deps}
-
-# TODO pypy3
+deps =
+    {[testenv]deps}
+    flake8
+    nose
 
 [flake8]
 # ignore line-length for now

From feaa4a5f1aa97caf984d08e50d4e6c384fe1f0ae Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Mon, 24 Aug 2015 11:51:38 -0400
Subject: [PATCH 0220/1265] Unit tests passing again.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/config/validation.py |  2 +-
 compose/service.py           |  4 ++--
 compose/utils.py             |  4 ++--
 tests/unit/config_test.py    | 27 +++++++++++++--------------
 tests/unit/service_test.py   |  2 +-
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 8911f5ae..e5f195f4 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -150,7 +150,7 @@ def process_errors(errors):
                 config_key = error.path[0]
                 required.append("Service '{}' option '{}' is invalid, {}".format(service_name, config_key, _clean_error_message(error.message)))
             elif error.validator == 'dependencies':
-                dependency_key = error.validator_value.keys()[0]
+                dependency_key = list(error.validator_value.keys())[0]
                 required_keys = ",".join(error.validator_value[dependency_key])
                 required.append("Invalid '{}' configuration for '{}' service: when defining '{}' you must set '{}' as well".format(
                     dependency_key, service_name, dependency_key, required_keys))
diff --git a/compose/service.py b/compose/service.py
index d8a26e73..9c0bc443 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -103,11 +103,11 @@ class Service(object):
     def containers(self, stopped=False, one_off=False, filters={}):
         filters.update({'label': self.labels(one_off=one_off)})
 
-        containers = filter(None, [
+        containers = list(filter(None, [
             Container.from_ps(self.client, container)
             for container in self.client.containers(
                 all=stopped,
-                filters=filters)])
+                filters=filters)]))
 
         if not containers:
             check_for_legacy_containers(
diff --git a/compose/utils.py b/compose/utils.py
index 0cbefba9..738fcaca 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -3,11 +3,11 @@ import hashlib
 import json
 import logging
 import sys
-from Queue import Empty
-from Queue import Queue
 from threading import Thread
 
 from docker.errors import APIError
+from six.moves.queue import Empty
+from six.moves.queue import Queue
 
 
 log = logging.getLogger(__name__)
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 7ecb6c4a..ccd5b57b 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -18,6 +18,10 @@ def make_service_dict(name, service_dict, working_dir):
     return config.ServiceLoader(working_dir=working_dir).make_service_dict(name, service_dict)
 
 
+def service_sort(services):
+    return sorted(services, key=itemgetter('name'))
+
+
 class ConfigTest(unittest.TestCase):
     def test_load(self):
         service_dicts = config.load(
@@ -32,8 +36,8 @@ class ConfigTest(unittest.TestCase):
         )
 
         self.assertEqual(
-            sorted(service_dicts, key=itemgetter('name')),
-            sorted([
+            service_sort(service_dicts),
+            service_sort([
                 {
                     'name': 'bar',
                     'image': 'busybox',
@@ -43,7 +47,7 @@ class ConfigTest(unittest.TestCase):
                     'name': 'foo',
                     'image': 'busybox',
                 }
-            ], key=itemgetter('name'))
+            ])
         )
 
     def test_load_throws_error_when_not_dict(self):
@@ -684,12 +688,7 @@ class ExtendsTest(unittest.TestCase):
     def test_extends(self):
         service_dicts = load_from_filename('tests/fixtures/extends/docker-compose.yml')
 
-        service_dicts = sorted(
-            service_dicts,
-            key=lambda sd: sd['name'],
-        )
-
-        self.assertEqual(service_dicts, [
+        self.assertEqual(service_sort(service_dicts), service_sort([
             {
                 'name': 'mydb',
                 'image': 'busybox',
@@ -706,7 +705,7 @@ class ExtendsTest(unittest.TestCase):
                     "BAZ": "2",
                 },
             }
-        ])
+        ]))
 
     def test_nested(self):
         service_dicts = load_from_filename('tests/fixtures/extends/nested.yml')
@@ -728,7 +727,7 @@ class ExtendsTest(unittest.TestCase):
         We specify a 'file' key that is the filename we're already in.
         """
         service_dicts = load_from_filename('tests/fixtures/extends/specify-file-as-self.yml')
-        self.assertEqual(service_dicts, [
+        self.assertEqual(service_sort(service_dicts), service_sort([
             {
                 'environment':
                 {
@@ -749,7 +748,7 @@ class ExtendsTest(unittest.TestCase):
                 'image': 'busybox',
                 'name': 'web'
             }
-        ])
+        ]))
 
     def test_circular(self):
         try:
@@ -856,7 +855,7 @@ class ExtendsTest(unittest.TestCase):
         config is valid and correctly extends from itself.
         """
         service_dicts = load_from_filename('tests/fixtures/extends/no-file-specified.yml')
-        self.assertEqual(service_dicts, [
+        self.assertEqual(service_sort(service_dicts), service_sort([
             {
                 'name': 'myweb',
                 'image': 'busybox',
@@ -872,7 +871,7 @@ class ExtendsTest(unittest.TestCase):
                     "BAZ": "3",
                 }
             }
-        ])
+        ]))
 
     def test_blacklisted_options(self):
         def load_config():
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index f2247527..4708616e 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -34,7 +34,7 @@ class ServiceTest(unittest.TestCase):
     def test_containers(self):
         service = Service('db', self.mock_client, 'myproject', image='foo')
         self.mock_client.containers.return_value = []
-        self.assertEqual(service.containers(), [])
+        self.assertEqual(list(service.containers()), [])
 
     def test_containers_with_containers(self):
         self.mock_client.containers.return_value = [

From 7e4c3142d721ccab37ee6e34d93e9214fc3b89ef Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Mon, 24 Aug 2015 12:43:08 -0400
Subject: [PATCH 0221/1265] Have log_printer use utf8 stream.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/cli/log_printer.py     | 6 +++---
 tests/unit/log_printer_test.py | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index c7d0b638..034551ec 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -5,7 +5,9 @@ import sys
 from itertools import cycle
 
 import six
+from six import next
 
+from compose import utils
 from . import colors
 from .multiplexer import Multiplexer
 from .utils import split_buffer
@@ -17,13 +19,11 @@ class LogPrinter(object):
         self.attach_params = attach_params or {}
         self.prefix_width = self._calculate_prefix_width(containers)
         self.generators = self._make_log_generators(monochrome)
-        self.output = output
+        self.output = utils.get_output_stream(output)
 
     def run(self):
         mux = Multiplexer(self.generators)
         for line in mux.loop():
-            if isinstance(line, six.text_type) and not six.PY3:
-                line = line.encode('utf-8')
             self.output.write(line)
 
     def _calculate_prefix_width(self, containers):
diff --git a/tests/unit/log_printer_test.py b/tests/unit/log_printer_test.py
index f3fa64c6..284934a6 100644
--- a/tests/unit/log_printer_test.py
+++ b/tests/unit/log_printer_test.py
@@ -32,7 +32,6 @@ class LogPrinterTest(unittest.TestCase):
         output = self.get_default_output()
         self.assertIn('\033[', output)
 
-    @unittest.skipIf(six.PY3, "Only test unicode in python2")
     def test_unicode(self):
         glyph = u'\u2022'
 
@@ -42,7 +41,10 @@ class LogPrinterTest(unittest.TestCase):
         container = MockContainer(reader)
         output = run_log_printer([container])
 
-        self.assertIn(glyph, output.decode('utf-8'))
+        if six.PY2:
+            output = output.decode('utf-8')
+
+        self.assertIn(glyph, output)
 
 
 def run_log_printer(containers, monochrome=False):

From 71ff872e8e6f09a15f39f90b7faba2b44201c46d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Mon, 24 Aug 2015 13:16:13 -0400
Subject: [PATCH 0222/1265] Update unit tests for stream_output to match the
 behaviour of a docker-py response.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/cli/log_printer.py         |  3 +--
 compose/progress_stream.py         |  8 ++++----
 compose/project.py                 |  4 ++--
 compose/service.py                 |  2 ++
 compose/utils.py                   |  9 ++++++++-
 tests/integration/legacy_test.py   |  4 ++--
 tests/unit/progress_stream_test.py | 18 +++++++++---------
 tests/unit/service_test.py         |  2 +-
 8 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 034551ec..69ada850 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -4,13 +4,12 @@ from __future__ import unicode_literals
 import sys
 from itertools import cycle
 
-import six
 from six import next
 
-from compose import utils
 from . import colors
 from .multiplexer import Multiplexer
 from .utils import split_buffer
+from compose import utils
 
 
 class LogPrinter(object):
diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index e2300fd4..c44b33e5 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -1,8 +1,9 @@
-import codecs
 import json
 
 import six
 
+from compose import utils
+
 
 class StreamOutputError(Exception):
     pass
@@ -10,14 +11,13 @@ class StreamOutputError(Exception):
 
 def stream_output(output, stream):
     is_terminal = hasattr(stream, 'isatty') and stream.isatty()
-    if not six.PY3:
-        stream = codecs.getwriter('utf-8')(stream)
+    stream = utils.get_output_stream(stream)
     all_events = []
     lines = {}
     diff = 0
 
     for chunk in output:
-        if six.PY3 and not isinstance(chunk, str):
+        if six.PY3:
             chunk = chunk.decode('utf-8')
         event = json.loads(chunk)
         all_events.append(event)
diff --git a/compose/project.py b/compose/project.py
index a3127c6c..542c8785 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -324,11 +324,11 @@ class Project(object):
         else:
             service_names = self.service_names
 
-        containers = filter(None, [
+        containers = list(filter(None, [
             Container.from_ps(self.client, container)
             for container in self.client.containers(
                 all=stopped,
-                filters={'label': self.labels(one_off=one_off)})])
+                filters={'label': self.labels(one_off=one_off)})]))
 
         def matches_service_names(container):
             return container.labels.get(LABEL_SERVICE) in service_names
diff --git a/compose/service.py b/compose/service.py
index 9c0bc443..a15ee1b9 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -710,6 +710,8 @@ class Service(object):
         log.info('Building %s...' % self.name)
 
         path = self.options['build']
+        # python2 os.path() doesn't support unicode, so we need to encode it to
+        # a byte string
         if not six.PY3:
             path = path.encode('utf8')
 
diff --git a/compose/utils.py b/compose/utils.py
index 738fcaca..c7292284 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -5,6 +5,7 @@ import logging
 import sys
 from threading import Thread
 
+import six
 from docker.errors import APIError
 from six.moves.queue import Empty
 from six.moves.queue import Queue
@@ -18,7 +19,7 @@ def parallel_execute(objects, obj_callable, msg_index, msg):
     For a given list of objects, call the callable passing in the first
     object we give it.
     """
-    stream = codecs.getwriter('utf-8')(sys.stdout)
+    stream = get_output_stream()
     lines = []
     errors = {}
 
@@ -70,6 +71,12 @@ def parallel_execute(objects, obj_callable, msg_index, msg):
             stream.write("ERROR: for {}  {} \n".format(error, errors[error]))
 
 
+def get_output_stream(stream=sys.stdout):
+    if six.PY3:
+        return stream
+    return codecs.getwriter('utf-8')(stream)
+
+
 def write_out_msg(stream, lines, msg_index, msg, status="done"):
     """
     Using special ANSI code characters we can write out the msg over the top of
diff --git a/tests/integration/legacy_test.py b/tests/integration/legacy_test.py
index fa983e6d..3465d57f 100644
--- a/tests/integration/legacy_test.py
+++ b/tests/integration/legacy_test.py
@@ -1,8 +1,8 @@
 import unittest
 
 from docker.errors import APIError
-from mock import Mock
 
+from .. import mock
 from .testcases import DockerClientTestCase
 from compose import legacy
 from compose.project import Project
@@ -66,7 +66,7 @@ class UtilitiesTestCase(unittest.TestCase):
         )
 
     def test_get_legacy_containers(self):
-        client = Mock()
+        client = mock.Mock()
         client.containers.return_value = [
             {
                 "Id": "abc123",
diff --git a/tests/unit/progress_stream_test.py b/tests/unit/progress_stream_test.py
index e38a7443..d8f7ec83 100644
--- a/tests/unit/progress_stream_test.py
+++ b/tests/unit/progress_stream_test.py
@@ -10,27 +10,27 @@ from tests import unittest
 class ProgressStreamTestCase(unittest.TestCase):
     def test_stream_output(self):
         output = [
-            '{"status": "Downloading", "progressDetail": {"current": '
-            '31019763, "start": 1413653874, "total": 62763875}, '
-            '"progress": "..."}',
+            b'{"status": "Downloading", "progressDetail": {"current": '
+            b'31019763, "start": 1413653874, "total": 62763875}, '
+            b'"progress": "..."}',
         ]
         events = progress_stream.stream_output(output, StringIO())
         self.assertEqual(len(events), 1)
 
     def test_stream_output_div_zero(self):
         output = [
-            '{"status": "Downloading", "progressDetail": {"current": '
-            '0, "start": 1413653874, "total": 0}, '
-            '"progress": "..."}',
+            b'{"status": "Downloading", "progressDetail": {"current": '
+            b'0, "start": 1413653874, "total": 0}, '
+            b'"progress": "..."}',
         ]
         events = progress_stream.stream_output(output, StringIO())
         self.assertEqual(len(events), 1)
 
     def test_stream_output_null_total(self):
         output = [
-            '{"status": "Downloading", "progressDetail": {"current": '
-            '0, "start": 1413653874, "total": null}, '
-            '"progress": "..."}',
+            b'{"status": "Downloading", "progressDetail": {"current": '
+            b'0, "start": 1413653874, "total": null}, '
+            b'"progress": "..."}',
         ]
         events = progress_stream.stream_output(output, StringIO())
         self.assertEqual(len(events), 1)
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 4708616e..275bde1b 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -280,7 +280,7 @@ class ServiceTest(unittest.TestCase):
 
     def test_build_does_not_pull(self):
         self.mock_client.build.return_value = [
-            '{"stream": "Successfully built 12345"}',
+            b'{"stream": "Successfully built 12345"}',
         ]
 
         service = Service('foo', client=self.mock_client, build='.')

From bd7c032a00b7701e5b29a983bb5a83b202dcd952 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Mon, 24 Aug 2015 14:49:51 -0400
Subject: [PATCH 0223/1265] Fix service integration tests.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/utils.py                  |  4 ++--
 requirements-dev.txt              |  1 +
 tests/integration/service_test.py | 16 +++++-----------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/compose/utils.py b/compose/utils.py
index c7292284..30284f97 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -19,7 +19,7 @@ def parallel_execute(objects, obj_callable, msg_index, msg):
     For a given list of objects, call the callable passing in the first
     object we give it.
     """
-    stream = get_output_stream()
+    stream = get_output_stream(sys.stdout)
     lines = []
     errors = {}
 
@@ -71,7 +71,7 @@ def parallel_execute(objects, obj_callable, msg_index, msg):
             stream.write("ERROR: for {}  {} \n".format(error, errors[error]))
 
 
-def get_output_stream(stream=sys.stdout):
+def get_output_stream(stream):
     if six.PY3:
         return stream
     return codecs.getwriter('utf-8')(stream)
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 9e830733..c8a694ab 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -3,3 +3,4 @@ git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c
 mock >= 1.0.1
 nose==1.3.4
 pep8==1.6.1
+coverage==3.7.1
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index f300c6d5..bc9dcc69 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -581,8 +581,7 @@ class ServiceTest(DockerClientTestCase):
         service.scale(0)
         self.assertEqual(len(service.containers()), 0)
 
-    @mock.patch('sys.stdout', new_callable=StringIO)
-    def test_scale_with_stopped_containers(self, mock_stdout):
+    def test_scale_with_stopped_containers(self):
         """
         Given there are some stopped containers and scale is called with a
         desired number that is the same as the number of stopped containers,
@@ -591,15 +590,11 @@ class ServiceTest(DockerClientTestCase):
         service = self.create_service('web')
         next_number = service._next_container_number()
         valid_numbers = [next_number, next_number + 1]
-        service.create_container(number=next_number, quiet=True)
-        service.create_container(number=next_number + 1, quiet=True)
+        service.create_container(number=next_number)
+        service.create_container(number=next_number + 1)
 
-        for container in service.containers():
-            self.assertFalse(container.is_running)
-
-        service.scale(2)
-
-        self.assertEqual(len(service.containers()), 2)
+        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+            service.scale(2)
         for container in service.containers():
             self.assertTrue(container.is_running)
             self.assertTrue(container.number in valid_numbers)
@@ -701,7 +696,6 @@ class ServiceTest(DockerClientTestCase):
         results in warning output.
         """
         service = self.create_service('web', container_name='custom-container')
-
         self.assertEqual(service.custom_container_name(), 'custom-container')
 
         service.scale(3)

From 1451a6e1889b48a780759c41779e99b09ad16d18 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Mon, 24 Aug 2015 18:54:59 -0400
Subject: [PATCH 0224/1265] Python3 requires a locale

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 Dockerfile           | 5 +++++
 requirements-dev.txt | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 546e28d6..a9892031 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,7 @@ FROM debian:wheezy
 RUN set -ex; \
     apt-get update -qq; \
     apt-get install -y \
+        locales \
         gcc \
         make \
         zlib1g \
@@ -61,6 +62,10 @@ RUN set -ex; \
     rm -rf pip-7.0.1; \
     rm pip-7.0.1.tar.gz
 
+# Python3 requires a valid locale
+RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
+ENV LANG en_US.UTF-8
+
 ENV ALL_DOCKER_VERSIONS 1.7.1 1.8.1
 
 RUN set -ex; \
diff --git a/requirements-dev.txt b/requirements-dev.txt
index c8a694ab..adb4387d 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,6 @@
+coverage==3.7.1
 flake8==2.3.0
 git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
 mock >= 1.0.1
 nose==1.3.4
 pep8==1.6.1
-coverage==3.7.1

From 196f0afe8d689bf94543db97c96c17ad128459d6 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Tue, 25 Aug 2015 16:52:10 +0200
Subject: [PATCH 0225/1265] Update zsh completion with last changes

 - sdurrheimer/docker-compose-zsh-completion@4ff5c0d Add pause and unpause commands
 - sdurrheimer/docker-compose-zsh-completion@9948d66 Add -t/--timeout flag to scale command
 - sdurrheimer/docker-compose-zsh-completion@7cf14c8 Improve -p/--publish flag for the run command
 - sdurrheimer/docker-compose-zsh-completion@cb16818 Don't trigger expensive completion function for flags
 - sdurrheimer/docker-compose-zsh-completion@52d33fa Several cosmetic improvements and return responses
 - sdurrheimer/docker-compose-zsh-completion@632ca9c Bump to version 1.5.0
 - sdurrheimer/docker-compose-zsh-completion@22f92d9 Refactor compose file and project-name option flags when invoking docker-compose
 - sdurrheimer/docker-compose-zsh-completion@1b512fc Refactor --help flags

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 154 +++++++++++++++----------
 1 file changed, 91 insertions(+), 63 deletions(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 9ac7e756..58105dc2 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -7,7 +7,7 @@
 # -------------------------------------------------------------------------
 # Version
 # -------
-#  0.1.0
+#  1.5.0
 # -------------------------------------------------------------------------
 # Authors
 # -------
@@ -37,40 +37,54 @@ __docker-compose_compose_file() {
 ___docker-compose_all_services_in_compose_file() {
     local already_selected
     local -a services
-    already_selected=$(echo ${words[@]} | tr " " "|")
+    already_selected=$(echo $words | tr " " "|")
     awk -F: '/^[a-zA-Z0-9]/{print $1}' "${compose_file:-$(__docker-compose_compose_file)}" 2>/dev/null | grep -Ev "$already_selected"
 }
 
 # All services, even those without an existing container
 __docker-compose_services_all() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
     services=$(___docker-compose_all_services_in_compose_file)
-    _alternative "args:services:($services)"
+    _alternative "args:services:($services)" && ret=0
+
+    return ret
 }
 
 # All services that have an entry with the given key in their docker-compose.yml section
 ___docker-compose_services_with_key() {
     local already_selected
     local -a buildable
-    already_selected=$(echo ${words[@]} | tr " " "|")
+    already_selected=$(echo $words | tr " " "|")
     # flatten sections to one line, then filter lines containing the key and return section name.
     awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' "${compose_file:-$(__docker-compose_compose_file)}" 2>/dev/null | awk -F: -v key=": +$1:" '$0 ~ key {print $1}' 2>/dev/null | grep -Ev "$already_selected"
 }
 
 # All services that are defined by a Dockerfile reference
 __docker-compose_services_from_build() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
     buildable=$(___docker-compose_services_with_key build)
-    _alternative "args:buildable services:($buildable)"
+    _alternative "args:buildable services:($buildable)" && ret=0
+
+   return ret
 }
 
 # All services that are defined by an image
 __docker-compose_services_from_image() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
     pullable=$(___docker-compose_services_with_key image)
-    _alternative "args:pullable services:($pullable)"
+    _alternative "args:pullable services:($pullable)" && ret=0
+
+    return ret
 }
 
 __docker-compose_get_services() {
-    local kind expl
-    declare -a running stopped lines args services
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
+    local kind
+    declare -a running paused stopped lines args services
 
     docker_status=$(docker ps > /dev/null 2>&1)
     if [ $? -ne 0 ]; then
@@ -80,64 +94,78 @@ __docker-compose_get_services() {
 
     kind=$1
     shift
-    [[ $kind = (stopped|all) ]] && args=($args -a)
+    [[ $kind =~ (stopped|all) ]] && args=($args -a)
 
-    lines=(${(f)"$(_call_program commands docker ps ${args})"})
-    services=(${(f)"$(_call_program commands docker-compose 2>/dev/null ${compose_file:+-f $compose_file} ${compose_project:+-p $compose_project} ps -q)"})
+    lines=(${(f)"$(_call_program commands docker ps $args)"})
+    services=(${(f)"$(_call_program commands docker-compose 2>/dev/null $compose_options ps -q)"})
 
     # Parse header line to find columns
     local i=1 j=1 k header=${lines[1]}
     declare -A begin end
-    while (( $j < ${#header} - 1 )) {
-        i=$(( $j + ${${header[$j,-1]}[(i)[^ ]]} - 1))
-        j=$(( $i + ${${header[$i,-1]}[(i)  ]} - 1))
-        k=$(( $j + ${${header[$j,-1]}[(i)[^ ]]} - 2))
-        begin[${header[$i,$(($j-1))]}]=$i
-        end[${header[$i,$(($j-1))]}]=$k
-    }
+    while (( j < ${#header} - 1 )); do
+        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
+        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
+        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
+        begin[${header[$i,$((j-1))]}]=$i
+        end[${header[$i,$((j-1))]}]=$k
+    done
     lines=(${lines[2,-1]})
 
     # Container ID
     local line s name
     local -a names
     for line in $lines; do
-        if [[ $services == *"${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}"* ]]; then
+        if [[ ${services[@]} == *"${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}"* ]]; then
             names=(${(ps:,:)${${line[${begin[NAMES]},-1]}%% *}})
             for name in $names; do
                 s="${${name%_*}#*_}:${(l:15:: :::)${${line[${begin[CREATED]},${end[CREATED]}]/ ago/}%% ##}}"
                 s="$s, ${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}"
-                s="$s, ${${${line[$begin[IMAGE],$end[IMAGE]]}/:/\\:}%% ##}"
+                s="$s, ${${${line[${begin[IMAGE]},${end[IMAGE]}]}/:/\\:}%% ##}"
                 if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = Exit* ]]; then
                     stopped=($stopped $s)
                 else
+                    if [[  ${line[${begin[STATUS]},${end[STATUS]}]} = *\(Paused\)* ]]; then
+                        paused=($paused $s)
+                    fi
                     running=($running $s)
                 fi
             done
         fi
     done
 
-    [[ $kind = (running|all) ]] && _describe -t services-running "running services" running
-    [[ $kind = (stopped|all) ]] && _describe -t services-stopped "stopped services" stopped
+    [[ $kind =~ (running|all) ]] && _describe -t services-running "running services" running "$@" && ret=0
+    [[ $kind =~ (paused|all) ]] && _describe -t services-paused "paused services" paused "$@" && ret=0
+    [[ $kind =~ (stopped|all) ]] && _describe -t services-stopped "stopped services" stopped "$@" && ret=0
+
+    return ret
+}
+
+__docker-compose_pausedservices() {
+    [[ $PREFIX = -* ]] && return 1
+    __docker-compose_get_services paused "$@"
 }
 
 __docker-compose_stoppedservices() {
+    [[ $PREFIX = -* ]] && return 1
     __docker-compose_get_services stopped "$@"
 }
 
 __docker-compose_runningservices() {
+    [[ $PREFIX = -* ]] && return 1
     __docker-compose_get_services running "$@"
 }
 
-__docker-compose_services () {
+__docker-compose_services() {
+    [[ $PREFIX = -* ]] && return 1
     __docker-compose_get_services all "$@"
 }
 
 __docker-compose_caching_policy() {
-    oldp=( "$1"(Nmh+1) )     # 1 hour
+    oldp=( "$1"(Nmh+1) )            # 1 hour
     (( $#oldp ))
 }
 
-__docker-compose_commands () {
+__docker-compose_commands() {
     local cache_policy
 
     zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
@@ -156,13 +184,14 @@ __docker-compose_commands () {
     _describe -t docker-compose-commands "docker-compose command" _docker_compose_subcommands
 }
 
-__docker-compose_subcommand () {
-    local -a _command_args
+__docker-compose_subcommand() {
+    local opts_help='(: -)--help[Print usage]'
     integer ret=1
+
     case "$words[1]" in
         (build)
             _arguments \
-                '--help[Print usage]' \
+                $opts_help \
                 '--no-cache[Do not use cache when building the image]' \
                 '*:services:__docker-compose_services_from_build' && ret=0
             ;;
@@ -171,24 +200,29 @@ __docker-compose_subcommand () {
             ;;
         (kill)
             _arguments \
-                '--help[Print usage]' \
+                $opts_help \
                 '-s[SIGNAL to send to the container. Default signal is SIGKILL.]:signal:_signals' \
                 '*:running services:__docker-compose_runningservices' && ret=0
             ;;
         (logs)
             _arguments \
-                '--help[Print usage]' \
+                $opts_help \
                 '--no-color[Produce monochrome output.]' \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
         (migrate-to-labels)
             _arguments -A '-*' \
-                '--help[Print usage]' \
+                $opts_help \
                 '(-):Recreate containers to add labels' && ret=0
             ;;
+        (pause)
+            _arguments \
+                $opts_help \
+                '*:running services:__docker-compose_runningservices' && ret=0
+            ;;
         (port)
             _arguments \
-                '--help[Print usage]' \
+                $opts_help \
                 '--protocol=-[tcp or udap (defaults to tcp)]:protocol:(tcp udp)' \
                 '--index=-[index of the container if there are mutiple instances of a service (defaults to 1)]:index: ' \
                 '1:running services:__docker-compose_runningservices' \
@@ -196,33 +230,33 @@ __docker-compose_subcommand () {
             ;;
         (ps)
             _arguments \
-                '--help[Print usage]' \
+                $opts_help \
                 '-q[Only display IDs]' \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
         (pull)
             _arguments \
-                '--help[Print usage]' \
+                $opts_help \
                 '*:services:__docker-compose_services_from_image' && ret=0
             ;;
         (rm)
             _arguments \
+                $opts_help \
                 '(-f --force)'{-f,--force}"[Don't ask to confirm removal]" \
-                '--help[Print usage]' \
                 '-v[Remove volumes associated with containers]' \
                 '*:stopped services:__docker-compose_stoppedservices' && ret=0
             ;;
         (run)
             _arguments \
+                $opts_help \
                 '-d[Detached mode: Run container in the background, print new container name.]' \
                 '--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
                 '*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
-                '--help[Print usage]' \
                 '(-u --user)'{-u,--user=-}'[Run as specified username or uid]:username or uid:_users' \
                 "--no-deps[Don't start linked services.]" \
                 '--rm[Remove container after run. Ignored in detached mode.]' \
-                "--publish[Run command with manually mapped container's port(s) to the host.]" \
                 "--service-ports[Run command with the service's ports enabled and mapped to the host.]" \
+                '(-p --publish)'{-p,--publish=-}"[Run command with manually mapped container's port(s) to the host.]" \
                 '-T[Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.]' \
                 '(-):services:__docker-compose_services' \
                 '(-):command: _command_names -e' \
@@ -230,45 +264,52 @@ __docker-compose_subcommand () {
             ;;
         (scale)
             _arguments \
-                '--help[Print usage]' \
+                $opts_help \
+                '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
                 '*:running services:__docker-compose_runningservices' && ret=0
             ;;
         (start)
             _arguments \
-                '--help[Print usage]' \
+                $opts_help \
                 '*:stopped services:__docker-compose_stoppedservices' && ret=0
             ;;
         (stop|restart)
             _arguments \
-                '--help[Print usage]' \
+                $opts_help \
                 '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
                 '*:running services:__docker-compose_runningservices' && ret=0
             ;;
+        (unpause)
+            _arguments \
+                $opts_help \
+                '*:paused services:__docker-compose_pausedservices' && ret=0
+            ;;
         (up)
             _arguments \
+                $opts_help \
                 '-d[Detached mode: Run containers in the background, print new container names.]' \
-                '--help[Print usage]' \
                 '--no-color[Produce monochrome output.]' \
                 "--no-deps[Don't start linked services.]" \
+                "--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
                 "--no-recreate[If containers already exist, don't recreate them.]" \
-                "--force-recreate[Recreate containers even if their configuration and image haven't changed]" \
                 "--no-build[Don't build an image, even if it's missing]" \
                 '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
         (version)
             _arguments \
-                '--help[Print usage]' \
+                $opts_help \
                 "--short[Shows only Compose's version number.]" && ret=0
             ;;
         (*)
-            _message 'Unknown sub command'
+            _message 'Unknown sub command' && ret=1
+            ;;
     esac
 
     return ret
 }
 
-_docker-compose () {
+_docker-compose() {
     # Support for subservices, which allows for `compdef _docker docker-shell=_docker_containers`.
     # Based on /usr/share/zsh/functions/Completion/Unix/_git without support for `ret`.
     if [[ $service != docker-compose ]]; then
@@ -276,7 +317,8 @@ _docker-compose () {
         return
     fi
 
-    local curcontext="$curcontext" state line ret=1
+    local curcontext="$curcontext" state line
+    integer ret=1
     typeset -A opt_args
 
     _arguments -C \
@@ -288,23 +330,9 @@ _docker-compose () {
         '(-): :->command' \
         '(-)*:: :->option-or-argument' && ret=0
 
-    local counter=1
-    #local compose_file compose_project
-    while [ $counter -lt ${#words[@]} ]; do
-        case "${words[$counter]}" in
-            -f|--file)
-                (( counter++ ))
-                compose_file="${words[$counter]}"
-                ;;
-            -p|--project-name)
-                (( counter++ ))
-                compose_project="${words[$counter]}"
-                ;;
-            *)
-                ;;
-        esac
-        (( counter++ ))
-    done
+    local compose_file=${opt_args[-f]}${opt_args[--file]}
+    local compose_project=${opt_args[-p]}${opt_args[--project-name]}
+    local compose_options="${compose_file:+--file $compose_file} ${compose_project:+--project-name $compose_project}"
 
     case $state in
         (command)

From 2b589606dab4e9acc94c15fd328760e4da0a84cd Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 25 Aug 2015 16:49:49 -0400
Subject: [PATCH 0226/1265] Move log_printer_test into correct testing module
 for naming convention.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 tests/unit/{ => cli}/log_printer_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename tests/unit/{ => cli}/log_printer_test.py (98%)

diff --git a/tests/unit/log_printer_test.py b/tests/unit/cli/log_printer_test.py
similarity index 98%
rename from tests/unit/log_printer_test.py
rename to tests/unit/cli/log_printer_test.py
index 284934a6..142bd7f3 100644
--- a/tests/unit/log_printer_test.py
+++ b/tests/unit/cli/log_printer_test.py
@@ -5,8 +5,8 @@ import os
 
 import six
 
-from .. import unittest
 from compose.cli.log_printer import LogPrinter
+from tests import unittest
 
 
 class LogPrinterTest(unittest.TestCase):

From a348993d2c15688aefb05914b5e3973622f83179 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 25 Aug 2015 16:55:29 -0400
Subject: [PATCH 0227/1265] Remove two unused functions from cli/utils.py

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/cli/utils.py | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index b6c83f9e..cbc9123c 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -2,7 +2,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import unicode_literals
 
-import datetime
 import os
 import platform
 import ssl
@@ -36,39 +35,6 @@ def yesno(prompt, default=None):
         return None
 
 
-# http://stackoverflow.com/a/5164027
-def prettydate(d):
-    diff = datetime.datetime.utcnow() - d
-    s = diff.seconds
-    if diff.days > 7 or diff.days < 0:
-        return d.strftime('%d %b %y')
-    elif diff.days == 1:
-        return '1 day ago'
-    elif diff.days > 1:
-        return '{0} days ago'.format(diff.days)
-    elif s <= 1:
-        return 'just now'
-    elif s < 60:
-        return '{0} seconds ago'.format(s)
-    elif s < 120:
-        return '1 minute ago'
-    elif s < 3600:
-        return '{0} minutes ago'.format(s / 60)
-    elif s < 7200:
-        return '1 hour ago'
-    else:
-        return '{0} hours ago'.format(s / 3600)
-
-
-def mkdir(path, permissions=0o700):
-    if not os.path.exists(path):
-        os.mkdir(path)
-
-    os.chmod(path, permissions)
-
-    return path
-
-
 def find_candidates_in_parent_dirs(filenames, path):
     """
     Given a directory path to start, looks for filenames in the

From 9d9550c5b677647ad52235ed6d7fcf5ccfeac21a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 25 Aug 2015 17:17:12 -0400
Subject: [PATCH 0228/1265] Fix log printing for python3 by converting
 everything to unicode.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/cli/log_printer.py         |  2 +-
 compose/cli/utils.py               |  7 ++++---
 tests/unit/cli/log_printer_test.py |  5 ++---
 tests/unit/split_buffer_test.py    | 28 ++++++++++++++--------------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 69ada850..c2fcc54f 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -57,7 +57,7 @@ class LogPrinter(object):
     def _make_log_generator(self, container, color_fn):
         prefix = color_fn(self._generate_prefix(container))
         # Attach to container before log printer starts running
-        line_generator = split_buffer(self._attach(container), '\n')
+        line_generator = split_buffer(self._attach(container), u'\n')
 
         for line in line_generator:
             yield prefix + line
diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index cbc9123c..0b7ac683 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -7,6 +7,7 @@ import platform
 import ssl
 import subprocess
 
+import six
 from docker import version as docker_py_version
 from six.moves import input
 
@@ -63,11 +64,11 @@ def split_buffer(reader, separator):
     separator, except for the last one if none was found on the end
     of the input.
     """
-    buffered = str('')
-    separator = str(separator)
+    buffered = six.text_type('')
+    separator = six.text_type(separator)
 
     for data in reader:
-        buffered += data
+        buffered += data.decode('utf-8')
         while True:
             index = buffered.find(separator)
             if index == -1:
diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py
index 142bd7f3..d8fbf94b 100644
--- a/tests/unit/cli/log_printer_test.py
+++ b/tests/unit/cli/log_printer_test.py
@@ -12,7 +12,7 @@ from tests import unittest
 class LogPrinterTest(unittest.TestCase):
     def get_default_output(self, monochrome=False):
         def reader(*args, **kwargs):
-            yield "hello\nworld"
+            yield b"hello\nworld"
 
         container = MockContainer(reader)
         output = run_log_printer([container], monochrome=monochrome)
@@ -36,11 +36,10 @@ class LogPrinterTest(unittest.TestCase):
         glyph = u'\u2022'
 
         def reader(*args, **kwargs):
-            yield glyph + '\n'
+            yield glyph.encode('utf-8') + b'\n'
 
         container = MockContainer(reader)
         output = run_log_printer([container])
-
         if six.PY2:
             output = output.decode('utf-8')
 
diff --git a/tests/unit/split_buffer_test.py b/tests/unit/split_buffer_test.py
index 11646099..47c72f08 100644
--- a/tests/unit/split_buffer_test.py
+++ b/tests/unit/split_buffer_test.py
@@ -8,33 +8,33 @@ from compose.cli.utils import split_buffer
 class SplitBufferTest(unittest.TestCase):
     def test_single_line_chunks(self):
         def reader():
-            yield 'abc\n'
-            yield 'def\n'
-            yield 'ghi\n'
+            yield b'abc\n'
+            yield b'def\n'
+            yield b'ghi\n'
 
         self.assert_produces(reader, ['abc\n', 'def\n', 'ghi\n'])
 
     def test_no_end_separator(self):
         def reader():
-            yield 'abc\n'
-            yield 'def\n'
-            yield 'ghi'
+            yield b'abc\n'
+            yield b'def\n'
+            yield b'ghi'
 
         self.assert_produces(reader, ['abc\n', 'def\n', 'ghi'])
 
     def test_multiple_line_chunk(self):
         def reader():
-            yield 'abc\ndef\nghi'
+            yield b'abc\ndef\nghi'
 
         self.assert_produces(reader, ['abc\n', 'def\n', 'ghi'])
 
     def test_chunked_line(self):
         def reader():
-            yield 'a'
-            yield 'b'
-            yield 'c'
-            yield '\n'
-            yield 'd'
+            yield b'a'
+            yield b'b'
+            yield b'c'
+            yield b'\n'
+            yield b'd'
 
         self.assert_produces(reader, ['abc\n', 'd'])
 
@@ -42,12 +42,12 @@ class SplitBufferTest(unittest.TestCase):
         string = u"a\u2022c\n"
 
         def reader():
-            yield string
+            yield string.encode('utf-8')
 
         self.assert_produces(reader, [string])
 
     def assert_produces(self, reader, expectations):
-        split = split_buffer(reader(), '\n')
+        split = split_buffer(reader(), u'\n')
 
         for (actual, expected) in zip(split, expectations):
             self.assertEqual(type(actual), type(expected))

From 34249fad5d2e14320e35aaa1bf3cc8b3843e69c7 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 25 Aug 2015 14:26:33 +0100
Subject: [PATCH 0229/1265] Improve release docs

Incorporating questions from
https://gist.github.com/aanand/e567bd8d6a5d8e28c829

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 RELEASE_PROCESS.md | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index e81a55ec..0d5f42eb 100644
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -18,6 +18,12 @@ Building a Compose release
 
 4.  Write release notes in `CHANGES.md`.
 
+    Almost every feature enhancement should be mentioned, with the most visible/exciting ones first. Use descriptive sentences and give context where appropriate.
+
+    Bug fixes are worth mentioning if it's likely that they've affected lots of people, or if they were regressions in the previous version.
+
+    Improvements to the code are not worth mentioning.
+
 5.   Add a bump commit:
 
         git commit -am "Bump $VERSION"
@@ -78,9 +84,29 @@ Building a Compose release
 
         git push git@github.com:docker/compose.git $TAG
 
-8.  Create a release from the tag on GitHub.
+8.  Draft a release from the tag on GitHub.
 
-9.  Paste in installation instructions and release notes.
+    - Go to https://github.com/docker/compose/releases and click "Draft a new release".
+    - In the "Tag version" dropdown, select the tag you just pushed.
+
+9.  Paste in installation instructions and release notes. Here's an example - change the Compose version and Docker version as appropriate:
+
+        Firstly, note that Compose 1.5.0 requires Docker 1.8.0 or later.
+
+        Secondly, if you're a Mac user, the **[Docker Toolbox](https://www.docker.com/toolbox)** will install Compose ${VERSION} for you, alongside the latest versions of the Docker Engine, Machine and Kitematic.
+
+        Otherwise, you can use the usual commands to install/upgrade. Either download the binary:
+
+            curl -L https://github.com/docker/compose/releases/download/1.5.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+            chmod +x /usr/local/bin/docker-compose
+
+        Or install the PyPi package:
+
+            pip install -U docker-compose==1.5.0
+
+        Here's what's new:
+
+        ...release notes go here...
 
 10.  Attach the binaries.
 

From 7e22719090bf33012c5cd327cc70ebd965cd923f Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Wed, 26 Aug 2015 17:48:51 +0200
Subject: [PATCH 0230/1265] Fix suppressed blank in completion of `scale
 --help`

Wrong placement of `compopt -o` introduces an unexpected behavior that did
not matter as long as --help was the only option (you would probably not
continue to type after --help): completion of options would not automatically
append a whitespace character as expected.

For the outstanding addition of the --timeout option, which has an
argument, this would mean that the user would have to type an extra
whitespace after completion of --timeout before the argument could be
added.

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 5692f0e4..ee810ffa 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -278,10 +278,7 @@ _docker_compose_scale() {
 	case "$prev" in
 		=)
 			COMPREPLY=("$cur")
-			;;
-		*)
-			COMPREPLY=( $(compgen -S "=" -W "$(___docker_compose_all_services_in_compose_file)" -- "$cur") )
-			compopt -o nospace
+			return
 			;;
 	esac
 
@@ -289,6 +286,10 @@ _docker_compose_scale() {
 		-*)
 			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
 			;;
+		*)
+			COMPREPLY=( $(compgen -S "=" -W "$(___docker_compose_all_services_in_compose_file)" -- "$cur") )
+			compopt -o nospace
+			;;
 	esac
 }
 

From b03a2f79104e098a9e9a01f7fcb9e8da7e6c4ec4 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Wed, 26 Aug 2015 17:57:04 +0200
Subject: [PATCH 0231/1265] Add completion for `scale --timeout`

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index ee810ffa..71745d82 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -280,11 +280,14 @@ _docker_compose_scale() {
 			COMPREPLY=("$cur")
 			return
 			;;
+		--timeout|-t)
+			return
+			;;
 	esac
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help --timeout -t" -- "$cur" ) )
 			;;
 		*)
 			COMPREPLY=( $(compgen -S "=" -W "$(___docker_compose_all_services_in_compose_file)" -- "$cur") )

From 2cfda01ff4562304d646b10c9069683bda774e33 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Wed, 26 Aug 2015 18:16:36 +0200
Subject: [PATCH 0232/1265] Use consistent argument order in bash completion

In most of this file and in Dockers's bash completion the sort order of
options is to sort alphabetically by long option name.
The short options are put right behind their long couterpart.

This commit improves consistency.

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 71745d82..fe46a334 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -223,7 +223,7 @@ _docker_compose_pull() {
 
 _docker_compose_restart() {
 	case "$prev" in
-		-t | --timeout)
+		--timeout|-t)
 			return
 			;;
 	esac
@@ -311,7 +311,7 @@ _docker_compose_start() {
 
 _docker_compose_stop() {
 	case "$prev" in
-		-t | --timeout)
+		--timeout|-t)
 			return
 			;;
 	esac
@@ -341,7 +341,7 @@ _docker_compose_unpause() {
 
 _docker_compose_up() {
 	case "$prev" in
-		-t | --timeout)
+		--timeout|-t)
 			return
 			;;
 	esac
@@ -402,11 +402,11 @@ _docker_compose() {
 	local compose_file compose_project
 	while [ $counter -lt $cword ]; do
 		case "${words[$counter]}" in
-			-f|--file)
+			--file|-f)
 				(( counter++ ))
 				compose_file="${words[$counter]}"
 				;;
-			-p|--project-name)
+			--project-name|p)
 				(( counter++ ))
 				compose_project="${words[$counter]}"
 				;;

From 54973e8200a13dc9a386464c8eddaa2790155326 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 26 Aug 2015 12:53:11 -0400
Subject: [PATCH 0233/1265] Remove flake8 ignores and wrap the longest lines to
 140 char.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/config/validation.py      | 34 +++++++++++++++++++++++++------
 compose/legacy.py                 |  3 ++-
 compose/project.py                | 16 ++++++++++++---
 tests/integration/cli_test.py     |  4 +++-
 tests/integration/service_test.py |  5 ++++-
 tests/unit/config_test.py         |  5 ++++-
 tests/unit/container_test.py      | 10 ++++++++-
 tox.ini                           |  4 ++--
 8 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index e5f195f4..0df73e3c 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -30,7 +30,11 @@ DOCKER_CONFIG_HINTS = {
 VALID_NAME_CHARS = '[a-zA-Z0-9\._\-]'
 
 
-@FormatChecker.cls_checks(format="ports", raises=ValidationError("Invalid port formatting, it should be '[[remote_ip:]remote_port:]port[/protocol]'"))
+@FormatChecker.cls_checks(
+    format="ports",
+    raises=ValidationError(
+        "Invalid port formatting, it should be "
+        "'[[remote_ip:]remote_port:]port[/protocol]'"))
 def format_ports(instance):
     try:
         split_port(instance)
@@ -122,9 +126,14 @@ def process_errors(errors):
                 invalid_keys.append(get_unsupported_config_msg(service_name, invalid_config_key))
             elif error.validator == 'anyOf':
                 if 'image' in error.instance and 'build' in error.instance:
-                    required.append("Service '{}' has both an image and build path specified. A service can either be built to image or use an existing image, not both.".format(service_name))
+                    required.append(
+                        "Service '{}' has both an image and build path specified. "
+                        "A service can either be built to image or use an existing "
+                        "image, not both.".format(service_name))
                 elif 'image' not in error.instance and 'build' not in error.instance:
-                    required.append("Service '{}' has neither an image nor a build path specified. Exactly one must be provided.".format(service_name))
+                    required.append(
+                        "Service '{}' has neither an image nor a build path "
+                        "specified. Exactly one must be provided.".format(service_name))
                 else:
                     required.append(_clean_error_message(error.message))
             elif error.validator == 'oneOf':
@@ -143,12 +152,25 @@ def process_errors(errors):
 
                 if len(error.path) > 0:
                     config_key = " ".join(["'%s'" % k for k in error.path])
-                    type_errors.append("Service '{}' configuration key {} contains an invalid type, it should be {} {}".format(service_name, config_key, msg, error.validator_value))
+                    type_errors.append(
+                        "Service '{}' configuration key {} contains an invalid "
+                        "type, it should be {} {}".format(
+                            service_name,
+                            config_key,
+                            msg,
+                            error.validator_value))
                 else:
-                    root_msgs.append("Service '{}' doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.'".format(service_name))
+                    root_msgs.append(
+                        "Service '{}' doesn\'t have any configuration options. "
+                        "All top level keys in your docker-compose.yml must map "
+                        "to a dictionary of configuration options.'".format(service_name))
             elif error.validator == 'required':
                 config_key = error.path[0]
-                required.append("Service '{}' option '{}' is invalid, {}".format(service_name, config_key, _clean_error_message(error.message)))
+                required.append(
+                    "Service '{}' option '{}' is invalid, {}".format(
+                        service_name,
+                        config_key,
+                        _clean_error_message(error.message)))
             elif error.validator == 'dependencies':
                 dependency_key = list(error.validator_value.keys())[0]
                 required_keys = ",".join(error.validator_value[dependency_key])
diff --git a/compose/legacy.py b/compose/legacy.py
index e8f4f957..54162417 100644
--- a/compose/legacy.py
+++ b/compose/legacy.py
@@ -17,7 +17,8 @@ Compose found the following containers without labels:
 
 {names_list}
 
-As of Compose 1.3.0, containers are identified with labels instead of naming convention. If you want to continue using these containers, run:
+As of Compose 1.3.0, containers are identified with labels instead of naming
+convention. If you want to continue using these containers, run:
 
     $ docker-compose migrate-to-labels
 
diff --git a/compose/project.py b/compose/project.py
index 542c8785..4e8696ba 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -157,7 +157,9 @@ class Project(object):
                 try:
                     links.append((self.get_service(service_name), link_name))
                 except NoSuchService:
-                    raise ConfigurationError('Service "%s" has a link to service "%s" which does not exist.' % (service_dict['name'], service_name))
+                    raise ConfigurationError(
+                        'Service "%s" has a link to service "%s" which does not '
+                        'exist.' % (service_dict['name'], service_name))
             del service_dict['links']
         return links
 
@@ -173,7 +175,11 @@ class Project(object):
                         container = Container.from_id(self.client, volume_name)
                         volumes_from.append(container)
                     except APIError:
-                        raise ConfigurationError('Service "%s" mounts volumes from "%s", which is not the name of a service or container.' % (service_dict['name'], volume_name))
+                        raise ConfigurationError(
+                            'Service "%s" mounts volumes from "%s", which is '
+                            'not the name of a service or container.' % (
+                                service_dict['name'],
+                                volume_name))
             del service_dict['volumes_from']
         return volumes_from
 
@@ -188,7 +194,11 @@ class Project(object):
                     try:
                         net = Container.from_id(self.client, net_name)
                     except APIError:
-                        raise ConfigurationError('Service "%s" is trying to use the network of "%s", which is not the name of a service or container.' % (service_dict['name'], net_name))
+                        raise ConfigurationError(
+                            'Service "%s" is trying to use the network of "%s", '
+                            'which is not the name of a service or container.' % (
+                                service_dict['name'],
+                                net_name))
             else:
                 net = service_dict['net']
 
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 9552bf6a..a7bc3b49 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -93,7 +93,9 @@ class CLITestCase(DockerClientTestCase):
     def test_pull_with_digest(self, mock_logging):
         self.command.dispatch(['-f', 'digest.yml', 'pull'], None)
         mock_logging.info.assert_any_call('Pulling simple (busybox:latest)...')
-        mock_logging.info.assert_any_call('Pulling digest (busybox@sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d)...')
+        mock_logging.info.assert_any_call(
+            'Pulling digest (busybox@'
+            'sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d)...')
 
     @mock.patch('sys.stdout', new_callable=StringIO)
     def test_build_no_cache(self, mock_stdout):
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index bc9dcc69..fc634c8c 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -804,7 +804,10 @@ class ServiceTest(DockerClientTestCase):
             self.assertEqual(env[k], v)
 
     def test_env_from_file_combined_with_env(self):
-        service = self.create_service('web', environment=['ONE=1', 'TWO=2', 'THREE=3'], env_file=['tests/fixtures/env/one.env', 'tests/fixtures/env/two.env'])
+        service = self.create_service(
+            'web',
+            environment=['ONE=1', 'TWO=2', 'THREE=3'],
+            env_file=['tests/fixtures/env/one.env', 'tests/fixtures/env/two.env'])
         env = create_and_start_container(service).environment
         for k, v in {'ONE': '1', 'TWO': '2', 'THREE': '3', 'FOO': 'baz', 'DOO': 'dah'}.items():
             self.assertEqual(env[k], v)
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index ccd5b57b..51dac052 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -529,7 +529,10 @@ class MemoryOptionsTest(unittest.TestCase):
         When you set a 'memswap_limit' it is invalid config unless you also set
         a mem_limit
         """
-        expected_error_msg = "Invalid 'memswap_limit' configuration for 'foo' service: when defining 'memswap_limit' you must set 'mem_limit' as well"
+        expected_error_msg = (
+            "Invalid 'memswap_limit' configuration for 'foo' service: when "
+            "defining 'memswap_limit' you must set 'mem_limit' as well"
+        )
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 config.ConfigDetails(
diff --git a/tests/unit/container_test.py b/tests/unit/container_test.py
index 1eba9f65..5637330c 100644
--- a/tests/unit/container_test.py
+++ b/tests/unit/container_test.py
@@ -142,4 +142,12 @@ class GetContainerNameTestCase(unittest.TestCase):
         self.assertIsNone(get_container_name({}))
         self.assertEqual(get_container_name({'Name': 'myproject_db_1'}), 'myproject_db_1')
         self.assertEqual(get_container_name({'Names': ['/myproject_db_1', '/myproject_web_1/db']}), 'myproject_db_1')
-        self.assertEqual(get_container_name({'Names': ['/swarm-host-1/myproject_db_1', '/swarm-host-1/myproject_web_1/db']}), 'myproject_db_1')
+        self.assertEqual(
+            get_container_name({
+                'Names': [
+                    '/swarm-host-1/myproject_db_1',
+                    '/swarm-host-1/myproject_web_1/db'
+                ]
+            }),
+            'myproject_db_1'
+        )
diff --git a/tox.ini b/tox.ini
index a2bd6b6b..4b27a4e9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,6 +33,6 @@ deps =
     nose
 
 [flake8]
-# ignore line-length for now
-ignore = E501,E203
+# Allow really long lines for now
+max-line-length = 140
 exclude = compose/packages

From bdec7e6b52500ce7ec3d0f0ee8acc789182e1e10 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 26 Aug 2015 13:32:21 -0400
Subject: [PATCH 0234/1265] Cleanup some test case, remove unused mock return
 values, and use standard single underscore for unused variable

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 tests/integration/cli_test.py | 8 ++++----
 tests/unit/service_test.py    | 6 ------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 9552bf6a..78ff7604 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -313,7 +313,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual('moto=bobo', container.environment['allo'])
 
     @mock.patch('dockerpty.start')
-    def test_run_service_without_map_ports(self, __):
+    def test_run_service_without_map_ports(self, _):
         # create one off container
         self.command.base_dir = 'tests/fixtures/ports-composefile'
         self.command.dispatch(['run', '-d', 'simple'], None)
@@ -331,7 +331,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_assigned, None)
 
     @mock.patch('dockerpty.start')
-    def test_run_service_with_map_ports(self, __):
+    def test_run_service_with_map_ports(self, _):
 
         # create one off container
         self.command.base_dir = 'tests/fixtures/ports-composefile'
@@ -354,7 +354,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_range[1], "0.0.0.0:49154")
 
     @mock.patch('dockerpty.start')
-    def test_run_service_with_explicitly_maped_ports(self, __):
+    def test_run_service_with_explicitly_maped_ports(self, _):
 
         # create one off container
         self.command.base_dir = 'tests/fixtures/ports-composefile'
@@ -373,7 +373,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_full, "0.0.0.0:30001")
 
     @mock.patch('dockerpty.start')
-    def test_run_service_with_explicitly_maped_ip_ports(self, __):
+    def test_run_service_with_explicitly_maped_ip_ports(self, _):
 
         # create one off container
         self.command.base_dir = 'tests/fixtures/ports-composefile'
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 275bde1b..5d37bfed 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -99,14 +99,12 @@ class ServiceTest(unittest.TestCase):
 
     def test_split_domainname_none(self):
         service = Service('foo', image='foo', hostname='name', client=self.mock_client)
-        self.mock_client.containers.return_value = []
         opts = service._get_container_create_options({'image': 'foo'}, 1)
         self.assertEqual(opts['hostname'], 'name', 'hostname')
         self.assertFalse('domainname' in opts, 'domainname')
 
     def test_memory_swap_limit(self):
         service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, mem_limit=1000000000, memswap_limit=2000000000)
-        self.mock_client.containers.return_value = []
         opts = service._get_container_create_options({'some': 'overrides'}, 1)
         self.assertEqual(opts['host_config']['MemorySwap'], 2000000000)
         self.assertEqual(opts['host_config']['Memory'], 1000000000)
@@ -114,7 +112,6 @@ class ServiceTest(unittest.TestCase):
     def test_log_opt(self):
         log_opt = {'syslog-address': 'tcp://192.168.0.42:123'}
         service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, log_driver='syslog', log_opt=log_opt)
-        self.mock_client.containers.return_value = []
         opts = service._get_container_create_options({'some': 'overrides'}, 1)
 
         self.assertIsInstance(opts['host_config']['LogConfig'], LogConfig)
@@ -127,7 +124,6 @@ class ServiceTest(unittest.TestCase):
             hostname='name.domain.tld',
             image='foo',
             client=self.mock_client)
-        self.mock_client.containers.return_value = []
         opts = service._get_container_create_options({'image': 'foo'}, 1)
         self.assertEqual(opts['hostname'], 'name', 'hostname')
         self.assertEqual(opts['domainname'], 'domain.tld', 'domainname')
@@ -139,7 +135,6 @@ class ServiceTest(unittest.TestCase):
             image='foo',
             domainname='domain.tld',
             client=self.mock_client)
-        self.mock_client.containers.return_value = []
         opts = service._get_container_create_options({'image': 'foo'}, 1)
         self.assertEqual(opts['hostname'], 'name', 'hostname')
         self.assertEqual(opts['domainname'], 'domain.tld', 'domainname')
@@ -151,7 +146,6 @@ class ServiceTest(unittest.TestCase):
             domainname='domain.tld',
             image='foo',
             client=self.mock_client)
-        self.mock_client.containers.return_value = []
         opts = service._get_container_create_options({'image': 'foo'}, 1)
         self.assertEqual(opts['hostname'], 'name.sub', 'hostname')
         self.assertEqual(opts['domainname'], 'domain.tld', 'domainname')

From d2718bed9938ad3d72500fb722c02970de4d1ac8 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 26 Aug 2015 13:33:03 -0400
Subject: [PATCH 0235/1265] Allow setting a one-off container name

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/cli/main.py           |  4 ++++
 compose/service.py            |  2 +-
 tests/integration/cli_test.py | 10 ++++++++++
 tests/unit/cli_test.py        |  4 ++++
 tests/unit/service_test.py    | 13 +++++++++++++
 5 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 890a3c37..58e54285 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -308,6 +308,7 @@ class TopLevelCommand(Command):
             --allow-insecure-ssl  Deprecated - no effect.
             -d                    Detached mode: Run container in the background, print
                                   new container name.
+            --name NAME           Assign a name to the container
             --entrypoint CMD      Override the entrypoint of the image.
             -e KEY=VAL            Set an environment variable (can be used multiple times)
             -u, --user=""         Run as specified username or uid
@@ -374,6 +375,9 @@ class TopLevelCommand(Command):
                 'can not be used togather'
             )
 
+        if options['--name']:
+            container_options['name'] = options['--name']
+
         try:
             container = service.create_container(
                 quiet=True,
diff --git a/compose/service.py b/compose/service.py
index a15ee1b9..a0423ff4 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -586,7 +586,7 @@ class Service(object):
 
         if self.custom_container_name() and not one_off:
             container_options['name'] = self.custom_container_name()
-        else:
+        elif not container_options.get('name'):
             container_options['name'] = self.get_container_name(number, one_off)
 
         if add_config_hash:
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 78ff7604..b94d7d1e 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -391,6 +391,16 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_short, "127.0.0.1:30000")
         self.assertEqual(port_full, "127.0.0.1:30001")
 
+    @mock.patch('dockerpty.start')
+    def test_run_with_custom_name(self, _):
+        self.command.base_dir = 'tests/fixtures/environment-composefile'
+        name = 'the-container-name'
+        self.command.dispatch(['run', '--name', name, 'service'], None)
+
+        service = self.project.get_service('service')
+        container, = service.containers(stopped=True, one_off=True)
+        self.assertEqual(container.name, name)
+
     def test_rm(self):
         service = self.project.get_service('simple')
         service.create_container()
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 7d22ad02..1fd9f529 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -112,6 +112,7 @@ class CLITestCase(unittest.TestCase):
             '--service-ports': None,
             '--publish': [],
             '--rm': None,
+            '--name': None,
         })
 
         _, _, call_kwargs = mock_client.create_container.mock_calls[0]
@@ -141,6 +142,7 @@ class CLITestCase(unittest.TestCase):
             '--service-ports': None,
             '--publish': [],
             '--rm': None,
+            '--name': None,
         })
         _, _, call_kwargs = mock_client.create_container.mock_calls[0]
         self.assertEquals(call_kwargs['host_config']['RestartPolicy']['Name'], 'always')
@@ -166,6 +168,7 @@ class CLITestCase(unittest.TestCase):
             '--service-ports': None,
             '--publish': [],
             '--rm': True,
+            '--name': None,
         })
         _, _, call_kwargs = mock_client.create_container.mock_calls[0]
         self.assertFalse('RestartPolicy' in call_kwargs['host_config'])
@@ -195,4 +198,5 @@ class CLITestCase(unittest.TestCase):
                 '--service-ports': True,
                 '--publish': ['80:80'],
                 '--rm': None,
+                '--name': None,
             })
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 5d37bfed..a24e524d 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -150,6 +150,19 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(opts['hostname'], 'name.sub', 'hostname')
         self.assertEqual(opts['domainname'], 'domain.tld', 'domainname')
 
+    def test_get_container_create_options_with_name_option(self):
+        service = Service(
+            'foo',
+            image='foo',
+            client=self.mock_client,
+            container_name='foo1')
+        name = 'the_new_name'
+        opts = service._get_container_create_options(
+            {'name': name},
+            1,
+            one_off=True)
+        self.assertEqual(opts['name'], name)
+
     def test_get_container_not_found(self):
         self.mock_client.containers.return_value = []
         service = Service('foo', client=self.mock_client, image='foo')

From 3a0153859ae6624970696c967e18a99710479cd4 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 26 Aug 2015 16:21:31 -0400
Subject: [PATCH 0236/1265] Resolves #1856, fix regression in #1645. Includes
 some refactoring to make testing easier.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/cli/main.py         | 36 ++++++++++++++++++----------
 compose/container.py        |  6 ++++-
 tests/unit/cli/main_test.py | 47 +++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 14 deletions(-)
 create mode 100644 tests/unit/cli/main_test.py

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 58e54285..2ace13c2 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -538,19 +538,8 @@ class TopLevelCommand(Command):
         )
 
         if not detached:
-            print("Attaching to", list_containers(to_attach))
-            log_printer = LogPrinter(to_attach, attach_params={"logs": True}, monochrome=monochrome)
-
-            try:
-                log_printer.run()
-            finally:
-                def handler(signal, frame):
-                    project.kill(service_names=service_names)
-                    sys.exit(0)
-                signal.signal(signal.SIGINT, handler)
-
-                print("Gracefully stopping... (press Ctrl+C again to force)")
-                project.stop(service_names=service_names, timeout=timeout)
+            log_printer = build_log_printer(to_attach, service_names, monochrome)
+            attach_to_logs(project, log_printer, service_names, timeout)
 
     def migrate_to_labels(self, project, _options):
         """
@@ -593,5 +582,26 @@ class TopLevelCommand(Command):
             print(get_version_info('full'))
 
 
+def build_log_printer(containers, service_names, monochrome):
+    return LogPrinter(
+        [c for c in containers if c.service in service_names],
+        attach_params={"logs": True},
+        monochrome=monochrome)
+
+
+def attach_to_logs(project, log_printer, service_names, timeout):
+    print("Attaching to", list_containers(log_printer.containers))
+    try:
+        log_printer.run()
+    finally:
+        def handler(signal, frame):
+            project.kill(service_names=service_names)
+            sys.exit(0)
+        signal.signal(signal.SIGINT, handler)
+
+        print("Gracefully stopping... (press Ctrl+C again to force)")
+        project.stop(service_names=service_names, timeout=timeout)
+
+
 def list_containers(containers):
     return ", ".join(c.name for c in containers)
diff --git a/compose/container.py b/compose/container.py
index f727c867..f2d8a403 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -64,9 +64,13 @@ class Container(object):
     def name(self):
         return self.dictionary['Name'][1:]
 
+    @property
+    def service(self):
+        return self.labels.get(LABEL_SERVICE)
+
     @property
     def name_without_project(self):
-        return '{0}_{1}'.format(self.labels.get(LABEL_SERVICE), self.number)
+        return '{0}_{1}'.format(self.service, self.number)
 
     @property
     def number(self):
diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py
new file mode 100644
index 00000000..817e8f49
--- /dev/null
+++ b/tests/unit/cli/main_test.py
@@ -0,0 +1,47 @@
+from __future__ import absolute_import
+
+from compose import container
+from compose.cli.log_printer import LogPrinter
+from compose.cli.main import attach_to_logs
+from compose.cli.main import build_log_printer
+from compose.project import Project
+from tests import mock
+from tests import unittest
+
+
+def mock_container(service, number):
+    return mock.create_autospec(
+        container.Container,
+        service=service,
+        number=number,
+        name_without_project='{0}_{1}'.format(service, number))
+
+
+class CLIMainTestCase(unittest.TestCase):
+
+    def test_build_log_printer(self):
+        containers = [
+            mock_container('web', 1),
+            mock_container('web', 2),
+            mock_container('db', 1),
+            mock_container('other', 1),
+            mock_container('another', 1),
+        ]
+        service_names = ['web', 'db']
+        log_printer = build_log_printer(containers, service_names, True)
+        self.assertEqual(log_printer.containers, containers[:3])
+
+    def test_attach_to_logs(self):
+        project = mock.create_autospec(Project)
+        log_printer = mock.create_autospec(LogPrinter, containers=[])
+        service_names = ['web', 'db']
+        timeout = 12
+
+        with mock.patch('compose.cli.main.signal', autospec=True) as mock_signal:
+            attach_to_logs(project, log_printer, service_names, timeout)
+
+        mock_signal.signal.assert_called_once_with(mock_signal.SIGINT, mock.ANY)
+        log_printer.run.assert_called_once_with()
+        project.stop.assert_called_once_with(
+            service_names=service_names,
+            timeout=timeout)

From acca22206ab7a3eeb1cad99d2a93f4e9190e67ff Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 27 Aug 2015 10:36:12 +0100
Subject: [PATCH 0237/1265] Fix typo

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 RELEASE_PROCESS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index 0d5f42eb..966e06ee 100644
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -93,7 +93,7 @@ Building a Compose release
 
         Firstly, note that Compose 1.5.0 requires Docker 1.8.0 or later.
 
-        Secondly, if you're a Mac user, the **[Docker Toolbox](https://www.docker.com/toolbox)** will install Compose ${VERSION} for you, alongside the latest versions of the Docker Engine, Machine and Kitematic.
+        Secondly, if you're a Mac user, the **[Docker Toolbox](https://www.docker.com/toolbox)** will install Compose 1.5.0 for you, alongside the latest versions of the Docker Engine, Machine and Kitematic.
 
         Otherwise, you can use the usual commands to install/upgrade. Either download the binary:
 

From b39e549c87696d7b1d3ee10ebb1880bd791c647f Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 27 Aug 2015 13:35:45 +0100
Subject: [PATCH 0238/1265] Normalise ignore files

- Consistent order and contents (where possible)
- Prepend .gitignore paths with slashes where appropriate

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 .dockerignore | 9 +++++++--
 .gitignore    | 7 ++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index b85b7e5d..ba7e9155 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,10 @@
+*.egg-info
+.coverage
 .git
+.tox
 build
-dist
-venv
 coverage-html
+dist
+docker-compose.spec
+docs/_site
+venv
diff --git a/.gitignore b/.gitignore
index 52a78bd9..f6750c1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,10 @@
 *.egg-info
 *.pyc
-.tox
+/.coverage
+/.tox
 /build
+/coverage-html
 /dist
+/docker-compose.spec
 /docs/_site
 /venv
-docker-compose.spec
-coverage-html

From 477d4f491dca36f9c717f8bb6366d1f756a387bc Mon Sep 17 00:00:00 2001
From: Karol Duleba <mr.fuxi@gmail.com>
Date: Wed, 26 Aug 2015 22:03:45 +0100
Subject: [PATCH 0239/1265] Do not allow to specify both image and dockerfile
 in configuration. Closes #1908

Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
---
 compose/config/schema.json   |  5 ++++-
 compose/config/validation.py |  5 +++++
 docs/yml.md                  |  6 ++++++
 tests/unit/config_test.py    | 11 +++++++++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/compose/config/schema.json b/compose/config/schema.json
index 8e9b79fb..94fe4fc5 100644
--- a/compose/config/schema.json
+++ b/compose/config/schema.json
@@ -113,7 +113,10 @@
         },
         {
           "required": ["image"],
-          "not": {"required": ["build"]}
+          "not": {"anyOf": [
+            {"required": ["build"]},
+            {"required": ["dockerfile"]}
+          ]}
         },
         {
           "required": ["extends"],
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 0df73e3c..d8350427 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -134,6 +134,11 @@ def process_errors(errors):
                     required.append(
                         "Service '{}' has neither an image nor a build path "
                         "specified. Exactly one must be provided.".format(service_name))
+                elif 'image' in error.instance and 'dockerfile' in error.instance:
+                    required.append(
+                        "Service '{}' has both an image and alternate Dockerfile. "
+                        "A service can either be built to image or use an existing "
+                        "image, not both.".format(service_name))
                 else:
                     required.append(_clean_error_message(error.message))
             elif error.validator == 'oneOf':
diff --git a/docs/yml.md b/docs/yml.md
index 6fb31a7d..3ece0264 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -33,6 +33,8 @@ pull if it doesn't exist locally.
     image: a4bc65fd
     image: busybox@sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d
 
+Using `image` together with either `build`  or `dockerfile` is not allowed. Attempting to do so results in an error.
+
 ### build
 
 Path to a directory containing a Dockerfile. When the value supplied is a
@@ -43,6 +45,8 @@ Compose will build and tag it with a generated name, and use that image thereaft
 
     build: /path/to/build/dir
 
+Using `build` together with `image` is not allowed. Attempting to do so results in an error.
+
 ### dockerfile
 
 Alternate Dockerfile.
@@ -51,6 +55,8 @@ Compose will use an alternate file to build with.
 
     dockerfile: Dockerfile-alternate
 
+Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
+
 ### command
 
 Override the default command.
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 51dac052..e488ceb5 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -191,6 +191,17 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_config_image_and_dockerfile_raise_validation_error(self):
+        expected_error_msg = "Service 'web' has both an image and alternate Dockerfile."
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            config.load(
+                config.ConfigDetails(
+                    {'web': {'image': 'busybox', 'dockerfile': 'Dockerfile.alt'}},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)

From d264c2e33a57469e17f97ff06819b3203f81a4b1 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Thu, 27 Aug 2015 17:42:26 -0400
Subject: [PATCH 0240/1265] Resolves #1804

Fix mutation of service.options when a label or environment variable is specified in the config.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/config/config.py   |  2 +-
 compose/service.py         | 20 +++++++++-----------
 tests/unit/service_test.py | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index ea122bc4..cfa8086f 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -358,7 +358,7 @@ def parse_environment(environment):
         return dict(split_env(e) for e in environment)
 
     if isinstance(environment, dict):
-        return environment
+        return dict(environment)
 
     raise ConfigurationError(
         "environment \"%s\" must be a list or mapping," %
diff --git a/compose/service.py b/compose/service.py
index a0423ff4..b48f2e14 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -576,7 +576,6 @@ class Service(object):
             number,
             one_off=False,
             previous_container=None):
-
         add_config_hash = (not one_off and not override_options)
 
         container_options = dict(
@@ -589,13 +588,6 @@ class Service(object):
         elif not container_options.get('name'):
             container_options['name'] = self.get_container_name(number, one_off)
 
-        if add_config_hash:
-            config_hash = self.config_hash
-            if 'labels' not in container_options:
-                container_options['labels'] = {}
-            container_options['labels'][LABEL_CONFIG_HASH] = config_hash
-            log.debug("Added config hash: %s" % config_hash)
-
         if 'detach' not in container_options:
             container_options['detach'] = True
 
@@ -643,7 +635,8 @@ class Service(object):
         container_options['labels'] = build_container_labels(
             container_options.get('labels', {}),
             self.labels(one_off=one_off),
-            number)
+            number,
+            self.config_hash if add_config_hash else None)
 
         # Delete options which are only used when starting
         for key in DOCKER_START_KEYS:
@@ -899,11 +892,16 @@ def parse_volume_spec(volume_config):
 # Labels
 
 
-def build_container_labels(label_options, service_labels, number, one_off=False):
-    labels = label_options or {}
+def build_container_labels(label_options, service_labels, number, config_hash):
+    labels = dict(label_options or {})
     labels.update(label.split('=', 1) for label in service_labels)
     labels[LABEL_CONTAINER_NUMBER] = str(number)
     labels[LABEL_VERSION] = __version__
+
+    if config_hash:
+        log.debug("Added config hash: %s" % config_hash)
+        labels[LABEL_CONFIG_HASH] = config_hash
+
     return labels
 
 
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index a24e524d..aa6d4d74 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -6,6 +6,7 @@ from docker.utils import LogConfig
 
 from .. import mock
 from .. import unittest
+from compose.const import LABEL_CONFIG_HASH
 from compose.const import LABEL_ONE_OFF
 from compose.const import LABEL_PROJECT
 from compose.const import LABEL_SERVICE
@@ -163,6 +164,40 @@ class ServiceTest(unittest.TestCase):
             one_off=True)
         self.assertEqual(opts['name'], name)
 
+    def test_get_container_create_options_does_not_mutate_options(self):
+        labels = {'thing': 'real'}
+        environment = {'also': 'real'}
+        service = Service(
+            'foo',
+            image='foo',
+            labels=dict(labels),
+            client=self.mock_client,
+            environment=dict(environment),
+        )
+        self.mock_client.inspect_image.return_value = {'Id': 'abcd'}
+        prev_container = mock.Mock(
+            id='ababab',
+            image_config={'ContainerConfig': {}})
+
+        opts = service._get_container_create_options(
+            {},
+            1,
+            previous_container=prev_container)
+
+        self.assertEqual(service.options['labels'], labels)
+        self.assertEqual(service.options['environment'], environment)
+
+        self.assertEqual(
+            opts['labels'][LABEL_CONFIG_HASH],
+            'b30306d0a73b67f67a45b99b88d36c359e470e6fa0c04dda1cf62d2087205b81')
+        self.assertEqual(
+            opts['environment'],
+            {
+                'affinity:container': '=ababab',
+                'also': 'real',
+            }
+        )
+
     def test_get_container_not_found(self):
         self.mock_client.containers.return_value = []
         service = Service('foo', client=self.mock_client, image='foo')

From 9543cb341bc98b7ef7a61cbb2d2543e446dea163 Mon Sep 17 00:00:00 2001
From: Herman Junge <hermanalonsojunge@gmail.com>
Date: Thu, 27 Aug 2015 19:41:17 -0300
Subject: [PATCH 0241/1265] Fix doc install.md

termial -> terminal

Signed-off-by: Herman Junge <hermanalonsojunge@gmail.com>
---
 docs/install.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/install.md b/docs/install.md
index 7a2763ed..85060ce0 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -35,7 +35,7 @@ To install Compose, do the following:
 
 3. Go to the <a href="https://github.com/docker/compose/releases" target="_blank">repository release page</a>.
 
-4. Enter the `curl` command in your termial.
+4. Enter the `curl` command in your terminal.
 
      The command has the following format:
 

From a4bab13aee9b5804e74e6192bc412fccbdf6d8d5 Mon Sep 17 00:00:00 2001
From: Frank Sachsenheim <funkyfuture@riseup.net>
Date: Fri, 28 Aug 2015 19:05:19 +0200
Subject: [PATCH 0242/1265] Adds pause- and unpause-command to docopt's TLC

solves # 1921

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
---
 compose/cli/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 2ace13c2..06dacf1e 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -101,6 +101,7 @@ class TopLevelCommand(Command):
       help               Get help on a command
       kill               Kill containers
       logs               View output from containers
+      pause              Pause services
       port               Print the public port for a port binding
       ps                 List containers
       pull               Pulls service images
@@ -110,6 +111,7 @@ class TopLevelCommand(Command):
       scale              Set number of containers for a service
       start              Start services
       stop               Stop services
+      unpause            Unpause services
       up                 Create and start containers
       migrate-to-labels  Recreate containers to add labels
       version            Show the Docker-Compose version information

From 8f310767a63c4cdb151593cb5dd2e8808516ba4f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Fri, 28 Aug 2015 14:01:02 -0400
Subject: [PATCH 0243/1265] Add ISSUE-TRIAGE.md doc

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 project/ISSUE-TRIAGE.md                       | 32 +++++++++++++++++++
 .../RELEASE-PROCESS.md                        |  0
 2 files changed, 32 insertions(+)
 create mode 100644 project/ISSUE-TRIAGE.md
 rename RELEASE_PROCESS.md => project/RELEASE-PROCESS.md (100%)

diff --git a/project/ISSUE-TRIAGE.md b/project/ISSUE-TRIAGE.md
new file mode 100644
index 00000000..bcedbb43
--- /dev/null
+++ b/project/ISSUE-TRIAGE.md
@@ -0,0 +1,32 @@
+Triaging of issues
+------------------
+
+The docker-compose issue triage process follows
+https://github.com/docker/docker/blob/master/project/ISSUE-TRIAGE.md
+with the following additions or exceptions.
+
+
+### Classify the Issue
+
+The following labels are provided in additional to the standard labels:
+
+| Kind         | Description                                                       |
+|--------------|-------------------------------------------------------------------|
+| kind/cleanup | A refactor or improvement that is related to quality not function |
+| kind/parity  | A request for feature parity with docker cli                      |
+
+
+### Functional areas
+
+Most issues should fit into one of the following functional areas:
+
+| Area        |
+|-------------|
+| area/build  |
+| area/cli    |
+| area/config |
+| area/logs   |
+| area/run    |
+| area/scale  |
+| area/tests  |
+| area/up     |
diff --git a/RELEASE_PROCESS.md b/project/RELEASE-PROCESS.md
similarity index 100%
rename from RELEASE_PROCESS.md
rename to project/RELEASE-PROCESS.md

From 235fe21fd0ad3097e6e35692bc2f25b1c2062bc9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 26 Aug 2015 18:55:22 -0400
Subject: [PATCH 0244/1265] Prevent flaky test by changing container names.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 tests/integration/service_test.py | 2 +-
 tests/integration/state_test.py   | 1 -
 tests/integration/testcases.py    | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index fc634c8c..0cf8cdb0 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -695,7 +695,7 @@ class ServiceTest(DockerClientTestCase):
         Test that calling scale on a service that has a custom container name
         results in warning output.
         """
-        service = self.create_service('web', container_name='custom-container')
+        service = self.create_service('app', container_name='custom-container')
         self.assertEqual(service.custom_container_name(), 'custom-container')
 
         service.scale(3)
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index 3d4a5b5a..b3dd42d9 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -199,7 +199,6 @@ class ServiceStateTest(DockerClientTestCase):
 
         self.assertEqual([c.is_running for c in containers], [False, True])
 
-        web = self.create_service('web', **options)
         self.assertEqual(
             ('start', containers[0:1]),
             web.convergence_plan(),
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index e239010e..08ef9f27 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -33,6 +33,9 @@ class DockerClientTestCase(unittest.TestCase):
 
         options = ServiceLoader(working_dir='.').make_service_dict(name, kwargs)
 
+        labels = options.setdefault('labels', {})
+        labels['com.docker.compose.test-name'] = self.id()
+
         return Service(
             project='composetest',
             client=self.client,

From 5a5f28228a44975899a1b2787ac4b9ad72b74bea Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 25 Aug 2015 10:53:31 -0400
Subject: [PATCH 0245/1265] Document installing of pre-commit hooks.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 CONTRIBUTING.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c9188ac9..9ff8304c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,6 +30,17 @@ that should get you started.
    `docker-compose` from anywhere on your machine, it will run your development
    version of Compose.
 
+## Install pre-commit hooks
+
+This step is optional, but recommended. Pre-commit hooks will run style checks
+and in some cases fix style issues for you, when you commit code.
+
+Install the git pre-commit hooks using [tox](https://tox.readthedocs.org) by
+running `tox -e pre-commit` or by following the
+[pre-commit install guide](http://pre-commit.com/#install).
+
+To run the style checks at any time run `tox -e pre-commit`.
+
 ## Submitting a pull request
 
 See Docker's [basic contribution workflow](https://docs.docker.com/project/make-a-contribution/#the-basic-contribution-workflow) for a guide on how to submit a pull request for code or documentation.

From 74782a56b53638431c93f0081e8d933f7fc0a104 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 25 Aug 2015 10:57:21 -0400
Subject: [PATCH 0246/1265] Fix script/test by just calling
 script/test-versions directly instead of launching another container.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 script/ci            |  1 +
 script/test          | 15 +++++----------
 script/test-versions |  5 ++++-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/script/ci b/script/ci
index b4975487..e8356bb7 100755
--- a/script/ci
+++ b/script/ci
@@ -10,6 +10,7 @@ set -e
 
 export DOCKER_VERSIONS=all
 export DOCKER_DAEMON_ARGS="--storage-driver=overlay"
+GIT_VOLUME="--volumes-from=$(hostname)"
 . script/test-versions
 
 >&2 echo "Building Linux binary"
diff --git a/script/test b/script/test
index adf3fb1b..bdb3579b 100755
--- a/script/test
+++ b/script/test
@@ -6,15 +6,10 @@ set -ex
 TAG="docker-compose:$(git rev-parse --short HEAD)"
 
 rm -rf coverage-html
+# Create the host directory so it's owned by $USER
+mkdir -p coverage-html
 
 docker build -t "$TAG" .
-docker run \
-  --rm \
-  --volume="/var/run/docker.sock:/var/run/docker.sock" \
-  -e DOCKER_VERSIONS \
-  -e "TAG=$TAG" \
-  -e "affinity:image==$TAG" \
-  -e "COVERAGE_DIR=$(pwd)/coverage-html" \
-  --entrypoint="script/test-versions" \
-  "$TAG" \
-  "$@"
+
+GIT_VOLUME="--volume=$(pwd)/.git:/code/.git"
+. script/test-versions
diff --git a/script/test-versions b/script/test-versions
index f39c17e8..88d2554c 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -5,7 +5,10 @@
 set -e
 
 >&2 echo "Running lint checks"
-tox -e pre-commit
+docker run --rm \
+  ${GIT_VOLUME} \
+  --entrypoint="tox" \
+  "$TAG" -e pre-commit
 
 if [ "$DOCKER_VERSIONS" == "" ]; then
   DOCKER_VERSIONS="default"

From 6ac617bae1871dc6dcd53c1108376f2a920541a0 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 1 Sep 2015 16:23:04 -0400
Subject: [PATCH 0247/1265] Split requirements-build.txt from
 requirements-dev.txt to support a leaner tox.ini

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 Dockerfile               | 2 +-
 requirements-build.txt   | 1 +
 requirements-dev.txt     | 1 -
 script/build-linux       | 1 -
 script/build-linux-inner | 9 ++++++---
 script/build-osx         | 2 +-
 script/ci                | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 requirements-build.txt

diff --git a/Dockerfile b/Dockerfile
index a9892031..1d13c2b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -91,7 +91,7 @@ RUN pip install -r requirements-dev.txt
 RUN pip install tox==2.1.1
 
 ADD . /code/
-RUN python setup.py install
+RUN pip install --no-deps -e /code
 
 RUN chown -R user /code/
 
diff --git a/requirements-build.txt b/requirements-build.txt
new file mode 100644
index 00000000..5da6fa49
--- /dev/null
+++ b/requirements-build.txt
@@ -0,0 +1 @@
+git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
diff --git a/requirements-dev.txt b/requirements-dev.txt
index adb4387d..33a49151 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,5 @@
 coverage==3.7.1
 flake8==2.3.0
-git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
 mock >= 1.0.1
 nose==1.3.4
 pep8==1.6.1
diff --git a/script/build-linux b/script/build-linux
index 5e4a9470..4fdf1d92 100755
--- a/script/build-linux
+++ b/script/build-linux
@@ -6,7 +6,6 @@ TAG="docker-compose"
 docker build -t "$TAG" .
 docker run \
   --rm \
-  --user=user \
   --volume="$(pwd):/code" \
   --entrypoint="script/build-linux-inner" \
   "$TAG"
diff --git a/script/build-linux-inner b/script/build-linux-inner
index adc030ea..cfea8380 100755
--- a/script/build-linux-inner
+++ b/script/build-linux-inner
@@ -2,9 +2,12 @@
 
 set -ex
 
+TARGET=dist/docker-compose-Linux-x86_64
+
 mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 
-pyinstaller -F bin/docker-compose
-mv dist/docker-compose dist/docker-compose-Linux-x86_64
-dist/docker-compose-Linux-x86_64 version
+pip install -r requirements-build.txt
+su -c "pyinstaller -F bin/docker-compose" user
+mv dist/docker-compose $TARGET
+$TARGET version
diff --git a/script/build-osx b/script/build-osx
index 2a9cf512..d99c1fb9 100755
--- a/script/build-osx
+++ b/script/build-osx
@@ -6,7 +6,7 @@ PATH="/usr/local/bin:$PATH"
 rm -rf venv
 virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
-venv/bin/pip install -r requirements-dev.txt
+venv/bin/pip install -r requirements-build.txt
 venv/bin/pip install .
 venv/bin/pyinstaller -F bin/docker-compose
 mv dist/docker-compose dist/docker-compose-Darwin-x86_64
diff --git a/script/ci b/script/ci
index b4975487..e392fae7 100755
--- a/script/ci
+++ b/script/ci
@@ -13,4 +13,4 @@ export DOCKER_DAEMON_ARGS="--storage-driver=overlay"
 . script/test-versions
 
 >&2 echo "Building Linux binary"
-su -c script/build-linux-inner user
+. script/build-linux-inner

From c1ed1efde81dc2c93b5231cd67416fb89091377e Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 1 Sep 2015 16:24:07 -0400
Subject: [PATCH 0248/1265] Use py.test as the test runner

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 requirements-dev.txt |  7 +++----
 setup.py             |  5 +----
 tox.ini              | 28 ++++++++++++++++------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 33a49151..73b80783 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,4 @@
 coverage==3.7.1
-flake8==2.3.0
-mock >= 1.0.1
-nose==1.3.4
-pep8==1.6.1
+mock>=1.0.1
+pytest==2.7.2
+pytest-cov==2.1.0
diff --git a/setup.py b/setup.py
index 33335047..e93dafc6 100644
--- a/setup.py
+++ b/setup.py
@@ -41,13 +41,10 @@ install_requires = [
 
 
 tests_require = [
-    'nose',
-    'flake8',
+    'pytest',
 ]
 
 
-if sys.version_info < (2, 7):
-    tests_require.append('unittest2')
 if sys.version_info[:1] < (3,):
     tests_require.append('mock >= 1.0.1')
 
diff --git a/tox.ini b/tox.ini
index 4b27a4e9..71ab4fc9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,10 +8,14 @@ passenv =
 setenv =
     HOME=/tmp
 deps =
-    -rrequirements.txt
+    -rrequirements-dev.txt
 commands =
-    nosetests -v --with-coverage --cover-branches --cover-package=compose --cover-erase --cover-html-dir=coverage-html --cover-html {posargs}
-    flake8 compose tests setup.py
+    py.test -v \
+        --cov=compose \
+        --cov-report html \
+        --cov-report term \
+        --cov-config=tox.ini \
+        {posargs}
 
 [testenv:pre-commit]
 skip_install = True
@@ -21,16 +25,16 @@ commands =
     pre-commit install
     pre-commit run --all-files
 
-[testenv:py27]
-deps =
-    {[testenv]deps}
-    -rrequirements-dev.txt
+# Coverage configuration
+[run]
+branch = True
 
-[testenv:py34]
-deps =
-    {[testenv]deps}
-    flake8
-    nose
+[report]
+show_missing = true
+
+[html]
+directory = coverage-html
+# end coverage configuration
 
 [flake8]
 # Allow really long lines for now

From 6969829a705fe784213b139f7087708fd0b026b5 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Tue, 1 Sep 2015 17:23:39 -0700
Subject: [PATCH 0249/1265] Link to ZenHub instead of Waffle

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c9188ac9..cb26a550 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -58,6 +58,6 @@ you can specify a test directory, file, module, class or method:
 
 ## Finding things to work on
 
-We use a [Waffle.io board](https://waffle.io/docker/compose) to keep track of specific things we are working on and planning to work on. If you're looking for things to work on, stuff in the backlog is a great place to start.
+We use a [ZenHub board](https://www.zenhub.io/) to keep track of specific things we are working on and planning to work on. If you're looking for things to work on, stuff in the backlog is a great place to start.
 
 For more information about our project planning, take a look at our [GitHub wiki](https://github.com/docker/compose/wiki).

From c907f35e741ff2f40c775c07d311f53a0d4c2373 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 20 Aug 2015 15:05:33 +0100
Subject: [PATCH 0250/1265] Raise if working_dir is None

Check for this in the init so we can remove the duplication of
raising in further functions.

A ServiceLoader isn't valid without one.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index cfa8086f..e08b503f 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -152,7 +152,11 @@ def load(config_details):
 
 class ServiceLoader(object):
     def __init__(self, working_dir, filename=None, already_seen=None):
+        if working_dir is None:
+            raise Exception("No working_dir passed to ServiceLoader()")
+
         self.working_dir = os.path.abspath(working_dir)
+
         if filename:
             self.filename = os.path.abspath(filename)
         else:
@@ -176,9 +180,6 @@ class ServiceLoader(object):
 
         extends_options = self.validate_extends_options(service_dict['name'], service_dict['extends'])
 
-        if self.working_dir is None:
-            raise Exception("No working_dir passed to ServiceLoader()")
-
         if 'file' in extends_options:
             extends_from_filename = extends_options['file']
             other_config_path = expand_path(self.working_dir, extends_from_filename)
@@ -320,9 +321,6 @@ def get_env_files(options, working_dir=None):
     if 'env_file' not in options:
         return {}
 
-    if working_dir is None:
-        raise Exception("No working_dir passed to get_env_files()")
-
     env_files = options.get('env_file', [])
     if not isinstance(env_files, list):
         env_files = [env_files]

From 1344533b240ddc344029536df8361125617e1a3d Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 21 Aug 2015 17:04:10 +0100
Subject: [PATCH 0251/1265] filename is not optional

While it can be set to ultimately a value of None, when a
config file is read in from stdin, it is not optional.

We kinda make use of it's ability to be set to None in our
tests but functionally and design wise, it is required.

If filename is not set, extends does not work.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py       | 2 +-
 tests/integration/testcases.py | 2 +-
 tests/unit/config_test.py      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index e08b503f..b7697f00 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -151,7 +151,7 @@ def load(config_details):
 
 
 class ServiceLoader(object):
-    def __init__(self, working_dir, filename=None, already_seen=None):
+    def __init__(self, working_dir, filename, already_seen=None):
         if working_dir is None:
             raise Exception("No working_dir passed to ServiceLoader()")
 
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 08ef9f27..d9d666d2 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -31,7 +31,7 @@ class DockerClientTestCase(unittest.TestCase):
         if 'command' not in kwargs:
             kwargs['command'] = ["top"]
 
-        options = ServiceLoader(working_dir='.').make_service_dict(name, kwargs)
+        options = ServiceLoader(working_dir='.', filename=None).make_service_dict(name, kwargs)
 
         labels = options.setdefault('labels', {})
         labels['com.docker.compose.test-name'] = self.id()
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index e488ceb5..aa10982b 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -11,11 +11,11 @@ from compose.config import config
 from compose.config.errors import ConfigurationError
 
 
-def make_service_dict(name, service_dict, working_dir):
+def make_service_dict(name, service_dict, working_dir, filename=None):
     """
     Test helper function to construct a ServiceLoader
     """
-    return config.ServiceLoader(working_dir=working_dir).make_service_dict(name, service_dict)
+    return config.ServiceLoader(working_dir=working_dir, filename=filename).make_service_dict(name, service_dict)
 
 
 def service_sort(services):

From 8a6061bfb9a3e4a98c11ad385eee45710af81e3f Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 21 Aug 2015 17:07:37 +0100
Subject: [PATCH 0252/1265] __init__ takes service name and dict

Moving service name and dict out of the function make_service_dict
and into __init__. We always call make_service_dict with those so
let's put them in the initialiser. Slightly cleaner design intent.

The whole purpose of the ServiceLoader is to take a
service name&service dictionary then validate, process and return
service dictionaries ready to be created.

This is also another step towards cleaning the code up so we can
interpolate and validate an extended dictionary.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py       | 42 +++++++++++++++++++---------------
 tests/integration/testcases.py |  2 +-
 tests/unit/config_test.py      |  6 ++++-
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index b7697f00..9d90bd61 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -142,8 +142,12 @@ def load(config_details):
     service_dicts = []
 
     for service_name, service_dict in list(processed_config.items()):
-        loader = ServiceLoader(working_dir=working_dir, filename=filename)
-        service_dict = loader.make_service_dict(service_name, service_dict)
+        loader = ServiceLoader(
+            working_dir=working_dir,
+            filename=filename,
+            service_name=service_name,
+            service_dict=service_dict)
+        service_dict = loader.make_service_dict()
         validate_paths(service_dict)
         service_dicts.append(service_dict)
 
@@ -151,7 +155,7 @@ def load(config_details):
 
 
 class ServiceLoader(object):
-    def __init__(self, working_dir, filename, already_seen=None):
+    def __init__(self, working_dir, filename, service_name, service_dict, already_seen=None):
         if working_dir is None:
             raise Exception("No working_dir passed to ServiceLoader()")
 
@@ -162,17 +166,19 @@ class ServiceLoader(object):
         else:
             self.filename = filename
         self.already_seen = already_seen or []
+        self.service_dict = service_dict.copy()
+        self.service_dict['name'] = service_name
 
     def detect_cycle(self, name):
         if self.signature(name) in self.already_seen:
             raise CircularReference(self.already_seen + [self.signature(name)])
 
-    def make_service_dict(self, name, service_dict):
-        service_dict = service_dict.copy()
-        service_dict['name'] = name
-        service_dict = resolve_environment(service_dict, working_dir=self.working_dir)
-        service_dict = self.resolve_extends(service_dict)
-        return process_container_options(service_dict, working_dir=self.working_dir)
+    def make_service_dict(self):
+        # service_dict = service_dict.copy()
+        # service_dict['name'] = name
+        self.service_dict = resolve_environment(self.service_dict, working_dir=self.working_dir)
+        self.service_dict = self.resolve_extends(self.service_dict)
+        return process_container_options(self.service_dict, working_dir=self.working_dir)
 
     def resolve_extends(self, service_dict):
         if 'extends' not in service_dict:
@@ -188,11 +194,6 @@ class ServiceLoader(object):
 
         other_working_dir = os.path.dirname(other_config_path)
         other_already_seen = self.already_seen + [self.signature(service_dict['name'])]
-        other_loader = ServiceLoader(
-            working_dir=other_working_dir,
-            filename=other_config_path,
-            already_seen=other_already_seen,
-        )
 
         base_service = extends_options['service']
         other_config = load_yaml(other_config_path)
@@ -204,11 +205,16 @@ class ServiceLoader(object):
             raise ConfigurationError(msg)
 
         other_service_dict = other_config[base_service]
-        other_loader.detect_cycle(extends_options['service'])
-        other_service_dict = other_loader.make_service_dict(
-            service_dict['name'],
-            other_service_dict,
+        other_loader = ServiceLoader(
+            working_dir=other_working_dir,
+            filename=other_config_path,
+            service_name=service_dict['name'],
+            service_dict=other_service_dict,
+            already_seen=other_already_seen,
         )
+
+        other_loader.detect_cycle(extends_options['service'])
+        other_service_dict = other_loader.make_service_dict()
         validate_extended_service_dict(
             other_service_dict,
             filename=other_config_path,
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index d9d666d2..58240d5e 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -31,7 +31,7 @@ class DockerClientTestCase(unittest.TestCase):
         if 'command' not in kwargs:
             kwargs['command'] = ["top"]
 
-        options = ServiceLoader(working_dir='.', filename=None).make_service_dict(name, kwargs)
+        options = ServiceLoader(working_dir='.', filename=None, service_name=name, service_dict=kwargs).make_service_dict()
 
         labels = options.setdefault('labels', {})
         labels['com.docker.compose.test-name'] = self.id()
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index aa10982b..f3a4bd30 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -15,7 +15,11 @@ def make_service_dict(name, service_dict, working_dir, filename=None):
     """
     Test helper function to construct a ServiceLoader
     """
-    return config.ServiceLoader(working_dir=working_dir, filename=filename).make_service_dict(name, service_dict)
+    return config.ServiceLoader(
+        working_dir=working_dir,
+        filename=filename,
+        service_name=name,
+        service_dict=service_dict).make_service_dict()
 
 
 def service_sort(services):

From 02c52ae673a66c7a8f6455611d8561d8f6954383 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 24 Aug 2015 12:23:45 +0100
Subject: [PATCH 0253/1265] Move resolve_environment within __init__

resolve_environment is specific to ServiceLoader, the function
does not need to be on the global scope, it is a part of the
ServiceLoader object. The environment needs to be resolved
before we can make any service dicts, it belongs in the
constructor.

This is cleaning up the design a little and being clearer
about intent and scope of functions.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py | 45 ++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 9d90bd61..ff9b3593 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -169,17 +169,36 @@ class ServiceLoader(object):
         self.service_dict = service_dict.copy()
         self.service_dict['name'] = service_name
 
+        self.resolve_environment()
+
     def detect_cycle(self, name):
         if self.signature(name) in self.already_seen:
             raise CircularReference(self.already_seen + [self.signature(name)])
 
     def make_service_dict(self):
-        # service_dict = service_dict.copy()
-        # service_dict['name'] = name
-        self.service_dict = resolve_environment(self.service_dict, working_dir=self.working_dir)
         self.service_dict = self.resolve_extends(self.service_dict)
         return process_container_options(self.service_dict, working_dir=self.working_dir)
 
+    def resolve_environment(self):
+        """
+        Unpack any environment variables from an env_file, if set.
+        Interpolate environment values if set.
+        """
+        if 'environment' not in self.service_dict and 'env_file' not in self.service_dict:
+            return
+
+        env = {}
+
+        if 'env_file' in self.service_dict:
+            for f in get_env_files(self.service_dict, working_dir=self.working_dir):
+                env.update(env_vars_from_file(f))
+            del self.service_dict['env_file']
+
+        env.update(parse_environment(self.service_dict.get('environment')))
+        env = dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
+
+        self.service_dict['environment'] = env
+
     def resolve_extends(self, service_dict):
         if 'extends' not in service_dict:
             return service_dict
@@ -334,26 +353,6 @@ def get_env_files(options, working_dir=None):
     return [expand_path(working_dir, path) for path in env_files]
 
 
-def resolve_environment(service_dict, working_dir=None):
-    service_dict = service_dict.copy()
-
-    if 'environment' not in service_dict and 'env_file' not in service_dict:
-        return service_dict
-
-    env = {}
-
-    if 'env_file' in service_dict:
-        for f in get_env_files(service_dict, working_dir=working_dir):
-            env.update(env_vars_from_file(f))
-        del service_dict['env_file']
-
-    env.update(parse_environment(service_dict.get('environment')))
-    env = dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
-
-    service_dict['environment'] = env
-    return service_dict
-
-
 def parse_environment(environment):
     if not environment:
         return {}

From 538a501eece5f645285f8235cf21507127750300 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 24 Aug 2015 15:58:17 +0100
Subject: [PATCH 0254/1265] Refactor validating extends file path

Separating out the steps we need to resolve extends, so that it
will be clear to insert pre-processing of interpolation and
validation.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py     | 36 ++++++++++++++++++------------------
 compose/config/validation.py | 13 +++++++++++++
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index ff9b3593..51bd9384 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -11,6 +11,7 @@ from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
 from .interpolation import interpolate_environment_variables
 from .validation import validate_against_schema
+from .validation import validate_extends_file_path
 from .validation import validate_service_names
 from .validation import validate_top_level_object
 from compose.cli.utils import find_candidates_in_parent_dirs
@@ -171,12 +172,20 @@ class ServiceLoader(object):
 
         self.resolve_environment()
 
+        if 'extends' in self.service_dict:
+            validate_extends_file_path(
+                service_name,
+                self.service_dict['extends'],
+                self.filename
+            )
+
+
     def detect_cycle(self, name):
         if self.signature(name) in self.already_seen:
             raise CircularReference(self.already_seen + [self.signature(name)])
 
     def make_service_dict(self):
-        self.service_dict = self.resolve_extends(self.service_dict)
+        self.service_dict = self.resolve_extends()
         return process_container_options(self.service_dict, working_dir=self.working_dir)
 
     def resolve_environment(self):
@@ -199,11 +208,12 @@ class ServiceLoader(object):
 
         self.service_dict['environment'] = env
 
-    def resolve_extends(self, service_dict):
-        if 'extends' not in service_dict:
-            return service_dict
+    def resolve_extends(self):
+        if 'extends' not in self.service_dict:
+            return self.service_dict
 
-        extends_options = self.validate_extends_options(service_dict['name'], service_dict['extends'])
+        extends_options = self.service_dict['extends']
+        service_name = self.service_dict['name']
 
         if 'file' in extends_options:
             extends_from_filename = extends_options['file']
@@ -212,7 +222,7 @@ class ServiceLoader(object):
             other_config_path = self.filename
 
         other_working_dir = os.path.dirname(other_config_path)
-        other_already_seen = self.already_seen + [self.signature(service_dict['name'])]
+        other_already_seen = self.already_seen + [self.signature(service_name)]
 
         base_service = extends_options['service']
         other_config = load_yaml(other_config_path)
@@ -227,7 +237,7 @@ class ServiceLoader(object):
         other_loader = ServiceLoader(
             working_dir=other_working_dir,
             filename=other_config_path,
-            service_name=service_dict['name'],
+            service_name=service_name,
             service_dict=other_service_dict,
             already_seen=other_already_seen,
         )
@@ -240,21 +250,11 @@ class ServiceLoader(object):
             service=extends_options['service'],
         )
 
-        return merge_service_dicts(other_service_dict, service_dict)
+        return merge_service_dicts(other_service_dict, self.service_dict)
 
     def signature(self, name):
         return (self.filename, name)
 
-    def validate_extends_options(self, service_name, extends_options):
-        error_prefix = "Invalid 'extends' configuration for %s:" % service_name
-
-        if 'file' not in extends_options and self.filename is None:
-            raise ConfigurationError(
-                "%s you need to specify a 'file', e.g. 'file: something.yml'" % error_prefix
-            )
-
-        return extends_options
-
 
 def validate_extended_service_dict(service_dict, filename, service):
     error_prefix = "Cannot extend service '%s' in %s:" % (service, filename)
diff --git a/compose/config/validation.py b/compose/config/validation.py
index d8350427..1ae8981c 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -66,6 +66,19 @@ def validate_top_level_object(func):
     return func_wrapper
 
 
+def validate_extends_file_path(service_name, extends_options, filename):
+    """
+    The service to be extended must either be defined in the config key 'file',
+    or within 'filename'.
+    """
+    error_prefix = "Invalid 'extends' configuration for %s:" % service_name
+
+    if 'file' not in extends_options and filename is None:
+        raise ConfigurationError(
+            "%s you need to specify a 'file', e.g. 'file: something.yml'" % error_prefix
+        )
+
+
 def get_unsupported_config_msg(service_name, error_key):
     msg = "Unsupported config option for '{}' service: '{}'".format(service_name, error_key)
     if error_key in DOCKER_CONFIG_HINTS:

From 37bf8235b71a45b4b303b937129e07997784c61b Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 24 Aug 2015 16:00:47 +0100
Subject: [PATCH 0255/1265] Get extended config path

Refactored out into it's own function.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 51bd9384..0f3099dc 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -179,6 +179,9 @@ class ServiceLoader(object):
                 self.filename
             )
 
+            self.extended_config_path = self.get_extended_config_path(
+                self.service_dict['extends']
+            )
 
     def detect_cycle(self, name):
         if self.signature(name) in self.already_seen:
@@ -215,11 +218,7 @@ class ServiceLoader(object):
         extends_options = self.service_dict['extends']
         service_name = self.service_dict['name']
 
-        if 'file' in extends_options:
-            extends_from_filename = extends_options['file']
-            other_config_path = expand_path(self.working_dir, extends_from_filename)
-        else:
-            other_config_path = self.filename
+        other_config_path = self.get_extended_config_path(extends_options)
 
         other_working_dir = os.path.dirname(other_config_path)
         other_already_seen = self.already_seen + [self.signature(service_name)]
@@ -252,6 +251,18 @@ class ServiceLoader(object):
 
         return merge_service_dicts(other_service_dict, self.service_dict)
 
+    def get_extended_config_path(self, extends_options):
+        """
+        Service we are extending either has a value for 'file' set, which we
+        need to obtain a full path too or we are extending from a service
+        defined in our own file.
+        """
+        if 'file' in extends_options:
+            extends_from_filename = extends_options['file']
+            return expand_path(self.working_dir, extends_from_filename)
+
+        return self.filename
+
     def signature(self, name):
         return (self.filename, name)
 

From 36757cde1cbe38d9673f00af0f515038b8280cfe Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 25 Aug 2015 17:54:06 +0100
Subject: [PATCH 0256/1265] Validate extended service against our schema

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py                      |  7 +--
 tests/fixtures/extends/invalid-links.yml      |  9 ++++
 tests/fixtures/extends/invalid-net.yml        |  8 ++++
 tests/fixtures/extends/invalid-volumes.yml    |  9 ++++
 .../extends/service-with-invalid-schema.yml   |  5 +++
 tests/unit/config_test.py                     | 45 ++++++++-----------
 6 files changed, 53 insertions(+), 30 deletions(-)
 create mode 100644 tests/fixtures/extends/invalid-links.yml
 create mode 100644 tests/fixtures/extends/invalid-net.yml
 create mode 100644 tests/fixtures/extends/invalid-volumes.yml
 create mode 100644 tests/fixtures/extends/service-with-invalid-schema.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 0f3099dc..65a5b547 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -182,6 +182,8 @@ class ServiceLoader(object):
             self.extended_config_path = self.get_extended_config_path(
                 self.service_dict['extends']
             )
+            extended_config = load_yaml(self.extended_config_path)
+            validate_against_schema(extended_config)
 
     def detect_cycle(self, name):
         if self.signature(name) in self.already_seen:
@@ -217,10 +219,9 @@ class ServiceLoader(object):
 
         extends_options = self.service_dict['extends']
         service_name = self.service_dict['name']
+        other_config_path = self.extended_config_path
 
-        other_config_path = self.get_extended_config_path(extends_options)
-
-        other_working_dir = os.path.dirname(other_config_path)
+        other_working_dir = os.path.dirname(self.extended_config_path)
         other_already_seen = self.already_seen + [self.signature(service_name)]
 
         base_service = extends_options['service']
diff --git a/tests/fixtures/extends/invalid-links.yml b/tests/fixtures/extends/invalid-links.yml
new file mode 100644
index 00000000..edfeb8b2
--- /dev/null
+++ b/tests/fixtures/extends/invalid-links.yml
@@ -0,0 +1,9 @@
+myweb:
+  build: '.'
+  extends:
+    service: web
+  command: top
+web:
+  build: '.'
+  links:
+    - "mydb:db"
diff --git a/tests/fixtures/extends/invalid-net.yml b/tests/fixtures/extends/invalid-net.yml
new file mode 100644
index 00000000..fbcd020b
--- /dev/null
+++ b/tests/fixtures/extends/invalid-net.yml
@@ -0,0 +1,8 @@
+myweb:
+  build: '.'
+  extends:
+    service: web
+  command: top
+web:
+  build: '.'
+  net: "container:db"
diff --git a/tests/fixtures/extends/invalid-volumes.yml b/tests/fixtures/extends/invalid-volumes.yml
new file mode 100644
index 00000000..3db0118e
--- /dev/null
+++ b/tests/fixtures/extends/invalid-volumes.yml
@@ -0,0 +1,9 @@
+myweb:
+  build: '.'
+  extends:
+    service: web
+  command: top
+web:
+  build: '.'
+  volumes_from:
+    - "db"
diff --git a/tests/fixtures/extends/service-with-invalid-schema.yml b/tests/fixtures/extends/service-with-invalid-schema.yml
new file mode 100644
index 00000000..90dc76a0
--- /dev/null
+++ b/tests/fixtures/extends/service-with-invalid-schema.yml
@@ -0,0 +1,5 @@
+myweb:
+  extends:
+    service: web
+web:
+  command: top
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index f3a4bd30..98ae5138 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -867,6 +867,12 @@ class ExtendsTest(unittest.TestCase):
         self.assertEquals(len(service), 1)
         self.assertIsInstance(service[0], dict)
 
+    def test_extended_service_with_invalid_config(self):
+        expected_error_msg = "Service 'myweb' has neither an image nor a build path specified"
+
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            load_from_filename('tests/fixtures/extends/service-with-invalid-schema.yml')
+
     def test_extends_file_defaults_to_self(self):
         """
         Test not specifying a file in our extends options that the
@@ -891,37 +897,22 @@ class ExtendsTest(unittest.TestCase):
             }
         ]))
 
-    def test_blacklisted_options(self):
-        def load_config():
-            return make_service_dict('myweb', {
-                'extends': {
-                    'file': 'whatever',
-                    'service': 'web',
-                }
-            }, '.')
+    def test_invalid_links_in_extended_service(self):
+        expected_error_msg = "services with 'links' cannot be extended"
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            load_from_filename('tests/fixtures/extends/invalid-links.yml')
 
-        with self.assertRaisesRegexp(ConfigurationError, 'links'):
-            other_config = {'web': {'links': ['db']}}
+    def test_invalid_volumes_from_in_extended_service(self):
+        expected_error_msg = "services with 'volumes_from' cannot be extended"
 
-            with mock.patch.object(config, 'load_yaml', return_value=other_config):
-                print(load_config())
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            load_from_filename('tests/fixtures/extends/invalid-volumes.yml')
 
-        with self.assertRaisesRegexp(ConfigurationError, 'volumes_from'):
-            other_config = {'web': {'volumes_from': ['db']}}
+    def test_invalid_net_in_extended_service(self):
+        expected_error_msg = "services with 'net: container' cannot be extended"
 
-            with mock.patch.object(config, 'load_yaml', return_value=other_config):
-                print(load_config())
-
-        with self.assertRaisesRegexp(ConfigurationError, 'net'):
-            other_config = {'web': {'net': 'container:db'}}
-
-            with mock.patch.object(config, 'load_yaml', return_value=other_config):
-                print(load_config())
-
-        other_config = {'web': {'net': 'host'}}
-
-        with mock.patch.object(config, 'load_yaml', return_value=other_config):
-            print(load_config())
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            load_from_filename('tests/fixtures/extends/invalid-net.yml')
 
     def test_volume_path(self):
         dicts = load_from_filename('tests/fixtures/volume-path/docker-compose.yml')

From 4a8b2947caae7151db39a425e71f0f66dfd060ea Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 26 Aug 2015 13:23:29 +0100
Subject: [PATCH 0257/1265] Interpolate extended config

This refactoring is now really coming together. Construction is
happening in the __init__, which is a constructor and helps
clean up the design and clarity of intent of the code. We can now
see (nearly) everything that is being constructed when a ServiceLoader
is created. It needs all of these data constructs to perform the
domain logic and actions. Which are now clearer to see and moving
more towards the principle of functions doing (mostly)one thing and
function names being more descriptive.

resolve_extends is now concerned with the resolving of extends, rather
than the construction, validation, pre processing and *then* resolving
of extends.

Happy days :)

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py                      | 44 ++++++++++---------
 compose/config/validation.py                  |  8 ++++
 .../extends/valid-interpolation-2.yml         |  3 ++
 .../fixtures/extends/valid-interpolation.yml  |  5 +++
 tests/unit/config_test.py                     | 11 +++++
 5 files changed, 50 insertions(+), 21 deletions(-)
 create mode 100644 tests/fixtures/extends/valid-interpolation-2.yml
 create mode 100644 tests/fixtures/extends/valid-interpolation.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 65a5b547..e3ba2aeb 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -11,6 +11,7 @@ from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
 from .interpolation import interpolate_environment_variables
 from .validation import validate_against_schema
+from .validation import validate_extended_service_exists
 from .validation import validate_extends_file_path
 from .validation import validate_service_names
 from .validation import validate_top_level_object
@@ -178,12 +179,25 @@ class ServiceLoader(object):
                 self.service_dict['extends'],
                 self.filename
             )
-
             self.extended_config_path = self.get_extended_config_path(
                 self.service_dict['extends']
             )
-            extended_config = load_yaml(self.extended_config_path)
-            validate_against_schema(extended_config)
+            self.extended_service_name = self.service_dict['extends']['service']
+
+            full_extended_config = pre_process_config(
+                load_yaml(self.extended_config_path)
+            )
+
+            validate_extended_service_exists(
+                self.extended_service_name,
+                full_extended_config,
+                self.extended_config_path
+            )
+            validate_against_schema(full_extended_config)
+
+            self.extended_config = full_extended_config[self.extended_service_name]
+        else:
+            self.extended_config = None
 
     def detect_cycle(self, name):
         if self.signature(name) in self.already_seen:
@@ -214,40 +228,28 @@ class ServiceLoader(object):
         self.service_dict['environment'] = env
 
     def resolve_extends(self):
-        if 'extends' not in self.service_dict:
+        if self.extended_config is None:
             return self.service_dict
 
-        extends_options = self.service_dict['extends']
         service_name = self.service_dict['name']
-        other_config_path = self.extended_config_path
 
         other_working_dir = os.path.dirname(self.extended_config_path)
         other_already_seen = self.already_seen + [self.signature(service_name)]
 
-        base_service = extends_options['service']
-        other_config = load_yaml(other_config_path)
-
-        if base_service not in other_config:
-            msg = (
-                "Cannot extend service '%s' in %s: Service not found"
-            ) % (base_service, other_config_path)
-            raise ConfigurationError(msg)
-
-        other_service_dict = other_config[base_service]
         other_loader = ServiceLoader(
             working_dir=other_working_dir,
-            filename=other_config_path,
+            filename=self.extended_config_path,
             service_name=service_name,
-            service_dict=other_service_dict,
+            service_dict=self.extended_config,
             already_seen=other_already_seen,
         )
 
-        other_loader.detect_cycle(extends_options['service'])
+        other_loader.detect_cycle(self.extended_service_name)
         other_service_dict = other_loader.make_service_dict()
         validate_extended_service_dict(
             other_service_dict,
-            filename=other_config_path,
-            service=extends_options['service'],
+            filename=self.extended_config_path,
+            service=self.extended_service_name,
         )
 
         return merge_service_dicts(other_service_dict, self.service_dict)
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 1ae8981c..304e7e76 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -79,6 +79,14 @@ def validate_extends_file_path(service_name, extends_options, filename):
         )
 
 
+def validate_extended_service_exists(extended_service_name, full_extended_config, extended_config_path):
+    if extended_service_name not in full_extended_config:
+        msg = (
+            "Cannot extend service '%s' in %s: Service not found"
+        ) % (extended_service_name, extended_config_path)
+        raise ConfigurationError(msg)
+
+
 def get_unsupported_config_msg(service_name, error_key):
     msg = "Unsupported config option for '{}' service: '{}'".format(service_name, error_key)
     if error_key in DOCKER_CONFIG_HINTS:
diff --git a/tests/fixtures/extends/valid-interpolation-2.yml b/tests/fixtures/extends/valid-interpolation-2.yml
new file mode 100644
index 00000000..cb7bd93f
--- /dev/null
+++ b/tests/fixtures/extends/valid-interpolation-2.yml
@@ -0,0 +1,3 @@
+web:
+  build: '.'
+  hostname: "host-${HOSTNAME_VALUE}"
diff --git a/tests/fixtures/extends/valid-interpolation.yml b/tests/fixtures/extends/valid-interpolation.yml
new file mode 100644
index 00000000..68e8740f
--- /dev/null
+++ b/tests/fixtures/extends/valid-interpolation.yml
@@ -0,0 +1,5 @@
+myweb:
+  extends:
+    service: web
+    file: valid-interpolation-2.yml
+  command: top
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 98ae5138..7624bbdf 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -914,6 +914,17 @@ class ExtendsTest(unittest.TestCase):
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             load_from_filename('tests/fixtures/extends/invalid-net.yml')
 
+    @mock.patch.dict(os.environ)
+    def test_valid_interpolation_in_extended_service(self):
+        os.environ.update(
+            HOSTNAME_VALUE="penguin",
+        )
+        expected_interpolated_value = "host-penguin"
+
+        service_dicts = load_from_filename('tests/fixtures/extends/valid-interpolation.yml')
+        for service in service_dicts:
+            self.assertTrue(service['hostname'], expected_interpolated_value)
+
     def test_volume_path(self):
         dicts = load_from_filename('tests/fixtures/volume-path/docker-compose.yml')
 

From 950577d60f7d9ff76c1087f0f93de97303975d71 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 28 Aug 2015 18:49:17 +0100
Subject: [PATCH 0258/1265] Split validation into fields and service

We want to give feedback to the user as soon as possible about the
validity of the config supplied for the services.

When extending a service, we can validate that the fields are
correct against our schema but we must wait until the *end* of
the extends cycle once all of the extended dicts have been merged
into the service dict, to perform the final validation check on the
config to ensure it is a complete valid service.

Doing this before that had happened resulted in false reports of
invalid config, as common config when split out, by itself, is not
a valid service but *is* valid config to be included.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py                      | 11 ++++--
 .../{schema.json => fields_schema.json}       | 18 ---------
 compose/config/service_schema.json            | 39 +++++++++++++++++++
 compose/config/validation.py                  | 18 +++++++--
 .../extends/service-with-invalid-schema.yml   |  3 +-
 .../service-with-valid-composite-extends.yml  |  5 +++
 .../fixtures/extends/valid-common-config.yml  |  6 +++
 tests/fixtures/extends/valid-common.yml       |  3 ++
 .../extends/valid-composite-extends.yml       |  2 +
 tests/unit/config_test.py                     |  9 +++++
 10 files changed, 88 insertions(+), 26 deletions(-)
 rename compose/config/{schema.json => fields_schema.json} (90%)
 create mode 100644 compose/config/service_schema.json
 create mode 100644 tests/fixtures/extends/service-with-valid-composite-extends.yml
 create mode 100644 tests/fixtures/extends/valid-common-config.yml
 create mode 100644 tests/fixtures/extends/valid-common.yml
 create mode 100644 tests/fixtures/extends/valid-composite-extends.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index e3ba2aeb..736f5aeb 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -10,7 +10,8 @@ from .errors import CircularReference
 from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
 from .interpolation import interpolate_environment_variables
-from .validation import validate_against_schema
+from .validation import validate_against_fields_schema
+from .validation import validate_against_service_schema
 from .validation import validate_extended_service_exists
 from .validation import validate_extends_file_path
 from .validation import validate_service_names
@@ -139,7 +140,7 @@ def load(config_details):
     config, working_dir, filename = config_details
 
     processed_config = pre_process_config(config)
-    validate_against_schema(processed_config)
+    validate_against_fields_schema(processed_config)
 
     service_dicts = []
 
@@ -193,7 +194,7 @@ class ServiceLoader(object):
                 full_extended_config,
                 self.extended_config_path
             )
-            validate_against_schema(full_extended_config)
+            validate_against_fields_schema(full_extended_config)
 
             self.extended_config = full_extended_config[self.extended_service_name]
         else:
@@ -205,6 +206,10 @@ class ServiceLoader(object):
 
     def make_service_dict(self):
         self.service_dict = self.resolve_extends()
+
+        if not self.already_seen:
+            validate_against_service_schema(self.service_dict)
+
         return process_container_options(self.service_dict, working_dir=self.working_dir)
 
     def resolve_environment(self):
diff --git a/compose/config/schema.json b/compose/config/fields_schema.json
similarity index 90%
rename from compose/config/schema.json
rename to compose/config/fields_schema.json
index 94fe4fc5..92305c57 100644
--- a/compose/config/schema.json
+++ b/compose/config/fields_schema.json
@@ -106,24 +106,6 @@
         "working_dir": {"type": "string"}
       },
 
-      "anyOf": [
-        {
-          "required": ["build"],
-          "not": {"required": ["image"]}
-        },
-        {
-          "required": ["image"],
-          "not": {"anyOf": [
-            {"required": ["build"]},
-            {"required": ["dockerfile"]}
-          ]}
-        },
-        {
-          "required": ["extends"],
-          "not": {"required": ["build", "image"]}
-        }
-      ],
-
       "dependencies": {
         "memswap_limit": ["mem_limit"]
       },
diff --git a/compose/config/service_schema.json b/compose/config/service_schema.json
new file mode 100644
index 00000000..5cb5d6d0
--- /dev/null
+++ b/compose/config/service_schema.json
@@ -0,0 +1,39 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+
+  "properties": {
+      "name": {"type": "string"}
+  },
+
+  "required": ["name"],
+
+  "allOf": [
+    {"$ref": "fields_schema.json#/definitions/service"},
+    {"$ref": "#/definitions/service_constraints"}
+  ],
+
+  "definitions": {
+    "service_constraints": {
+      "anyOf": [
+        {
+          "required": ["build"],
+          "not": {"required": ["image"]}
+        },
+        {
+          "required": ["image"],
+          "not": {"anyOf": [
+            {"required": ["build"]},
+            {"required": ["dockerfile"]}
+          ]}
+        },
+        {
+          "required": ["extends"],
+          "not": {"required": ["build", "image"]}
+        }
+      ]
+    }
+  }
+
+}
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 304e7e76..3ae5485a 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -5,6 +5,7 @@ from functools import wraps
 from docker.utils.ports import split_port
 from jsonschema import Draft4Validator
 from jsonschema import FormatChecker
+from jsonschema import RefResolver
 from jsonschema import ValidationError
 
 from .errors import ConfigurationError
@@ -210,14 +211,25 @@ def process_errors(errors):
     return "\n".join(root_msgs + invalid_keys + required + type_errors + other_errors)
 
 
-def validate_against_schema(config):
+def validate_against_fields_schema(config):
+    schema_filename = "fields_schema.json"
+    return _validate_against_schema(config, schema_filename)
+
+
+def validate_against_service_schema(config):
+    schema_filename = "service_schema.json"
+    return _validate_against_schema(config, schema_filename)
+
+
+def _validate_against_schema(config, schema_filename):
     config_source_dir = os.path.dirname(os.path.abspath(__file__))
-    schema_file = os.path.join(config_source_dir, "schema.json")
+    schema_file = os.path.join(config_source_dir, schema_filename)
 
     with open(schema_file, "r") as schema_fh:
         schema = json.load(schema_fh)
 
-    validation_output = Draft4Validator(schema, format_checker=FormatChecker(["ports"]))
+    resolver = RefResolver('file://' + config_source_dir + '/', schema)
+    validation_output = Draft4Validator(schema, resolver=resolver, format_checker=FormatChecker(["ports"]))
 
     errors = [error for error in sorted(validation_output.iter_errors(config), key=str)]
     if errors:
diff --git a/tests/fixtures/extends/service-with-invalid-schema.yml b/tests/fixtures/extends/service-with-invalid-schema.yml
index 90dc76a0..00c36647 100644
--- a/tests/fixtures/extends/service-with-invalid-schema.yml
+++ b/tests/fixtures/extends/service-with-invalid-schema.yml
@@ -1,5 +1,4 @@
 myweb:
   extends:
+    file: valid-composite-extends.yml
     service: web
-web:
-  command: top
diff --git a/tests/fixtures/extends/service-with-valid-composite-extends.yml b/tests/fixtures/extends/service-with-valid-composite-extends.yml
new file mode 100644
index 00000000..6c419ed0
--- /dev/null
+++ b/tests/fixtures/extends/service-with-valid-composite-extends.yml
@@ -0,0 +1,5 @@
+myweb:
+  build: '.'
+  extends:
+    file: 'valid-composite-extends.yml'
+    service: web
diff --git a/tests/fixtures/extends/valid-common-config.yml b/tests/fixtures/extends/valid-common-config.yml
new file mode 100644
index 00000000..d8f13e7a
--- /dev/null
+++ b/tests/fixtures/extends/valid-common-config.yml
@@ -0,0 +1,6 @@
+myweb:
+  build: '.'
+  extends:
+    file: valid-common.yml
+    service: common-config
+  command: top
diff --git a/tests/fixtures/extends/valid-common.yml b/tests/fixtures/extends/valid-common.yml
new file mode 100644
index 00000000..07ad68e3
--- /dev/null
+++ b/tests/fixtures/extends/valid-common.yml
@@ -0,0 +1,3 @@
+common-config:
+  environment:
+    - FOO=1
diff --git a/tests/fixtures/extends/valid-composite-extends.yml b/tests/fixtures/extends/valid-composite-extends.yml
new file mode 100644
index 00000000..8816c3f3
--- /dev/null
+++ b/tests/fixtures/extends/valid-composite-extends.yml
@@ -0,0 +1,2 @@
+web:
+  command: top
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 7624bbdf..8f4251cf 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -866,6 +866,7 @@ class ExtendsTest(unittest.TestCase):
 
         self.assertEquals(len(service), 1)
         self.assertIsInstance(service[0], dict)
+        self.assertEquals(service[0]['command'], "/bin/true")
 
     def test_extended_service_with_invalid_config(self):
         expected_error_msg = "Service 'myweb' has neither an image nor a build path specified"
@@ -873,6 +874,10 @@ class ExtendsTest(unittest.TestCase):
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             load_from_filename('tests/fixtures/extends/service-with-invalid-schema.yml')
 
+    def test_extended_service_with_valid_config(self):
+        service = load_from_filename('tests/fixtures/extends/service-with-valid-composite-extends.yml')
+        self.assertEquals(service[0]['command'], "top")
+
     def test_extends_file_defaults_to_self(self):
         """
         Test not specifying a file in our extends options that the
@@ -955,6 +960,10 @@ class ExtendsTest(unittest.TestCase):
         with self.assertRaisesRegexp(ConfigurationError, err_msg):
             load_from_filename('tests/fixtures/extends/nonexistent-service.yml')
 
+    def test_partial_service_config_in_extends_is_still_valid(self):
+        dicts = load_from_filename('tests/fixtures/extends/valid-common-config.yml')
+        self.assertEqual(dicts[0]['environment'], {'FOO': '1'})
+
 
 class BuildPathTest(unittest.TestCase):
     def setUp(self):

From 9fa6e42f5562be98a4541941f40327f248179b43 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 31 Aug 2015 17:52:00 +0100
Subject: [PATCH 0259/1265] process_errors handle both schemas

Now the schema has been split into two, we need to modify the
process_errors function to accomodate.

Previously if an error.path was empty then it meant they were root
errors. Now that service_schema checks after the service has been
resolved, our service name is a key within the dictionary and
so our root error logic check is no longer true.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/validation.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 3ae5485a..59fb1394 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -125,7 +125,7 @@ def process_errors(errors):
 
     for error in errors:
         # handle root level errors
-        if len(error.path) == 0:
+        if len(error.path) == 0 and not error.instance.get('name'):
             if error.validator == 'type':
                 msg = "Top level object needs to be a dictionary. Check your .yml file that you have defined a service at the top level."
                 root_msgs.append(msg)
@@ -137,11 +137,13 @@ def process_errors(errors):
                 root_msgs.append(_clean_error_message(error.message))
 
         else:
-            # handle service level errors
-            service_name = error.path[0]
-
-            # pop the service name off our path
-            error.path.popleft()
+            try:
+                # field_schema errors will have service name on the path
+                service_name = error.path[0]
+                error.path.popleft()
+            except IndexError:
+                # service_schema errors will have the name in the instance
+                service_name = error.instance.get('name')
 
             if error.validator == 'additionalProperties':
                 invalid_config_key = _parse_key_from_error_msg(error)

From 4b487e3957bf6aad71358fb4fdc2c7bf952b1927 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 1 Sep 2015 16:14:02 +0100
Subject: [PATCH 0260/1265] Refactor extends back out of __init__

If make_service_dict is our factory function then we'll give it the
responsibility of validation/construction and resolving.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py | 67 +++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 36 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 736f5aeb..70eac267 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -170,42 +170,18 @@ class ServiceLoader(object):
             self.filename = filename
         self.already_seen = already_seen or []
         self.service_dict = service_dict.copy()
+        self.service_name = service_name
         self.service_dict['name'] = service_name
 
-        self.resolve_environment()
-
-        if 'extends' in self.service_dict:
-            validate_extends_file_path(
-                service_name,
-                self.service_dict['extends'],
-                self.filename
-            )
-            self.extended_config_path = self.get_extended_config_path(
-                self.service_dict['extends']
-            )
-            self.extended_service_name = self.service_dict['extends']['service']
-
-            full_extended_config = pre_process_config(
-                load_yaml(self.extended_config_path)
-            )
-
-            validate_extended_service_exists(
-                self.extended_service_name,
-                full_extended_config,
-                self.extended_config_path
-            )
-            validate_against_fields_schema(full_extended_config)
-
-            self.extended_config = full_extended_config[self.extended_service_name]
-        else:
-            self.extended_config = None
-
     def detect_cycle(self, name):
         if self.signature(name) in self.already_seen:
             raise CircularReference(self.already_seen + [self.signature(name)])
 
     def make_service_dict(self):
-        self.service_dict = self.resolve_extends()
+        self.resolve_environment()
+        if 'extends' in self.service_dict:
+            self.validate_and_construct_extends()
+            self.service_dict = self.resolve_extends()
 
         if not self.already_seen:
             validate_against_service_schema(self.service_dict)
@@ -232,19 +208,38 @@ class ServiceLoader(object):
 
         self.service_dict['environment'] = env
 
+    def validate_and_construct_extends(self):
+        validate_extends_file_path(
+            self.service_name,
+            self.service_dict['extends'],
+            self.filename
+        )
+        self.extended_config_path = self.get_extended_config_path(
+            self.service_dict['extends']
+        )
+        self.extended_service_name = self.service_dict['extends']['service']
+
+        full_extended_config = pre_process_config(
+            load_yaml(self.extended_config_path)
+        )
+
+        validate_extended_service_exists(
+            self.extended_service_name,
+            full_extended_config,
+            self.extended_config_path
+        )
+        validate_against_fields_schema(full_extended_config)
+
+        self.extended_config = full_extended_config[self.extended_service_name]
+
     def resolve_extends(self):
-        if self.extended_config is None:
-            return self.service_dict
-
-        service_name = self.service_dict['name']
-
         other_working_dir = os.path.dirname(self.extended_config_path)
-        other_already_seen = self.already_seen + [self.signature(service_name)]
+        other_already_seen = self.already_seen + [self.signature(self.service_name)]
 
         other_loader = ServiceLoader(
             working_dir=other_working_dir,
             filename=self.extended_config_path,
-            service_name=service_name,
+            service_name=self.service_name,
             service_dict=self.extended_config,
             already_seen=other_already_seen,
         )

From 9979880c9fc5371f2e0a26fa4d43bfdad156263f Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 1 Sep 2015 17:00:52 +0100
Subject: [PATCH 0261/1265] Add in volume_driver

I'd missed out this field by accident previously.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/fields_schema.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 92305c57..299f6de4 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -102,6 +102,7 @@
         "tty": {"type": "string"},
         "user": {"type": "string"},
         "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "volume_driver": {"type": "string"},
         "volumes_from": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "working_dir": {"type": "string"}
       },

From f51a5431ec0c3318af5c39599805f20cd135d5f9 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 2 Sep 2015 14:58:45 +0100
Subject: [PATCH 0262/1265] Correct some schema field definitions

Now validation is split in two, the integration tests helped
highlight some places where the schema definition was incorrect.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/fields_schema.json | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 299f6de4..2a122b7a 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -19,7 +19,12 @@
         "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "command": {"$ref": "#/definitions/string_or_list"},
         "container_name": {"type": "string"},
-        "cpu_shares": {"type": "string"},
+        "cpu_shares": {
+          "oneOf": [
+            {"type": "number"},
+            {"type": "string"}
+          ]
+        },
         "cpuset": {"type": "string"},
         "detach": {"type": "boolean"},
         "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
@@ -27,7 +32,7 @@
         "dns_search": {"$ref": "#/definitions/string_or_list"},
         "dockerfile": {"type": "string"},
         "domainname": {"type": "string"},
-        "entrypoint": {"type": "string"},
+        "entrypoint": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "env_file": {"$ref": "#/definitions/string_or_list"},
 
         "environment": {
@@ -75,7 +80,7 @@
         },
         "name": {"type": "string"},
         "net": {"type": "string"},
-        "pid": {"type": "string"},
+        "pid": {"type": ["string", "null"]},
 
         "ports": {
           "type": "array",
@@ -94,10 +99,10 @@
           "uniqueItems": true
         },
 
-        "privileged": {"type": "string"},
+        "privileged": {"type": "boolean"},
         "read_only": {"type": "boolean"},
         "restart": {"type": "string"},
-        "security_opt": {"type": "string"},
+        "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "stdin_open": {"type": "string"},
         "tty": {"type": "string"},
         "user": {"type": "string"},

From 9b8e404d138a1999594231b12ba29c935b93eb69 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 2 Sep 2015 15:00:28 +0100
Subject: [PATCH 0263/1265] Pass service_name to process_errors

Previously on Buffy... The process_errors was parsing a load of
ValidationErrors that we get back from jsonschema which included
assumptions about the state of the instance we're validating.

Now it's split in two and we're doing field separate to service,
those assumptions don't hold and we can't logically retrieve the
service_name from the error parsing when we're doing service schema
validation, have to explicitly pass this in.

process_errors is high on my list for some future re-factoring to help
make it a bit clearer, smaller state of doing things.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py     |  2 +-
 compose/config/validation.py | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 70eac267..8df45b8a 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -184,7 +184,7 @@ class ServiceLoader(object):
             self.service_dict = self.resolve_extends()
 
         if not self.already_seen:
-            validate_against_service_schema(self.service_dict)
+            validate_against_service_schema(self.service_dict, self.service_name)
 
         return process_container_options(self.service_dict, working_dir=self.working_dir)
 
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 59fb1394..632bdf03 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -95,7 +95,7 @@ def get_unsupported_config_msg(service_name, error_key):
     return msg
 
 
-def process_errors(errors):
+def process_errors(errors, service_name=None):
     """
     jsonschema gives us an error tree full of information to explain what has
     gone wrong. Process each error and pull out relevant information and re-write
@@ -137,13 +137,14 @@ def process_errors(errors):
                 root_msgs.append(_clean_error_message(error.message))
 
         else:
-            try:
+            if not service_name:
                 # field_schema errors will have service name on the path
                 service_name = error.path[0]
                 error.path.popleft()
-            except IndexError:
-                # service_schema errors will have the name in the instance
-                service_name = error.instance.get('name')
+            else:
+                # service_schema errors have the service name passed in, as that
+                # is not available on error.path or necessarily error.instance
+                service_name = service_name
 
             if error.validator == 'additionalProperties':
                 invalid_config_key = _parse_key_from_error_msg(error)
@@ -218,12 +219,12 @@ def validate_against_fields_schema(config):
     return _validate_against_schema(config, schema_filename)
 
 
-def validate_against_service_schema(config):
+def validate_against_service_schema(config, service_name):
     schema_filename = "service_schema.json"
-    return _validate_against_schema(config, schema_filename)
+    return _validate_against_schema(config, schema_filename, service_name)
 
 
-def _validate_against_schema(config, schema_filename):
+def _validate_against_schema(config, schema_filename, service_name=None):
     config_source_dir = os.path.dirname(os.path.abspath(__file__))
     schema_file = os.path.join(config_source_dir, schema_filename)
 
@@ -235,5 +236,5 @@ def _validate_against_schema(config, schema_filename):
 
     errors = [error for error in sorted(validation_output.iter_errors(config), key=str)]
     if errors:
-        error_msg = process_errors(errors)
+        error_msg = process_errors(errors, service_name)
         raise ConfigurationError("Validation failed, reason(s):\n{}".format(error_msg))

From d31d24d19fc7faa54bd793e812ca3a4447afaa27 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 2 Sep 2015 15:03:29 +0100
Subject: [PATCH 0264/1265] Work around some coupling of links, net &
 volume_from

This is minimal disruptive change I could make to ensure
the service integration tests worked, now we have some validation
happening.

There is some coupling/entanglement/assumption going on here.

Project when creating a service, using it's class method from_dicts
performs some transformations on links, net & volume_from, which
get passed on to Service when creating. Service itself, then performs
some transformation on those values. This worked fine in the tests before
because those options were merely passed on via make_service_dict.

This is no longer true with our validation in place. You can't pass to
ServiceLoader [(obj, 'string')] for links, the validation expects it to be
a list of strings. Which it would be when passed into Project.from_dicts
method.

I think the tests need some re-factoring but for now, manually deleting
keys out of the kwargs and then putting them back in for Service Creation
allows the tests to continue.

I am not super happy about this approach. Hopefully we can come back and
improve it.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/integration/testcases.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 58240d5e..4557c07b 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -31,11 +31,29 @@ class DockerClientTestCase(unittest.TestCase):
         if 'command' not in kwargs:
             kwargs['command'] = ["top"]
 
+        links = kwargs.get('links', None)
+        volumes_from = kwargs.get('volumes_from', None)
+        net = kwargs.get('net', None)
+
+        workaround_options = ['links', 'volumes_from', 'net']
+        for key in workaround_options:
+            try:
+                del kwargs[key]
+            except KeyError:
+                pass
+
         options = ServiceLoader(working_dir='.', filename=None, service_name=name, service_dict=kwargs).make_service_dict()
 
         labels = options.setdefault('labels', {})
         labels['com.docker.compose.test-name'] = self.id()
 
+        if links:
+            options['links'] = links
+        if volumes_from:
+            options['volumes_from'] = volumes_from
+        if net:
+            options['net'] = net
+
         return Service(
             project='composetest',
             client=self.client,

From 6a399a5b2f1ed0e014fcb21bae80cae3b725e506 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 2 Sep 2015 15:41:25 +0100
Subject: [PATCH 0265/1265] Update tests to be compatible with validation

Some were missing build '.' from their dicts, others were the
incorrect type and one I've moved from integration to unit.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/integration/service_test.py | 12 +-----
 tests/unit/config_test.py         | 67 ++++++++++++++++++++++++-------
 2 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 0cf8cdb0..177471ff 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -165,16 +165,6 @@ class ServiceTest(DockerClientTestCase):
         service.start_container(container)
         self.assertEqual(set(container.get('HostConfig.ExtraHosts')), set(extra_hosts))
 
-    def test_create_container_with_extra_hosts_string(self):
-        extra_hosts = 'somehost:162.242.195.82'
-        service = self.create_service('db', extra_hosts=extra_hosts)
-        self.assertRaises(ConfigError, lambda: service.create_container())
-
-    def test_create_container_with_extra_hosts_list_of_dicts(self):
-        extra_hosts = [{'somehost': '162.242.195.82'}, {'otherhost': '50.31.209.229'}]
-        service = self.create_service('db', extra_hosts=extra_hosts)
-        self.assertRaises(ConfigError, lambda: service.create_container())
-
     def test_create_container_with_extra_hosts_dicts(self):
         extra_hosts = {'somehost': '162.242.195.82', 'otherhost': '50.31.209.229'}
         extra_hosts_list = ['somehost:162.242.195.82', 'otherhost:50.31.209.229']
@@ -515,7 +505,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(container['HostConfig']['Privileged'], True)
 
     def test_expose_does_not_publish_ports(self):
-        service = self.create_service('web', expose=[8000])
+        service = self.create_service('web', expose=["8000"])
         container = create_and_start_container(service).inspect()
         self.assertEqual(container['NetworkSettings']['Ports'], {'8000/tcp': None})
 
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 8f4251cf..21f1261e 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -206,6 +206,39 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_config_extra_hosts_string_raises_validation_error(self):
+        expected_error_msg = "Service 'web' configuration key 'extra_hosts' contains an invalid type"
+
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            config.load(
+                config.ConfigDetails(
+                    {'web': {
+                        'image': 'busybox',
+                        'extra_hosts': 'somehost:162.242.195.82'
+                    }},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+
+    def test_config_extra_hosts_list_of_dicts_validation_error(self):
+        expected_error_msg = "Service 'web' configuration key 'extra_hosts' contains an invalid type"
+
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            config.load(
+                config.ConfigDetails(
+                    {'web': {
+                        'image': 'busybox',
+                        'extra_hosts': [
+                            {'somehost': '162.242.195.82'},
+                            {'otherhost': '50.31.209.229'}
+                        ]
+                    }},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)
@@ -240,7 +273,7 @@ class InterpolationTest(unittest.TestCase):
                 'web': {
                     'image': '${FOO}',
                     'command': '${BAR}',
-                    'entrypoint': '${BAR}',
+                    'container_name': '${BAR}',
                 },
             },
             working_dir='.',
@@ -286,12 +319,13 @@ class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)
     def test_volume_binding_with_home(self):
         os.environ['HOME'] = '/home/user'
-        d = make_service_dict('foo', {'volumes': ['~:/container/path']}, working_dir='.')
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['~:/container/path']}, working_dir='.')
         self.assertEqual(d['volumes'], ['/home/user:/container/path'])
 
     @mock.patch.dict(os.environ)
     def test_volume_binding_with_local_dir_name_raises_warning(self):
         def make_dict(**config):
+            config['build'] = '.'
             make_service_dict('foo', config, working_dir='.')
 
         with mock.patch('compose.config.config.log.warn') as warn:
@@ -336,6 +370,7 @@ class InterpolationTest(unittest.TestCase):
 
     def test_named_volume_with_driver_does_not_expand(self):
         d = make_service_dict('foo', {
+            'build': '.',
             'volumes': ['namedvolume:/data'],
             'volume_driver': 'foodriver',
         }, working_dir='.')
@@ -345,6 +380,7 @@ class InterpolationTest(unittest.TestCase):
     def test_home_directory_with_driver_does_not_expand(self):
         os.environ['NAME'] = 'surprise!'
         d = make_service_dict('foo', {
+            'build': '.',
             'volumes': ['~:/data'],
             'volume_driver': 'foodriver',
         }, working_dir='.')
@@ -504,36 +540,36 @@ class MergeLabelsTest(unittest.TestCase):
 
     def test_no_override(self):
         service_dict = config.merge_service_dicts(
-            make_service_dict('foo', {'labels': ['foo=1', 'bar']}, 'tests/'),
-            make_service_dict('foo', {}, 'tests/'),
+            make_service_dict('foo', {'build': '.', 'labels': ['foo=1', 'bar']}, 'tests/'),
+            make_service_dict('foo', {'build': '.'}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '1', 'bar': ''})
 
     def test_no_base(self):
         service_dict = config.merge_service_dicts(
-            make_service_dict('foo', {}, 'tests/'),
-            make_service_dict('foo', {'labels': ['foo=2']}, 'tests/'),
+            make_service_dict('foo', {'build': '.'}, 'tests/'),
+            make_service_dict('foo', {'build': '.', 'labels': ['foo=2']}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '2'})
 
     def test_override_explicit_value(self):
         service_dict = config.merge_service_dicts(
-            make_service_dict('foo', {'labels': ['foo=1', 'bar']}, 'tests/'),
-            make_service_dict('foo', {'labels': ['foo=2']}, 'tests/'),
+            make_service_dict('foo', {'build': '.', 'labels': ['foo=1', 'bar']}, 'tests/'),
+            make_service_dict('foo', {'build': '.', 'labels': ['foo=2']}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '2', 'bar': ''})
 
     def test_add_explicit_value(self):
         service_dict = config.merge_service_dicts(
-            make_service_dict('foo', {'labels': ['foo=1', 'bar']}, 'tests/'),
-            make_service_dict('foo', {'labels': ['bar=2']}, 'tests/'),
+            make_service_dict('foo', {'build': '.', 'labels': ['foo=1', 'bar']}, 'tests/'),
+            make_service_dict('foo', {'build': '.', 'labels': ['bar=2']}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '1', 'bar': '2'})
 
     def test_remove_explicit_value(self):
         service_dict = config.merge_service_dicts(
-            make_service_dict('foo', {'labels': ['foo=1', 'bar=2']}, 'tests/'),
-            make_service_dict('foo', {'labels': ['bar']}, 'tests/'),
+            make_service_dict('foo', {'build': '.', 'labels': ['foo=1', 'bar=2']}, 'tests/'),
+            make_service_dict('foo', {'build': '.', 'labels': ['bar']}, 'tests/'),
         )
         self.assertEqual(service_dict['labels'], {'foo': '1', 'bar': ''})
 
@@ -615,6 +651,7 @@ class EnvTest(unittest.TestCase):
 
         service_dict = make_service_dict(
             'foo', {
+                'build': '.',
                 'environment': {
                     'FILE_DEF': 'F1',
                     'FILE_DEF_EMPTY': '',
@@ -633,7 +670,7 @@ class EnvTest(unittest.TestCase):
     def test_env_from_file(self):
         service_dict = make_service_dict(
             'foo',
-            {'env_file': 'one.env'},
+            {'build': '.', 'env_file': 'one.env'},
             'tests/fixtures/env',
         )
         self.assertEqual(
@@ -644,7 +681,7 @@ class EnvTest(unittest.TestCase):
     def test_env_from_multiple_files(self):
         service_dict = make_service_dict(
             'foo',
-            {'env_file': ['one.env', 'two.env']},
+            {'build': '.', 'env_file': ['one.env', 'two.env']},
             'tests/fixtures/env',
         )
         self.assertEqual(
@@ -666,7 +703,7 @@ class EnvTest(unittest.TestCase):
         os.environ['ENV_DEF'] = 'E3'
         service_dict = make_service_dict(
             'foo',
-            {'env_file': 'resolve.env'},
+            {'build': '.', 'env_file': 'resolve.env'},
             'tests/fixtures/env',
         )
         self.assertEqual(

From b54b932b54ea39054aeaab1273c8570001b90804 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 2 Sep 2015 11:53:37 -0700
Subject: [PATCH 0266/1265] Exit gracefully when requests encounter a
 ReadTimeout exception.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/docker_client.py | 2 +-
 compose/cli/main.py          | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index ad67d563..91e4059c 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -34,5 +34,5 @@ def docker_client():
             ca_cert=ca_cert,
         )
 
-    timeout = int(os.environ.get('DOCKER_CLIENT_TIMEOUT', 60))
+    timeout = int(os.environ.get('COMPOSE_HTTP_TIMEOUT', os.environ.get('DOCKER_CLIENT_TIMEOUT', 60)))
     return Client(base_url=base_url, tls=tls_config, version=api_version, timeout=timeout)
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 2ace13c2..116c8300 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -10,6 +10,7 @@ from operator import attrgetter
 
 import dockerpty
 from docker.errors import APIError
+from requests.exceptions import ReadTimeout
 
 from .. import __version__
 from .. import legacy
@@ -65,6 +66,12 @@ def main():
     except NeedsBuildError as e:
         log.error("Service '%s' needs to be built, but --no-build was passed." % e.service.name)
         sys.exit(1)
+    except ReadTimeout as e:
+        log.error(
+            "HTTP request took too long to complete. Retry with --verbose to obtain debug information.\n"
+            "If you encounter this issue regularly because of slow network conditions, consider setting "
+            "COMPOSE_HTTP_TIMEOUT to a higher value."
+        )
 
 
 def setup_logging():

From 80c909299965243800401f061c17afc56a689cdd Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 2 Sep 2015 12:52:48 -0700
Subject: [PATCH 0267/1265] Document COMPOSE_HTTP_TIMEOUT env config

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 docs/reference/overview.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/reference/overview.md b/docs/reference/overview.md
index 7425aa5e..52598737 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/overview.md
@@ -44,6 +44,11 @@ the `docker` daemon.
 
 Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TLS verification. Defaults to `~/.docker`.
 
+### COMPOSE\_HTTP\_TIMEOUT
+
+Configures the time (in seconds) a request to the Docker daemon is allowed to hang before Compose considers
+it failed. Defaults to 60 seconds.
+
 
 
 

From 48466d7d824c17c321be6f4308166f34eff822f9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 2 Sep 2015 16:08:18 -0400
Subject: [PATCH 0268/1265] Fix #1961 - docker-compose up should attach to all
 containers with no service names are specified, and add tests.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/cli/main.py           |  5 ++++-
 tests/integration/cli_test.py | 28 +++++++++++++++++++++++-----
 tests/unit/cli/main_test.py   | 10 ++++++++++
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 2ace13c2..2d72646d 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -583,8 +583,11 @@ class TopLevelCommand(Command):
 
 
 def build_log_printer(containers, service_names, monochrome):
+    if service_names:
+        containers = [c for c in containers if c.service in service_names]
+
     return LogPrinter(
-        [c for c in containers if c.service in service_names],
+        containers,
         attach_params={"logs": True},
         monochrome=monochrome)
 
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 124ae559..9606ef41 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -113,7 +113,7 @@ class CLITestCase(DockerClientTestCase):
         output = mock_stdout.getvalue()
         self.assertNotIn(cache_indicator, output)
 
-    def test_up(self):
+    def test_up_detached(self):
         self.command.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
         another = self.project.get_service('another')
@@ -121,10 +121,28 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(another.containers()), 1)
 
         # Ensure containers don't have stdin and stdout connected in -d mode
-        config = service.containers()[0].inspect()['Config']
-        self.assertFalse(config['AttachStderr'])
-        self.assertFalse(config['AttachStdout'])
-        self.assertFalse(config['AttachStdin'])
+        container, = service.containers()
+        self.assertFalse(container.get('Config.AttachStderr'))
+        self.assertFalse(container.get('Config.AttachStdout'))
+        self.assertFalse(container.get('Config.AttachStdin'))
+
+    def test_up_attached(self):
+        with mock.patch(
+            'compose.cli.main.attach_to_logs',
+            autospec=True
+        ) as mock_attach:
+            self.command.dispatch(['up'], None)
+            _, args, kwargs = mock_attach.mock_calls[0]
+            _project, log_printer, _names, _timeout = args
+
+        service = self.project.get_service('simple')
+        another = self.project.get_service('another')
+        self.assertEqual(len(service.containers()), 1)
+        self.assertEqual(len(another.containers()), 1)
+        self.assertEqual(
+            set(log_printer.containers),
+            set(self.project.containers())
+        )
 
     def test_up_with_links(self):
         self.command.base_dir = 'tests/fixtures/links-composefile'
diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py
index 817e8f49..e3a4629e 100644
--- a/tests/unit/cli/main_test.py
+++ b/tests/unit/cli/main_test.py
@@ -31,6 +31,16 @@ class CLIMainTestCase(unittest.TestCase):
         log_printer = build_log_printer(containers, service_names, True)
         self.assertEqual(log_printer.containers, containers[:3])
 
+    def test_build_log_printer_all_services(self):
+        containers = [
+            mock_container('web', 1),
+            mock_container('db', 1),
+            mock_container('other', 1),
+        ]
+        service_names = []
+        log_printer = build_log_printer(containers, service_names, True)
+        self.assertEqual(log_printer.containers, containers)
+
     def test_attach_to_logs(self):
         project = mock.create_autospec(Project)
         log_printer = mock.create_autospec(LogPrinter, containers=[])

From e634fe3fd6a768bcd5818dfb81b4c11cdc460853 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 2 Sep 2015 14:28:57 -0700
Subject: [PATCH 0269/1265] Deprecation warning when DOCKER_CLIENT_TIMEOUT is
 used

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/docker_client.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 91e4059c..e16549e8 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -1,9 +1,12 @@
+import logging
 import os
 import ssl
 
 from docker import Client
 from docker import tls
 
+log = logging.getLogger(__name__)
+
 
 def docker_client():
     """
@@ -34,5 +37,8 @@ def docker_client():
             ca_cert=ca_cert,
         )
 
+    if 'DOCKER_CLIENT_TIMEOUT' in os.environ:
+        log.warn('The DOCKER_CLIENT_TIMEOUT environment variable is deprecated. Please use COMPOSE_HTTP_TIMEOUT instead.')
     timeout = int(os.environ.get('COMPOSE_HTTP_TIMEOUT', os.environ.get('DOCKER_CLIENT_TIMEOUT', 60)))
+
     return Client(base_url=base_url, tls=tls_config, version=api_version, timeout=timeout)

From b110bbe9e3f2c69e8f1dc8e990d16f4b016da955 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 2 Sep 2015 14:31:30 -0700
Subject: [PATCH 0270/1265] Refined error message when timeout is encountered.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 116c8300..66187429 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -2,6 +2,7 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 import logging
+import os
 import re
 import signal
 import sys
@@ -68,9 +69,9 @@ def main():
         sys.exit(1)
     except ReadTimeout as e:
         log.error(
-            "HTTP request took too long to complete. Retry with --verbose to obtain debug information.\n"
+            "An HTTP request took too long to complete. Retry with --verbose to obtain debug information.\n"
             "If you encounter this issue regularly because of slow network conditions, consider setting "
-            "COMPOSE_HTTP_TIMEOUT to a higher value."
+            "COMPOSE_HTTP_TIMEOUT to a higher value (current value: %s)." % os.environ.get('COMPOSE_HTTP_TIMEOUT', 60)
         )
 
 

From f9c7346380dc9c3da7f465b8ac542673700db837 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 2 Sep 2015 14:52:47 -0700
Subject: [PATCH 0271/1265] HTTP_TIMEOUT as importable constant for consistency

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/docker_client.py | 5 +++--
 compose/cli/main.py          | 4 ++--
 compose/const.py             | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index e16549e8..601b0b9a 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -5,6 +5,8 @@ import ssl
 from docker import Client
 from docker import tls
 
+from ..const import HTTP_TIMEOUT
+
 log = logging.getLogger(__name__)
 
 
@@ -39,6 +41,5 @@ def docker_client():
 
     if 'DOCKER_CLIENT_TIMEOUT' in os.environ:
         log.warn('The DOCKER_CLIENT_TIMEOUT environment variable is deprecated. Please use COMPOSE_HTTP_TIMEOUT instead.')
-    timeout = int(os.environ.get('COMPOSE_HTTP_TIMEOUT', os.environ.get('DOCKER_CLIENT_TIMEOUT', 60)))
 
-    return Client(base_url=base_url, tls=tls_config, version=api_version, timeout=timeout)
+    return Client(base_url=base_url, tls=tls_config, version=api_version, timeout=HTTP_TIMEOUT)
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 66187429..13a8cef2 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -2,7 +2,6 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 import logging
-import os
 import re
 import signal
 import sys
@@ -17,6 +16,7 @@ from .. import __version__
 from .. import legacy
 from ..config import parse_environment
 from ..const import DEFAULT_TIMEOUT
+from ..const import HTTP_TIMEOUT
 from ..progress_stream import StreamOutputError
 from ..project import ConfigurationError
 from ..project import NoSuchService
@@ -71,7 +71,7 @@ def main():
         log.error(
             "An HTTP request took too long to complete. Retry with --verbose to obtain debug information.\n"
             "If you encounter this issue regularly because of slow network conditions, consider setting "
-            "COMPOSE_HTTP_TIMEOUT to a higher value (current value: %s)." % os.environ.get('COMPOSE_HTTP_TIMEOUT', 60)
+            "COMPOSE_HTTP_TIMEOUT to a higher value (current value: %s)." % HTTP_TIMEOUT
         )
 
 
diff --git a/compose/const.py b/compose/const.py
index 709c3a10..dbfa56b8 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -1,3 +1,4 @@
+import os
 
 DEFAULT_TIMEOUT = 10
 LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
@@ -6,3 +7,4 @@ LABEL_PROJECT = 'com.docker.compose.project'
 LABEL_SERVICE = 'com.docker.compose.service'
 LABEL_VERSION = 'com.docker.compose.version'
 LABEL_CONFIG_HASH = 'com.docker.compose.config-hash'
+HTTP_TIMEOUT = int(os.environ.get('COMPOSE_HTTP_TIMEOUT', os.environ.get('DOCKER_CLIENT_TIMEOUT', 60)))

From b165ae07c97e3af52528c829d136dd29c37da0a3 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 1 Sep 2015 14:58:16 -0700
Subject: [PATCH 0272/1265] Configure PyInstaller using docker-compose.spec

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 .dockerignore            |  1 -
 .gitignore               |  1 -
 docker-compose.spec      | 24 ++++++++++++++++++++++++
 script/build-linux-inner |  2 +-
 script/build-osx         |  2 +-
 5 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 docker-compose.spec

diff --git a/.dockerignore b/.dockerignore
index ba7e9155..5a4da301 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,6 +5,5 @@
 build
 coverage-html
 dist
-docker-compose.spec
 docs/_site
 venv
diff --git a/.gitignore b/.gitignore
index f6750c1f..1b0c5011 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,5 @@
 /build
 /coverage-html
 /dist
-/docker-compose.spec
 /docs/_site
 /venv
diff --git a/docker-compose.spec b/docker-compose.spec
new file mode 100644
index 00000000..eae63914
--- /dev/null
+++ b/docker-compose.spec
@@ -0,0 +1,24 @@
+# -*- mode: python -*-
+
+block_cipher = None
+
+a = Analysis(['bin/docker-compose'],
+             pathex=['.'],
+             hiddenimports=[],
+             hookspath=None,
+             runtime_hooks=None,
+             cipher=block_cipher)
+
+pyz = PYZ(a.pure,
+             cipher=block_cipher)
+
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='docker-compose',
+          debug=False,
+          strip=None,
+          upx=True,
+          console=True )
diff --git a/script/build-linux-inner b/script/build-linux-inner
index cfea8380..e5d290eb 100755
--- a/script/build-linux-inner
+++ b/script/build-linux-inner
@@ -8,6 +8,6 @@ mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 
 pip install -r requirements-build.txt
-su -c "pyinstaller -F bin/docker-compose" user
+su -c "pyinstaller docker-compose.spec" user
 mv dist/docker-compose $TARGET
 $TARGET version
diff --git a/script/build-osx b/script/build-osx
index d99c1fb9..e1cc7038 100755
--- a/script/build-osx
+++ b/script/build-osx
@@ -8,6 +8,6 @@ virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
 venv/bin/pip install -r requirements-build.txt
 venv/bin/pip install .
-venv/bin/pyinstaller -F bin/docker-compose
+venv/bin/pyinstaller docker-compose.spec
 mv dist/docker-compose dist/docker-compose-Darwin-x86_64
 dist/docker-compose-Darwin-x86_64 version

From 6a95f6d628933299ba0531b87a38c7f9a0c5dcc3 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 2 Sep 2015 18:00:08 -0700
Subject: [PATCH 0273/1265] custom timeout test rewrite

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/unit/cli/docker_client_test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index 5ccde73a..d497495b 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -16,7 +16,7 @@ class DockerClientTestCase(unittest.TestCase):
             docker_client.docker_client()
 
     def test_docker_client_with_custom_timeout(self):
-        with mock.patch.dict(os.environ):
-            os.environ['DOCKER_CLIENT_TIMEOUT'] = timeout = "300"
+        timeout = 300
+        with mock.patch('compose.cli.docker_client.HTTP_TIMEOUT', 300):
             client = docker_client.docker_client()
-        self.assertEqual(client.timeout, int(timeout))
+            self.assertEqual(client.timeout, int(timeout))

From ecea79fd4e3ae4ee91c6e34c5230fec8739295f4 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 1 Sep 2015 15:22:00 -0700
Subject: [PATCH 0274/1265] Bundle schema files

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docker-compose.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.spec b/docker-compose.spec
index eae63914..678fc132 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -17,6 +17,8 @@ exe = EXE(pyz,
           a.binaries,
           a.zipfiles,
           a.datas,
+          [('compose/config/fields_schema.json', 'compose/config/fields_schema.json', 'DATA')],
+          [('compose/config/service_schema.json', 'compose/config/service_schema.json', 'DATA')],
           name='docker-compose',
           debug=False,
           strip=None,

From 7326608369d52656eae56202d3cc005300a17771 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 3 Sep 2015 11:44:08 +0100
Subject: [PATCH 0275/1265] expose array can contain either strings or numbers

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/fields_schema.json |  6 +++++-
 tests/unit/config_test.py         | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 2a122b7a..f03ef711 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -42,7 +42,11 @@
           ]
         },
 
-        "expose": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "expose": {
+          "type": "array",
+          "items": {"type": ["string", "number"]},
+          "uniqueItems": true
+        },
 
         "extends": {
           "type": "object",
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 21f1261e..3f602fb5 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -239,6 +239,21 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_valid_config_which_allows_two_type_definitions(self):
+        expose_values = [["8000"], [8000]]
+        for expose in expose_values:
+            service = config.load(
+                config.ConfigDetails(
+                    {'web': {
+                        'image': 'busybox',
+                        'expose': expose
+                    }},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+            self.assertEqual(service[0]['expose'], expose)
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)

From ef56523883a8c2d5bd2d48a556ece6a3b8b130f5 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 1 Sep 2015 18:56:40 -0400
Subject: [PATCH 0276/1265] Make external_links a regular service.option so
 that it's part of the config hash

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/service.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index b48f2e14..5942fca5 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -87,7 +87,16 @@ ConvergencePlan = namedtuple('ConvergencePlan', 'action containers')
 
 
 class Service(object):
-    def __init__(self, name, client=None, project='default', links=None, external_links=None, volumes_from=None, net=None, **options):
+    def __init__(
+        self,
+        name,
+        client=None,
+        project='default',
+        links=None,
+        volumes_from=None,
+        net=None,
+        **options
+    ):
         if not re.match('^%s+$' % VALID_NAME_CHARS, project):
             raise ConfigError('Invalid project name "%s" - only %s are allowed' % (project, VALID_NAME_CHARS))
 
@@ -95,7 +104,6 @@ class Service(object):
         self.client = client
         self.project = project
         self.links = links or []
-        self.external_links = external_links or []
         self.volumes_from = volumes_from or []
         self.net = net or None
         self.options = options
@@ -528,7 +536,7 @@ class Service(object):
                 links.append((container.name, self.name))
                 links.append((container.name, container.name))
                 links.append((container.name, container.name_without_project))
-        for external_link in self.external_links:
+        for external_link in self.options.get('external_links') or []:
             if ':' not in external_link:
                 link_name = external_link
             else:

From e801981fed4049d0f7eab94ed969ec20f3ba8a76 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 1 Sep 2015 19:21:22 -0400
Subject: [PATCH 0277/1265] Sort config keys

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/config/config.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 8df45b8a..d9b06f3e 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -22,9 +22,9 @@ from compose.cli.utils import find_candidates_in_parent_dirs
 DOCKER_CONFIG_KEYS = [
     'cap_add',
     'cap_drop',
+    'command',
     'cpu_shares',
     'cpuset',
-    'command',
     'detach',
     'devices',
     'dns',
@@ -38,12 +38,12 @@ DOCKER_CONFIG_KEYS = [
     'image',
     'labels',
     'links',
+    'log_driver',
+    'log_opt',
     'mac_address',
     'mem_limit',
     'memswap_limit',
     'net',
-    'log_driver',
-    'log_opt',
     'pid',
     'ports',
     'privileged',

From 08ba857807753f43a2b64844fe53ca70756bfa14 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 1 Sep 2015 19:54:49 -0400
Subject: [PATCH 0278/1265] Cleanup some project logic.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/project.py | 50 ++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index 4e8696ba..54d6c443 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -87,8 +87,14 @@ class Project(object):
             volumes_from = project.get_volumes_from(service_dict)
             net = project.get_net(service_dict)
 
-            project.services.append(Service(client=client, project=name, links=links, net=net,
-                                            volumes_from=volumes_from, **service_dict))
+            project.services.append(
+                Service(
+                    client=client,
+                    project=name,
+                    links=links,
+                    net=net,
+                    volumes_from=volumes_from,
+                    **service_dict))
         return project
 
     @property
@@ -184,30 +190,26 @@ class Project(object):
         return volumes_from
 
     def get_net(self, service_dict):
-        if 'net' in service_dict:
-            net_name = get_service_name_from_net(service_dict.get('net'))
+        net = service_dict.pop('net', None)
+        if not net:
+            return
 
-            if net_name:
-                try:
-                    net = self.get_service(net_name)
-                except NoSuchService:
-                    try:
-                        net = Container.from_id(self.client, net_name)
-                    except APIError:
-                        raise ConfigurationError(
-                            'Service "%s" is trying to use the network of "%s", '
-                            'which is not the name of a service or container.' % (
-                                service_dict['name'],
-                                net_name))
-            else:
-                net = service_dict['net']
+        net_name = get_service_name_from_net(net)
+        if not net_name:
+            return net
 
-            del service_dict['net']
-
-        else:
-            net = None
-
-        return net
+        try:
+            return self.get_service(net_name)
+        except NoSuchService:
+            pass
+        try:
+            return Container.from_id(self.client, net_name)
+        except APIError:
+            raise ConfigurationError(
+                'Service "%s" is trying to use the network of "%s", '
+                'which is not the name of a service or container.' % (
+                    service_dict['name'],
+                    net_name))
 
     def start(self, service_names=None, **options):
         for service in self.get_services(service_names):

From c183e52502da8efd3e60f104b4d25f0577f55c04 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 1 Sep 2015 19:40:15 -0400
Subject: [PATCH 0279/1265] Fixes #1757 - include all service properties in the
 config_dict()

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/service.py              |  3 +++
 tests/integration/state_test.py | 22 +++++++++++++++++
 tests/unit/service_test.py      | 43 ++++++++++++++++++++++++++++++++-
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/compose/service.py b/compose/service.py
index 5942fca5..f60d57bf 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -488,6 +488,9 @@ class Service(object):
         return {
             'options': self.options,
             'image_id': self.image()['Id'],
+            'links': [(service.name, alias) for service, alias in self.links],
+            'net': self.get_net_name() or getattr(self.net, 'id', self.net),
+            'volumes_from': self.get_volumes_from_names(),
         }
 
     def get_dependency_names(self):
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index b3dd42d9..d077f094 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -1,3 +1,7 @@
+"""
+Integration tests which cover state convergence (aka smart recreate) performed
+by `docker-compose up`.
+"""
 from __future__ import unicode_literals
 
 import os
@@ -151,6 +155,24 @@ class ProjectWithDependenciesTest(ProjectTestCase):
 
         self.assertEqual(new_containers - old_containers, set())
 
+    def test_service_removed_while_down(self):
+        next_cfg = {
+            'web': {
+                'image': 'busybox:latest',
+                'command': 'tail -f /dev/null',
+            },
+            'nginx': self.cfg['nginx'],
+        }
+
+        containers = self.run_up(self.cfg)
+        self.assertEqual(len(containers), 3)
+
+        project = self.make_project(self.cfg)
+        project.stop(timeout=1)
+
+        containers = self.run_up(next_cfg)
+        self.assertEqual(len(containers), 2)
+
 
 def converge(service,
              allow_recreate=True,
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index aa6d4d74..3981cad2 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -189,7 +189,7 @@ class ServiceTest(unittest.TestCase):
 
         self.assertEqual(
             opts['labels'][LABEL_CONFIG_HASH],
-            'b30306d0a73b67f67a45b99b88d36c359e470e6fa0c04dda1cf62d2087205b81')
+            '3c85881a8903b9d73a06c41860c8be08acce1494ab4cf8408375966dccd714de')
         self.assertEqual(
             opts['environment'],
             {
@@ -331,6 +331,47 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(self.mock_client.build.call_count, 1)
         self.assertFalse(self.mock_client.build.call_args[1]['pull'])
 
+    def test_config_dict(self):
+        self.mock_client.inspect_image.return_value = {'Id': 'abcd'}
+        service = Service(
+            'foo',
+            image='example.com/foo',
+            client=self.mock_client,
+            net=Service('other'),
+            links=[(Service('one'), 'one')],
+            volumes_from=[Service('two')])
+
+        config_dict = service.config_dict()
+        expected = {
+            'image_id': 'abcd',
+            'options': {'image': 'example.com/foo'},
+            'links': [('one', 'one')],
+            'net': 'other',
+            'volumes_from': ['two'],
+        }
+        self.assertEqual(config_dict, expected)
+
+    def test_config_dict_with_net_from_container(self):
+        self.mock_client.inspect_image.return_value = {'Id': 'abcd'}
+        container = Container(
+            self.mock_client,
+            {'Id': 'aaabbb', 'Name': '/foo_1'})
+        service = Service(
+            'foo',
+            image='example.com/foo',
+            client=self.mock_client,
+            net=container)
+
+        config_dict = service.config_dict()
+        expected = {
+            'image_id': 'abcd',
+            'options': {'image': 'example.com/foo'},
+            'links': [],
+            'net': 'aaabbb',
+            'volumes_from': [],
+        }
+        self.assertEqual(config_dict, expected)
+
 
 def mock_get_image(images):
     if images:

From 187ad4ce26401aaa10984c3c9a9782d6b2efdb87 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 3 Sep 2015 13:02:46 -0400
Subject: [PATCH 0280/1265] Refactor network_mode logic out of Service.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/project.py         | 11 +++--
 compose/service.py         | 88 +++++++++++++++++++++++++-------------
 tests/unit/project_test.py |  6 +--
 tests/unit/service_test.py | 48 ++++++++++++++++++++-
 4 files changed, 116 insertions(+), 37 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index 54d6c443..8db20e76 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -14,7 +14,10 @@ from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
 from .container import Container
 from .legacy import check_for_legacy_containers
+from .service import ContainerNet
+from .service import Net
 from .service import Service
+from .service import ServiceNet
 from .utils import parallel_execute
 
 
@@ -192,18 +195,18 @@ class Project(object):
     def get_net(self, service_dict):
         net = service_dict.pop('net', None)
         if not net:
-            return
+            return Net(None)
 
         net_name = get_service_name_from_net(net)
         if not net_name:
-            return net
+            return Net(net)
 
         try:
-            return self.get_service(net_name)
+            return ServiceNet(self.get_service(net_name))
         except NoSuchService:
             pass
         try:
-            return Container.from_id(self.client, net_name)
+            return ContainerNet(Container.from_id(self.client, net_name))
         except APIError:
             raise ConfigurationError(
                 'Service "%s" is trying to use the network of "%s", '
diff --git a/compose/service.py b/compose/service.py
index f60d57bf..bfc6f904 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -105,7 +105,7 @@ class Service(object):
         self.project = project
         self.links = links or []
         self.volumes_from = volumes_from or []
-        self.net = net or None
+        self.net = net or Net(None)
         self.options = options
 
     def containers(self, stopped=False, one_off=False, filters={}):
@@ -489,12 +489,12 @@ class Service(object):
             'options': self.options,
             'image_id': self.image()['Id'],
             'links': [(service.name, alias) for service, alias in self.links],
-            'net': self.get_net_name() or getattr(self.net, 'id', self.net),
+            'net': self.net.id,
             'volumes_from': self.get_volumes_from_names(),
         }
 
     def get_dependency_names(self):
-        net_name = self.get_net_name()
+        net_name = self.net.service_name
         return (self.get_linked_names() +
                 self.get_volumes_from_names() +
                 ([net_name] if net_name else []))
@@ -505,12 +505,6 @@ class Service(object):
     def get_volumes_from_names(self):
         return [s.name for s in self.volumes_from if isinstance(s, Service)]
 
-    def get_net_name(self):
-        if isinstance(self.net, Service):
-            return self.net.name
-        else:
-            return
-
     def get_container_name(self, number, one_off=False):
         # TODO: Implement issue #652 here
         return build_container_name(self.project, self.name, number, one_off)
@@ -562,25 +556,6 @@ class Service(object):
 
         return volumes_from
 
-    def _get_net(self):
-        if not self.net:
-            return None
-
-        if isinstance(self.net, Service):
-            containers = self.net.containers()
-            if len(containers) > 0:
-                net = 'container:' + containers[0].id
-            else:
-                log.warning("Warning: Service %s is trying to use reuse the network stack "
-                            "of another service that is not running." % (self.net.name))
-                net = None
-        elif isinstance(self.net, Container):
-            net = 'container:' + self.net.id
-        else:
-            net = self.net
-
-        return net
-
     def _get_container_create_options(
             self,
             override_options,
@@ -694,7 +669,7 @@ class Service(object):
             binds=options.get('binds'),
             volumes_from=self._get_volumes_from(),
             privileged=privileged,
-            network_mode=self._get_net(),
+            network_mode=self.net.mode,
             devices=devices,
             dns=dns,
             dns_search=dns_search,
@@ -793,6 +768,61 @@ class Service(object):
         stream_output(output, sys.stdout)
 
 
+class Net(object):
+    """A `standard` network mode (ex: host, bridge)"""
+
+    service_name = None
+
+    def __init__(self, net):
+        self.net = net
+
+    @property
+    def id(self):
+        return self.net
+
+    mode = id
+
+
+class ContainerNet(object):
+    """A network mode that uses a containers network stack."""
+
+    service_name = None
+
+    def __init__(self, container):
+        self.container = container
+
+    @property
+    def id(self):
+        return self.container.id
+
+    @property
+    def mode(self):
+        return 'container:' + self.container.id
+
+
+class ServiceNet(object):
+    """A network mode that uses a service's network stack."""
+
+    def __init__(self, service):
+        self.service = service
+
+    @property
+    def id(self):
+        return self.service.name
+
+    service_name = id
+
+    @property
+    def mode(self):
+        containers = self.service.containers()
+        if containers:
+            return 'container:' + containers[0].id
+
+        log.warn("Warning: Service %s is trying to use reuse the network stack "
+                 "of another service that is not running." % (self.id))
+        return None
+
+
 # Names
 
 
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 37ebe514..ce74eb30 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -221,7 +221,7 @@ class ProjectTest(unittest.TestCase):
             }
         ], self.mock_client)
         service = project.get_service('test')
-        self.assertEqual(service._get_net(), None)
+        self.assertEqual(service.net.id, None)
         self.assertNotIn('NetworkMode', service._get_container_host_config({}))
 
     def test_use_net_from_container(self):
@@ -236,7 +236,7 @@ class ProjectTest(unittest.TestCase):
             }
         ], self.mock_client)
         service = project.get_service('test')
-        self.assertEqual(service._get_net(), 'container:' + container_id)
+        self.assertEqual(service.net.mode, 'container:' + container_id)
 
     def test_use_net_from_service(self):
         container_name = 'test_aaa_1'
@@ -261,7 +261,7 @@ class ProjectTest(unittest.TestCase):
         ], self.mock_client)
 
         service = project.get_service('test')
-        self.assertEqual(service._get_net(), 'container:' + container_name)
+        self.assertEqual(service.net.mode, 'container:' + container_name)
 
     def test_container_without_name(self):
         self.mock_client.containers.return_value = [
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 3981cad2..de973339 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -13,13 +13,16 @@ from compose.const import LABEL_SERVICE
 from compose.container import Container
 from compose.service import build_volume_binding
 from compose.service import ConfigError
+from compose.service import ContainerNet
 from compose.service import get_container_data_volumes
 from compose.service import merge_volume_bindings
 from compose.service import NeedsBuildError
+from compose.service import Net
 from compose.service import NoSuchImageError
 from compose.service import parse_repository_tag
 from compose.service import parse_volume_spec
 from compose.service import Service
+from compose.service import ServiceNet
 
 
 class ServiceTest(unittest.TestCase):
@@ -337,7 +340,7 @@ class ServiceTest(unittest.TestCase):
             'foo',
             image='example.com/foo',
             client=self.mock_client,
-            net=Service('other'),
+            net=ServiceNet(Service('other')),
             links=[(Service('one'), 'one')],
             volumes_from=[Service('two')])
 
@@ -373,6 +376,49 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(config_dict, expected)
 
 
+class NetTestCase(unittest.TestCase):
+
+    def test_net(self):
+        net = Net('host')
+        self.assertEqual(net.id, 'host')
+        self.assertEqual(net.mode, 'host')
+        self.assertEqual(net.service_name, None)
+
+    def test_net_container(self):
+        container_id = 'abcd'
+        net = ContainerNet(Container(None, {'Id': container_id}))
+        self.assertEqual(net.id, container_id)
+        self.assertEqual(net.mode, 'container:' + container_id)
+        self.assertEqual(net.service_name, None)
+
+    def test_net_service(self):
+        container_id = 'bbbb'
+        service_name = 'web'
+        mock_client = mock.create_autospec(docker.Client)
+        mock_client.containers.return_value = [
+            {'Id': container_id, 'Name': container_id, 'Image': 'abcd'},
+        ]
+
+        service = Service(name=service_name, client=mock_client)
+        net = ServiceNet(service)
+
+        self.assertEqual(net.id, service_name)
+        self.assertEqual(net.mode, 'container:' + container_id)
+        self.assertEqual(net.service_name, service_name)
+
+    def test_net_service_no_containers(self):
+        service_name = 'web'
+        mock_client = mock.create_autospec(docker.Client)
+        mock_client.containers.return_value = []
+
+        service = Service(name=service_name, client=mock_client)
+        net = ServiceNet(service)
+
+        self.assertEqual(net.id, service_name)
+        self.assertEqual(net.mode, None)
+        self.assertEqual(net.service_name, service_name)
+
+
 def mock_get_image(images):
     if images:
         return images[0]

From db9f577ad6cdadfb8eaa33b492fd513821ed57b6 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 3 Sep 2015 13:13:22 -0400
Subject: [PATCH 0281/1265] Extract link names into a function.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py               |  2 +-
 compose/service.py                | 13 ++++++++-----
 tests/integration/project_test.py |  4 ++--
 tests/integration/service_test.py |  7 ++++---
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 2d72646d..11d2d104 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -326,7 +326,7 @@ class TopLevelCommand(Command):
             log.warn(INSECURE_SSL_WARNING)
 
         if not options['--no-deps']:
-            deps = service.get_linked_names()
+            deps = service.get_linked_service_names()
 
             if len(deps) > 0:
                 project.up(
diff --git a/compose/service.py b/compose/service.py
index bfc6f904..8dc1efa1 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -488,19 +488,22 @@ class Service(object):
         return {
             'options': self.options,
             'image_id': self.image()['Id'],
-            'links': [(service.name, alias) for service, alias in self.links],
+            'links': self.get_link_names(),
             'net': self.net.id,
             'volumes_from': self.get_volumes_from_names(),
         }
 
     def get_dependency_names(self):
         net_name = self.net.service_name
-        return (self.get_linked_names() +
+        return (self.get_linked_service_names() +
                 self.get_volumes_from_names() +
                 ([net_name] if net_name else []))
 
-    def get_linked_names(self):
-        return [s.name for (s, _) in self.links]
+    def get_linked_service_names(self):
+        return [service.name for (service, _) in self.links]
+
+    def get_link_names(self):
+        return [(service.name, alias) for service, alias in self.links]
 
     def get_volumes_from_names(self):
         return [s.name for s in self.volumes_from if isinstance(s, Service)]
@@ -784,7 +787,7 @@ class Net(object):
 
 
 class ContainerNet(object):
-    """A network mode that uses a containers network stack."""
+    """A network mode that uses a container's network stack."""
 
     service_name = None
 
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 51619cb5..fe63838f 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -112,7 +112,7 @@ class ProjectTest(DockerClientTestCase):
 
         web = project.get_service('web')
         net = project.get_service('net')
-        self.assertEqual(web._get_net(), 'container:' + net.containers()[0].id)
+        self.assertEqual(web.net.mode, 'container:' + net.containers()[0].id)
 
     def test_net_from_container(self):
         net_container = Container.create(
@@ -138,7 +138,7 @@ class ProjectTest(DockerClientTestCase):
         project.up()
 
         web = project.get_service('web')
-        self.assertEqual(web._get_net(), 'container:' + net_container.id)
+        self.assertEqual(web.net.mode, 'container:' + net_container.id)
 
     def test_start_pause_unpause_stop_kill_remove(self):
         web = self.create_service('web')
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 177471ff..b6257821 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -22,6 +22,7 @@ from compose.container import Container
 from compose.service import build_extra_hosts
 from compose.service import ConfigError
 from compose.service import ConvergencePlan
+from compose.service import Net
 from compose.service import Service
 
 
@@ -707,17 +708,17 @@ class ServiceTest(DockerClientTestCase):
             self.assertEqual(list(container.inspect()['HostConfig']['PortBindings'].keys()), ['8000/tcp'])
 
     def test_network_mode_none(self):
-        service = self.create_service('web', net='none')
+        service = self.create_service('web', net=Net('none'))
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.NetworkMode'), 'none')
 
     def test_network_mode_bridged(self):
-        service = self.create_service('web', net='bridge')
+        service = self.create_service('web', net=Net('bridge'))
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.NetworkMode'), 'bridge')
 
     def test_network_mode_host(self):
-        service = self.create_service('web', net='host')
+        service = self.create_service('web', net=Net('host'))
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.NetworkMode'), 'host')
 

From 9d7ad796a38ee79f7dd2c1436cadb6d2bb17b24e Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 3 Sep 2015 14:11:44 -0400
Subject: [PATCH 0282/1265] bump requests to 2.7 to fix the ResponseNotReady()
 error, and add a missing default for tox posargs

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 tox.ini          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index e93db7b3..587c04c5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ docker-py==1.3.1
 dockerpty==0.3.4
 docopt==0.6.1
 jsonschema==2.5.1
-requests==2.6.1
+requests==2.7.0
 six==1.7.3
 texttable==0.8.2
 websocket-client==0.32.0
diff --git a/setup.py b/setup.py
index e93dafc6..737e074c 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ def find_version(*file_paths):
 install_requires = [
     'docopt >= 0.6.1, < 0.7',
     'PyYAML >= 3.10, < 4',
-    'requests >= 2.6.1, < 2.7',
+    'requests >= 2.6.1, < 2.8',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
     'docker-py >= 1.3.1, < 1.4',
diff --git a/tox.ini b/tox.ini
index 71ab4fc9..4cb933dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ commands =
         --cov-report html \
         --cov-report term \
         --cov-config=tox.ini \
-        {posargs}
+        {posargs:tests}
 
 [testenv:pre-commit]
 skip_install = True

From a1ec26435cbe41ad63e765bfd973ccf306a4e54c Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 3 Sep 2015 18:30:50 -0700
Subject: [PATCH 0283/1265] Test against Docker 1.8.2 RC1

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1d13c2b6..ba508742 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,13 +66,13 @@ RUN set -ex; \
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 
-ENV ALL_DOCKER_VERSIONS 1.7.1 1.8.1
+ENV ALL_DOCKER_VERSIONS 1.7.1 1.8.2-rc1
 
 RUN set -ex; \
     curl https://get.docker.com/builds/Linux/x86_64/docker-1.7.1 -o /usr/local/bin/docker-1.7.1; \
     chmod +x /usr/local/bin/docker-1.7.1; \
-    curl https://get.docker.com/builds/Linux/x86_64/docker-1.8.1 -o /usr/local/bin/docker-1.8.1; \
-    chmod +x /usr/local/bin/docker-1.8.1
+    curl https://test.docker.com/builds/Linux/x86_64/docker-1.8.2-rc1 -o /usr/local/bin/docker-1.8.2-rc1; \
+    chmod +x /usr/local/bin/docker-1.8.2-rc1
 
 # Set the default Docker to be run
 RUN ln -s /usr/local/bin/docker-1.7.1 /usr/local/bin/docker

From 000bf1c16a1e2181d4b6b2a580692ed3f48231c0 Mon Sep 17 00:00:00 2001
From: Charles Chan <charleswhchan@users.noreply.github.com>
Date: Wed, 2 Sep 2015 21:06:25 -0700
Subject: [PATCH 0284/1265] Fix #1958. Remove release notes for old version of
 Docker Compose.

Replace by link to the latest CHANGELOG in GitHub.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
---
 docs/index.md | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 4342b368..59bf2009 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -206,17 +206,8 @@ At this point, you have seen the basics of how Compose works.
 
 ## Release Notes
 
-### Version 1.2.0 (April 7, 2015)
-
-For complete information on this release, see the [1.2.0 Milestone project page](https://github.com/docker/compose/wiki/1.2.0-Milestone-Project-Page).
-In addition to bug fixes and refinements, this release adds the following:
-
-* The `extends` keyword, which adds the ability to extend services by sharing  common configurations. For details, see
-[PR #1088](https://github.com/docker/compose/pull/1088).
-
-* Better integration with Swarm. Swarm will now schedule inter-dependent
-containers on the same host. For details, see
-[PR #972](https://github.com/docker/compose/pull/972).
+To see a detailed list of changes for past and current releases of Docker 
+Compose, please refer to the [CHANGELOG](https://github.com/docker/compose/blob/master/CHANGELOG.md).
 
 ## Getting help
 

From 0484e22a84cf430871b32d1136d94d3083214f61 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 2 Sep 2015 11:07:59 -0400
Subject: [PATCH 0285/1265] Add enum34 and use it to create a
 ConvergenceStrategy enum.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/cli/main.py                  | 31 ++++++++++++++---------
 compose/project.py                   | 38 ++++++++--------------------
 compose/service.py                   | 30 +++++++++++++++-------
 docs/index.md                        |  2 +-
 requirements.txt                     |  1 +
 setup.py                             |  3 ++-
 tests/integration/cli_test.py        |  6 ++---
 tests/integration/project_test.py    |  7 ++---
 tests/integration/resilience_test.py |  7 ++---
 tests/integration/state_test.py      | 25 ++++++------------
 tests/unit/cli/main_test.py          | 32 +++++++++++++++++++++++
 11 files changed, 105 insertions(+), 77 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 11d2d104..cf971844 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -19,6 +19,7 @@ from ..progress_stream import StreamOutputError
 from ..project import ConfigurationError
 from ..project import NoSuchService
 from ..service import BuildError
+from ..service import ConvergenceStrategy
 from ..service import NeedsBuildError
 from .command import Command
 from .docopt_command import NoSuchCommand
@@ -332,7 +333,7 @@ class TopLevelCommand(Command):
                 project.up(
                     service_names=deps,
                     start_deps=True,
-                    allow_recreate=False,
+                    strategy=ConvergenceStrategy.never,
                 )
 
         tty = True
@@ -515,29 +516,20 @@ class TopLevelCommand(Command):
         if options['--allow-insecure-ssl']:
             log.warn(INSECURE_SSL_WARNING)
 
-        detached = options['-d']
-
         monochrome = options['--no-color']
-
         start_deps = not options['--no-deps']
-        allow_recreate = not options['--no-recreate']
-        force_recreate = options['--force-recreate']
         service_names = options['SERVICE']
         timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
 
-        if force_recreate and not allow_recreate:
-            raise UserError("--force-recreate and --no-recreate cannot be combined.")
-
         to_attach = project.up(
             service_names=service_names,
             start_deps=start_deps,
-            allow_recreate=allow_recreate,
-            force_recreate=force_recreate,
+            strategy=convergence_strategy_from_opts(options),
             do_build=not options['--no-build'],
             timeout=timeout
         )
 
-        if not detached:
+        if not options['-d']:
             log_printer = build_log_printer(to_attach, service_names, monochrome)
             attach_to_logs(project, log_printer, service_names, timeout)
 
@@ -582,6 +574,21 @@ class TopLevelCommand(Command):
             print(get_version_info('full'))
 
 
+def convergence_strategy_from_opts(options):
+    no_recreate = options['--no-recreate']
+    force_recreate = options['--force-recreate']
+    if force_recreate and no_recreate:
+        raise UserError("--force-recreate and --no-recreate cannot be combined.")
+
+    if force_recreate:
+        return ConvergenceStrategy.always
+
+    if no_recreate:
+        return ConvergenceStrategy.never
+
+    return ConvergenceStrategy.changed
+
+
 def build_log_printer(containers, service_names, monochrome):
     if service_names:
         containers = [c for c in containers if c.service in service_names]
diff --git a/compose/project.py b/compose/project.py
index 8db20e76..9a6e98e0 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -15,6 +15,7 @@ from .const import LABEL_SERVICE
 from .container import Container
 from .legacy import check_for_legacy_containers
 from .service import ContainerNet
+from .service import ConvergenceStrategy
 from .service import Net
 from .service import Service
 from .service import ServiceNet
@@ -266,24 +267,16 @@ class Project(object):
     def up(self,
            service_names=None,
            start_deps=True,
-           allow_recreate=True,
-           force_recreate=False,
+           strategy=ConvergenceStrategy.changed,
            do_build=True,
            timeout=DEFAULT_TIMEOUT):
 
-        if force_recreate and not allow_recreate:
-            raise ValueError("force_recreate and allow_recreate are in conflict")
-
         services = self.get_services(service_names, include_deps=start_deps)
 
         for service in services:
             service.remove_duplicate_containers()
 
-        plans = self._get_convergence_plans(
-            services,
-            allow_recreate=allow_recreate,
-            force_recreate=force_recreate,
-        )
+        plans = self._get_convergence_plans(services, strategy)
 
         return [
             container
@@ -295,11 +288,7 @@ class Project(object):
             )
         ]
 
-    def _get_convergence_plans(self,
-                               services,
-                               allow_recreate=True,
-                               force_recreate=False):
-
+    def _get_convergence_plans(self, services, strategy):
         plans = {}
 
         for service in services:
@@ -310,20 +299,13 @@ class Project(object):
                 and plans[name].action == 'recreate'
             ]
 
-            if updated_dependencies and allow_recreate:
-                log.debug(
-                    '%s has upstream changes (%s)',
-                    service.name, ", ".join(updated_dependencies),
-                )
-                plan = service.convergence_plan(
-                    allow_recreate=allow_recreate,
-                    force_recreate=True,
-                )
+            if updated_dependencies and strategy.allows_recreate:
+                log.debug('%s has upstream changes (%s)',
+                          service.name,
+                          ", ".join(updated_dependencies))
+                plan = service.convergence_plan(ConvergenceStrategy.always)
             else:
-                plan = service.convergence_plan(
-                    allow_recreate=allow_recreate,
-                    force_recreate=force_recreate,
-                )
+                plan = service.convergence_plan(strategy)
 
             plans[service.name] = plan
 
diff --git a/compose/service.py b/compose/service.py
index 8dc1efa1..be74ca3a 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -8,6 +8,7 @@ import sys
 from collections import namedtuple
 from operator import attrgetter
 
+import enum
 import six
 from docker.errors import APIError
 from docker.utils import create_host_config
@@ -86,6 +87,20 @@ ServiceName = namedtuple('ServiceName', 'project service number')
 ConvergencePlan = namedtuple('ConvergencePlan', 'action containers')
 
 
+@enum.unique
+class ConvergenceStrategy(enum.Enum):
+    """Enumeration for all possible convergence strategies. Values refer to
+    when containers should be recreated.
+    """
+    changed = 1
+    always = 2
+    never = 3
+
+    @property
+    def allows_recreate(self):
+        return self is not type(self).never
+
+
 class Service(object):
     def __init__(
         self,
@@ -326,22 +341,19 @@ class Service(object):
         else:
             return self.options['image']
 
-    def convergence_plan(self,
-                         allow_recreate=True,
-                         force_recreate=False):
-
-        if force_recreate and not allow_recreate:
-            raise ValueError("force_recreate and allow_recreate are in conflict")
-
+    def convergence_plan(self, strategy=ConvergenceStrategy.changed):
         containers = self.containers(stopped=True)
 
         if not containers:
             return ConvergencePlan('create', [])
 
-        if not allow_recreate:
+        if strategy is ConvergenceStrategy.never:
             return ConvergencePlan('start', containers)
 
-        if force_recreate or self._containers_have_diverged(containers):
+        if (
+            strategy is ConvergenceStrategy.always or
+            self._containers_have_diverged(containers)
+        ):
             return ConvergencePlan('recreate', containers)
 
         stopped = [c for c in containers if not c.is_running]
diff --git a/docs/index.md b/docs/index.md
index 59bf2009..4e4f58da 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -206,7 +206,7 @@ At this point, you have seen the basics of how Compose works.
 
 ## Release Notes
 
-To see a detailed list of changes for past and current releases of Docker 
+To see a detailed list of changes for past and current releases of Docker
 Compose, please refer to the [CHANGELOG](https://github.com/docker/compose/blob/master/CHANGELOG.md).
 
 ## Getting help
diff --git a/requirements.txt b/requirements.txt
index 587c04c5..666efcd2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,7 @@ PyYAML==3.10
 docker-py==1.3.1
 dockerpty==0.3.4
 docopt==0.6.1
+enum34==1.0.4
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3
diff --git a/setup.py b/setup.py
index 737e074c..29c5299e 100644
--- a/setup.py
+++ b/setup.py
@@ -45,8 +45,9 @@ tests_require = [
 ]
 
 
-if sys.version_info[:1] < (3,):
+if sys.version_info[:2] < (3, 4):
     tests_require.append('mock >= 1.0.1')
+    install_requires.append('enum34 >= 1.0.4, < 2')
 
 
 setup(
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 9606ef41..4a80d336 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -223,7 +223,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertTrue(config['AttachStdin'])
 
     @mock.patch('dockerpty.start')
-    def test_run_service_with_links(self, __):
+    def test_run_service_with_links(self, _):
         self.command.base_dir = 'tests/fixtures/links-composefile'
         self.command.dispatch(['run', 'web', '/bin/true'], None)
         db = self.project.get_service('db')
@@ -232,14 +232,14 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(console.containers()), 0)
 
     @mock.patch('dockerpty.start')
-    def test_run_with_no_deps(self, __):
+    def test_run_with_no_deps(self, _):
         self.command.base_dir = 'tests/fixtures/links-composefile'
         self.command.dispatch(['run', '--no-deps', 'web', '/bin/true'], None)
         db = self.project.get_service('db')
         self.assertEqual(len(db.containers()), 0)
 
     @mock.patch('dockerpty.start')
-    def test_run_does_not_recreate_linked_containers(self, __):
+    def test_run_does_not_recreate_linked_containers(self, _):
         self.command.base_dir = 'tests/fixtures/links-composefile'
         self.command.dispatch(['up', '-d', 'db'], None)
         db = self.project.get_service('db')
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index fe63838f..ad49ad10 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -5,6 +5,7 @@ from compose import config
 from compose.const import LABEL_PROJECT
 from compose.container import Container
 from compose.project import Project
+from compose.service import ConvergenceStrategy
 
 
 def build_service_dicts(service_config):
@@ -224,7 +225,7 @@ class ProjectTest(DockerClientTestCase):
         old_db_id = project.containers()[0].id
         db_volume_path = project.containers()[0].get('Volumes./etc')
 
-        project.up(force_recreate=True)
+        project.up(strategy=ConvergenceStrategy.always)
         self.assertEqual(len(project.containers()), 2)
 
         db_container = [c for c in project.containers() if 'db' in c.name][0]
@@ -243,7 +244,7 @@ class ProjectTest(DockerClientTestCase):
         old_db_id = project.containers()[0].id
         db_volume_path = project.containers()[0].inspect()['Volumes']['/var/db']
 
-        project.up(allow_recreate=False)
+        project.up(strategy=ConvergenceStrategy.never)
         self.assertEqual(len(project.containers()), 2)
 
         db_container = [c for c in project.containers() if 'db' in c.name][0]
@@ -267,7 +268,7 @@ class ProjectTest(DockerClientTestCase):
         old_db_id = old_containers[0].id
         db_volume_path = old_containers[0].inspect()['Volumes']['/var/db']
 
-        project.up(allow_recreate=False)
+        project.up(strategy=ConvergenceStrategy.never)
 
         new_containers = project.containers(stopped=True)
         self.assertEqual(len(new_containers), 2)
diff --git a/tests/integration/resilience_test.py b/tests/integration/resilience_test.py
index 82a4680d..befd72c7 100644
--- a/tests/integration/resilience_test.py
+++ b/tests/integration/resilience_test.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 from .. import mock
 from .testcases import DockerClientTestCase
 from compose.project import Project
+from compose.service import ConvergenceStrategy
 
 
 class ResilienceTest(DockerClientTestCase):
@@ -16,14 +17,14 @@ class ResilienceTest(DockerClientTestCase):
         self.host_path = container.get('Volumes')['/var/db']
 
     def test_successful_recreate(self):
-        self.project.up(force_recreate=True)
+        self.project.up(strategy=ConvergenceStrategy.always)
         container = self.db.containers()[0]
         self.assertEqual(container.get('Volumes')['/var/db'], self.host_path)
 
     def test_create_failure(self):
         with mock.patch('compose.service.Service.create_container', crash):
             with self.assertRaises(Crash):
-                self.project.up(force_recreate=True)
+                self.project.up(strategy=ConvergenceStrategy.always)
 
         self.project.up()
         container = self.db.containers()[0]
@@ -32,7 +33,7 @@ class ResilienceTest(DockerClientTestCase):
     def test_start_failure(self):
         with mock.patch('compose.service.Service.start_container', crash):
             with self.assertRaises(Crash):
-                self.project.up(force_recreate=True)
+                self.project.up(strategy=ConvergenceStrategy.always)
 
         self.project.up()
         container = self.db.containers()[0]
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index d077f094..93d0572a 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -12,6 +12,7 @@ from .testcases import DockerClientTestCase
 from compose import config
 from compose.const import LABEL_CONFIG_HASH
 from compose.project import Project
+from compose.service import ConvergenceStrategy
 
 
 class ProjectTestCase(DockerClientTestCase):
@@ -151,7 +152,9 @@ class ProjectWithDependenciesTest(ProjectTestCase):
         old_containers = self.run_up(self.cfg)
 
         self.cfg['db']['environment'] = {'NEW_VAR': '1'}
-        new_containers = self.run_up(self.cfg, allow_recreate=False)
+        new_containers = self.run_up(
+            self.cfg,
+            strategy=ConvergenceStrategy.never)
 
         self.assertEqual(new_containers - old_containers, set())
 
@@ -175,23 +178,11 @@ class ProjectWithDependenciesTest(ProjectTestCase):
 
 
 def converge(service,
-             allow_recreate=True,
-             force_recreate=False,
+             strategy=ConvergenceStrategy.changed,
              do_build=True):
-    """
-    If a container for this service doesn't exist, create and start one. If there are
-    any, stop them, create+start new ones, and remove the old containers.
-    """
-    plan = service.convergence_plan(
-        allow_recreate=allow_recreate,
-        force_recreate=force_recreate,
-    )
-
-    return service.execute_convergence_plan(
-        plan,
-        do_build=do_build,
-        timeout=1,
-    )
+    """Create a converge plan from a strategy and execute the plan."""
+    plan = service.convergence_plan(strategy)
+    return service.execute_convergence_plan(plan, do_build=do_build, timeout=1)
 
 
 class ServiceStateTest(DockerClientTestCase):
diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py
index e3a4629e..a5b36980 100644
--- a/tests/unit/cli/main_test.py
+++ b/tests/unit/cli/main_test.py
@@ -1,10 +1,13 @@
 from __future__ import absolute_import
 
 from compose import container
+from compose.cli.errors import UserError
 from compose.cli.log_printer import LogPrinter
 from compose.cli.main import attach_to_logs
 from compose.cli.main import build_log_printer
+from compose.cli.main import convergence_strategy_from_opts
 from compose.project import Project
+from compose.service import ConvergenceStrategy
 from tests import mock
 from tests import unittest
 
@@ -55,3 +58,32 @@ class CLIMainTestCase(unittest.TestCase):
         project.stop.assert_called_once_with(
             service_names=service_names,
             timeout=timeout)
+
+
+class ConvergeStrategyFromOptsTestCase(unittest.TestCase):
+
+    def test_invalid_opts(self):
+        options = {'--force-recreate': True, '--no-recreate': True}
+        with self.assertRaises(UserError):
+            convergence_strategy_from_opts(options)
+
+    def test_always(self):
+        options = {'--force-recreate': True, '--no-recreate': False}
+        self.assertEqual(
+            convergence_strategy_from_opts(options),
+            ConvergenceStrategy.always
+        )
+
+    def test_never(self):
+        options = {'--force-recreate': False, '--no-recreate': True}
+        self.assertEqual(
+            convergence_strategy_from_opts(options),
+            ConvergenceStrategy.never
+        )
+
+    def test_changed(self):
+        options = {'--force-recreate': False, '--no-recreate': False}
+        self.assertEqual(
+            convergence_strategy_from_opts(options),
+            ConvergenceStrategy.changed
+        )

From 0f60c783fa4feba0e4a1f33ac662e8b046355fe5 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 4 Sep 2015 17:01:44 +0100
Subject: [PATCH 0286/1265] Remove trailing white space

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 59bf2009..4e4f58da 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -206,7 +206,7 @@ At this point, you have seen the basics of how Compose works.
 
 ## Release Notes
 
-To see a detailed list of changes for past and current releases of Docker 
+To see a detailed list of changes for past and current releases of Docker
 Compose, please refer to the [CHANGELOG](https://github.com/docker/compose/blob/master/CHANGELOG.md).
 
 ## Getting help

From 31e8137452dfefbc3fc36c754d9839e89978542d Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 4 Sep 2015 17:20:21 +0100
Subject: [PATCH 0287/1265] Running a single test command updated

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a94aa990..62bf415c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -64,8 +64,8 @@ you can specify a test directory, file, module, class or method:
 
     $ script/test tests/unit
     $ script/test tests/unit/cli_test.py
-    $ script/test tests.integration.service_test
-    $ script/test tests.integration.service_test:ServiceTest.test_containers
+    $ script/test tests/unit/config_test.py::ConfigTest
+    $ script/test tests/unit/config_test.py::ConfigTest::test_load
 
 ## Finding things to work on
 

From 6da7a9194c8d02dce71b9b70c499c3abb64ede5f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 4 Sep 2015 17:43:12 -0700
Subject: [PATCH 0288/1265] Remove or space out suspension dots after service
 name for easier copy-pasting

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/service.py | 20 ++++++++++----------
 compose/utils.py   |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 8dc1efa1..1a34f50c 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -143,27 +143,27 @@ class Service(object):
     # TODO: remove these functions, project takes care of starting/stopping,
     def stop(self, **options):
         for c in self.containers():
-            log.info("Stopping %s..." % c.name)
+            log.info("Stopping %s" % c.name)
             c.stop(**options)
 
     def pause(self, **options):
         for c in self.containers(filters={'status': 'running'}):
-            log.info("Pausing %s..." % c.name)
+            log.info("Pausing %s" % c.name)
             c.pause(**options)
 
     def unpause(self, **options):
         for c in self.containers(filters={'status': 'paused'}):
-            log.info("Unpausing %s..." % c.name)
+            log.info("Unpausing %s" % c.name)
             c.unpause()
 
     def kill(self, **options):
         for c in self.containers():
-            log.info("Killing %s..." % c.name)
+            log.info("Killing %s" % c.name)
             c.kill(**options)
 
     def restart(self, **options):
         for c in self.containers():
-            log.info("Restarting %s..." % c.name)
+            log.info("Restarting %s" % c.name)
             c.restart(**options)
 
     # end TODO
@@ -289,7 +289,7 @@ class Service(object):
         )
 
         if 'name' in container_options and not quiet:
-            log.info("Creating %s..." % container_options['name'])
+            log.info("Creating %s" % container_options['name'])
 
         return Container.create(self.client, **container_options)
 
@@ -423,7 +423,7 @@ class Service(object):
         volumes can be copied to the new container, before the original
         container is removed.
         """
-        log.info("Recreating %s..." % container.name)
+        log.info("Recreating %s" % container.name)
         try:
             container.stop(timeout=timeout)
         except APIError as e:
@@ -453,7 +453,7 @@ class Service(object):
         if container.is_running:
             return container
         else:
-            log.info("Starting %s..." % container.name)
+            log.info("Starting %s" % container.name)
             return self.start_container(container)
 
     def start_container(self, container):
@@ -462,7 +462,7 @@ class Service(object):
 
     def remove_duplicate_containers(self, timeout=DEFAULT_TIMEOUT):
         for c in self.duplicate_containers():
-            log.info('Removing %s...' % c.name)
+            log.info('Removing %s' % c.name)
             c.stop(timeout=timeout)
             c.remove()
 
@@ -689,7 +689,7 @@ class Service(object):
         )
 
     def build(self, no_cache=False):
-        log.info('Building %s...' % self.name)
+        log.info('Building %s' % self.name)
 
         path = self.options['build']
         # python2 os.path() doesn't support unicode, so we need to encode it to
diff --git a/compose/utils.py b/compose/utils.py
index 30284f97..690c5ffd 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -90,13 +90,13 @@ def write_out_msg(stream, lines, msg_index, msg, status="done"):
         stream.write("%c[%dA" % (27, diff))
         # erase
         stream.write("%c[2K\r" % 27)
-        stream.write("{} {}... {}\n".format(msg, obj_index, status))
+        stream.write("{} {} ... {}\n".format(msg, obj_index, status))
         # move back down
         stream.write("%c[%dB" % (27, diff))
     else:
         diff = 0
         lines.append(obj_index)
-        stream.write("{} {}... \r\n".format(msg, obj_index))
+        stream.write("{} {} ... \r\n".format(msg, obj_index))
 
     stream.flush()
 

From 2468235472eb0a849dcad7a7838488cc9df6f8dc Mon Sep 17 00:00:00 2001
From: Lachlan Pease <predatory.kangaroo@gmail.com>
Date: Sun, 6 Sep 2015 11:55:36 +1000
Subject: [PATCH 0289/1265] Added support for IPC namespaces, fixes GH-1689

Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
---
 compose/config/config.py | 1 +
 compose/service.py       | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 8df45b8a..c23a541e 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -36,6 +36,7 @@ DOCKER_CONFIG_KEYS = [
     'extra_hosts',
     'hostname',
     'image',
+    'ipc',
     'labels',
     'links',
     'mac_address',
diff --git a/compose/service.py b/compose/service.py
index b48f2e14..bf65888c 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -44,6 +44,7 @@ DOCKER_START_KEYS = [
     'dns_search',
     'env_file',
     'extra_hosts',
+    'ipc',
     'read_only',
     'net',
     'log_driver',
@@ -696,7 +697,8 @@ class Service(object):
             extra_hosts=extra_hosts,
             read_only=read_only,
             pid_mode=pid,
-            security_opt=security_opt
+            security_opt=security_opt,
+            ipc_mode=options.get('ipc')
         )
 
     def build(self, no_cache=False):

From 67957318ed5080fe2babc3b704583f9c38bd5ea8 Mon Sep 17 00:00:00 2001
From: Lachlan Pease <predatory.kangaroo@gmail.com>
Date: Sun, 6 Sep 2015 12:16:12 +1000
Subject: [PATCH 0290/1265] Added IPC spec to fields_schema.json

Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
---
 compose/config/fields_schema.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 2a122b7a..d25b3fa2 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -59,6 +59,7 @@
         "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "hostname": {"type": "string"},
         "image": {"type": "string"},
+        "ipc": {"type": "string"},
         "labels": {"$ref": "#/definitions/list_or_dict"},
         "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
 

From d83d6306c94c45469f86b7ae08089b8b77514be4 Mon Sep 17 00:00:00 2001
From: Karol Duleba <mr.fuxi@gmail.com>
Date: Wed, 12 Aug 2015 23:16:42 +0100
Subject: [PATCH 0291/1265] Use custom container name in logs. Fixes #1851

Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
---
 compose/container.py         | 8 +++++++-
 tests/unit/container_test.py | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/compose/container.py b/compose/container.py
index f2d8a403..51b62589 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -6,6 +6,7 @@ from functools import reduce
 import six
 
 from .const import LABEL_CONTAINER_NUMBER
+from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
 
 
@@ -70,7 +71,12 @@ class Container(object):
 
     @property
     def name_without_project(self):
-        return '{0}_{1}'.format(self.service, self.number)
+        project = self.labels.get(LABEL_PROJECT)
+
+        if self.name.startswith('{0}_{1}'.format(project, self.service)):
+            return '{0}_{1}'.format(self.service, self.number)
+        else:
+            return self.name
 
     @property
     def number(self):
diff --git a/tests/unit/container_test.py b/tests/unit/container_test.py
index 5637330c..5f7bf1ea 100644
--- a/tests/unit/container_test.py
+++ b/tests/unit/container_test.py
@@ -83,9 +83,15 @@ class ContainerTest(unittest.TestCase):
         self.assertEqual(container.name, "composetest_db_1")
 
     def test_name_without_project(self):
+        self.container_dict['Name'] = "/composetest_web_7"
         container = Container(None, self.container_dict, has_been_inspected=True)
         self.assertEqual(container.name_without_project, "web_7")
 
+    def test_name_without_project_custom_container_name(self):
+        self.container_dict['Name'] = "/custom_name_of_container"
+        container = Container(None, self.container_dict, has_been_inspected=True)
+        self.assertEqual(container.name_without_project, "custom_name_of_container")
+
     def test_inspect_if_not_inspected(self):
         mock_client = mock.create_autospec(docker.Client)
         container = Container(mock_client, dict(Id="the_id"))

From 866979c57bae31d42c3092bdb089a8b11907e4c6 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 7 Sep 2015 17:26:38 +0100
Subject: [PATCH 0292/1265] Allow entrypoint to be a list or string

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/fields_schema.json |  2 +-
 tests/unit/config_test.py         | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index f03ef711..a82dd397 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -32,7 +32,7 @@
         "dns_search": {"$ref": "#/definitions/string_or_list"},
         "dockerfile": {"type": "string"},
         "domainname": {"type": "string"},
-        "entrypoint": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "entrypoint": {"$ref": "#/definitions/string_or_list"},
         "env_file": {"$ref": "#/definitions/string_or_list"},
 
         "environment": {
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 3f602fb5..aeebc049 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -254,6 +254,21 @@ class ConfigTest(unittest.TestCase):
             )
             self.assertEqual(service[0]['expose'], expose)
 
+    def test_valid_config_oneof_string_or_list(self):
+        entrypoint_values = [["sh"], "sh"]
+        for entrypoint in entrypoint_values:
+            service = config.load(
+                config.ConfigDetails(
+                    {'web': {
+                        'image': 'busybox',
+                        'entrypoint': entrypoint
+                    }},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+            self.assertEqual(service[0]['entrypoint'], entrypoint)
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)

From b33dd3bc01a6552a8803b0c4379eb27a1b761a51 Mon Sep 17 00:00:00 2001
From: "Lucas N. Munhoz" <ln.munhoz@gmail.com>
Date: Tue, 8 Sep 2015 09:53:10 -0300
Subject: [PATCH 0293/1265] Fix error message and class name from Boot2Docker
 to DockerMachine

Signed-off-by: Lucas N. Munhoz <ln.munhoz@gmail.com>
---
 compose/cli/command.py | 2 +-
 compose/cli/errors.py  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 67176df2..ca2d96ea 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -41,7 +41,7 @@ class Command(DocoptCommand):
                 else:
                     raise errors.DockerNotFoundGeneric()
             elif call_silently(['which', 'boot2docker']) == 0:
-                raise errors.ConnectionErrorBoot2Docker()
+                raise errors.ConnectionErrorDockerMachine()
             else:
                 raise errors.ConnectionErrorGeneric(self.get_client().base_url)
 
diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index 0569c1a0..244897f8 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -40,10 +40,10 @@ class DockerNotFoundGeneric(UserError):
         """)
 
 
-class ConnectionErrorBoot2Docker(UserError):
+class ConnectionErrorDockerMachine(UserError):
     def __init__(self):
-        super(ConnectionErrorBoot2Docker, self).__init__("""
-        Couldn't connect to Docker daemon - you might need to run `boot2docker up`.
+        super(ConnectionErrorDockerMachine, self).__init__("""
+        Couldn't connect to Docker daemon - you might need to run `docker-machine start default`.
         """)
 
 

From ad46757bafed98058f244960ad21edeadcd8b255 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 8 Sep 2015 19:44:25 -0400
Subject: [PATCH 0294/1265] Add more github label areas.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 .pre-commit-config.yaml |  1 +
 project/ISSUE-TRIAGE.md | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 832be6ab..8913a05f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,3 +16,4 @@
   sha: 3d86483455ab5bd06cc1069fdd5ac57be5463f10
   hooks:
     - id: reorder-python-imports
+      language_version: 'python2.7'
diff --git a/project/ISSUE-TRIAGE.md b/project/ISSUE-TRIAGE.md
index bcedbb43..58312a60 100644
--- a/project/ISSUE-TRIAGE.md
+++ b/project/ISSUE-TRIAGE.md
@@ -20,13 +20,15 @@ The following labels are provided in additional to the standard labels:
 
 Most issues should fit into one of the following functional areas:
 
-| Area        |
-|-------------|
-| area/build  |
-| area/cli    |
-| area/config |
-| area/logs   |
-| area/run    |
-| area/scale  |
-| area/tests  |
-| area/up     |
+| Area           |
+|----------------|
+| area/build     |
+| area/cli       |
+| area/config    |
+| area/logs      |
+| area/packaging |
+| area/run       |
+| area/scale     |
+| area/tests     |
+| area/up        |
+| area/volumes   |

From 7223d5cee06b434486e83d283df198f1b62edf93 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 9 Sep 2015 16:23:54 +0100
Subject: [PATCH 0295/1265] Remove mistaken field

detach is a run param, not a config param. Oops, sorry!

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/fields_schema.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index a82dd397..6c73a8f3 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -26,7 +26,6 @@
           ]
         },
         "cpuset": {"type": "string"},
-        "detach": {"type": "boolean"},
         "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "dns": {"$ref": "#/definitions/string_or_list"},
         "dns_search": {"$ref": "#/definitions/string_or_list"},

From 4bed5de291307f4099b6abb564bc8c2cf472dbc3 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 9 Sep 2015 16:04:27 +0100
Subject: [PATCH 0296/1265] Remove item unique constraint for command

The command value can be a list, which would be a Unix command-line
invocation broken up into individual values, thus needing the ability to
have non unique values.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/fields_schema.json | 7 ++++++-
 tests/unit/config_test.py         | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index a82dd397..bc033f2d 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -17,7 +17,12 @@
         "build": {"type": "string"},
         "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "command": {"$ref": "#/definitions/string_or_list"},
+        "command": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
         "container_name": {"type": "string"},
         "cpu_shares": {
           "oneOf": [
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index aeebc049..9d67a891 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -183,7 +183,7 @@ class ConfigTest(unittest.TestCase):
             )
 
     def test_invalid_list_of_strings_format(self):
-        expected_error_msg = "'command' contains an invalid type, valid types are string or list of strings"
+        expected_error_msg = "'command' contains an invalid type, valid types are string or array"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 config.ConfigDetails(

From a372275c6ec74eb96c4d94e9821d8811caad5bba Mon Sep 17 00:00:00 2001
From: Nick H <nick.humrich@canopytax.com>
Date: Tue, 1 Sep 2015 12:40:24 -0600
Subject: [PATCH 0297/1265] Allow for user relative paths

'~/' in a path currently doesnt work, you get the following error:

[Errno 2] No such file or directory: u'/home/USER/folder/~/some/path/.yml'

Signed-off-by: Nick H <nick.humrich@gmail.com>
---
 compose/config/config.py  |  2 +-
 tests/unit/config_test.py | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index cfa8086f..d5ee486b 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -499,7 +499,7 @@ def split_label(label):
 
 
 def expand_path(working_dir, path):
-    return os.path.abspath(os.path.join(working_dir, path))
+    return os.path.abspath(os.path.join(working_dir, os.path.expanduser(path)))
 
 
 def to_list(value):
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index e488ceb5..ddcad76e 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -950,6 +950,27 @@ class ExtendsTest(unittest.TestCase):
             load_from_filename('tests/fixtures/extends/nonexistent-service.yml')
 
 
+class ExpandPathTest(unittest.TestCase):
+    working_dir = '/home/user/somedir'
+
+    def test_expand_path_normal(self):
+        result = config.expand_path(self.working_dir, 'myfile')
+        self.assertEqual(result, self.working_dir + '/' + 'myfile')
+
+    def test_expand_path_absolute(self):
+        abs_path = '/home/user/otherdir/somefile'
+        result = config.expand_path(self.working_dir, abs_path)
+        self.assertEqual(result, abs_path)
+
+    def test_expand_path_with_tilde(self):
+        test_path = '~/otherdir/somefile'
+        with mock.patch.dict(os.environ):
+            os.environ['HOME'] = user_path = '/home/user/'
+            result = config.expand_path(self.working_dir, test_path)
+
+        self.assertEqual(result, user_path + 'otherdir/somefile')
+
+
 class BuildPathTest(unittest.TestCase):
     def setUp(self):
         self.abs_context_path = os.path.join(os.getcwd(), 'tests/fixtures/build-ctx')

From 851129de6c38be79c3c065104a2a369d74a8dc2b Mon Sep 17 00:00:00 2001
From: Lachlan Pease <predatory.kangaroo@gmail.com>
Date: Thu, 10 Sep 2015 23:34:07 +1000
Subject: [PATCH 0298/1265] Added documentation for IPC config

Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
---
 docs/yml.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/yml.md b/docs/yml.md
index 3ece0264..0524940f 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -373,7 +373,7 @@ Override the default labeling scheme for each container.
         - label:user:USER
         - label:role:ROLE
 
-### working\_dir, entrypoint, user, hostname, domainname, mac\_address, mem\_limit, memswap\_limit, privileged, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only, volume\_driver
+### working\_dir, entrypoint, user, hostname, domainname, mac\_address, mem\_limit, memswap\_limit, privileged, ipc, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only, volume\_driver
 
 Each of these is a single value, analogous to its
 [docker run](https://docs.docker.com/reference/run/) counterpart.
@@ -394,6 +394,8 @@ Each of these is a single value, analogous to its
     memswap_limit: 2000000000
     privileged: true
 
+    ipc: host
+
     restart: always
 
     stdin_open: true

From 860b304f4afd094b3c0ffbb6964e854f79e7b582 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 2 Sep 2015 16:30:09 -0400
Subject: [PATCH 0299/1265] Add COMPOSE_API_VERSION to the docs

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/reference/overview.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/reference/overview.md b/docs/reference/overview.md
index 52598737..f5d778fd 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/overview.md
@@ -31,6 +31,26 @@ Setting this is optional. If you do not set this, the `COMPOSE_PROJECT_NAME` def
 
 Specify the file containing the compose configuration. If not provided, Compose looks for a file named  `docker-compose.yml` in the current directory and then each parent directory in succession until a file by that name is found.
 
+### COMPOSE\_API\_VERSION
+
+The Docker API only supports requests from clients which report a specific
+version. If you receive a `client and server don't have same version error` using
+`docker-compose`, you can workaround this error by setting this environment
+variable. Set the version value to match the server version.
+
+Setting this variable is intended as a workaround for situations where you need
+to run temporarily with a mismatch between the client and server version. For
+example, if you can upgrade the client but need to wait to upgrade the server.
+
+Running with this variable set and a known mismatch does prevent some Docker
+features from working properly. The exact features that fail would depend on the
+Docker client and server versions. For this reason, running with this variable
+set is only intended as a workaround and it is not officially supported.
+
+If you run into problems running with this set, resolve the mismatch through
+upgrade and remove this setting to see if your problems resolve before notifying
+support.
+
 ### DOCKER\_HOST
 
 Sets the URL of the `docker` daemon. As with the Docker client, defaults to `unix:///var/run/docker.sock`.

From 4bdf57ead8078e9737c87c88b0910d5fa471938b Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 2 Sep 2015 16:55:48 -0400
Subject: [PATCH 0300/1265] Add a where to go next section to the main index
 page for compose

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 docs/index.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/index.md b/docs/index.md
index 4e4f58da..72de04d3 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -222,3 +222,14 @@ like-minded individuals, we have a number of open channels for communication.
 * To contribute code or documentation changes: please submit a [pull request on Github](https://github.com/docker/compose/pulls).
 
 For more information and resources, please visit the [Getting Help project page](https://docs.docker.com/project/get-help/).
+
+## Where to go next
+
+- [Installing Compose](install.md)
+- [Get started with Django](django.md)
+- [Get started with Rails](rails.md)
+- [Get started with Wordpress](wordpress.md)
+- [Command line reference](/reference)
+- [Yaml file reference](yml.md)
+- [Compose environment variables](env.md)
+- [Compose command line completion](completion.md)

From 1eb925ee3198596b44f67fe588ca6cfdff9c9521 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 2 Sep 2015 16:59:04 -0400
Subject: [PATCH 0301/1265] Link between pages in the CLI reference section

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 docs/reference/docker-compose.md |  5 +++++
 docs/reference/index.md          |  5 +++++
 docs/reference/overview.md       | 12 +++++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/docs/reference/docker-compose.md b/docs/reference/docker-compose.md
index 6c46b31d..b43055fb 100644
--- a/docs/reference/docker-compose.md
+++ b/docs/reference/docker-compose.md
@@ -55,3 +55,8 @@ used all paths in the configuration are relative to the current working
 directory.
 
 Each configuration can has a project name. If you supply a `-p` flag, you can specify a project name. If you don't specify the flag, Compose uses the current directory name.
+
+## Where to go next
+
+* [CLI environment variables](overview.md)
+* [Command line reference](index.md)
diff --git a/docs/reference/index.md b/docs/reference/index.md
index e7a07b09..7a1fb9b4 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -27,3 +27,8 @@ The following pages describe the usage information for the [docker-compose](/ref
 * [rm](/reference/rm.md)
 * [scale](/reference/scale.md)
 * [stop](/reference/stop.md)
+
+## Where to go next
+
+* [CLI environment variables](overview.md)
+* [docker-compose Command](docker-compose.md)
diff --git a/docs/reference/overview.md b/docs/reference/overview.md
index f5d778fd..00260711 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/overview.md
@@ -14,6 +14,13 @@ weight=-2
 
 This section describes the subcommands you can use with the `docker-compose` command.  You can run subcommand against one or more services. To run against a specific service, you supply the service name from your compose configuration. If you do not specify the service name, the command runs against all the services in your configuration.
 
+
+## Commands
+
+* [docker-compose Command](docker-compose.md)
+* [CLI Reference](index.md)
+
+
 ## Environment Variables
 
 Several environment variables are available for you to configure the Docker Compose command-line behaviour.
@@ -70,11 +77,6 @@ Configures the time (in seconds) a request to the Docker daemon is allowed to ha
 it failed. Defaults to 60 seconds.
 
 
-
-
-
-
-
 ## Compose documentation
 
 - [User guide](/)

From e80f0bdf86225d172025ac70280eaf869518f5b8 Mon Sep 17 00:00:00 2001
From: Christophe Labouisse <christophe@labouisse.org>
Date: Thu, 10 Sep 2015 23:41:22 +0200
Subject: [PATCH 0302/1265] Fix type for `tty` & `stdin_open`

Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
---
 compose/config/fields_schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 38dfd2e3..5c732251 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -111,8 +111,8 @@
         "read_only": {"type": "boolean"},
         "restart": {"type": "string"},
         "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "stdin_open": {"type": "string"},
-        "tty": {"type": "string"},
+        "stdin_open": {"type": "boolean"},
+        "tty": {"type": "boolean"},
         "user": {"type": "string"},
         "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "volume_driver": {"type": "string"},

From 4641d4052640ec541ac3fbedae5e2e5e86385b34 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 9 Sep 2015 15:54:51 -0400
Subject: [PATCH 0303/1265] Document limitation of other log drivers.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 docs/yml.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/yml.md b/docs/yml.md
index 3ece0264..9c1ffa07 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -289,11 +289,10 @@ Because Docker container names must be unique, you cannot scale a service
 beyond 1 container if you have specified a custom name. Attempting to do so
 results in an error.
 
-### log driver
+### log_driver
 
-Specify a logging driver for the service's containers, as with the ``--log-driver`` option for docker run ([documented here](http://docs.docker.com/reference/run/#logging-drivers-log-driver)).
-
-Allowed values are currently ``json-file``, ``syslog`` and ``none``. The list will change over time as more drivers are added to the Docker engine.
+Specify a logging driver for the service's containers, as with the ``--log-driver``
+option for docker run ([documented here](https://docs.docker.com/reference/logging/overview/)).
 
 The default value is json-file.
 
@@ -301,6 +300,12 @@ The default value is json-file.
     log_driver: "syslog"
     log_driver: "none"
 
+> **Note:** Only the `json-file` driver makes the logs available directly from
+> `docker-compose up` and `docker-compose logs`. Using any other driver will not
+> print any logs.
+
+### log_opt
+
 Specify logging options with `log_opt` for the logging driver, as with the ``--log-opt`` option for `docker run`.
 
 Logging options are key value pairs. An example of `syslog` options:

From 413b76e2285f5f6575601385f9b4af7503b41c3e Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 9 Sep 2015 17:53:36 -0400
Subject: [PATCH 0304/1265] Fix warning message when a container uses a
 non-json log driver

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/cli/log_printer.py         | 48 ++++++++++++--------
 compose/cli/main.py                |  8 +---
 compose/container.py               |  9 ++++
 tests/unit/cli/log_printer_test.py | 73 ++++++++++++++++++------------
 4 files changed, 84 insertions(+), 54 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index c2fcc54f..49071dd4 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -13,9 +13,9 @@ from compose import utils
 
 
 class LogPrinter(object):
-    def __init__(self, containers, attach_params=None, output=sys.stdout, monochrome=False):
+    # TODO: move logic to run
+    def __init__(self, containers, output=sys.stdout, monochrome=False):
         self.containers = containers
-        self.attach_params = attach_params or {}
         self.prefix_width = self._calculate_prefix_width(containers)
         self.generators = self._make_log_generators(monochrome)
         self.output = utils.get_output_stream(output)
@@ -25,6 +25,7 @@ class LogPrinter(object):
         for line in mux.loop():
             self.output.write(line)
 
+    # TODO: doesn't use self, remove from class
     def _calculate_prefix_width(self, containers):
         """
         Calculate the maximum width of container names so we can make the log
@@ -56,14 +57,10 @@ class LogPrinter(object):
 
     def _make_log_generator(self, container, color_fn):
         prefix = color_fn(self._generate_prefix(container))
-        # Attach to container before log printer starts running
-        line_generator = split_buffer(self._attach(container), u'\n')
 
-        for line in line_generator:
-            yield prefix + line
-
-        exit_code = container.wait()
-        yield color_fn("%s exited with code %s\n" % (container.name, exit_code))
+        if container.has_api_logs:
+            return build_log_generator(container, prefix, color_fn)
+        return build_no_log_generator(container, prefix, color_fn)
 
     def _generate_prefix(self, container):
         """
@@ -73,12 +70,27 @@ class LogPrinter(object):
         padding = ' ' * (self.prefix_width - len(name))
         return ''.join([name, padding, ' | '])
 
-    def _attach(self, container):
-        params = {
-            'stdout': True,
-            'stderr': True,
-            'stream': True,
-        }
-        params.update(self.attach_params)
-        params = dict((name, 1 if value else 0) for (name, value) in list(params.items()))
-        return container.attach(**params)
+
+def build_no_log_generator(container, prefix, color_fn):
+    """Return a generator that prints a warning about logs and waits for
+    container to exit.
+    """
+    yield "{} WARNING: no logs are available with the '{}' log driver\n".format(
+        prefix,
+        container.log_driver)
+    yield color_fn(wait_on_exit(container))
+
+
+def build_log_generator(container, prefix, color_fn):
+    # Attach to container before log printer starts running
+    stream = container.attach(stdout=True, stderr=True,  stream=True, logs=True)
+    line_generator = split_buffer(stream, u'\n')
+
+    for line in line_generator:
+        yield prefix + line
+    yield color_fn(wait_on_exit(container))
+
+
+def wait_on_exit(container):
+    exit_code = container.wait()
+    return "%s exited with code %s\n" % (container.name, exit_code)
diff --git a/compose/cli/main.py b/compose/cli/main.py
index a7b91816..61461ae7 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -193,7 +193,7 @@ class TopLevelCommand(Command):
 
         monochrome = options['--no-color']
         print("Attaching to", list_containers(containers))
-        LogPrinter(containers, attach_params={'logs': True}, monochrome=monochrome).run()
+        LogPrinter(containers, monochrome=monochrome).run()
 
     def pause(self, project, options):
         """
@@ -602,11 +602,7 @@ def convergence_strategy_from_opts(options):
 def build_log_printer(containers, service_names, monochrome):
     if service_names:
         containers = [c for c in containers if c.service in service_names]
-
-    return LogPrinter(
-        containers,
-        attach_params={"logs": True},
-        monochrome=monochrome)
+    return LogPrinter(containers, monochrome=monochrome)
 
 
 def attach_to_logs(project, log_printer, service_names, timeout):
diff --git a/compose/container.py b/compose/container.py
index 51b62589..28af093d 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -137,6 +137,15 @@ class Container(object):
     def is_paused(self):
         return self.get('State.Paused')
 
+    @property
+    def log_driver(self):
+        return self.get('HostConfig.LogConfig.Type')
+
+    @property
+    def has_api_logs(self):
+        log_type = self.log_driver
+        return not log_type or log_type == 'json-file'
+
     def get(self, key):
         """Return a value from the container or None if the value is not set.
 
diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py
index d8fbf94b..2c916898 100644
--- a/tests/unit/cli/log_printer_test.py
+++ b/tests/unit/cli/log_printer_test.py
@@ -1,20 +1,31 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import os
-
+import mock
 import six
 
 from compose.cli.log_printer import LogPrinter
+from compose.cli.log_printer import wait_on_exit
+from compose.container import Container
 from tests import unittest
 
 
+def build_mock_container(reader):
+    return mock.Mock(
+        spec=Container,
+        name='myapp_web_1',
+        name_without_project='web_1',
+        has_api_logs=True,
+        attach=reader,
+        wait=mock.Mock(return_value=0),
+    )
+
+
 class LogPrinterTest(unittest.TestCase):
     def get_default_output(self, monochrome=False):
         def reader(*args, **kwargs):
             yield b"hello\nworld"
-
-        container = MockContainer(reader)
+        container = build_mock_container(reader)
         output = run_log_printer([container], monochrome=monochrome)
         return output
 
@@ -38,37 +49,39 @@ class LogPrinterTest(unittest.TestCase):
         def reader(*args, **kwargs):
             yield glyph.encode('utf-8') + b'\n'
 
-        container = MockContainer(reader)
+        container = build_mock_container(reader)
         output = run_log_printer([container])
         if six.PY2:
             output = output.decode('utf-8')
 
         self.assertIn(glyph, output)
 
+    def test_wait_on_exit(self):
+        exit_status = 3
+        mock_container = mock.Mock(
+            spec=Container,
+            name='cname',
+            wait=mock.Mock(return_value=exit_status))
+
+        expected = '{} exited with code {}\n'.format(mock_container.name, exit_status)
+        self.assertEqual(expected, wait_on_exit(mock_container))
+
+    def test_generator_with_no_logs(self):
+        mock_container = mock.Mock(
+            spec=Container,
+            has_api_logs=False,
+            log_driver='none',
+            name_without_project='web_1',
+            wait=mock.Mock(return_value=0))
+
+        output = run_log_printer([mock_container])
+        self.assertIn(
+            "WARNING: no logs are available with the 'none' log driver\n",
+            output
+        )
+
 
 def run_log_printer(containers, monochrome=False):
-    r, w = os.pipe()
-    reader, writer = os.fdopen(r, 'r'), os.fdopen(w, 'w')
-    printer = LogPrinter(containers, output=writer, monochrome=monochrome)
-    printer.run()
-    writer.close()
-    return reader.read()
-
-
-class MockContainer(object):
-    def __init__(self, reader):
-        self._reader = reader
-
-    @property
-    def name(self):
-        return 'myapp_web_1'
-
-    @property
-    def name_without_project(self):
-        return 'web_1'
-
-    def attach(self, *args, **kwargs):
-        return self._reader()
-
-    def wait(self, *args, **kwargs):
-        return 0
+    output = six.StringIO()
+    LogPrinter(containers, output=output, monochrome=monochrome).run()
+    return output.getvalue()

From 7d8ae9aa6dc907975433657a926c0e329d937d41 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 9 Sep 2015 18:26:34 -0400
Subject: [PATCH 0305/1265] Refactor LogPrinter to make it immutable and remove
 logic from the constructor.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/cli/log_printer.py | 93 +++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 51 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 49071dd4..845f799b 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -4,8 +4,6 @@ from __future__ import unicode_literals
 import sys
 from itertools import cycle
 
-from six import next
-
 from . import colors
 from .multiplexer import Multiplexer
 from .utils import split_buffer
@@ -13,82 +11,75 @@ from compose import utils
 
 
 class LogPrinter(object):
-    # TODO: move logic to run
+    """Print logs from many containers to a single output stream."""
+
     def __init__(self, containers, output=sys.stdout, monochrome=False):
         self.containers = containers
-        self.prefix_width = self._calculate_prefix_width(containers)
-        self.generators = self._make_log_generators(monochrome)
         self.output = utils.get_output_stream(output)
+        self.monochrome = monochrome
 
     def run(self):
-        mux = Multiplexer(self.generators)
-        for line in mux.loop():
+        if not self.containers:
+            return
+
+        prefix_width = max_name_width(self.containers)
+        generators = list(self._make_log_generators(self.monochrome, prefix_width))
+        for line in Multiplexer(generators).loop():
             self.output.write(line)
 
-    # TODO: doesn't use self, remove from class
-    def _calculate_prefix_width(self, containers):
-        """
-        Calculate the maximum width of container names so we can make the log
-        prefixes line up like so:
-
-        db_1  | Listening
-        web_1 | Listening
-        """
-        prefix_width = 0
-        for container in containers:
-            prefix_width = max(prefix_width, len(container.name_without_project))
-        return prefix_width
-
-    def _make_log_generators(self, monochrome):
-        color_fns = cycle(colors.rainbow())
-        generators = []
-
+    def _make_log_generators(self, monochrome, prefix_width):
         def no_color(text):
             return text
 
-        for container in self.containers:
-            if monochrome:
-                color_fn = no_color
-            else:
-                color_fn = next(color_fns)
-            generators.append(self._make_log_generator(container, color_fn))
+        if monochrome:
+            color_funcs = cycle([no_color])
+        else:
+            color_funcs = cycle(colors.rainbow())
 
-        return generators
-
-    def _make_log_generator(self, container, color_fn):
-        prefix = color_fn(self._generate_prefix(container))
-
-        if container.has_api_logs:
-            return build_log_generator(container, prefix, color_fn)
-        return build_no_log_generator(container, prefix, color_fn)
-
-    def _generate_prefix(self, container):
-        """
-        Generate the prefix for a log line without colour
-        """
-        name = container.name_without_project
-        padding = ' ' * (self.prefix_width - len(name))
-        return ''.join([name, padding, ' | '])
+        for color_func, container in zip(color_funcs, self.containers):
+            generator_func = get_log_generator(container)
+            prefix = color_func(build_log_prefix(container, prefix_width))
+            yield generator_func(container, prefix, color_func)
 
 
-def build_no_log_generator(container, prefix, color_fn):
+def build_log_prefix(container, prefix_width):
+    return container.name_without_project.ljust(prefix_width) + ' | '
+
+
+def max_name_width(containers):
+    """Calculate the maximum width of container names so we can make the log
+    prefixes line up like so:
+
+    db_1  | Listening
+    web_1 | Listening
+    """
+    return max(len(container.name_without_project) for container in containers)
+
+
+def get_log_generator(container):
+    if container.has_api_logs:
+        return build_log_generator
+    return build_no_log_generator
+
+
+def build_no_log_generator(container, prefix, color_func):
     """Return a generator that prints a warning about logs and waits for
     container to exit.
     """
     yield "{} WARNING: no logs are available with the '{}' log driver\n".format(
         prefix,
         container.log_driver)
-    yield color_fn(wait_on_exit(container))
+    yield color_func(wait_on_exit(container))
 
 
-def build_log_generator(container, prefix, color_fn):
+def build_log_generator(container, prefix, color_func):
     # Attach to container before log printer starts running
     stream = container.attach(stdout=True, stderr=True,  stream=True, logs=True)
     line_generator = split_buffer(stream, u'\n')
 
     for line in line_generator:
         yield prefix + line
-    yield color_fn(wait_on_exit(container))
+    yield color_func(wait_on_exit(container))
 
 
 def wait_on_exit(container):

From 61415cd8bcf2d08dbfea957ca4801ed4f0f6e554 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 9 Sep 2015 14:38:46 -0400
Subject: [PATCH 0306/1265] Fixes #1955 - Handle unexpected errors, but don't
 ignore background threads.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 compose/utils.py                  | 26 ++++++++++++++++----------
 tests/integration/service_test.py |  6 +++---
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/compose/utils.py b/compose/utils.py
index 690c5ffd..e0304ba5 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -21,7 +21,6 @@ def parallel_execute(objects, obj_callable, msg_index, msg):
     """
     stream = get_output_stream(sys.stdout)
     lines = []
-    errors = {}
 
     for obj in objects:
         write_out_msg(stream, lines, msg_index(obj), msg)
@@ -29,16 +28,17 @@ def parallel_execute(objects, obj_callable, msg_index, msg):
     q = Queue()
 
     def inner_execute_function(an_callable, parameter, msg_index):
+        error = None
         try:
             result = an_callable(parameter)
         except APIError as e:
-            errors[msg_index] = e.explanation
+            error = e.explanation
             result = "error"
         except Exception as e:
-            errors[msg_index] = e
+            error = e
             result = 'unexpected_exception'
 
-        q.put((msg_index, result))
+        q.put((msg_index, result, error))
 
     for an_object in objects:
         t = Thread(
@@ -49,15 +49,17 @@ def parallel_execute(objects, obj_callable, msg_index, msg):
         t.start()
 
     done = 0
+    errors = {}
     total_to_execute = len(objects)
 
     while done < total_to_execute:
         try:
-            msg_index, result = q.get(timeout=1)
+            msg_index, result, error = q.get(timeout=1)
 
             if result == 'unexpected_exception':
-                raise errors[msg_index]
+                errors[msg_index] = result, error
             if result == 'error':
+                errors[msg_index] = result, error
                 write_out_msg(stream, lines, msg_index, msg, status='error')
             else:
                 write_out_msg(stream, lines, msg_index, msg)
@@ -65,10 +67,14 @@ def parallel_execute(objects, obj_callable, msg_index, msg):
         except Empty:
             pass
 
-    if errors:
-        stream.write("\n")
-        for error in errors:
-            stream.write("ERROR: for {}  {} \n".format(error, errors[error]))
+    if not errors:
+        return
+
+    stream.write("\n")
+    for msg_index, (result, error) in errors.items():
+        stream.write("ERROR: for {}  {} \n".format(msg_index, error))
+        if result == 'unexpected_exception':
+            raise error
 
 
 def get_output_stream(stream):
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index b6257821..79188f69 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -638,8 +638,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertTrue(service.containers()[0].is_running)
         self.assertIn("ERROR: for 2  Boom", mock_stdout.getvalue())
 
-    @mock.patch('sys.stdout', new_callable=StringIO)
-    def test_scale_with_api_returns_unexpected_exception(self, mock_stdout):
+    def test_scale_with_api_returns_unexpected_exception(self):
         """
         Test that when scaling if the API returns an error, that is not of type
         APIError, that error is re-raised.
@@ -650,7 +649,8 @@ class ServiceTest(DockerClientTestCase):
 
         with mock.patch(
             'compose.container.Container.create',
-                side_effect=ValueError("BOOM")):
+            side_effect=ValueError("BOOM")
+        ):
             with self.assertRaises(ValueError):
                 service.scale(3)
 

From 1fcacae1fe381331a324399332bdb8b0fa926a1a Mon Sep 17 00:00:00 2001
From: Luiz Geron <luiz@geron.me>
Date: Fri, 11 Sep 2015 19:06:08 -0300
Subject: [PATCH 0307/1265] Fix schema.json MANIFEST.in entry

docker-compose up doesn't run after install without this.

Signed-off-by: Luiz Geron <luiz@geron.me>
---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 7d48d347..43ae06d3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,7 +4,7 @@ include requirements.txt
 include requirements-dev.txt
 include tox.ini
 include *.md
-include compose/config/schema.json
+include compose/config/*.json
 recursive-include contrib/completion *
 recursive-include tests *
 global-exclude *.pyc

From d1dd06a7e2f28c0e2f7df53c0a7af13d6b12ece1 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 11 Sep 2015 11:24:57 -0700
Subject: [PATCH 0308/1265] Update docker-py to 1.4.0

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 requirements.txt                  | 2 +-
 setup.py                          | 2 +-
 tests/integration/service_test.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 666efcd2..4f2ea9d1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 PyYAML==3.10
-docker-py==1.3.1
+docker-py==1.4.0
 dockerpty==0.3.4
 docopt==0.6.1
 enum34==1.0.4
diff --git a/setup.py b/setup.py
index 29c5299e..0313fbd0 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.8',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.3.1, < 1.4',
+    'docker-py >= 1.4.0, < 2',
     'dockerpty >= 0.3.4, < 0.4',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 79188f69..bb30da1a 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -864,7 +864,7 @@ class ServiceTest(DockerClientTestCase):
 
     def test_log_drive_invalid(self):
         service = self.create_service('web', log_driver='xxx')
-        self.assertRaises(ValueError, lambda: create_and_start_container(service))
+        self.assertRaises(APIError, lambda: create_and_start_container(service))
 
     def test_log_drive_empty_default_jsonfile(self):
         service = self.create_service('web')

From a95ac0f0e0c973a139a50c1e0af10055e32f829a Mon Sep 17 00:00:00 2001
From: Charles Chan <charleswhchan@users.noreply.github.com>
Date: Tue, 1 Sep 2015 21:11:43 -0700
Subject: [PATCH 0309/1265] Touch up documentation for Docker Compose.

index.md:
* clarify Python & Flask
* minor edits & reformatting

install.md:
* merge the elevated installation instructions with `sudo -i` discussed by @asveepay and @aanand in PR #1201; fixes #1081 (not sure what happened to the merge, but it's not showing up on the master branch or website)
* minor edits

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
---
 docs/index.md   | 20 ++++++++------------
 docs/install.md | 17 ++++++++---------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 4342b368..992610a9 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -74,7 +74,7 @@ Next, you'll want to make a directory for the project:
     $ mkdir composetest
     $ cd composetest
 
-Inside this directory, create `app.py`, a simple web app that uses the Flask
+Inside this directory, create `app.py`, a simple Python web app that uses the Flask
 framework and increments a value in Redis. Don't worry if you don't have Redis installed, docker is going to take care of that for you when we [define services](#define-services):
 
     from flask import Flask
@@ -113,12 +113,12 @@ This tells Docker to:
 * Build an image starting with the Python 2.7 image.
 * Add the current directory `.` into the path `/code` in the image.
 * Set the working directory to `/code`.
-* Install your Python dependencies.
+* Install the Python dependencies.
 * Set the default command for the container to `python app.py`
 
 For more information on how to write Dockerfiles, see the [Docker user guide](https://docs.docker.com/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](http://docs.docker.com/reference/builder/).
 
-You can test that this builds by running `docker build -t web .`.
+You can build the image by running `docker build -t web .`.
 
 ### Define services
 
@@ -135,18 +135,14 @@ Next, define a set of services using `docker-compose.yml`:
     redis:
       image: redis
 
-This defines two services:
-
-#### web
+This template defines two services, `web` and `redis`. The `web` service:
 
 * Builds from the `Dockerfile` in the current directory.
 * Forwards the exposed port 5000 on the container to port 5000 on the host machine.
-* Connects the web container to the Redis service via a link.
-* Mounts the current directory on the host to `/code` inside the container allowing you to modify the code without having to rebuild the image.
+* Mounts the current directory on the host to ``/code` inside the container allowing you to modify the code without having to rebuild the image.
+* Links the web container to the Redis service.
 
-#### redis
-
-* Uses the public [Redis](https://registry.hub.docker.com/_/redis/) image which gets pulled from the Docker Hub registry.
+The `redis` service uses the latest public [Redis](https://registry.hub.docker.com/_/redis/) image pulled from the Docker Hub registry.
 
 ### Build and run your app with Compose
 
@@ -163,7 +159,7 @@ Now, when you run `docker-compose up`, Compose will pull a Redis image, build an
 
 If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` will tell you its address and you can open `http://MACHINE_VM_IP:5000` in a browser.
 
-If you're not using Boot2docker and are on linux, then the web app should now be listening on port 5000 on your Docker daemon host. If http://0.0.0.0:5000 doesn't resolve, you can also try localhost:5000.
+If you're using Docker on Linux natively, then the web app should now be listening on port 5000 on your Docker daemon host. If http://0.0.0.0:5000 doesn't resolve, you can also try http://localhost:5000.
 
 You should get a message in your browser saying:
 
diff --git a/docs/install.md b/docs/install.md
index 85060ce0..371d0a90 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -16,16 +16,11 @@ You can run Compose on OS X and 64-bit Linux.  It is currently not supported on
 the Windows operating system. To install Compose, you'll need to install Docker
 first.
 
-Depending on how your system is configured, you may require `sudo` access to
-install Compose. If your system requires `sudo`, you will receive "Permission
-denied" errors when installing Compose. If this is the case for you, preface the
-install commands with `sudo` to install.
-
 To install Compose, do the following:
 
 1. Install Docker Engine version 1.7.1 or greater:
 
-     * <a href="https://docs.docker.com/installation/mac/" target="_blank">Mac OS X installation</a> (installs both Engine and Compose)
+     * <a href="https://docs.docker.com/installation/mac/" target="_blank">Mac OS X installation</a> (Toolbox installation includes both Engine and Compose)
 
      * <a href="https://docs.docker.com/installation/ubuntulinux/" target="_blank">Ubuntu installation</a>
 
@@ -33,9 +28,13 @@ To install Compose, do the following:
 
 2. Mac OS X users are done installing. Others should continue to the next step.
 
-3. Go to the <a href="https://github.com/docker/compose/releases" target="_blank">repository release page</a>.
+3. Go to the <a href="https://github.com/docker/compose/releases" target="_blank">Compose repository release page on GitHub</a>.
 
-4. Enter the `curl` command in your terminal.
+4. Follow the instructions from the release page and run the `curl` command in your terminal.
+
+     > Note: If you get a "Permission denied" error, your `/usr/local/bin` directory
+     probably isn't writable and you'll need to install Compose as the superuser. Run
+     `sudo -i`, then the two commands below, then `exit`.
 
      The command has the following format:
 
@@ -69,7 +68,7 @@ to preserve) you can migrate them with the following command:
 
     $ docker-compose migrate-to-labels
 
-Alternatively, if you're not worried about keeping them, you can remove them &endash;
+Alternatively, if you're not worried about keeping them, you can remove them.
 Compose will just create new ones.
 
     $ docker rm -f -v myapp_web_1 myapp_db_1 ...

From 32cd404c8c1bb31d04aa2845ca7fa15deae9b00b Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 8 Sep 2015 11:54:03 +0100
Subject: [PATCH 0310/1265] Remove redundant oneOf definitions

For simple definitions where a field can be multiple types, we can
specify the allowed types in an array. It's simpler and clearer.

This is only applicable to *simple* definitions, like number, string, list,
object without any other constraints.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/fields_schema.json | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 5c732251..6277b57d 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -24,12 +24,7 @@
           ]
         },
         "container_name": {"type": "string"},
-        "cpu_shares": {
-          "oneOf": [
-            {"type": "number"},
-            {"type": "string"}
-          ]
-        },
+        "cpu_shares": {"type": ["number", "string"]},
         "cpuset": {"type": "string"},
         "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "dns": {"$ref": "#/definitions/string_or_list"},
@@ -74,18 +69,8 @@
         "log_opt": {"type": "object"},
 
         "mac_address": {"type": "string"},
-        "mem_limit": {
-          "oneOf": [
-            {"type": "number"},
-            {"type": "string"}
-          ]
-        },
-        "memswap_limit": {
-          "oneOf": [
-            {"type": "number"},
-            {"type": "string"}
-          ]
-        },
+        "mem_limit": {"type": ["number", "string"]},
+        "memswap_limit": {"type": ["number", "string"]},
         "name": {"type": "string"},
         "net": {"type": "string"},
         "pid": {"type": ["string", "null"]},

From 418ec5336b0c7848087b38b3d2617b2ce340c67d Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 8 Sep 2015 12:01:47 +0100
Subject: [PATCH 0311/1265] Improved messaging for simple type validator

English language is a tricky old thing and I've pulled out the validator type
parsing so that we can prefix our validator types with the correct article,
'an' or 'a'.

Doing a bit of extra hard work to ensure the error message is clear and
well constructed english.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/validation.py | 41 ++++++++++++++++++++++++++++++------
 tests/unit/config_test.py    | 15 +++++++++++++
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 632bdf03..44763fda 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -117,6 +117,38 @@ def process_errors(errors, service_name=None):
         else:
             return str(schema['type'])
 
+    def _parse_valid_types_from_validator(validator):
+        """
+        A validator value can be either an array of valid types or a string of
+        a valid type. Parse the valid types and prefix with the correct article.
+        """
+        pre_msg_type_prefix = "a"
+        last_msg_type_prefix = "a"
+        types_requiring_an = ["array", "object"]
+
+        if isinstance(validator, list):
+            last_type = validator.pop()
+            types_from_validator = ", ".join(validator)
+
+            if validator[0] in types_requiring_an:
+                pre_msg_type_prefix = "an"
+
+            if last_type in types_requiring_an:
+                last_msg_type_prefix = "an"
+
+            msg = "{} {} or {} {}".format(
+                pre_msg_type_prefix,
+                types_from_validator,
+                last_msg_type_prefix,
+                last_type
+            )
+        else:
+            if validator in types_requiring_an:
+                pre_msg_type_prefix = "an"
+            msg = "{} {}".format(pre_msg_type_prefix, validator)
+
+        return msg
+
     root_msgs = []
     invalid_keys = []
     required = []
@@ -176,19 +208,16 @@ def process_errors(errors, service_name=None):
                     service_name, config_key, valid_type_msg)
                 )
             elif error.validator == 'type':
-                msg = "a"
-                if error.validator_value == "array":
-                    msg = "an"
+                msg = _parse_valid_types_from_validator(error.validator_value)
 
                 if len(error.path) > 0:
                     config_key = " ".join(["'%s'" % k for k in error.path])
                     type_errors.append(
                         "Service '{}' configuration key {} contains an invalid "
-                        "type, it should be {} {}".format(
+                        "type, it should be {}".format(
                             service_name,
                             config_key,
-                            msg,
-                            error.validator_value))
+                            msg))
                 else:
                     root_msgs.append(
                         "Service '{}' doesn\'t have any configuration options. "
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 870adcf8..90d7a6a2 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -269,6 +269,21 @@ class ConfigTest(unittest.TestCase):
             )
             self.assertEqual(service[0]['entrypoint'], entrypoint)
 
+    def test_validation_message_for_invalid_type_when_multiple_types_allowed(self):
+        expected_error_msg = "Service 'web' configuration key 'mem_limit' contains an invalid type, it should be a number or a string"
+
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            config.load(
+                config.ConfigDetails(
+                    {'web': {
+                        'image': 'busybox',
+                        'mem_limit': ['incorrect']
+                    }},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)

From 0bdbb334476e6155cae346734a21f428ecc15a11 Mon Sep 17 00:00:00 2001
From: Tomas Tomecek <ttomecek@redhat.com>
Date: Mon, 14 Sep 2015 23:46:48 +0200
Subject: [PATCH 0312/1265] include logo in README

Resolves #2024

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
---
 README.md |   2 ++
 logo.png  | Bin 0 -> 39135 bytes
 2 files changed, 2 insertions(+)
 create mode 100644 logo.png

diff --git a/README.md b/README.md
index 69423111..3c776a71 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 Docker Compose
 ==============
+![Docker Compose](logo.png?raw=true "Docker Compose Logo")
+
 *(Previously known as Fig)*
 
 Compose is a tool for defining and running multi-container applications with
diff --git a/logo.png b/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bc5eb2f9e5051601aa8628f194932c8001e26cd
GIT binary patch
literal 39135
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
UaBka@*8l(j07*qoM6N<$f^aN~WB>pF

literal 0
HcmV?d00001


From cf7b59538572c3cb49c8e54aec3e7a7f0da06b42 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 9 Sep 2015 13:18:52 +0100
Subject: [PATCH 0313/1265] Improve error messages from oneOf schema errors

oneOf schema ValidationError takes a little more work to parse and
pull out more detail so we can give a better error message back to
the user.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/validation.py | 51 +++++++++++++++++++++++++-----------
 tests/unit/config_test.py    |  5 ++--
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 44763fda..971cfe37 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -107,16 +107,6 @@ def process_errors(errors, service_name=None):
     def _clean_error_message(message):
         return message.replace("u'", "'")
 
-    def _parse_valid_types_from_schema(schema):
-        """
-        Our defined types using $ref in the schema require some extra parsing
-        retrieve a helpful type for error message display.
-        """
-        if '$ref' in schema:
-            return schema['$ref'].replace("#/definitions/", "").replace("_", " ")
-        else:
-            return str(schema['type'])
-
     def _parse_valid_types_from_validator(validator):
         """
         A validator value can be either an array of valid types or a string of
@@ -149,6 +139,39 @@ def process_errors(errors, service_name=None):
 
         return msg
 
+    def _parse_oneof_validator(error):
+        """
+        oneOf has multiple schemas, so we need to reason about which schema, sub
+        schema or constraint the validation is failing on.
+        Inspecting the context value of a ValidationError gives us information about
+        which sub schema failed and which kind of error it is.
+        """
+        constraint = [context for context in error.context if len(context.path) > 0]
+        if constraint:
+            valid_types = _parse_valid_types_from_validator(constraint[0].validator_value)
+            msg = "contains {}, which is an invalid type, it should be {}".format(
+                constraint[0].instance,
+                valid_types
+            )
+            return msg
+
+        uniqueness = [context for context in error.context if context.validator == 'uniqueItems']
+        if uniqueness:
+            msg = "contains non unique items, please remove duplicates from {}".format(
+                uniqueness[0].instance
+            )
+            return msg
+
+        types = [context.validator_value for context in error.context if context.validator == 'type']
+        if len(types) == 1:
+            valid_types = _parse_valid_types_from_validator(types[0])
+        else:
+            valid_types = _parse_valid_types_from_validator(types)
+
+        msg = "contains an invalid type, it should be {}".format(valid_types)
+
+        return msg
+
     root_msgs = []
     invalid_keys = []
     required = []
@@ -200,12 +223,10 @@ def process_errors(errors, service_name=None):
                     required.append(_clean_error_message(error.message))
             elif error.validator == 'oneOf':
                 config_key = error.path[0]
+                msg = _parse_oneof_validator(error)
 
-                valid_types = [_parse_valid_types_from_schema(schema) for schema in error.schema['oneOf']]
-                valid_type_msg = " or ".join(valid_types)
-
-                type_errors.append("Service '{}' configuration key '{}' contains an invalid type, valid types are {}".format(
-                    service_name, config_key, valid_type_msg)
+                type_errors.append("Service '{}' configuration key '{}' {}".format(
+                    service_name, config_key, msg)
                 )
             elif error.validator == 'type':
                 msg = _parse_valid_types_from_validator(error.validator_value)
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 90d7a6a2..f5578920 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -183,7 +183,8 @@ class ConfigTest(unittest.TestCase):
             )
 
     def test_invalid_list_of_strings_format(self):
-        expected_error_msg = "'command' contains an invalid type, valid types are string or array"
+        expected_error_msg = "Service 'web' configuration key 'command' contains 1"
+        expected_error_msg += ", which is an invalid type, it should be a string"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 config.ConfigDetails(
@@ -222,7 +223,7 @@ class ConfigTest(unittest.TestCase):
             )
 
     def test_config_extra_hosts_list_of_dicts_validation_error(self):
-        expected_error_msg = "Service 'web' configuration key 'extra_hosts' contains an invalid type"
+        expected_error_msg = "key 'extra_hosts' contains {'somehost': '162.242.195.82'}, which is an invalid type, it should be a string"
 
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(

From 1007ad0f868e00c61267e7b9eb059b5b811a84d9 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 14 Sep 2015 17:23:05 +0100
Subject: [PATCH 0314/1265] Refactor to simplify _parse_valid_types

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/validation.py | 43 +++++++++++++++---------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 971cfe37..dc630adf 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -95,6 +95,12 @@ def get_unsupported_config_msg(service_name, error_key):
     return msg
 
 
+def anglicize_validator(validator):
+    if validator in ["array", "object"]:
+        return 'an ' + validator
+    return 'a ' + validator
+
+
 def process_errors(errors, service_name=None):
     """
     jsonschema gives us an error tree full of information to explain what has
@@ -112,30 +118,20 @@ def process_errors(errors, service_name=None):
         A validator value can be either an array of valid types or a string of
         a valid type. Parse the valid types and prefix with the correct article.
         """
-        pre_msg_type_prefix = "a"
-        last_msg_type_prefix = "a"
-        types_requiring_an = ["array", "object"]
-
         if isinstance(validator, list):
-            last_type = validator.pop()
-            types_from_validator = ", ".join(validator)
+            if len(validator) >= 2:
+                first_type = anglicize_validator(validator[0])
+                last_type = anglicize_validator(validator[-1])
+                types_from_validator = "{}{}".format(first_type, ", ".join(validator[1:-1]))
 
-            if validator[0] in types_requiring_an:
-                pre_msg_type_prefix = "an"
-
-            if last_type in types_requiring_an:
-                last_msg_type_prefix = "an"
-
-            msg = "{} {} or {} {}".format(
-                pre_msg_type_prefix,
-                types_from_validator,
-                last_msg_type_prefix,
-                last_type
-            )
+                msg = "{} or {}".format(
+                    types_from_validator,
+                    last_type
+                )
+            else:
+                msg = "{}".format(anglicize_validator(validator[0]))
         else:
-            if validator in types_requiring_an:
-                pre_msg_type_prefix = "an"
-            msg = "{} {}".format(pre_msg_type_prefix, validator)
+            msg = "{}".format(anglicize_validator(validator))
 
         return msg
 
@@ -163,10 +159,7 @@ def process_errors(errors, service_name=None):
             return msg
 
         types = [context.validator_value for context in error.context if context.validator == 'type']
-        if len(types) == 1:
-            valid_types = _parse_valid_types_from_validator(types[0])
-        else:
-            valid_types = _parse_valid_types_from_validator(types)
+        valid_types = _parse_valid_types_from_validator(types)
 
         msg = "contains an invalid type, it should be {}".format(valid_types)
 

From a594a2ccc25206cc7794ccf8db47982eebc34ecb Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 7 Sep 2015 16:45:58 +0100
Subject: [PATCH 0315/1265] Disallow booleans in environment

When users were putting true/false/yes/no in the environment key,
the YML parser was converting them into True/False, rather than leaving
them as a string.

This change will force people to put them in quotes, thus ensuring
that the value gets passed through as intended.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/fields_schema.json | 10 +++++++++-
 docs/yml.md                       |  6 +++++-
 tests/unit/config_test.py         |  6 +++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 6277b57d..baf7eb0e 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -36,7 +36,15 @@
 
         "environment": {
           "oneOf": [
-            {"type": "object"},
+            {
+              "type": "object",
+              "patternProperties": {
+                "^[a-zA-Z0-9_]+$": {
+                  "type": ["string", "number"]
+                }
+              },
+              "additionalProperties": false
+            },
             {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
           ]
         },
diff --git a/docs/yml.md b/docs/yml.md
index 9c1ffa07..17415684 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -184,17 +184,21 @@ Mount all of the volumes from another service or container.
 
 ### environment
 
-Add environment variables. You can use either an array or a dictionary.
+Add environment variables. You can use either an array or a dictionary. Any
+boolean values; true, false, yes no, need to be enclosed in quotes to ensure
+they are not converted to True or False by the YML parser.
 
 Environment variables with only a key are resolved to their values on the
 machine Compose is running on, which can be helpful for secret or host-specific values.
 
     environment:
       RACK_ENV: development
+      SHOW: 'true'
       SESSION_SECRET:
 
     environment:
       - RACK_ENV=development
+      - SHOW=true
       - SESSION_SECRET
 
 ### env_file
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index f5578920..0c1f81ba 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -270,15 +270,15 @@ class ConfigTest(unittest.TestCase):
             )
             self.assertEqual(service[0]['entrypoint'], entrypoint)
 
-    def test_validation_message_for_invalid_type_when_multiple_types_allowed(self):
-        expected_error_msg = "Service 'web' configuration key 'mem_limit' contains an invalid type, it should be a number or a string"
+    def test_config_environment_contains_boolean_validation_error(self):
+        expected_error_msg = "Service 'web' configuration key 'environment' contains an invalid type"
 
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 config.ConfigDetails(
                     {'web': {
                         'image': 'busybox',
-                        'mem_limit': ['incorrect']
+                        'environment': {'SHOW_STUFF': True}
                     }},
                     'working_dir',
                     'filename.yml'

From 8caeffe27eb29b830f181c086302ceb724397571 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 10 Sep 2015 16:25:54 +0100
Subject: [PATCH 0316/1265] Log a warning when boolean is found in
 `environment`

We're going to warn people that allowing a boolean in the environment is
being deprecated, so in a future release we can disallow it. This is to
ensure boolean variables are quoted in strings to ensure they don't get
mis-parsed by YML.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/fields_schema.json |  3 ++-
 compose/config/validation.py      | 29 +++++++++++++++++++++++++----
 tests/unit/config_test.py         | 28 +++++++++++++++-------------
 3 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index baf7eb0e..66cb2b41 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -40,7 +40,8 @@
               "type": "object",
               "patternProperties": {
                 "^[a-zA-Z0-9_]+$": {
-                  "type": ["string", "number"]
+                  "type": ["string", "number", "boolean"],
+                  "format": "environment"
                 }
               },
               "additionalProperties": false
diff --git a/compose/config/validation.py b/compose/config/validation.py
index dc630adf..0258c5d9 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -1,4 +1,5 @@
 import json
+import logging
 import os
 from functools import wraps
 
@@ -11,6 +12,9 @@ from jsonschema import ValidationError
 from .errors import ConfigurationError
 
 
+log = logging.getLogger(__name__)
+
+
 DOCKER_CONFIG_HINTS = {
     'cpu_share': 'cpu_shares',
     'add_host': 'extra_hosts',
@@ -44,6 +48,21 @@ def format_ports(instance):
     return True
 
 
+@FormatChecker.cls_checks(format="environment")
+def format_boolean_in_environment(instance):
+    """
+    Check if there is a boolean in the environment and display a warning.
+    Always return True here so the validation won't raise an error.
+    """
+    if isinstance(instance, bool):
+        log.warn(
+            "Warning: There is a boolean value, {0} in the 'environment' key.\n"
+            "Environment variables can only be strings.\nPlease add quotes to any boolean values to make them string "
+            "(eg, '{0}').\nThis warning will become an error in a future release. \r\n".format(instance)
+        )
+    return True
+
+
 def validate_service_names(func):
     @wraps(func)
     def func_wrapper(config):
@@ -259,15 +278,17 @@ def process_errors(errors, service_name=None):
 
 def validate_against_fields_schema(config):
     schema_filename = "fields_schema.json"
-    return _validate_against_schema(config, schema_filename)
+    format_checkers = ["ports", "environment"]
+    return _validate_against_schema(config, schema_filename, format_checkers)
 
 
 def validate_against_service_schema(config, service_name):
     schema_filename = "service_schema.json"
-    return _validate_against_schema(config, schema_filename, service_name)
+    format_checkers = ["ports"]
+    return _validate_against_schema(config, schema_filename, format_checkers, service_name)
 
 
-def _validate_against_schema(config, schema_filename, service_name=None):
+def _validate_against_schema(config, schema_filename, format_checker=[], service_name=None):
     config_source_dir = os.path.dirname(os.path.abspath(__file__))
     schema_file = os.path.join(config_source_dir, schema_filename)
 
@@ -275,7 +296,7 @@ def _validate_against_schema(config, schema_filename, service_name=None):
         schema = json.load(schema_fh)
 
     resolver = RefResolver('file://' + config_source_dir + '/', schema)
-    validation_output = Draft4Validator(schema, resolver=resolver, format_checker=FormatChecker(["ports"]))
+    validation_output = Draft4Validator(schema, resolver=resolver, format_checker=FormatChecker(format_checker))
 
     errors = [error for error in sorted(validation_output.iter_errors(config), key=str)]
     if errors:
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 0c1f81ba..f246d9f6 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -270,20 +270,22 @@ class ConfigTest(unittest.TestCase):
             )
             self.assertEqual(service[0]['entrypoint'], entrypoint)
 
-    def test_config_environment_contains_boolean_validation_error(self):
-        expected_error_msg = "Service 'web' configuration key 'environment' contains an invalid type"
-
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
-            config.load(
-                config.ConfigDetails(
-                    {'web': {
-                        'image': 'busybox',
-                        'environment': {'SHOW_STUFF': True}
-                    }},
-                    'working_dir',
-                    'filename.yml'
-                )
+    @mock.patch('compose.config.validation.log')
+    def test_logs_warning_for_boolean_in_environment(self, mock_logging):
+        expected_warning_msg = "Warning: There is a boolean value, True in the 'environment' key."
+        config.load(
+            config.ConfigDetails(
+                {'web': {
+                    'image': 'busybox',
+                    'environment': {'SHOW_STUFF': True}
+                }},
+                'working_dir',
+                'filename.yml'
             )
+        )
+
+        self.assertTrue(mock_logging.warn.called)
+        self.assertTrue(expected_warning_msg in mock_logging.warn.call_args[0][0])
 
 
 class InterpolationTest(unittest.TestCase):

From 4b2fd7699b1905de2b2f03be5d6a6ba442b5653f Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 10 Sep 2015 16:54:31 +0100
Subject: [PATCH 0317/1265] Relax constraints on key naming for environment

One of the use cases is swarm requires at least : character, so going
from conservative to relaxed.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/fields_schema.json |  2 +-
 tests/unit/config_test.py         | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 66cb2b41..e7902626 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -39,7 +39,7 @@
             {
               "type": "object",
               "patternProperties": {
-                "^[a-zA-Z0-9_]+$": {
+                "^[^-]+$": {
                   "type": ["string", "number", "boolean"],
                   "format": "environment"
                 }
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index f246d9f6..ff80270e 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -287,6 +287,21 @@ class ConfigTest(unittest.TestCase):
         self.assertTrue(mock_logging.warn.called)
         self.assertTrue(expected_warning_msg in mock_logging.warn.call_args[0][0])
 
+    def test_config_invalid_environment_dict_key_raises_validation_error(self):
+        expected_error_msg = "Service 'web' configuration key 'environment' contains an invalid type"
+
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            config.load(
+                config.ConfigDetails(
+                    {'web': {
+                        'image': 'busybox',
+                        'environment': {'---': 'nope'}
+                    }},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)

From 2f4564961123feb2f033aa91ba1b2b7938b32c62 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 17 Aug 2015 13:15:52 +0100
Subject: [PATCH 0318/1265] Handle invalid log_driver

Now docker-py isn't hardcoding a list of valid log_drivers, we
can expect an APIError in response rather than a ValueError
if we send an invalid log_driver.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/integration/service_test.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index bb30da1a..17fd0aaf 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -864,7 +864,10 @@ class ServiceTest(DockerClientTestCase):
 
     def test_log_drive_invalid(self):
         service = self.create_service('web', log_driver='xxx')
-        self.assertRaises(APIError, lambda: create_and_start_container(service))
+        expected_error_msg = "logger: no log driver named 'xxx' is registered"
+
+        with self.assertRaisesRegexp(APIError, expected_error_msg):
+            create_and_start_container(service)
 
     def test_log_drive_empty_default_jsonfile(self):
         service = self.create_service('web')

From fb96ed113a4757372e01d1403587af73c9e77bea Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 17 Aug 2015 13:17:01 +0100
Subject: [PATCH 0319/1265] Stop sending json-file by default

By doing this we were over-riding any of the daemon's defaults.
Instead we can send an empty string which docker-py sends on
and the daemon interprets as, 'json-file' as a default if it
hasn't got any other daemon level config options.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/service.py b/compose/service.py
index 7406ad80..7e035e29 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -657,7 +657,7 @@ class Service(object):
         cap_add = options.get('cap_add', None)
         cap_drop = options.get('cap_drop', None)
         log_config = LogConfig(
-            type=options.get('log_driver', 'json-file'),
+            type=options.get('log_driver', ""),
             config=options.get('log_opt', None)
         )
         pid = options.get('pid', None)

From 39786d4da7127bb1a0898da8c63ad77ec0adf8a3 Mon Sep 17 00:00:00 2001
From: Christophe Labouisse <christophe@labouisse.org>
Date: Mon, 14 Sep 2015 15:02:15 +0200
Subject: [PATCH 0320/1265] Add new --pull option in build.

Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
---
 compose/cli/main.py           |  4 ++-
 compose/project.py            |  4 +--
 compose/service.py            |  4 +--
 docs/reference/build.md       |  1 +
 tests/integration/cli_test.py | 46 +++++++++++++++++++++++++++++++----
 5 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 61461ae7..9b03ea67 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -153,9 +153,11 @@ class TopLevelCommand(Command):
 
         Options:
             --no-cache  Do not use cache when building the image.
+            --pull      Always attempt to pull a newer version of the image.
         """
         no_cache = bool(options.get('--no-cache', False))
-        project.build(service_names=options['SERVICE'], no_cache=no_cache)
+        pull = bool(options.get('--pull', False))
+        project.build(service_names=options['SERVICE'], no_cache=no_cache, pull=pull)
 
     def help(self, project, options):
         """
diff --git a/compose/project.py b/compose/project.py
index 9a6e98e0..f34cc0c3 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -257,10 +257,10 @@ class Project(object):
         for service in self.get_services(service_names):
             service.restart(**options)
 
-    def build(self, service_names=None, no_cache=False):
+    def build(self, service_names=None, no_cache=False, pull=False):
         for service in self.get_services(service_names):
             if service.can_be_built():
-                service.build(no_cache)
+                service.build(no_cache, pull)
             else:
                 log.info('%s uses an image, skipping' % service.name)
 
diff --git a/compose/service.py b/compose/service.py
index 7406ad80..d74c310b 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -700,7 +700,7 @@ class Service(object):
             security_opt=security_opt
         )
 
-    def build(self, no_cache=False):
+    def build(self, no_cache=False, pull=False):
         log.info('Building %s' % self.name)
 
         path = self.options['build']
@@ -714,7 +714,7 @@ class Service(object):
             tag=self.image_name,
             stream=True,
             rm=True,
-            pull=False,
+            pull=pull,
             nocache=no_cache,
             dockerfile=self.options.get('dockerfile', None),
         )
diff --git a/docs/reference/build.md b/docs/reference/build.md
index 77d87def..c427199f 100644
--- a/docs/reference/build.md
+++ b/docs/reference/build.md
@@ -16,6 +16,7 @@ Usage: build [options] [SERVICE...]
 
 Options:
 --no-cache  Do not use cache when building the image.
+--pull      Always attempt to pull a newer version of the image.
 ```
 
 Services are built once and then tagged as `project_service`, e.g.,
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 4a80d336..9dadd036 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -97,6 +97,19 @@ class CLITestCase(DockerClientTestCase):
             'Pulling digest (busybox@'
             'sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d)...')
 
+    @mock.patch('sys.stdout', new_callable=StringIO)
+    def test_build_plain(self, mock_stdout):
+        self.command.base_dir = 'tests/fixtures/simple-dockerfile'
+        self.command.dispatch(['build', 'simple'], None)
+
+        mock_stdout.truncate(0)
+        cache_indicator = 'Using cache'
+        pull_indicator = 'Status: Image is up to date for busybox:latest'
+        self.command.dispatch(['build', 'simple'], None)
+        output = mock_stdout.getvalue()
+        self.assertIn(cache_indicator, output)
+        self.assertNotIn(pull_indicator, output)
+
     @mock.patch('sys.stdout', new_callable=StringIO)
     def test_build_no_cache(self, mock_stdout):
         self.command.base_dir = 'tests/fixtures/simple-dockerfile'
@@ -104,14 +117,37 @@ class CLITestCase(DockerClientTestCase):
 
         mock_stdout.truncate(0)
         cache_indicator = 'Using cache'
-        self.command.dispatch(['build', 'simple'], None)
-        output = mock_stdout.getvalue()
-        self.assertIn(cache_indicator, output)
-
-        mock_stdout.truncate(0)
+        pull_indicator = 'Status: Image is up to date for busybox:latest'
         self.command.dispatch(['build', '--no-cache', 'simple'], None)
         output = mock_stdout.getvalue()
         self.assertNotIn(cache_indicator, output)
+        self.assertNotIn(pull_indicator, output)
+
+    @mock.patch('sys.stdout', new_callable=StringIO)
+    def test_build_pull(self, mock_stdout):
+        self.command.base_dir = 'tests/fixtures/simple-dockerfile'
+        self.command.dispatch(['build', 'simple'], None)
+
+        mock_stdout.truncate(0)
+        cache_indicator = 'Using cache'
+        pull_indicator = 'Status: Image is up to date for busybox:latest'
+        self.command.dispatch(['build', '--pull', 'simple'], None)
+        output = mock_stdout.getvalue()
+        self.assertIn(cache_indicator, output)
+        self.assertIn(pull_indicator, output)
+
+    @mock.patch('sys.stdout', new_callable=StringIO)
+    def test_build_no_cache_pull(self, mock_stdout):
+        self.command.base_dir = 'tests/fixtures/simple-dockerfile'
+        self.command.dispatch(['build', 'simple'], None)
+
+        mock_stdout.truncate(0)
+        cache_indicator = 'Using cache'
+        pull_indicator = 'Status: Image is up to date for busybox:latest'
+        self.command.dispatch(['build', '--no-cache', '--pull', 'simple'], None)
+        output = mock_stdout.getvalue()
+        self.assertNotIn(cache_indicator, output)
+        self.assertIn(pull_indicator, output)
 
     def test_up_detached(self):
         self.command.dispatch(['up', '-d'], None)

From 7c32fcbcf58831d51e1cc981e4880ee554809ddd Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 10 Sep 2015 17:49:48 -0400
Subject: [PATCH 0321/1265] Add 1.4.1 release notes and download instructions.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 CHANGELOG.md    | 16 ++++++++++++++++
 docs/install.md |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f18ddbf..a054a0ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,22 @@
 Change log
 ==========
 
+1.4.1 (2015-09-10)
+------------------
+
+The following bugs have been fixed:
+
+-   Some configuration changes (notably changes to `links`, `volumes_from`, and
+    `net`) were not properly triggering a container recreate as part of
+    `docker-compose up`.
+-   `docker-compose up <service>` was showing logs for all services instead of
+    just the specified services.
+-   Containers with custom container names were showing up in logs as
+    `service_number` instead of their custom container name.
+-   When scaling a service sometimes containers would be recreated even when
+    the configuration had not changed.
+
+
 1.4.0 (2015-08-04)
 ------------------
 
diff --git a/docs/install.md b/docs/install.md
index 371d0a90..5496db2e 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -52,7 +52,7 @@ To install Compose, do the following:
 6. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.4.0
+        docker-compose version: 1.4.1
 
 ## Upgrading
 

From bdfb21f0171ffa175be5414b192e9b88f7775d04 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 15 Sep 2015 20:46:22 -0400
Subject: [PATCH 0322/1265] Fixes #189 - stacktrace when ctrl-c stops logs

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/multiplexer.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compose/cli/multiplexer.py b/compose/cli/multiplexer.py
index b502c351..4c73c6cd 100644
--- a/compose/cli/multiplexer.py
+++ b/compose/cli/multiplexer.py
@@ -2,6 +2,8 @@ from __future__ import absolute_import
 
 from threading import Thread
 
+from six.moves import _thread as thread
+
 try:
     from Queue import Queue, Empty
 except ImportError:
@@ -38,6 +40,9 @@ class Multiplexer(object):
                     yield item
             except Empty:
                 pass
+            # See https://github.com/docker/compose/issues/189
+            except thread.error:
+                raise KeyboardInterrupt()
 
     def _init_readers(self):
         for iterator in self.iterators:

From bbc8765343f7824e2107bb78acb8814de3f1cb4e Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 16 Sep 2015 12:38:59 +0100
Subject: [PATCH 0323/1265] Fix typo in docs/index.md

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 3180d7df..0c919e48 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -139,7 +139,7 @@ This template defines two services, `web` and `redis`. The `web` service:
 
 * Builds from the `Dockerfile` in the current directory.
 * Forwards the exposed port 5000 on the container to port 5000 on the host machine.
-* Mounts the current directory on the host to ``/code` inside the container allowing you to modify the code without having to rebuild the image.
+* Mounts the current directory on the host to `/code` inside the container allowing you to modify the code without having to rebuild the image.
 * Links the web container to the Redis service.
 
 The `redis` service uses the latest public [Redis](https://registry.hub.docker.com/_/redis/) image pulled from the Docker Hub registry.

From fb83b4c6a40406c968c6c6723259e25d10cc2237 Mon Sep 17 00:00:00 2001
From: Zachary Jaffee <zjaffee@us.ibm.com>
Date: Wed, 16 Sep 2015 11:01:43 -0400
Subject: [PATCH 0324/1265] updated wordpress format syntax

Signed-off-by: Zachary Jaffee <zjaffee@us.ibm.com>
---
 docs/completion.md |  2 +-
 docs/django.md     |  2 +-
 docs/env.md        |  2 +-
 docs/extends.md    |  2 +-
 docs/index.md      |  2 +-
 docs/install.md    |  2 +-
 docs/production.md |  2 +-
 docs/rails.md      |  2 +-
 docs/wordpress.md  | 20 ++++++++++----------
 docs/yml.md        |  2 +-
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/completion.md b/docs/completion.md
index 7b8a6733..bf8d1555 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -63,7 +63,7 @@ Enjoy working with Compose faster and with less typos!
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
-- [Get started with Wordpress](wordpress.md)
+- [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
diff --git a/docs/django.md b/docs/django.md
index 7e476b35..e52f5030 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -128,7 +128,7 @@ example, run `docker-compose up` and in another terminal run:
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
-- [Get started with Wordpress](wordpress.md)
+- [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
diff --git a/docs/env.md b/docs/env.md
index 8ead34f0..a8e6e214 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -43,7 +43,7 @@ Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
-- [Get started with Wordpress](wordpress.md)
+- [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose command line completion](completion.md)
diff --git a/docs/extends.md b/docs/extends.md
index 18a072a8..7b4d5b20 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -357,7 +357,7 @@ locally-defined bindings taking precedence:
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
-- [Get started with Wordpress](wordpress.md)
+- [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose command line completion](completion.md)
diff --git a/docs/index.md b/docs/index.md
index 3180d7df..0112d0aa 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -52,7 +52,7 @@ Compose has commands for managing the whole lifecycle of your application:
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
-- [Get started with Wordpress](wordpress.md)
+- [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
diff --git a/docs/install.md b/docs/install.md
index 371d0a90..b2932467 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -96,7 +96,7 @@ To uninstall Docker Compose if you installed using `pip`:
 - [User guide](/)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
-- [Get started with Wordpress](wordpress.md)
+- [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
diff --git a/docs/production.md b/docs/production.md
index 5a3a07e8..29e3fd34 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -88,7 +88,7 @@ guide</a>.
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
-- [Get started with Wordpress](wordpress.md)
+- [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
diff --git a/docs/rails.md b/docs/rails.md
index 186f9b2b..0a164ca7 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -126,7 +126,7 @@ That's it. Your app should now be running on port 3000 on your Docker daemon. If
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
-- [Get started with Wordpress](wordpress.md)
+- [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
diff --git a/docs/wordpress.md b/docs/wordpress.md
index ab22e2a0..8de5a264 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -1,7 +1,7 @@
 <!--[metadata]>
 +++
-title = "Quickstart Guide: Compose and Wordpress"
-description = "Getting started with Compose and Wordpress"
+title = "Quickstart Guide: Compose and WordPress"
+description = "Getting started with Compose and WordPress"
 keywords = ["documentation, docs,  docker, compose, orchestration, containers"]
 [menu.main]
 parent="smn_workw_compose"
@@ -10,14 +10,14 @@ weight=6
 <![end-metadata]-->
 
 
-# Quickstart Guide: Compose and Wordpress
+# Quickstart Guide: Compose and WordPress
 
-You can use Compose to easily run Wordpress in an isolated environment built
+You can use Compose to easily run WordPress in an isolated environment built
 with Docker containers.
 
 ## Define the project
 
-First, [Install Compose](install.md) and then download Wordpress into the
+First, [Install Compose](install.md) and then download WordPress into the
 current directory:
 
     $ curl https://wordpress.org/latest.tar.gz | tar -xvzf -
@@ -36,7 +36,7 @@ your Dockerfile should be:
     ADD . /code
 
 This tells Docker how to build an image defining a container that contains PHP
-and Wordpress.
+and WordPress.
 
 Next you'll create a `docker-compose.yml` file that will start your web service
 and a separate MySQL instance:
@@ -56,7 +56,7 @@ and a separate MySQL instance:
         MYSQL_DATABASE: wordpress
 
 Two supporting files are needed to get this working - first, `wp-config.php` is
-the standard Wordpress config file with a single change to point the database
+the standard WordPress config file with a single change to point the database
 configuration at the `db` container:
 
     <?php
@@ -85,7 +85,7 @@ configuration at the `db` container:
 
     require_once(ABSPATH . 'wp-settings.php');
 
-Second, `router.php` tells PHP's built-in web server how to run Wordpress:
+Second, `router.php` tells PHP's built-in web server how to run WordPress:
 
     <?php
 
@@ -106,7 +106,7 @@ Second, `router.php` tells PHP's built-in web server how to run Wordpress:
 
 ### Build the project
 
-With those four files in place, run `docker-compose up` inside your Wordpress
+With those four files in place, run `docker-compose up` inside your WordPress
 directory and it'll pull and build the needed images, and then start the web and
 database containers. If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.
 
@@ -116,7 +116,7 @@ database containers. If you're using [Docker Machine](https://docs.docker.com/ma
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
-- [Get started with Wordpress](wordpress.md)
+- [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
diff --git a/docs/yml.md b/docs/yml.md
index 17415684..3337f915 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -444,7 +444,7 @@ dollar sign (`$$`).
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
-- [Get started with Wordpress](wordpress.md)
+- [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)

From 42c890796bca50bd8317b094dbfab1be0c2043b3 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 18 Aug 2015 16:43:19 +0100
Subject: [PATCH 0325/1265] Use docker.client.create_host_config

create_host_config from docker.utils will be deprecated so that
the new create_host_config has access to the _version so
we can ensure that network_mode only gets set to 'default' by
default if the version is high enough and won't explode.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/service.py                | 3 +--
 tests/integration/service_test.py | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 7e035e29..6d3df1f7 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -11,7 +11,6 @@ from operator import attrgetter
 import enum
 import six
 from docker.errors import APIError
-from docker.utils import create_host_config
 from docker.utils import LogConfig
 from docker.utils.ports import build_port_bindings
 from docker.utils.ports import split_port
@@ -678,7 +677,7 @@ class Service(object):
 
         devices = options.get('devices', None)
 
-        return create_host_config(
+        return self.client.create_host_config(
             links=self._get_links(link_to_self=one_off),
             port_bindings=port_bindings,
             binds=options.get('binds'),
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 17fd0aaf..040098c9 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -813,6 +813,13 @@ class ServiceTest(DockerClientTestCase):
         for k, v in {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''}.items():
             self.assertEqual(env[k], v)
 
+    def test_with_high_enough_api_version_we_get_default_network_mode(self):
+        # TODO: remove this test once minimum docker version is 1.8.x
+        with mock.patch.object(self.client, '_version', '1.20'):
+            service = self.create_service('web')
+            service_config = service._get_container_host_config({})
+            self.assertEquals(service_config['NetworkMode'], 'default')
+
     def test_labels(self):
         labels_dict = {
             'com.example.description': "Accounting webapp",

From 6f6c04b5c938a7ee510d63bb36912a2e7513cb71 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 16 Sep 2015 12:02:58 +0100
Subject: [PATCH 0326/1265] Test what we are sending, not what we get

This is a unit test and we are mocking the client. The method to get
the create_config_host now lives on the client, so we mock that too.

So we can test to the boundary that the method is called with the
arguments we expect.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/unit/service_test.py | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index de973339..7ba630fb 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -2,7 +2,6 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import docker
-from docker.utils import LogConfig
 
 from .. import mock
 from .. import unittest
@@ -108,19 +107,33 @@ class ServiceTest(unittest.TestCase):
         self.assertFalse('domainname' in opts, 'domainname')
 
     def test_memory_swap_limit(self):
+        self.mock_client.create_host_config.return_value = {}
+
         service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, mem_limit=1000000000, memswap_limit=2000000000)
-        opts = service._get_container_create_options({'some': 'overrides'}, 1)
-        self.assertEqual(opts['host_config']['MemorySwap'], 2000000000)
-        self.assertEqual(opts['host_config']['Memory'], 1000000000)
+        service._get_container_create_options({'some': 'overrides'}, 1)
+
+        self.assertTrue(self.mock_client.create_host_config.called)
+        self.assertEqual(
+            self.mock_client.create_host_config.call_args[1]['mem_limit'],
+            1000000000
+        )
+        self.assertEqual(
+            self.mock_client.create_host_config.call_args[1]['memswap_limit'],
+            2000000000
+        )
 
     def test_log_opt(self):
+        self.mock_client.create_host_config.return_value = {}
+
         log_opt = {'syslog-address': 'tcp://192.168.0.42:123'}
         service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, log_driver='syslog', log_opt=log_opt)
-        opts = service._get_container_create_options({'some': 'overrides'}, 1)
+        service._get_container_create_options({'some': 'overrides'}, 1)
 
-        self.assertIsInstance(opts['host_config']['LogConfig'], LogConfig)
-        self.assertEqual(opts['host_config']['LogConfig'].type, 'syslog')
-        self.assertEqual(opts['host_config']['LogConfig'].config, log_opt)
+        self.assertTrue(self.mock_client.create_host_config.called)
+        self.assertEqual(
+            self.mock_client.create_host_config.call_args[1]['log_config'],
+            {'Type': 'syslog', 'Config': {'syslog-address': 'tcp://192.168.0.42:123'}}
+        )
 
     def test_split_domainname_fqdn(self):
         service = Service(

From 39ba2c5a7cb5a4f7cec1e5a28bd43dc95492b22d Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 17 Sep 2015 15:33:58 +0100
Subject: [PATCH 0327/1265] Fix leaky tests

It was mocking self.client but relying on the call to
utils.create_host_config which was not mocked. So now that function
has moved to also be on self.client we need to redefine the test
boundary, up to where we would call docker-py, not the result of
docker-py.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/unit/cli_test.py     | 13 +++++++++----
 tests/unit/service_test.py | 10 +++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 1fd9f529..d12f4195 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -144,8 +144,11 @@ class CLITestCase(unittest.TestCase):
             '--rm': None,
             '--name': None,
         })
-        _, _, call_kwargs = mock_client.create_container.mock_calls[0]
-        self.assertEquals(call_kwargs['host_config']['RestartPolicy']['Name'], 'always')
+
+        self.assertEquals(
+            mock_client.create_host_config.call_args[1]['restart_policy']['Name'],
+            'always'
+        )
 
         command = TopLevelCommand()
         mock_client = mock.create_autospec(docker.Client)
@@ -170,8 +173,10 @@ class CLITestCase(unittest.TestCase):
             '--rm': True,
             '--name': None,
         })
-        _, _, call_kwargs = mock_client.create_container.mock_calls[0]
-        self.assertFalse('RestartPolicy' in call_kwargs['host_config'])
+
+        self.assertFalse(
+            mock_client.create_host_config.call_args[1].get('restart_policy')
+        )
 
     def test_command_manula_and_service_ports_together(self):
         command = TopLevelCommand()
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 7ba630fb..5f7ae948 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -543,13 +543,13 @@ class ServiceVolumesTest(unittest.TestCase):
             }
         }
 
-        create_options = service._get_container_create_options(
+        service._get_container_create_options(
             override_options={},
             number=1,
         )
 
         self.assertEqual(
-            set(create_options['host_config']['Binds']),
+            set(self.mock_client.create_host_config.call_args[1]['binds']),
             set([
                 '/host/path:/data1:rw',
                 '/host/path:/data2:rw',
@@ -581,14 +581,14 @@ class ServiceVolumesTest(unittest.TestCase):
             },
         }
 
-        create_options = service._get_container_create_options(
+        service._get_container_create_options(
             override_options={},
             number=1,
             previous_container=Container(self.mock_client, {'Id': '123123123'}),
         )
 
         self.assertEqual(
-            create_options['host_config']['Binds'],
+            self.mock_client.create_host_config.call_args[1]['binds'],
             ['/mnt/sda1/host/path:/data:rw'],
         )
 
@@ -613,4 +613,4 @@ class ServiceVolumesTest(unittest.TestCase):
         ).create_container()
 
         self.assertEqual(len(create_calls), 1)
-        self.assertEqual(create_calls[0][1]['host_config']['Binds'], volumes)
+        self.assertEqual(self.mock_client.create_host_config.call_args[1]['binds'], volumes)

From 9be748f85c208da8c90636db400e418a5b0f353b Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 14 Sep 2015 18:42:53 -0400
Subject: [PATCH 0328/1265] Clean before doing a build so that we don't include
 stale build artifacts in the binaries.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/build-linux | 2 ++
 script/build-osx   | 2 ++
 script/clean       | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/script/build-linux b/script/build-linux
index 4fdf1d92..7d89bd1e 100755
--- a/script/build-linux
+++ b/script/build-linux
@@ -2,6 +2,8 @@
 
 set -ex
 
+./script/clean
+
 TAG="docker-compose"
 docker build -t "$TAG" .
 docker run \
diff --git a/script/build-osx b/script/build-osx
index e1cc7038..11b6ecc6 100755
--- a/script/build-osx
+++ b/script/build-osx
@@ -3,7 +3,9 @@ set -ex
 
 PATH="/usr/local/bin:$PATH"
 
+./script/clean
 rm -rf venv
+
 virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
 venv/bin/pip install -r requirements-build.txt
diff --git a/script/clean b/script/clean
index 07a9cff1..08ba551a 100755
--- a/script/clean
+++ b/script/clean
@@ -1,3 +1,6 @@
 #!/bin/sh
+set -e
+
 find . -type f -name '*.pyc' -delete
+find -name __pycache__ -delete
 rm -rf docs/_site build dist docker-compose.egg-info

From 2121f5117ea035c83d4ace97fad8f2db6582afc9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 11 Sep 2015 18:20:35 -0400
Subject: [PATCH 0329/1265] Add docopt support for multiple files

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 61461ae7..3dd0c9fa 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -96,7 +96,7 @@ class TopLevelCommand(Command):
     """Define and run multi-container applications with Docker.
 
     Usage:
-      docker-compose [options] [COMMAND] [ARGS...]
+      docker-compose [-f=<arg>...] [options] [COMMAND] [ARGS...]
       docker-compose -h|--help
 
     Options:

From 258d0fa0c660813d8b6b3d8d17731cc56a5da321 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 11 Sep 2015 19:51:50 -0400
Subject: [PATCH 0330/1265] Remove some functions from Command class

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/command.py | 82 +++++++++++++++++++++++-------------------
 tests/unit/cli_test.py | 39 +++++++++-----------
 2 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 67176df2..70b129d2 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -55,53 +55,61 @@ class Command(DocoptCommand):
             log.warn('The FIG_FILE environment variable is deprecated.')
             log.warn('Please use COMPOSE_FILE instead.')
 
-        explicit_config_path = options.get('--file') or os.environ.get('COMPOSE_FILE') or os.environ.get('FIG_FILE')
-        project = self.get_project(
+        explicit_config_path = (
+            options.get('--file') or
+            os.environ.get('COMPOSE_FILE') or
+            os.environ.get('FIG_FILE'))
+
+        project = get_project(
+            self.base_dir,
             explicit_config_path,
             project_name=options.get('--project-name'),
             verbose=options.get('--verbose'))
 
         handler(project, command_options)
 
-    def get_client(self, verbose=False):
-        client = docker_client()
-        if verbose:
-            version_info = six.iteritems(client.version())
-            log.info("Compose version %s", __version__)
-            log.info("Docker base_url: %s", client.base_url)
-            log.info("Docker version: %s",
-                     ", ".join("%s=%s" % item for item in version_info))
-            return verbose_proxy.VerboseProxy('docker', client)
-        return client
 
-    def get_project(self, config_path=None, project_name=None, verbose=False):
-        config_details = config.find(self.base_dir, config_path)
+def get_client(verbose=False):
+    client = docker_client()
+    if verbose:
+        version_info = six.iteritems(client.version())
+        log.info("Compose version %s", __version__)
+        log.info("Docker base_url: %s", client.base_url)
+        log.info("Docker version: %s",
+                 ", ".join("%s=%s" % item for item in version_info))
+        return verbose_proxy.VerboseProxy('docker', client)
+    return client
 
-        try:
-            return Project.from_dicts(
-                self.get_project_name(config_details.working_dir, project_name),
-                config.load(config_details),
-                self.get_client(verbose=verbose))
-        except ConfigError as e:
-            raise errors.UserError(six.text_type(e))
 
-    def get_project_name(self, working_dir, project_name=None):
-        def normalize_name(name):
-            return re.sub(r'[^a-z0-9]', '', name.lower())
+def get_project(base_dir, config_path=None, project_name=None, verbose=False):
+    config_details = config.find(base_dir, config_path)
 
-        if 'FIG_PROJECT_NAME' in os.environ:
-            log.warn('The FIG_PROJECT_NAME environment variable is deprecated.')
-            log.warn('Please use COMPOSE_PROJECT_NAME instead.')
+    try:
+        return Project.from_dicts(
+            get_project_name(config_details.working_dir, project_name),
+            config.load(config_details),
+            get_client(verbose=verbose))
+    except ConfigError as e:
+        raise errors.UserError(six.text_type(e))
 
-        project_name = (
-            project_name or
-            os.environ.get('COMPOSE_PROJECT_NAME') or
-            os.environ.get('FIG_PROJECT_NAME'))
-        if project_name is not None:
-            return normalize_name(project_name)
 
-        project = os.path.basename(os.path.abspath(working_dir))
-        if project:
-            return normalize_name(project)
+def get_project_name(working_dir, project_name=None):
+    def normalize_name(name):
+        return re.sub(r'[^a-z0-9]', '', name.lower())
 
-        return 'default'
+    if 'FIG_PROJECT_NAME' in os.environ:
+        log.warn('The FIG_PROJECT_NAME environment variable is deprecated.')
+        log.warn('Please use COMPOSE_PROJECT_NAME instead.')
+
+    project_name = (
+        project_name or
+        os.environ.get('COMPOSE_PROJECT_NAME') or
+        os.environ.get('FIG_PROJECT_NAME'))
+    if project_name is not None:
+        return normalize_name(project_name)
+
+    project = os.path.basename(os.path.abspath(working_dir))
+    if project:
+        return normalize_name(project)
+
+    return 'default'
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index d12f4195..321df97a 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -4,9 +4,12 @@ from __future__ import unicode_literals
 import os
 
 import docker
+import py
 
 from .. import mock
 from .. import unittest
+from compose.cli.command import get_project
+from compose.cli.command import get_project_name
 from compose.cli.docopt_command import NoSuchCommand
 from compose.cli.errors import UserError
 from compose.cli.main import TopLevelCommand
@@ -14,55 +17,45 @@ from compose.service import Service
 
 
 class CLITestCase(unittest.TestCase):
-    def test_default_project_name(self):
-        cwd = os.getcwd()
 
-        try:
-            os.chdir('tests/fixtures/simple-composefile')
-            command = TopLevelCommand()
-            project_name = command.get_project_name('.')
+    def test_default_project_name(self):
+        test_dir = py._path.local.LocalPath('tests/fixtures/simple-composefile')
+        with test_dir.as_cwd():
+            project_name = get_project_name('.')
             self.assertEquals('simplecomposefile', project_name)
-        finally:
-            os.chdir(cwd)
 
     def test_project_name_with_explicit_base_dir(self):
-        command = TopLevelCommand()
-        command.base_dir = 'tests/fixtures/simple-composefile'
-        project_name = command.get_project_name(command.base_dir)
+        base_dir = 'tests/fixtures/simple-composefile'
+        project_name = get_project_name(base_dir)
         self.assertEquals('simplecomposefile', project_name)
 
     def test_project_name_with_explicit_uppercase_base_dir(self):
-        command = TopLevelCommand()
-        command.base_dir = 'tests/fixtures/UpperCaseDir'
-        project_name = command.get_project_name(command.base_dir)
+        base_dir = 'tests/fixtures/UpperCaseDir'
+        project_name = get_project_name(base_dir)
         self.assertEquals('uppercasedir', project_name)
 
     def test_project_name_with_explicit_project_name(self):
-        command = TopLevelCommand()
         name = 'explicit-project-name'
-        project_name = command.get_project_name(None, project_name=name)
+        project_name = get_project_name(None, project_name=name)
         self.assertEquals('explicitprojectname', project_name)
 
     def test_project_name_from_environment_old_var(self):
-        command = TopLevelCommand()
         name = 'namefromenv'
         with mock.patch.dict(os.environ):
             os.environ['FIG_PROJECT_NAME'] = name
-            project_name = command.get_project_name(None)
+            project_name = get_project_name(None)
         self.assertEquals(project_name, name)
 
     def test_project_name_from_environment_new_var(self):
-        command = TopLevelCommand()
         name = 'namefromenv'
         with mock.patch.dict(os.environ):
             os.environ['COMPOSE_PROJECT_NAME'] = name
-            project_name = command.get_project_name(None)
+            project_name = get_project_name(None)
         self.assertEquals(project_name, name)
 
     def test_get_project(self):
-        command = TopLevelCommand()
-        command.base_dir = 'tests/fixtures/longer-filename-composefile'
-        project = command.get_project()
+        base_dir = 'tests/fixtures/longer-filename-composefile'
+        project = get_project(base_dir)
         self.assertEqual(project.name, 'longerfilenamecomposefile')
         self.assertTrue(project.client)
         self.assertTrue(project.services)

From 10b3188214fc6716387339bb0146d8d901962e93 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 11 Sep 2015 20:18:45 -0400
Subject: [PATCH 0331/1265] Support multiple config files

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/command.py    | 22 +++++----
 compose/config/config.py  | 66 +++++++++++++++++----------
 tests/unit/config_test.py | 96 +++++++++++++++++++++------------------
 3 files changed, 105 insertions(+), 79 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 70b129d2..2120ec4d 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -51,24 +51,26 @@ class Command(DocoptCommand):
             handler(None, command_options)
             return
 
-        if 'FIG_FILE' in os.environ:
-            log.warn('The FIG_FILE environment variable is deprecated.')
-            log.warn('Please use COMPOSE_FILE instead.')
-
-        explicit_config_path = (
-            options.get('--file') or
-            os.environ.get('COMPOSE_FILE') or
-            os.environ.get('FIG_FILE'))
-
         project = get_project(
             self.base_dir,
-            explicit_config_path,
+            get_config_path(options.get('--file')),
             project_name=options.get('--project-name'),
             verbose=options.get('--verbose'))
 
         handler(project, command_options)
 
 
+def get_config_path(file_option):
+    if file_option:
+        return file_option
+
+    if 'FIG_FILE' in os.environ:
+        log.warn('The FIG_FILE environment variable is deprecated.')
+        log.warn('Please use COMPOSE_FILE instead.')
+
+    return [os.environ.get('COMPOSE_FILE') or os.environ.get('FIG_FILE')]
+
+
 def get_client(verbose=False):
     client = docker_client()
     if verbose:
diff --git a/compose/config/config.py b/compose/config/config.py
index 840a28a1..204f70b6 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -2,6 +2,7 @@ import logging
 import os
 import sys
 from collections import namedtuple
+from functools import reduce
 
 import six
 import yaml
@@ -88,18 +89,24 @@ PATH_START_CHARS = [
 log = logging.getLogger(__name__)
 
 
-ConfigDetails = namedtuple('ConfigDetails', 'config working_dir filename')
+ConfigDetails = namedtuple('ConfigDetails', 'working_dir configs')
+
+ConfigFile = namedtuple('ConfigFile', 'filename config')
 
 
-def find(base_dir, filename):
-    if filename == '-':
-        return ConfigDetails(yaml.safe_load(sys.stdin), os.getcwd(), None)
+def find(base_dir, filenames):
+    if filenames == ['-']:
+        return ConfigDetails(
+            os.getcwd(),
+            [ConfigFile(None, yaml.safe_load(sys.stdin))])
 
-    if filename:
-        filename = os.path.join(base_dir, filename)
+    if filenames:
+        filenames = [os.path.join(base_dir, f) for f in filenames]
     else:
-        filename = get_config_path(base_dir)
-    return ConfigDetails(load_yaml(filename), os.path.dirname(filename), filename)
+        filenames = [get_config_path(base_dir)]
+    return ConfigDetails(
+        os.path.dirname(filenames[0]),
+        [ConfigFile(f, load_yaml(f)) for f in filenames])
 
 
 def get_config_path(base_dir):
@@ -133,29 +140,40 @@ def pre_process_config(config):
     Pre validation checks and processing of the config file to interpolate env
     vars returning a config dict ready to be tested against the schema.
     """
-    config = interpolate_environment_variables(config)
-    return config
+    return interpolate_environment_variables(config)
 
 
 def load(config_details):
-    config, working_dir, filename = config_details
+    working_dir, configs = config_details
 
-    processed_config = pre_process_config(config)
-    validate_against_fields_schema(processed_config)
-
-    service_dicts = []
-
-    for service_name, service_dict in list(processed_config.items()):
-        loader = ServiceLoader(
-            working_dir=working_dir,
-            filename=filename,
-            service_name=service_name,
-            service_dict=service_dict)
+    def build_service(filename, service_name, service_dict):
+        loader = ServiceLoader(working_dir, filename, service_name, service_dict)
         service_dict = loader.make_service_dict()
         validate_paths(service_dict)
-        service_dicts.append(service_dict)
+        return service_dict
 
-    return service_dicts
+    def load_file(filename, config):
+        processed_config = pre_process_config(config)
+        validate_against_fields_schema(processed_config)
+        return [
+            build_service(filename, name, service_config)
+            for name, service_config in processed_config.items()
+        ]
+
+    def merge_services(base, override):
+        return {
+            name: merge_service_dicts(base.get(name, {}), override.get(name, {}))
+            for name in set(base) | set(override)
+        }
+
+    def combine_configs(override, base):
+        service_dicts = load_file(base.filename, base.config)
+        if not override:
+            return service_dicts
+
+        return merge_service_dicts(base.config, override.config)
+
+    return reduce(combine_configs, configs, None)
 
 
 class ServiceLoader(object):
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index ff80270e..0347e443 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -26,10 +26,16 @@ def service_sort(services):
     return sorted(services, key=itemgetter('name'))
 
 
+def build_config_details(contents, working_dir, filename):
+    return config.ConfigDetails(
+        working_dir,
+        [config.ConfigFile(filename, contents)])
+
+
 class ConfigTest(unittest.TestCase):
     def test_load(self):
         service_dicts = config.load(
-            config.ConfigDetails(
+            build_config_details(
                 {
                     'foo': {'image': 'busybox'},
                     'bar': {'image': 'busybox', 'environment': ['FOO=1']},
@@ -57,7 +63,7 @@ class ConfigTest(unittest.TestCase):
     def test_load_throws_error_when_not_dict(self):
         with self.assertRaises(ConfigurationError):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {'web': 'busybox:latest'},
                     'working_dir',
                     'filename.yml'
@@ -68,7 +74,7 @@ class ConfigTest(unittest.TestCase):
         with self.assertRaises(ConfigurationError):
             for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
                 config.load(
-                    config.ConfigDetails(
+                    build_config_details(
                         {invalid_name: {'image': 'busybox'}},
                         'working_dir',
                         'filename.yml'
@@ -79,7 +85,7 @@ class ConfigTest(unittest.TestCase):
         expected_error_msg = "Service name: 1 needs to be a string, eg '1'"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {1: {'image': 'busybox'}},
                     'working_dir',
                     'filename.yml'
@@ -89,7 +95,7 @@ class ConfigTest(unittest.TestCase):
     def test_config_valid_service_names(self):
         for valid_name in ['_', '-', '.__.', '_what-up.', 'what_.up----', 'whatup']:
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {valid_name: {'image': 'busybox'}},
                     'tests/fixtures/extends',
                     'common.yml'
@@ -101,7 +107,7 @@ class ConfigTest(unittest.TestCase):
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             for invalid_ports in [{"1": "8000"}, False, 0, "8000", 8000, ["8000", "8000"]]:
                 config.load(
-                    config.ConfigDetails(
+                    build_config_details(
                         {'web': {'image': 'busybox', 'ports': invalid_ports}},
                         'working_dir',
                         'filename.yml'
@@ -112,7 +118,7 @@ class ConfigTest(unittest.TestCase):
         valid_ports = [["8000", "9000"], ["8000/8050"], ["8000"], [8000], ["49153-49154:3002-3003"]]
         for ports in valid_ports:
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {'web': {'image': 'busybox', 'ports': ports}},
                     'working_dir',
                     'filename.yml'
@@ -123,7 +129,7 @@ class ConfigTest(unittest.TestCase):
         expected_error_msg = "(did you mean 'privileged'?)"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {
                         'foo': {'image': 'busybox', 'privilige': 'something'},
                     },
@@ -136,7 +142,7 @@ class ConfigTest(unittest.TestCase):
         expected_error_msg = "Service 'foo' has both an image and build path specified."
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {
                         'foo': {'image': 'busybox', 'build': '.'},
                     },
@@ -149,7 +155,7 @@ class ConfigTest(unittest.TestCase):
         expected_error_msg = "Service 'foo' configuration key 'links' contains an invalid type, it should be an array"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {
                         'foo': {'image': 'busybox', 'links': 'an_link'},
                     },
@@ -162,7 +168,7 @@ class ConfigTest(unittest.TestCase):
         expected_error_msg = "Top level object needs to be a dictionary."
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     ['foo', 'lol'],
                     'tests/fixtures/extends',
                     'filename.yml'
@@ -173,7 +179,7 @@ class ConfigTest(unittest.TestCase):
         expected_error_msg = "has non-unique elements"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {
                         'web': {'build': '.', 'devices': ['/dev/foo:/dev/foo', '/dev/foo:/dev/foo']}
                     },
@@ -187,7 +193,7 @@ class ConfigTest(unittest.TestCase):
         expected_error_msg += ", which is an invalid type, it should be a string"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {
                         'web': {'build': '.', 'command': [1]}
                     },
@@ -200,7 +206,7 @@ class ConfigTest(unittest.TestCase):
         expected_error_msg = "Service 'web' has both an image and alternate Dockerfile."
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {'web': {'image': 'busybox', 'dockerfile': 'Dockerfile.alt'}},
                     'working_dir',
                     'filename.yml'
@@ -212,7 +218,7 @@ class ConfigTest(unittest.TestCase):
 
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {'web': {
                         'image': 'busybox',
                         'extra_hosts': 'somehost:162.242.195.82'
@@ -227,7 +233,7 @@ class ConfigTest(unittest.TestCase):
 
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {'web': {
                         'image': 'busybox',
                         'extra_hosts': [
@@ -244,7 +250,7 @@ class ConfigTest(unittest.TestCase):
         expose_values = [["8000"], [8000]]
         for expose in expose_values:
             service = config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {'web': {
                         'image': 'busybox',
                         'expose': expose
@@ -259,7 +265,7 @@ class ConfigTest(unittest.TestCase):
         entrypoint_values = [["sh"], "sh"]
         for entrypoint in entrypoint_values:
             service = config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {'web': {
                         'image': 'busybox',
                         'entrypoint': entrypoint
@@ -331,16 +337,16 @@ class InterpolationTest(unittest.TestCase):
     def test_unset_variable_produces_warning(self):
         os.environ.pop('FOO', None)
         os.environ.pop('BAR', None)
-        config_details = config.ConfigDetails(
-            config={
+        config_details = build_config_details(
+            {
                 'web': {
                     'image': '${FOO}',
                     'command': '${BAR}',
                     'container_name': '${BAR}',
                 },
             },
-            working_dir='.',
-            filename=None,
+            '.',
+            None,
         )
 
         with mock.patch('compose.config.interpolation.log') as log:
@@ -355,7 +361,7 @@ class InterpolationTest(unittest.TestCase):
     def test_invalid_interpolation(self):
         with self.assertRaises(config.ConfigurationError) as cm:
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {'web': {'image': '${'}},
                     'working_dir',
                     'filename.yml'
@@ -371,10 +377,10 @@ class InterpolationTest(unittest.TestCase):
     def test_volume_binding_with_environment_variable(self):
         os.environ['VOLUME_PATH'] = '/host/path'
         d = config.load(
-            config.ConfigDetails(
-                config={'foo': {'build': '.', 'volumes': ['${VOLUME_PATH}:/container/path']}},
-                working_dir='.',
-                filename=None,
+            build_config_details(
+                {'foo': {'build': '.', 'volumes': ['${VOLUME_PATH}:/container/path']}},
+                '.',
+                None,
             )
         )[0]
         self.assertEqual(d['volumes'], ['/host/path:/container/path'])
@@ -649,7 +655,7 @@ class MemoryOptionsTest(unittest.TestCase):
         )
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {
                         'foo': {'image': 'busybox', 'memswap_limit': 2000000},
                     },
@@ -660,7 +666,7 @@ class MemoryOptionsTest(unittest.TestCase):
 
     def test_validation_with_correct_memswap_values(self):
         service_dict = config.load(
-            config.ConfigDetails(
+            build_config_details(
                 {'foo': {'image': 'busybox', 'mem_limit': 1000000, 'memswap_limit': 2000000}},
                 'tests/fixtures/extends',
                 'common.yml'
@@ -670,7 +676,7 @@ class MemoryOptionsTest(unittest.TestCase):
 
     def test_memswap_can_be_a_string(self):
         service_dict = config.load(
-            config.ConfigDetails(
+            build_config_details(
                 {'foo': {'image': 'busybox', 'mem_limit': "1G", 'memswap_limit': "512M"}},
                 'tests/fixtures/extends',
                 'common.yml'
@@ -780,26 +786,26 @@ class EnvTest(unittest.TestCase):
         os.environ['CONTAINERENV'] = '/host/tmp'
 
         service_dict = config.load(
-            config.ConfigDetails(
-                config={'foo': {'build': '.', 'volumes': ['$HOSTENV:$CONTAINERENV']}},
-                working_dir="tests/fixtures/env",
-                filename=None,
+            build_config_details(
+                {'foo': {'build': '.', 'volumes': ['$HOSTENV:$CONTAINERENV']}},
+                "tests/fixtures/env",
+                None,
             )
         )[0]
         self.assertEqual(set(service_dict['volumes']), set(['/tmp:/host/tmp']))
 
         service_dict = config.load(
-            config.ConfigDetails(
-                config={'foo': {'build': '.', 'volumes': ['/opt${HOSTENV}:/opt${CONTAINERENV}']}},
-                working_dir="tests/fixtures/env",
-                filename=None,
+            build_config_details(
+                {'foo': {'build': '.', 'volumes': ['/opt${HOSTENV}:/opt${CONTAINERENV}']}},
+                "tests/fixtures/env",
+                None,
             )
         )[0]
         self.assertEqual(set(service_dict['volumes']), set(['/opt/tmp:/opt/host/tmp']))
 
 
 def load_from_filename(filename):
-    return config.load(config.find('.', filename))
+    return config.load(config.find('.', [filename]))
 
 
 class ExtendsTest(unittest.TestCase):
@@ -885,7 +891,7 @@ class ExtendsTest(unittest.TestCase):
     def test_extends_validation_empty_dictionary(self):
         with self.assertRaisesRegexp(ConfigurationError, 'service'):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {
                         'web': {'image': 'busybox', 'extends': {}},
                     },
@@ -897,7 +903,7 @@ class ExtendsTest(unittest.TestCase):
     def test_extends_validation_missing_service_key(self):
         with self.assertRaisesRegexp(ConfigurationError, "'service' is a required property"):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {
                         'web': {'image': 'busybox', 'extends': {'file': 'common.yml'}},
                     },
@@ -910,7 +916,7 @@ class ExtendsTest(unittest.TestCase):
         expected_error_msg = "Unsupported config option for 'web' service: 'rogue_key'"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {
                         'web': {
                             'image': 'busybox',
@@ -930,7 +936,7 @@ class ExtendsTest(unittest.TestCase):
         expected_error_msg = "Service 'web' configuration key 'extends' 'file' contains an invalid type"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {
                         'web': {
                             'image': 'busybox',
@@ -955,7 +961,7 @@ class ExtendsTest(unittest.TestCase):
 
     def test_extends_validation_valid_config(self):
         service = config.load(
-            config.ConfigDetails(
+            build_config_details(
                 {
                     'web': {'image': 'busybox', 'extends': {'service': 'web', 'file': 'common.yml'}},
                 },
@@ -1093,7 +1099,7 @@ class BuildPathTest(unittest.TestCase):
     def test_nonexistent_path(self):
         with self.assertRaises(ConfigurationError):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {
                         'foo': {'build': 'nonexistent.path'},
                     },

From c0c9a7c1e4d22980afb6e22817a960f7424f0eae Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 11 Sep 2015 20:50:31 -0400
Subject: [PATCH 0332/1265] Update integration tests for multiple file support

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/command.py            | 3 ++-
 tests/integration/cli_test.py     | 7 ++++---
 tests/integration/project_test.py | 7 +++++--
 tests/integration/state_test.py   | 8 +++++---
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 2120ec4d..950cb166 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -68,7 +68,8 @@ def get_config_path(file_option):
         log.warn('The FIG_FILE environment variable is deprecated.')
         log.warn('Please use COMPOSE_FILE instead.')
 
-    return [os.environ.get('COMPOSE_FILE') or os.environ.get('FIG_FILE')]
+    config_file = os.environ.get('COMPOSE_FILE') or os.environ.get('FIG_FILE')
+    return [config_file] if config_file else None
 
 
 def get_client(verbose=False):
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 4a80d336..8688fb8b 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -9,6 +9,7 @@ from six import StringIO
 
 from .. import mock
 from .testcases import DockerClientTestCase
+from compose.cli.command import get_project
 from compose.cli.errors import UserError
 from compose.cli.main import TopLevelCommand
 from compose.project import NoSuchService
@@ -38,7 +39,7 @@ class CLITestCase(DockerClientTestCase):
         if hasattr(self, '_project'):
             return self._project
 
-        return self.command.get_project()
+        return get_project(self.command.base_dir)
 
     def test_help(self):
         old_base_dir = self.command.base_dir
@@ -72,7 +73,7 @@ class CLITestCase(DockerClientTestCase):
     def test_ps_alternate_composefile(self, mock_stdout):
         config_path = os.path.abspath(
             'tests/fixtures/multiple-composefiles/compose2.yml')
-        self._project = self.command.get_project(config_path)
+        self._project = get_project(self.command.base_dir, [config_path])
 
         self.command.base_dir = 'tests/fixtures/multiple-composefiles'
         self.command.dispatch(['-f', 'compose2.yml', 'up', '-d'], None)
@@ -571,7 +572,7 @@ class CLITestCase(DockerClientTestCase):
     def test_env_file_relative_to_compose_file(self):
         config_path = os.path.abspath('tests/fixtures/env-file/docker-compose.yml')
         self.command.dispatch(['-f', config_path, 'up', '-d'], None)
-        self._project = self.command.get_project(config_path)
+        self._project = get_project(self.command.base_dir, [config_path])
 
         containers = self.project.containers(stopped=True)
         self.assertEqual(len(containers), 1)
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index ad49ad10..bd7ecccb 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
 from .testcases import DockerClientTestCase
-from compose import config
+from compose.config import config
 from compose.const import LABEL_PROJECT
 from compose.container import Container
 from compose.project import Project
@@ -9,7 +9,10 @@ from compose.service import ConvergenceStrategy
 
 
 def build_service_dicts(service_config):
-    return config.load(config.ConfigDetails(service_config, 'working_dir', None))
+    return config.load(
+        config.ConfigDetails(
+            'working_dir',
+            [config.ConfigFile(None, service_config)]))
 
 
 class ProjectTest(DockerClientTestCase):
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index 93d0572a..ef7276bd 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -9,7 +9,7 @@ import shutil
 import tempfile
 
 from .testcases import DockerClientTestCase
-from compose import config
+from compose.config import config
 from compose.const import LABEL_CONFIG_HASH
 from compose.project import Project
 from compose.service import ConvergenceStrategy
@@ -24,11 +24,13 @@ class ProjectTestCase(DockerClientTestCase):
         return set(project.containers(stopped=True))
 
     def make_project(self, cfg):
+        details = config.ConfigDetails(
+            'working_dir',
+            [config.ConfigFile(None, cfg)])
         return Project.from_dicts(
             name='composetest',
             client=self.client,
-            service_dicts=config.load(config.ConfigDetails(cfg, 'working_dir', None))
-        )
+            service_dicts=config.load(details))
 
 
 class BasicProjectTest(ProjectTestCase):

From 831276f53163c0999ec635d92629e6e1b4ba2683 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 14 Sep 2015 21:30:32 -0400
Subject: [PATCH 0333/1265] Move config_test to the correct package name.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/unit/config/__init__.py          | 0
 tests/unit/{ => config}/config_test.py | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 tests/unit/config/__init__.py
 rename tests/unit/{ => config}/config_test.py (99%)

diff --git a/tests/unit/config/__init__.py b/tests/unit/config/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/unit/config_test.py b/tests/unit/config/config_test.py
similarity index 99%
rename from tests/unit/config_test.py
rename to tests/unit/config/config_test.py
index 0347e443..3542f272 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -280,7 +280,7 @@ class ConfigTest(unittest.TestCase):
     def test_logs_warning_for_boolean_in_environment(self, mock_logging):
         expected_warning_msg = "Warning: There is a boolean value, True in the 'environment' key."
         config.load(
-            config.ConfigDetails(
+            build_config_details(
                 {'web': {
                     'image': 'busybox',
                     'environment': {'SHOW_STUFF': True}
@@ -298,7 +298,7 @@ class ConfigTest(unittest.TestCase):
 
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
-                config.ConfigDetails(
+                build_config_details(
                     {'web': {
                         'image': 'busybox',
                         'environment': {'---': 'nope'}

From 89be7f1fa76f53dbc082715eadec65e08f992e8a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 14 Sep 2015 21:35:41 -0400
Subject: [PATCH 0334/1265] Unit tests for multiple files

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         |  8 ++++---
 tests/unit/config/config_test.py | 41 ++++++++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 204f70b6..058183d9 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -166,14 +166,16 @@ def load(config_details):
             for name in set(base) | set(override)
         }
 
-    def combine_configs(override, base):
+    def combine_configs(base, override):
         service_dicts = load_file(base.filename, base.config)
         if not override:
             return service_dicts
 
-        return merge_service_dicts(base.config, override.config)
+        return ConfigFile(
+            override.filename,
+            merge_services(base.config, override.config))
 
-    return reduce(combine_configs, configs, None)
+    return reduce(combine_configs, configs + [None])
 
 
 class ServiceLoader(object):
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 3542f272..60f4bbe2 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -5,10 +5,10 @@ import shutil
 import tempfile
 from operator import itemgetter
 
-from .. import mock
-from .. import unittest
 from compose.config import config
 from compose.config.errors import ConfigurationError
+from tests import mock
+from tests import unittest
 
 
 def make_service_dict(name, service_dict, working_dir, filename=None):
@@ -92,6 +92,43 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_load_with_multiple_files(self):
+        base_file = config.ConfigFile(
+            'base.yaml',
+            {
+                'web': {
+                    'image': 'example/web',
+                    'links': ['db'],
+                },
+                'db': {
+                    'image': 'example/db',
+                },
+            })
+        override_file = config.ConfigFile(
+            'override.yaml',
+            {
+                'web': {
+                    'build': '/',
+                    'volumes': ['/home/user/project:/code'],
+                },
+            })
+        details = config.ConfigDetails('.', [base_file, override_file])
+
+        service_dicts = config.load(details)
+        expected = [
+            {
+                'name': 'web',
+                'build': '/',
+                'links': ['db'],
+                'volumes': ['/home/user/project:/code'],
+            },
+            {
+                'name': 'db',
+                'image': 'example/db',
+            },
+        ]
+        self.assertEqual(service_sort(service_dicts), service_sort(expected))
+
     def test_config_valid_service_names(self):
         for valid_name in ['_', '-', '.__.', '_what-up.', 'what_.up----', 'whatup']:
             config.load(

From fe5daf860dfb341ba894d79d225689ed2e981064 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 15 Sep 2015 14:17:27 -0400
Subject: [PATCH 0335/1265] Move find_candidates_in_parent_dirs() into a config
 module so that config doesn't import from cli.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/utils.py     | 19 -------------------
 compose/config/config.py | 24 +++++++++++++++++++++---
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index 0b7ac683..0a4416c0 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -36,25 +36,6 @@ def yesno(prompt, default=None):
         return None
 
 
-def find_candidates_in_parent_dirs(filenames, path):
-    """
-    Given a directory path to start, looks for filenames in the
-    directory, and then each parent directory successively,
-    until found.
-
-    Returns tuple (candidates, path).
-    """
-    candidates = [filename for filename in filenames
-                  if os.path.exists(os.path.join(path, filename))]
-
-    if len(candidates) == 0:
-        parent_dir = os.path.join(path, '..')
-        if os.path.abspath(parent_dir) != os.path.abspath(path):
-            return find_candidates_in_parent_dirs(filenames, parent_dir)
-
-    return (candidates, path)
-
-
 def split_buffer(reader, separator):
     """
     Given a generator which yields strings and a separator string,
diff --git a/compose/config/config.py b/compose/config/config.py
index 058183d9..2e4d0a75 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -17,7 +17,6 @@ from .validation import validate_extended_service_exists
 from .validation import validate_extends_file_path
 from .validation import validate_service_names
 from .validation import validate_top_level_object
-from compose.cli.utils import find_candidates_in_parent_dirs
 
 
 DOCKER_CONFIG_KEYS = [
@@ -103,13 +102,13 @@ def find(base_dir, filenames):
     if filenames:
         filenames = [os.path.join(base_dir, f) for f in filenames]
     else:
-        filenames = [get_config_path(base_dir)]
+        filenames = get_default_config_path(base_dir)
     return ConfigDetails(
         os.path.dirname(filenames[0]),
         [ConfigFile(f, load_yaml(f)) for f in filenames])
 
 
-def get_config_path(base_dir):
+def get_default_config_path(base_dir):
     (candidates, path) = find_candidates_in_parent_dirs(SUPPORTED_FILENAMES, base_dir)
 
     if len(candidates) == 0:
@@ -133,6 +132,25 @@ def get_config_path(base_dir):
     return os.path.join(path, winner)
 
 
+def find_candidates_in_parent_dirs(filenames, path):
+    """
+    Given a directory path to start, looks for filenames in the
+    directory, and then each parent directory successively,
+    until found.
+
+    Returns tuple (candidates, path).
+    """
+    candidates = [filename for filename in filenames
+                  if os.path.exists(os.path.join(path, filename))]
+
+    if len(candidates) == 0:
+        parent_dir = os.path.join(path, '..')
+        if os.path.abspath(parent_dir) != os.path.abspath(path):
+            return find_candidates_in_parent_dirs(filenames, parent_dir)
+
+    return (candidates, path)
+
+
 @validate_top_level_object
 @validate_service_names
 def pre_process_config(config):

From 39ae85db8ad4aa6429d6c4863d67b21d1c93aac7 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 15 Sep 2015 14:43:18 -0400
Subject: [PATCH 0336/1265] Support a default docker-compose.override.yml for
 overrides

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py                      | 16 +++++---
 .../docker-compose.override.yml               |  6 +++
 .../override-files/docker-compose.yml         | 10 +++++
 tests/fixtures/override-files/extra.yml       |  9 +++++
 tests/integration/cli_test.py                 | 39 ++++++++++++++++++-
 tests/unit/config/config_test.py              |  3 +-
 6 files changed, 76 insertions(+), 7 deletions(-)
 create mode 100644 tests/fixtures/override-files/docker-compose.override.yml
 create mode 100644 tests/fixtures/override-files/docker-compose.yml
 create mode 100644 tests/fixtures/override-files/extra.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 2e4d0a75..3ecdd29d 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -77,6 +77,7 @@ SUPPORTED_FILENAMES = [
     'fig.yaml',
 ]
 
+DEFAULT_OVERRIDE_FILENAME = 'docker-compose.override.yml'
 
 PATH_START_CHARS = [
     '/',
@@ -102,16 +103,16 @@ def find(base_dir, filenames):
     if filenames:
         filenames = [os.path.join(base_dir, f) for f in filenames]
     else:
-        filenames = get_default_config_path(base_dir)
+        filenames = get_default_config_files(base_dir)
     return ConfigDetails(
         os.path.dirname(filenames[0]),
         [ConfigFile(f, load_yaml(f)) for f in filenames])
 
 
-def get_default_config_path(base_dir):
+def get_default_config_files(base_dir):
     (candidates, path) = find_candidates_in_parent_dirs(SUPPORTED_FILENAMES, base_dir)
 
-    if len(candidates) == 0:
+    if not candidates:
         raise ComposeFileNotFound(SUPPORTED_FILENAMES)
 
     winner = candidates[0]
@@ -129,7 +130,12 @@ def get_default_config_path(base_dir):
         log.warn("%s is deprecated and will not be supported in future. "
                  "Please rename your config file to docker-compose.yml\n" % winner)
 
-    return os.path.join(path, winner)
+    return [os.path.join(path, winner)] + get_default_override_file(path)
+
+
+def get_default_override_file(path):
+    override_filename = os.path.join(path, DEFAULT_OVERRIDE_FILENAME)
+    return [override_filename] if os.path.exists(override_filename) else []
 
 
 def find_candidates_in_parent_dirs(filenames, path):
@@ -143,7 +149,7 @@ def find_candidates_in_parent_dirs(filenames, path):
     candidates = [filename for filename in filenames
                   if os.path.exists(os.path.join(path, filename))]
 
-    if len(candidates) == 0:
+    if not candidates:
         parent_dir = os.path.join(path, '..')
         if os.path.abspath(parent_dir) != os.path.abspath(path):
             return find_candidates_in_parent_dirs(filenames, parent_dir)
diff --git a/tests/fixtures/override-files/docker-compose.override.yml b/tests/fixtures/override-files/docker-compose.override.yml
new file mode 100644
index 00000000..a03d3d6f
--- /dev/null
+++ b/tests/fixtures/override-files/docker-compose.override.yml
@@ -0,0 +1,6 @@
+
+web:
+    command: "top"
+
+db:
+    command: "top"
diff --git a/tests/fixtures/override-files/docker-compose.yml b/tests/fixtures/override-files/docker-compose.yml
new file mode 100644
index 00000000..8eb43ddb
--- /dev/null
+++ b/tests/fixtures/override-files/docker-compose.yml
@@ -0,0 +1,10 @@
+
+web:
+    image: busybox:latest
+    command: "sleep 200"
+    links:
+        - db
+
+db:
+    image: busybox:latest
+    command: "sleep 200"
diff --git a/tests/fixtures/override-files/extra.yml b/tests/fixtures/override-files/extra.yml
new file mode 100644
index 00000000..7b3ade9c
--- /dev/null
+++ b/tests/fixtures/override-files/extra.yml
@@ -0,0 +1,9 @@
+
+web:
+    links:
+        - db
+        - other
+
+other:
+    image: busybox:latest
+    command: "top"
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 8688fb8b..33fdda3b 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -549,7 +549,6 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(get_port(3002), "0.0.0.0:49153")
 
     def test_port_with_scale(self):
-
         self.command.base_dir = 'tests/fixtures/ports-composefile-scale'
         self.command.dispatch(['scale', 'simple=2'], None)
         containers = sorted(
@@ -593,6 +592,44 @@ class CLITestCase(DockerClientTestCase):
         self.assertTrue(components[-2:] == ['home-dir', 'my-volume'],
                         msg="Last two components differ: %s, %s" % (actual_host_path, expected_host_path))
 
+    def test_up_with_default_override_file(self):
+        self.command.base_dir = 'tests/fixtures/override-files'
+        self.command.dispatch(['up', '-d'], None)
+
+        containers = self.project.containers()
+        self.assertEqual(len(containers), 2)
+
+        web, db = containers
+        self.assertEqual(web.human_readable_command, 'top')
+        self.assertEqual(db.human_readable_command, 'top')
+
+    def test_up_with_multiple_files(self):
+        self.command.base_dir = 'tests/fixtures/override-files'
+        config_paths = [
+            'docker-compose.yml',
+            'docker-compose.override.yml',
+            'extra.yml',
+
+        ]
+        self._project = get_project(self.command.base_dir, config_paths)
+        self.command.dispatch(
+            [
+                '-f', config_paths[0],
+                '-f', config_paths[1],
+                '-f', config_paths[2],
+                'up', '-d',
+            ],
+            None)
+
+        containers = self.project.containers()
+        self.assertEqual(len(containers), 3)
+
+        web, other, db = containers
+        self.assertEqual(web.human_readable_command, 'top')
+        self.assertTrue({'db', 'other'} <= set(web.links()))
+        self.assertEqual(db.human_readable_command, 'top')
+        self.assertEqual(other.human_readable_command, 'top')
+
     def test_up_with_extends(self):
         self.command.base_dir = 'tests/fixtures/extends'
         self.command.dispatch(['up', '-d'], None)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 60f4bbe2..38eb3de2 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1213,6 +1213,7 @@ def get_config_filename_for_files(filenames, subdir=None):
             base_dir = tempfile.mkdtemp(dir=project_dir)
         else:
             base_dir = project_dir
-        return os.path.basename(config.get_config_path(base_dir))
+        filename, = config.get_default_config_files(base_dir)
+        return os.path.basename(filename)
     finally:
         shutil.rmtree(project_dir)

From be0611bf3e435c9431d023b7f1fdef0e487554b0 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 15 Sep 2015 14:47:33 -0400
Subject: [PATCH 0337/1265] Cleanup get_default_config_files tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/unit/config/config_test.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 38eb3de2..79864ec7 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1167,7 +1167,7 @@ class BuildPathTest(unittest.TestCase):
         self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])
 
 
-class GetConfigPathTestCase(unittest.TestCase):
+class GetDefaultConfigFilesTestCase(unittest.TestCase):
 
     files = [
         'docker-compose.yml',
@@ -1177,25 +1177,21 @@ class GetConfigPathTestCase(unittest.TestCase):
     ]
 
     def test_get_config_path_default_file_in_basedir(self):
-        files = self.files
-        self.assertEqual('docker-compose.yml', get_config_filename_for_files(files[0:]))
-        self.assertEqual('docker-compose.yaml', get_config_filename_for_files(files[1:]))
-        self.assertEqual('fig.yml', get_config_filename_for_files(files[2:]))
-        self.assertEqual('fig.yaml', get_config_filename_for_files(files[3:]))
+        for index, filename in enumerate(self.files):
+            self.assertEqual(
+                filename,
+                get_config_filename_for_files(self.files[index:]))
         with self.assertRaises(config.ComposeFileNotFound):
             get_config_filename_for_files([])
 
     def test_get_config_path_default_file_in_parent_dir(self):
         """Test with files placed in the subdir"""
-        files = self.files
 
         def get_config_in_subdir(files):
             return get_config_filename_for_files(files, subdir=True)
 
-        self.assertEqual('docker-compose.yml', get_config_in_subdir(files[0:]))
-        self.assertEqual('docker-compose.yaml', get_config_in_subdir(files[1:]))
-        self.assertEqual('fig.yml', get_config_in_subdir(files[2:]))
-        self.assertEqual('fig.yaml', get_config_in_subdir(files[3:]))
+        for index, filename in enumerate(self.files):
+            self.assertEqual(filename, get_config_in_subdir(self.files[index:]))
         with self.assertRaises(config.ComposeFileNotFound):
             get_config_in_subdir([])
 

From fd75e4bf6385d33165f1c91af2f63d9a8201e530 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 16 Sep 2015 15:03:55 -0400
Subject: [PATCH 0338/1265] Update docs about using multiple -f arguments

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/reference/docker-compose.md | 62 ++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/docs/reference/docker-compose.md b/docs/reference/docker-compose.md
index b43055fb..32fcbe70 100644
--- a/docs/reference/docker-compose.md
+++ b/docs/reference/docker-compose.md
@@ -14,7 +14,7 @@ weight=-2
 
 ```
 Usage:
-  docker-compose [options] [COMMAND] [ARGS...]
+  docker-compose [-f=<arg>...] [options] [COMMAND] [ARGS...]
   docker-compose -h|--help
 
 Options:
@@ -41,20 +41,62 @@ Commands:
   unpause            Unpause services
   up                 Create and start containers
   migrate-to-labels  Recreate containers to add labels
+  version            Show the Docker-Compose version information
 ```
 
-The Docker Compose binary. You use this command to build and manage multiple services in Docker containers.
+The Docker Compose binary. You use this command to build and manage multiple
+services in Docker containers.
 
-Use the `-f` flag to specify the location of a Compose configuration file. This
-flag is optional. If you don't provide this flag. Compose looks for a file named
-`docker-compose.yml` in the  working directory. If the file is not found,
-Compose looks in each parent directory successively, until it finds the file.
+Use the `-f` flag to specify the location of a Compose configuration file. You
+can supply multiple `-f` configuration files. When you supply multiple files,
+Compose combines them into a single configuration. Compose builds the
+configuration in the order you supply the files. Subsequent files override and
+add to their successors.
 
-Use a `-` as the filename to read configuration file from stdin. When stdin is
-used all paths in the configuration are relative to the current working
-directory.
+For example, consider this command line:
+
+```
+$ docker-compose -f docker-compose.yml -f docker-compose.admin.yml run backup_db`
+```
+
+The `docker-compose.yml` file might specify a `webapp` service.
+
+```
+webapp:
+  image: examples/web
+  ports:
+    - "8000:8000"
+  volumes:
+    - "/data"
+```
+
+If the `docker-compose.admin.yml` also specifies this same service, any matching
+fields will override the previous file. New values, add to the `webapp` service
+configuration.
+
+```
+webapp:
+  build: .
+  environment:
+    - DEBUG=1
+```
+
+Use a `-f` with `-` (dash) as the filename to read the configuration from
+stdin. When stdin is used all paths in the configuration are
+relative to the current working directory.
+
+The `-f` flag is optional. If you don't provide this flag on the command line,
+Compose traverses the working directory and its subdirectories looking for a
+`docker-compose.yml` and a `docker-compose.override.yml` file. You must supply
+at least the `docker-compose.yml` file. If both files are present, Compose
+combines the two files into a single configuration. The configuration in the
+`docker-compose.override.yml` file is applied over and in addition to the values
+in the `docker-compose.yml` file.
+
+Each configuration has a project name. If you supply a `-p` flag, you can
+specify a project name. If you don't specify the flag, Compose uses the current
+directory name.
 
-Each configuration can has a project name. If you supply a `-p` flag, you can specify a project name. If you don't specify the flag, Compose uses the current directory name.
 
 ## Where to go next
 

From 577439ea7f6b506e6905ca097abeff7ba82af5e6 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 17 Sep 2015 14:28:16 -0400
Subject: [PATCH 0339/1265] Add a debug log message for config filenames.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compose/config/config.py b/compose/config/config.py
index 3ecdd29d..56e6e796 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -104,6 +104,8 @@ def find(base_dir, filenames):
         filenames = [os.path.join(base_dir, f) for f in filenames]
     else:
         filenames = get_default_config_files(base_dir)
+
+    log.debug("Using configuration files: {}".format(",".join(filenames)))
     return ConfigDetails(
         os.path.dirname(filenames[0]),
         [ConfigFile(f, load_yaml(f)) for f in filenames])

From eb20590ca66bb458504be60df7df948835a2eb45 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 29 Jul 2015 16:16:42 +0100
Subject: [PATCH 0340/1265] Use dockerswarm/dind image instead of doing
 docker-in-docker ourselves

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/dind          | 88 --------------------------------------------
 script/test-versions | 36 ++++++++++++------
 script/wrapdocker    | 27 --------------
 3 files changed, 25 insertions(+), 126 deletions(-)
 delete mode 100755 script/dind
 delete mode 100755 script/wrapdocker

diff --git a/script/dind b/script/dind
deleted file mode 100755
index f8fae637..00000000
--- a/script/dind
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-set -e
-
-# DinD: a wrapper script which allows docker to be run inside a docker container.
-# Original version by Jerome Petazzoni <jerome@docker.com>
-# See the blog post: http://blog.docker.com/2013/09/docker-can-now-run-within-docker/
-#
-# This script should be executed inside a docker container in privilieged mode
-# ('docker run --privileged', introduced in docker 0.6).
-
-# Usage: dind CMD [ARG...]
-
-# apparmor sucks and Docker needs to know that it's in a container (c) @tianon
-export container=docker
-
-# First, make sure that cgroups are mounted correctly.
-CGROUP=/cgroup
-
-mkdir -p "$CGROUP"
-
-if ! mountpoint -q "$CGROUP"; then
-	mount -n -t tmpfs -o uid=0,gid=0,mode=0755 cgroup $CGROUP || {
-		echo >&2 'Could not make a tmpfs mount. Did you use --privileged?'
-		exit 1
-	}
-fi
-
-if [ -d /sys/kernel/security ] && ! mountpoint -q /sys/kernel/security; then
-	mount -t securityfs none /sys/kernel/security || {
-		echo >&2 'Could not mount /sys/kernel/security.'
-		echo >&2 'AppArmor detection and -privileged mode might break.'
-	}
-fi
-
-# Mount the cgroup hierarchies exactly as they are in the parent system.
-for SUBSYS in $(cut -d: -f2 /proc/1/cgroup); do
-	mkdir -p "$CGROUP/$SUBSYS"
-	if ! mountpoint -q $CGROUP/$SUBSYS; then
-		mount -n -t cgroup -o "$SUBSYS" cgroup "$CGROUP/$SUBSYS"
-	fi
-
-	# The two following sections address a bug which manifests itself
-	# by a cryptic "lxc-start: no ns_cgroup option specified" when
-	# trying to start containers withina container.
-	# The bug seems to appear when the cgroup hierarchies are not
-	# mounted on the exact same directories in the host, and in the
-	# container.
-
-	# Named, control-less cgroups are mounted with "-o name=foo"
-	# (and appear as such under /proc/<pid>/cgroup) but are usually
-	# mounted on a directory named "foo" (without the "name=" prefix).
-	# Systemd and OpenRC (and possibly others) both create such a
-	# cgroup. To avoid the aforementioned bug, we symlink "foo" to
-	# "name=foo". This shouldn't have any adverse effect.
-	name="${SUBSYS#name=}"
-	if [ "$name" != "$SUBSYS" ]; then
-		ln -s "$SUBSYS" "$CGROUP/$name"
-	fi
-
-	# Likewise, on at least one system, it has been reported that
-	# systemd would mount the CPU and CPU accounting controllers
-	# (respectively "cpu" and "cpuacct") with "-o cpuacct,cpu"
-	# but on a directory called "cpu,cpuacct" (note the inversion
-	# in the order of the groups). This tries to work around it.
-	if [ "$SUBSYS" = 'cpuacct,cpu' ]; then
-		ln -s "$SUBSYS" "$CGROUP/cpu,cpuacct"
-	fi
-done
-
-# Note: as I write those lines, the LXC userland tools cannot setup
-# a "sub-container" properly if the "devices" cgroup is not in its
-# own hierarchy. Let's detect this and issue a warning.
-if ! grep -q :devices: /proc/1/cgroup; then
-	echo >&2 'WARNING: the "devices" cgroup should be in its own hierarchy.'
-fi
-if ! grep -qw devices /proc/1/cgroup; then
-	echo >&2 'WARNING: it looks like the "devices" cgroup is not mounted.'
-fi
-
-# Mount /tmp
-mount -t tmpfs none /tmp
-
-if [ $# -gt 0 ]; then
-	exec "$@"
-fi
-
-echo >&2 'ERROR: No command specified.'
-echo >&2 'You probably want to run hack/make.sh, or maybe a shell?'
diff --git a/script/test-versions b/script/test-versions
index 88d2554c..577cf67e 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -11,21 +11,35 @@ docker run --rm \
   "$TAG" -e pre-commit
 
 if [ "$DOCKER_VERSIONS" == "" ]; then
-  DOCKER_VERSIONS="default"
+  DOCKER_VERSIONS="$DEFAULT_DOCKER_VERSION"
 elif [ "$DOCKER_VERSIONS" == "all" ]; then
   DOCKER_VERSIONS="$ALL_DOCKER_VERSIONS"
 fi
 
 for version in $DOCKER_VERSIONS; do
   >&2 echo "Running tests against Docker $version"
-  docker run \
-    --rm \
-    --privileged \
-    --volume="/var/lib/docker" \
-    --volume="${COVERAGE_DIR:-$(pwd)/coverage-html}:/code/coverage-html" \
-    -e "DOCKER_VERSION=$version" \
-    -e "DOCKER_DAEMON_ARGS" \
-    --entrypoint="script/dind" \
-    "$TAG" \
-    script/wrapdocker tox -e py27,py34 -- "$@"
+
+  (
+    set -x
+
+    daemon_container_id=$(\
+      docker run \
+      -d \
+      --privileged \
+      --volume="/var/lib/docker" \
+      --expose="2375" \
+      dockerswarm/dind:$version \
+      docker -d -H tcp://0.0.0.0:2375 \
+    )
+
+    docker run \
+      --rm \
+      --link="$daemon_container_id:docker" \
+      --env="DOCKER_HOST=tcp://docker:2375" \
+      --entrypoint="tox" \
+      "$TAG" \
+      -e py27,py34 -- "$@"
+
+    docker rm -vf "$daemon_container_id"
+  )
 done
diff --git a/script/wrapdocker b/script/wrapdocker
deleted file mode 100755
index ab89f5ed..00000000
--- a/script/wrapdocker
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-if [ "$DOCKER_VERSION" != "" ] && [ "$DOCKER_VERSION" != "default" ]; then
-    ln -fs "/usr/local/bin/docker-$DOCKER_VERSION" "/usr/local/bin/docker"
-fi
-
-# If a pidfile is still around (for example after a container restart),
-# delete it so that docker can start.
-rm -rf /var/run/docker.pid
-docker_command="docker -d $DOCKER_DAEMON_ARGS"
->&2 echo "Starting Docker with: $docker_command"
-$docker_command &>/var/log/docker.log &
-docker_pid=$!
-
->&2 echo "Waiting for Docker to start..."
-while ! docker ps &>/dev/null; do
-    if ! kill -0 "$docker_pid" &>/dev/null; then
-        >&2 echo "Docker failed to start"
-        cat /var/log/docker.log
-        exit 1
-    fi
-
-    sleep 1
-done
-
->&2 echo ">" "$@"
-exec "$@"

From 9978c3ea52edbc99f2e293e98c4db5196972d655 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Mon, 31 Aug 2015 17:29:25 -0400
Subject: [PATCH 0341/1265] Update scriptests/test-versions to work with daemon
 args, and move docker version constants into tests-versions.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 Dockerfile           | 11 -----------
 script/test-versions | 45 ++++++++++++++++++++++++--------------------
 tox.ini              |  1 +
 3 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ba508742..354ba00a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,17 +66,6 @@ RUN set -ex; \
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 
-ENV ALL_DOCKER_VERSIONS 1.7.1 1.8.2-rc1
-
-RUN set -ex; \
-    curl https://get.docker.com/builds/Linux/x86_64/docker-1.7.1 -o /usr/local/bin/docker-1.7.1; \
-    chmod +x /usr/local/bin/docker-1.7.1; \
-    curl https://test.docker.com/builds/Linux/x86_64/docker-1.8.2-rc1 -o /usr/local/bin/docker-1.8.2-rc1; \
-    chmod +x /usr/local/bin/docker-1.8.2-rc1
-
-# Set the default Docker to be run
-RUN ln -s /usr/local/bin/docker-1.7.1 /usr/local/bin/docker
-
 RUN useradd -d /home/user -m -s /bin/bash user
 WORKDIR /code/
 
diff --git a/script/test-versions b/script/test-versions
index 577cf67e..bebc5567 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -10,36 +10,41 @@ docker run --rm \
   --entrypoint="tox" \
   "$TAG" -e pre-commit
 
+ALL_DOCKER_VERSIONS="1.7.1 1.8.2"
+DEFAULT_DOCKER_VERSION="1.8.2"
+
 if [ "$DOCKER_VERSIONS" == "" ]; then
   DOCKER_VERSIONS="$DEFAULT_DOCKER_VERSION"
 elif [ "$DOCKER_VERSIONS" == "all" ]; then
   DOCKER_VERSIONS="$ALL_DOCKER_VERSIONS"
 fi
 
+
+BUILD_NUMBER=${BUILD_NUMBER-$USER}
+
 for version in $DOCKER_VERSIONS; do
   >&2 echo "Running tests against Docker $version"
 
-  (
-    set -x
+  daemon_container="compose-dind-$version-$BUILD_NUMBER"
+  trap "docker rm -vf $daemon_container" EXIT
 
-    daemon_container_id=$(\
-      docker run \
-      -d \
-      --privileged \
-      --volume="/var/lib/docker" \
-      --expose="2375" \
-      dockerswarm/dind:$version \
-      docker -d -H tcp://0.0.0.0:2375 \
-    )
+  # TODO: remove when we stop testing against 1.7.x
+  daemon=$([[ "$version" == "1.7"* ]] && echo "-d" || echo "daemon")
 
-    docker run \
-      --rm \
-      --link="$daemon_container_id:docker" \
-      --env="DOCKER_HOST=tcp://docker:2375" \
-      --entrypoint="tox" \
-      "$TAG" \
-      -e py27,py34 -- "$@"
+  docker run \
+    -d \
+    --name "$daemon_container" \
+    --privileged \
+    --volume="/var/lib/docker" \
+    dockerswarm/dind:$version \
+    docker $daemon -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
+
+  docker run \
+    --rm \
+    --link="$daemon_container:docker" \
+    --env="DOCKER_HOST=tcp://docker:2375" \
+    --entrypoint="tox" \
+    "$TAG" \
+    -e py27,py34 -- "$@"
 
-    docker rm -vf "$daemon_container_id"
-  )
 done
diff --git a/tox.ini b/tox.ini
index 4cb933dd..901c1851 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,7 @@ envlist = py27,py34,pre-commit
 usedevelop=True
 passenv =
     LD_LIBRARY_PATH
+    DOCKER_HOST
 setenv =
     HOME=/tmp
 deps =

From 8b29a50b525c12e283db3b1aaecc1ab7d6ce6ef3 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 16 Sep 2015 16:45:26 -0400
Subject: [PATCH 0342/1265] Trim the dockerfile and re-use the virtualenv we
 already have.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 Dockerfile               | 27 +++++++++++++--------------
 script/build-linux       |  6 +-----
 script/build-linux-inner |  5 +++--
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 354ba00a..c6dbdefd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,15 +10,16 @@ RUN set -ex; \
         zlib1g-dev \
         libssl-dev \
         git \
-        apt-transport-https \
         ca-certificates \
         curl \
-        lxc \
-        iptables \
         libsqlite3-dev \
     ; \
     rm -rf /var/lib/apt/lists/*
 
+RUN curl https://get.docker.com/builds/Linux/x86_64/docker-latest \
+        -o /usr/local/bin/docker && \
+    chmod +x /usr/local/bin/docker
+
 # Build Python 2.7.9 from source
 RUN set -ex; \
     curl -LO https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz; \
@@ -69,19 +70,17 @@ ENV LANG en_US.UTF-8
 RUN useradd -d /home/user -m -s /bin/bash user
 WORKDIR /code/
 
-RUN pip install tox
-
-ADD requirements.txt /code/
-RUN pip install -r requirements.txt
-
-ADD requirements-dev.txt /code/
-RUN pip install -r requirements-dev.txt
-
 RUN pip install tox==2.1.1
 
-ADD . /code/
-RUN pip install --no-deps -e /code
+ADD requirements.txt /code/
+ADD requirements-dev.txt /code/
+ADD .pre-commit-config.yaml /code/
+ADD setup.py /code/
+ADD tox.ini /code/
+ADD compose /code/compose/
+RUN tox --notest
 
+ADD . /code/
 RUN chown -R user /code/
 
-ENTRYPOINT ["/usr/local/bin/docker-compose"]
+ENTRYPOINT ["/code/.tox/py27/bin/docker-compose"]
diff --git a/script/build-linux b/script/build-linux
index 4fdf1d92..bf966fc8 100755
--- a/script/build-linux
+++ b/script/build-linux
@@ -4,8 +4,4 @@ set -ex
 
 TAG="docker-compose"
 docker build -t "$TAG" .
-docker run \
-  --rm \
-  --volume="$(pwd):/code" \
-  --entrypoint="script/build-linux-inner" \
-  "$TAG"
+docker run --rm --entrypoint="script/build-linux-inner" "$TAG"
diff --git a/script/build-linux-inner b/script/build-linux-inner
index e5d290eb..1d0f7905 100755
--- a/script/build-linux-inner
+++ b/script/build-linux-inner
@@ -3,11 +3,12 @@
 set -ex
 
 TARGET=dist/docker-compose-Linux-x86_64
+VENV=/code/.tox/py27
 
 mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 
-pip install -r requirements-build.txt
-su -c "pyinstaller docker-compose.spec" user
+$VENV/bin/pip install -r requirements-build.txt
+su -c "$VENV/bin/pyinstaller docker-compose.spec" user
 mv dist/docker-compose $TARGET
 $TARGET version

From aac916c73ed99e8a2615707e4550a7d21edea135 Mon Sep 17 00:00:00 2001
From: Mike Bailey <mike.bailey@rea-group.com>
Date: Fri, 31 Jul 2015 16:35:13 +1000
Subject: [PATCH 0343/1265] Alphabetise reference list

Bring in line with Glossary. https://docs.docker.com/reference/glossary/

Alphabetising list makes makes parsing by humans easier.

Signed-off-by: Mike Bailey <mike.bailey@rea-group.com>

Conflicts:
	docs/yml.md
---
 docs/yml.md | 332 ++++++++++++++++++++++++----------------------------
 1 file changed, 151 insertions(+), 181 deletions(-)

diff --git a/docs/yml.md b/docs/yml.md
index 2f1ae1a6..77f76b10 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -19,22 +19,6 @@ As with `docker run`, options specified in the Dockerfile (e.g., `CMD`,
 `EXPOSE`, `VOLUME`, `ENV`) are respected by default - you don't need to
 specify them again in `docker-compose.yml`.
 
-Values for configuration options can contain environment variables, e.g.
-`image: postgres:${POSTGRES_VERSION}`. For more details, see the section on
-[variable substitution](#variable-substitution).
-
-### image
-
-Tag, partial image ID or digest. Can be local or remote - Compose will attempt to
-pull if it doesn't exist locally.
-
-    image: ubuntu
-    image: orchardup/postgresql
-    image: a4bc65fd
-    image: busybox@sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d
-
-Using `image` together with either `build`  or `dockerfile` is not allowed. Attempting to do so results in an error.
-
 ### build
 
 Path to a directory containing a Dockerfile. When the value supplied is a
@@ -47,13 +31,17 @@ Compose will build and tag it with a generated name, and use that image thereaft
 
 Using `build` together with `image` is not allowed. Attempting to do so results in an error.
 
-### dockerfile
+### cap_add, cap_drop
 
-Alternate Dockerfile.
+Add or drop container capabilities.
+See `man 7 capabilities` for a full list.
 
-Compose will use an alternate file to build with.
+    cap_add:
+      - ALL
 
-    dockerfile: Dockerfile-alternate
+    cap_drop:
+      - NET_ADMIN
+      - SYS_ADMIN
 
 Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
 
@@ -63,143 +51,49 @@ Override the default command.
 
     command: bundle exec thin -p 3000
 
-<a name="links"></a>
-### links
+### container_name
 
-Link to containers in another service. Either specify both the service name and
-the link alias (`SERVICE:ALIAS`), or just the service name (which will also be
-used for the alias).
+Specify a custom container name, rather than a generated default name.
 
-    links:
-     - db
-     - db:database
-     - redis
+    container_name: my-web-container
 
-An entry with the alias' name will be created in `/etc/hosts` inside containers
-for this service, e.g:
+Because Docker container names must be unique, you cannot scale a service
+beyond 1 container if you have specified a custom name. Attempting to do so
+results in an error.
 
-    172.17.2.186  db
-    172.17.2.186  database
-    172.17.2.187  redis
+### devices
 
-Environment variables will also be created - see the [environment variable
-reference](env.md) for details.
+List of device mappings.  Uses the same format as the `--device` docker
+client create option.
 
-### external_links
+    devices:
+      - "/dev/ttyUSB0:/dev/ttyUSB0"
 
-Link to containers started outside this `docker-compose.yml` or even outside
-of Compose, especially for containers that provide shared or common services.
-`external_links` follow semantics similar to `links` when specifying both the
-container name and the link alias (`CONTAINER:ALIAS`).
+### dns
 
-    external_links:
-     - redis_1
-     - project_db_1:mysql
-     - project_db_1:postgresql
+Custom DNS servers. Can be a single value or a list.
 
-### extra_hosts
+    dns: 8.8.8.8
+    dns:
+      - 8.8.8.8
+      - 9.9.9.9
 
-Add hostname mappings. Use the same values as the docker client `--add-host` parameter.
+### dns_search
 
-    extra_hosts:
-     - "somehost:162.242.195.82"
-     - "otherhost:50.31.209.229"
+Custom DNS search domains. Can be a single value or a list.
 
-An entry with the ip address and hostname will be created in `/etc/hosts` inside containers for this service, e.g:
+    dns_search: example.com
+    dns_search:
+      - dc1.example.com
+      - dc2.example.com
 
-    162.242.195.82  somehost
-    50.31.209.229   otherhost
+### dockerfile
 
-### ports
+Alternate Dockerfile.
 
-Makes an exposed port accessible on a host and the port is available to
-any client that can reach that host. Docker binds the exposed port to a random
-port on the host within an *ephemeral port range* defined by
-`/proc/sys/net/ipv4/ip_local_port_range`. You can also map to a specific port or range of ports.
+Compose will use an alternate file to build with.
 
-Acceptable formats for the `ports` value are:
-
-* `containerPort`
-* `ip:hostPort:containerPort`
-* `ip::containerPort`
-* `hostPort:containerPort`
-
-You can specify a range for both the `hostPort` and the `containerPort` values.
-When specifying ranges, the container port values in the range must match the
-number of host port values in the range, for example,
-`1234-1236:1234-1236/tcp`. Once a host is running, use the 'docker-compose port' command
-to see the actual mapping.
-
-The following configuration shows examples of the port formats in use:
-
-    ports:
-     - "3000"
-     - "3000-3005"
-     - "8000:8000"
-     - "9090-9091:8080-8081"
-     - "49100:22"
-     - "127.0.0.1:8001:8001"
-     - "127.0.0.1:5000-5010:5000-5010"
-
-
-When mapping ports, in the `hostPort:containerPort` format, you may
-experience erroneous results when using a container port lower than 60. This
-happens because YAML parses numbers in the format `xx:yy` as sexagesimal (base
-60). To avoid this problem, always explicitly specify your port
-mappings as strings.
-
-### expose
-
-Expose ports without publishing them to the host machine - they'll only be
-accessible to linked services. Only the internal port can be specified.
-
-    expose:
-     - "3000"
-     - "8000"
-
-### volumes
-
-Mount paths as volumes, optionally specifying a path on the host machine
-(`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`).
-
-    volumes:
-     - /var/lib/mysql
-     - ./cache:/tmp/cache
-     - ~/configs:/etc/configs/:ro
-
-You can mount a relative path on the host, which will expand relative to
-the directory of the Compose configuration file being used. Relative paths
-should always begin with `.` or `..`.
-
-> Note: No path expansion will be done if you have also specified a
-> `volume_driver`.
-
-### volumes_from
-
-Mount all of the volumes from another service or container.
-
-    volumes_from:
-     - service_name
-     - container_name
-
-### environment
-
-Add environment variables. You can use either an array or a dictionary. Any
-boolean values; true, false, yes no, need to be enclosed in quotes to ensure
-they are not converted to True or False by the YML parser.
-
-Environment variables with only a key are resolved to their values on the
-machine Compose is running on, which can be helpful for secret or host-specific values.
-
-    environment:
-      RACK_ENV: development
-      SHOW: 'true'
-      SESSION_SECRET:
-
-    environment:
-      - RACK_ENV=development
-      - SHOW=true
-      - SESSION_SECRET
+    dockerfile: Dockerfile-alternate
 
 ### env_file
 
@@ -223,6 +117,34 @@ beginning with `#` (i.e. comments) are ignored, as are blank lines.
     # Set Rails/Rack environment
     RACK_ENV=development
 
+### environment
+
+Add environment variables. You can use either an array or a dictionary. Any
+boolean values; true, false, yes no, need to be enclosed in quotes to ensure
+they are not converted to True or False by the YML parser.
+
+Environment variables with only a key are resolved to their values on the
+machine Compose is running on, which can be helpful for secret or host-specific values.
+
+    environment:
+      RACK_ENV: development
+      SHOW: 'true'
+      SESSION_SECRET:
+
+    environment:
+      - RACK_ENV=development
+      - SHOW=true
+      - SESSION_SECRET
+
+### expose
+
+Expose ports without publishing them to the host machine - they'll only be
+accessible to linked services. Only the internal port can be specified.
+
+    expose:
+     - "3000"
+     - "8000"
+
 ### extends
 
 Extend another service, in the current file or another, optionally overriding
@@ -267,6 +189,40 @@ service within the current file.
 For more on `extends`, see the [tutorial](extends.md#example) and
 [reference](extends.md#reference).
 
+### external_links
+
+Link to containers started outside this `docker-compose.yml` or even outside
+of Compose, especially for containers that provide shared or common services.
+`external_links` follow semantics similar to `links` when specifying both the
+container name and the link alias (`CONTAINER:ALIAS`).
+
+    external_links:
+     - redis_1
+     - project_db_1:mysql
+     - project_db_1:postgresql
+
+### extra_hosts
+
+Add hostname mappings. Use the same values as the docker client `--add-host` parameter.
+
+    extra_hosts:
+     - "somehost:162.242.195.82"
+     - "otherhost:50.31.209.229"
+
+An entry with the ip address and hostname will be created in `/etc/hosts` inside containers for this service, e.g:
+
+    162.242.195.82  somehost
+    50.31.209.229   otherhost
+
+### image
+
+Tag or partial image ID. Can be local or remote - Compose will attempt to
+pull if it doesn't exist locally.
+
+    image: ubuntu
+    image: orchardup/postgresql
+    image: a4bc65fd
+
 ### labels
 
 Add metadata to containers using [Docker labels](http://docs.docker.com/userguide/labels-custom-metadata/). You can use either an array or a dictionary.
@@ -283,15 +239,26 @@ It's recommended that you use reverse-DNS notation to prevent your labels from c
       - "com.example.department=Finance"
       - "com.example.label-with-empty-value"
 
-### container_name
+### links
 
-Specify a custom container name, rather than a generated default name.
+Link to containers in another service. Either specify both the service name and
+the link alias (`SERVICE:ALIAS`), or just the service name (which will also be
+used for the alias).
 
-    container_name: my-web-container
+    links:
+     - db
+     - db:database
+     - redis
 
-Because Docker container names must be unique, you cannot scale a service
-beyond 1 container if you have specified a custom name. Attempting to do so
-results in an error.
+An entry with the alias' name will be created in `/etc/hosts` inside containers
+for this service, e.g:
+
+    172.17.2.186  db
+    172.17.2.186  database
+    172.17.2.187  redis
+
+Environment variables will also be created - see the [environment variable
+reference](env.md) for details.
 
 ### log_driver
 
@@ -336,43 +303,21 @@ container and the host operating system the PID address space.  Containers
 launched with this flag will be able to access and manipulate other
 containers in the bare-metal machine's namespace and vise-versa.
 
-### dns
+### ports
 
-Custom DNS servers. Can be a single value or a list.
+Expose ports. Either specify both ports (`HOST:CONTAINER`), or just the container
+port (a random host port will be chosen).
 
-    dns: 8.8.8.8
-    dns:
-      - 8.8.8.8
-      - 9.9.9.9
+> **Note:** When mapping ports in the `HOST:CONTAINER` format, you may experience
+> erroneous results when using a container port lower than 60, because YAML will
+> parse numbers in the format `xx:yy` as sexagesimal (base 60). For this reason,
+> we recommend always explicitly specifying your port mappings as strings.
 
-### cap_add, cap_drop
-
-Add or drop container capabilities.
-See `man 7 capabilities` for a full list.
-
-    cap_add:
-      - ALL
-
-    cap_drop:
-      - NET_ADMIN
-      - SYS_ADMIN
-
-### dns_search
-
-Custom DNS search domains. Can be a single value or a list.
-
-    dns_search: example.com
-    dns_search:
-      - dc1.example.com
-      - dc2.example.com
-
-### devices
-
-List of device mappings.  Uses the same format as the `--device` docker
-client create option.
-
-    devices:
-      - "/dev/ttyUSB0:/dev/ttyUSB0"
+    ports:
+     - "3000"
+     - "8000:8000"
+     - "49100:22"
+     - "127.0.0.1:8001:8001"
 
 ### security_opt
 
@@ -382,6 +327,31 @@ Override the default labeling scheme for each container.
         - label:user:USER
         - label:role:ROLE
 
+### volumes
+
+Mount paths as volumes, optionally specifying a path on the host machine
+(`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`).
+
+    volumes:
+     - /var/lib/mysql
+     - ./cache:/tmp/cache
+     - ~/configs:/etc/configs/:ro
+
+You can mount a relative path on the host, which will expand relative to
+the directory of the Compose configuration file being used. Relative paths
+should always begin with `.` or `..`.
+
+> Note: No path expansion will be done if you have also specified a
+> `volume_driver`.
+
+### volumes_from
+
+Mount all of the volumes from another service or container.
+
+    volumes_from:
+     - service_name
+     - container_name
+
 ### working\_dir, entrypoint, user, hostname, domainname, mac\_address, mem\_limit, memswap\_limit, privileged, ipc, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only, volume\_driver
 
 Each of these is a single value, analogous to its

From 0232fb10d7570ae8efb048e5bbefa0cff5729f29 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 18 Sep 2015 11:30:24 +0100
Subject: [PATCH 0344/1265] Alphabetise run options

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/yml.md | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/yml.md b/docs/yml.md
index 77f76b10..81357df3 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -352,7 +352,7 @@ Mount all of the volumes from another service or container.
      - service_name
      - container_name
 
-### working\_dir, entrypoint, user, hostname, domainname, mac\_address, mem\_limit, memswap\_limit, privileged, ipc, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only, volume\_driver
+### cpu\_shares, cpuset, domainname, entrypoint, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, stdin\_open, tty, user, volume\_driver, working\_dir
 
 Each of these is a single value, analogous to its
 [docker run](https://docs.docker.com/reference/run/) counterpart.
@@ -360,26 +360,24 @@ Each of these is a single value, analogous to its
     cpu_shares: 73
     cpuset: 0,1
 
-    working_dir: /code
     entrypoint: /code/entrypoint.sh
     user: postgresql
+    working_dir: /code
 
-    hostname: foo
     domainname: foo.com
-
+    hostname: foo
+    ipc: host
     mac_address: 02:42:ac:11:65:43
 
     mem_limit: 1000000000
     memswap_limit: 2000000000
     privileged: true
 
-    ipc: host
-
     restart: always
 
+    read_only: true
     stdin_open: true
     tty: true
-    read_only: true
 
     volume_driver: mydriver
 

From db433041b4aa7c1fa8d81c3f5163ec7f87d15c3f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 18 Sep 2015 12:08:09 -0400
Subject: [PATCH 0345/1265] Restore the dist volume mount for building linux
 binaries.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/build-linux | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/script/build-linux b/script/build-linux
index 7ce4ffc6..4b869621 100755
--- a/script/build-linux
+++ b/script/build-linux
@@ -6,4 +6,7 @@ set -ex
 
 TAG="docker-compose"
 docker build -t "$TAG" .
-docker run --rm --entrypoint="script/build-linux-inner" "$TAG"
+docker run \
+    --rm --entrypoint="script/build-linux-inner" \
+    -v $(pwd)/dist:/code/dist \
+    "$TAG"

From af7b98ff56517eb7ba0c83f9478f62867a92f078 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Fri, 18 Sep 2015 18:12:30 +0200
Subject: [PATCH 0346/1265] Add bash completion for `docker-compose build
 --pull`

Also adds a fix for an error message on some completions when no
compose file is present:

    docker-compose build awk: cannot open docker-compose.yml (No such file or directory)

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index fe46a334..28d94394 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -44,7 +44,7 @@ __docker_compose_services_all() {
 # All services that have an entry with the given key in their compose_file section
 ___docker_compose_services_with_key() {
 	# flatten sections to one line, then filter lines containing the key and return section name.
-	awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' "${compose_file:-$(__docker_compose_compose_file)}" | awk -F: -v key=": +$1:" '$0 ~ key {print $1}'
+	awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' "${compose_file:-$(__docker_compose_compose_file)}" 2>/dev/null | awk -F: -v key=": +$1:" '$0 ~ key {print $1}'
 }
 
 # All services that are defined by a Dockerfile reference
@@ -87,7 +87,7 @@ __docker_compose_services_stopped() {
 _docker_compose_build() {
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--help --no-cache" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help --no-cache --pull" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_from_build

From 006146b2cda8dac0c5b1c79c8eb9008d0a1ada27 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Fri, 18 Sep 2015 17:45:35 +0200
Subject: [PATCH 0347/1265] Add bash completion for `docker-compose run --name`

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index fe46a334..ae57eaa3 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -258,14 +258,14 @@ _docker_compose_run() {
 			compopt -o nospace
 			return
 			;;
-		--entrypoint|--user|-u)
+		--entrypoint|--name|--user|-u)
 			return
 			;;
 	esac
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "-d --entrypoint -e --help --no-deps --rm --service-ports --publish -p -T --user -u" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "-d --entrypoint -e --help --name --no-deps --publish -p --rm --service-ports -T --user -u" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_all

From 5509990a7193985b72a22c0af000c5c1185ce4ed Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 18 Sep 2015 14:42:05 +0100
Subject: [PATCH 0348/1265] Ensure RefResolver works across operating systems

Slashes, paths and a tale of woe. Validation now works on windows \o/

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/validation.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 0258c5d9..959465e9 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -1,6 +1,7 @@
 import json
 import logging
 import os
+import sys
 from functools import wraps
 
 from docker.utils.ports import split_port
@@ -290,12 +291,20 @@ def validate_against_service_schema(config, service_name):
 
 def _validate_against_schema(config, schema_filename, format_checker=[], service_name=None):
     config_source_dir = os.path.dirname(os.path.abspath(__file__))
+
+    if sys.platform == "win32":
+        file_pre_fix = "///"
+        config_source_dir = config_source_dir.replace('\\', '/')
+    else:
+        file_pre_fix = "//"
+
+    resolver_full_path = "file:{}{}/".format(file_pre_fix, config_source_dir)
     schema_file = os.path.join(config_source_dir, schema_filename)
 
     with open(schema_file, "r") as schema_fh:
         schema = json.load(schema_fh)
 
-    resolver = RefResolver('file://' + config_source_dir + '/', schema)
+    resolver = RefResolver(resolver_full_path, schema)
     validation_output = Draft4Validator(schema, resolver=resolver, format_checker=FormatChecker(format_checker))
 
     errors = [error for error in sorted(validation_output.iter_errors(config), key=str)]

From 3e4182a48077bb4bd602b7a79622265234d7c518 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 1 Sep 2015 17:40:56 -0700
Subject: [PATCH 0349/1265] Stub 'run' on Windows

Adapted from @dopry's work in https://github.com/docker/compose/pull/1900

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 9b03ea67..0fc09efe 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -8,7 +8,6 @@ import sys
 from inspect import getdoc
 from operator import attrgetter
 
-import dockerpty
 from docker.errors import APIError
 from requests.exceptions import ReadTimeout
 
@@ -31,6 +30,11 @@ from .log_printer import LogPrinter
 from .utils import get_version_info
 from .utils import yesno
 
+WINDOWS = (sys.platform == 'win32')
+
+if not WINDOWS:
+    import dockerpty
+
 log = logging.getLogger(__name__)
 console_handler = logging.StreamHandler(sys.stderr)
 
@@ -335,6 +339,14 @@ class TopLevelCommand(Command):
         """
         service = project.get_service(options['SERVICE'])
 
+        detach = options['-d']
+
+        if WINDOWS and not detach:
+            raise UserError(
+                "Interactive mode is not yet supported on Windows.\n"
+                "Please pass the -d flag when using `docker-compose run`."
+            )
+
         if options['--allow-insecure-ssl']:
             log.warn(INSECURE_SSL_WARNING)
 
@@ -349,7 +361,7 @@ class TopLevelCommand(Command):
                 )
 
         tty = True
-        if options['-d'] or options['-T'] or not sys.stdin.isatty():
+        if detach or options['-T'] or not sys.stdin.isatty():
             tty = False
 
         if options['COMMAND']:
@@ -360,8 +372,8 @@ class TopLevelCommand(Command):
         container_options = {
             'command': command,
             'tty': tty,
-            'stdin_open': not options['-d'],
-            'detach': options['-d'],
+            'stdin_open': not detach,
+            'detach': detach,
         }
 
         if options['-e']:
@@ -407,7 +419,7 @@ class TopLevelCommand(Command):
 
             raise e
 
-        if options['-d']:
+        if detach:
             service.start_container(container)
             print(container.name)
         else:

From 4ae7f00412e539b9643e83c3eba65718af703f96 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 1 Sep 2015 17:41:09 -0700
Subject: [PATCH 0350/1265] Build Windows binary

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/build-windows.ps1 | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 script/build-windows.ps1

diff --git a/script/build-windows.ps1 b/script/build-windows.ps1
new file mode 100644
index 00000000..284e44f3
--- /dev/null
+++ b/script/build-windows.ps1
@@ -0,0 +1,24 @@
+$ErrorActionPreference = "Stop"
+Set-PSDebug -trace 1
+
+# Remove virtualenv
+if (Test-Path venv) {
+    Remove-Item -Recurse -Force .\venv
+}
+
+# Remove .pyc files
+Get-ChildItem -Recurse -Include *.pyc | foreach ($_) { Remove-Item $_.FullName }
+
+# Create virtualenv
+virtualenv .\venv
+
+# Install dependencies
+.\venv\Scripts\easy_install "http://sourceforge.net/projects/pywin32/files/pywin32/Build%20219/pywin32-219.win32-py2.7.exe/download"
+.\venv\Scripts\pip install -r requirements.txt
+.\venv\Scripts\pip install -r requirements-build.txt
+.\venv\Scripts\pip install .
+
+# Build binary
+.\venv\Scripts\pyinstaller .\docker-compose.spec
+Move-Item -Force .\dist\docker-compose .\dist\docker-compose-Windows-x86_64.exe
+.\dist\docker-compose-Windows-x86_64.exe --version

From fb304981536722ef42c9688b0688d4be048ccfd1 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 18 Sep 2015 17:37:09 +0100
Subject: [PATCH 0351/1265] Catch WindowsError in call_silently

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/utils.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index 0b7ac683..26a38af0 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -85,7 +85,12 @@ def call_silently(*args, **kwargs):
     Like subprocess.call(), but redirects stdout and stderr to /dev/null.
     """
     with open(os.devnull, 'w') as shutup:
-        return subprocess.call(*args, stdout=shutup, stderr=shutup, **kwargs)
+        try:
+            return subprocess.call(*args, stdout=shutup, stderr=shutup, **kwargs)
+        except WindowsError:
+            # On Windows, subprocess.call() can still raise exceptions. Normalize
+            # to POSIXy behaviour by returning a nonzero exit code.
+            return 1
 
 
 def is_mac():

From 12b38adfac3b1d1f15addc41e4ecf698007a8717 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <steve.durrheimer@netapsys.fr>
Date: Fri, 18 Sep 2015 22:42:19 +0200
Subject: [PATCH 0352/1265] Add zsh completion for 'docker-compose run --name'

Signed-off-by: Steve Durrheimer <steve.durrheimer@netapsys.fr>
---
 contrib/completion/zsh/_docker-compose | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 58105dc2..1ff1e728 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -250,6 +250,7 @@ __docker-compose_subcommand() {
             _arguments \
                 $opts_help \
                 '-d[Detached mode: Run container in the background, print new container name.]' \
+                '--name[Assign a name to the container]:name: ' \
                 '--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
                 '*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
                 '(-u --user)'{-u,--user=-}'[Run as specified username or uid]:username or uid:_users' \

From 51ce16cf18812514320a7f3da59d6ee0fff2fb7c Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Fri, 18 Sep 2015 22:46:08 +0200
Subject: [PATCH 0353/1265] Add zsh completion for 'docker-compose build
 --build'

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 58105dc2..912a1828 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -193,6 +193,7 @@ __docker-compose_subcommand() {
             _arguments \
                 $opts_help \
                 '--no-cache[Do not use cache when building the image]' \
+                '--pull[Always attempt to pull a newer version of the image.]' \
                 '*:services:__docker-compose_services_from_build' && ret=0
             ;;
         (help)

From 22bc174650fddb9b53ece787c489df7dabcef8d9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 17 Sep 2015 15:07:53 -0400
Subject: [PATCH 0354/1265] Refactor config.load() to remove reduce() and
 document some types.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py | 49 ++++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 56e6e796..94c5ab95 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -2,7 +2,6 @@ import logging
 import os
 import sys
 from collections import namedtuple
-from functools import reduce
 
 import six
 import yaml
@@ -89,9 +88,22 @@ PATH_START_CHARS = [
 log = logging.getLogger(__name__)
 
 
-ConfigDetails = namedtuple('ConfigDetails', 'working_dir configs')
+class ConfigDetails(namedtuple('_ConfigDetails', 'working_dir config_files')):
+    """
+    :param working_dir: the directory to use for relative paths in the config
+    :type  working_dir: string
+    :param config_files: list of configuration files to load
+    :type  config_files: list of :class:`ConfigFile`
+     """
 
-ConfigFile = namedtuple('ConfigFile', 'filename config')
+
+class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
+    """
+    :param filename: filename of the config file
+    :type  filename: string
+    :param config: contents of the config file
+    :type  config: :class:`dict`
+    """
 
 
 def find(base_dir, filenames):
@@ -170,10 +182,19 @@ def pre_process_config(config):
 
 
 def load(config_details):
-    working_dir, configs = config_details
+    """Load the configuration from a working directory and a list of
+    configuration files.  Files are loaded in order, and merged on top
+    of each other to create the final configuration.
+
+    Return a fully interpolated, extended and validated configuration.
+    """
 
     def build_service(filename, service_name, service_dict):
-        loader = ServiceLoader(working_dir, filename, service_name, service_dict)
+        loader = ServiceLoader(
+            config_details.working_dir,
+            filename,
+            service_name,
+            service_dict)
         service_dict = loader.make_service_dict()
         validate_paths(service_dict)
         return service_dict
@@ -187,21 +208,19 @@ def load(config_details):
         ]
 
     def merge_services(base, override):
+        all_service_names = set(base) | set(override)
         return {
             name: merge_service_dicts(base.get(name, {}), override.get(name, {}))
-            for name in set(base) | set(override)
+            for name in all_service_names
         }
 
-    def combine_configs(base, override):
-        service_dicts = load_file(base.filename, base.config)
-        if not override:
-            return service_dicts
+    config_file = config_details.config_files[0]
+    for next_file in config_details.config_files[1:]:
+        config_file = ConfigFile(
+            config_file.filename,
+            merge_services(config_file.config, next_file.config))
 
-        return ConfigFile(
-            override.filename,
-            merge_services(base.config, override.config))
-
-    return reduce(combine_configs, configs + [None])
+    return load_file(config_file.filename, config_file.config)
 
 
 class ServiceLoader(object):

From c9083e21c81576ba7b8f27dfd952f269cc25a7fd Mon Sep 17 00:00:00 2001
From: Vojta Orgon <villlem@gmail.com>
Date: Mon, 21 Sep 2015 11:59:23 +0200
Subject: [PATCH 0355/1265] Flag to skip all pull errors when pulling images.

Signed-off-by: Vojta Orgon <villlem@gmail.com>
---
 compose/cli/main.py                                   |  2 ++
 compose/project.py                                    |  4 ++--
 compose/service.py                                    | 11 +++++++++--
 contrib/completion/bash/docker-compose                |  2 +-
 contrib/completion/zsh/_docker-compose                |  1 +
 docs/reference/pull.md                                |  3 +++
 .../simple-composefile/ignore-pull-failures.yml       |  6 ++++++
 tests/integration/cli_test.py                         |  7 +++++++
 8 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 tests/fixtures/simple-composefile/ignore-pull-failures.yml

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 9b03ea67..f32b2a52 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -270,6 +270,7 @@ class TopLevelCommand(Command):
         Usage: pull [options] [SERVICE...]
 
         Options:
+            --ignore-pull-failures  Pull what it can and ignores images with pull failures.
             --allow-insecure-ssl    Deprecated - no effect.
         """
         if options['--allow-insecure-ssl']:
@@ -277,6 +278,7 @@ class TopLevelCommand(Command):
 
         project.pull(
             service_names=options['SERVICE'],
+            ignore_pull_failures=options.get('--ignore-pull-failures')
         )
 
     def rm(self, project, options):
diff --git a/compose/project.py b/compose/project.py
index f34cc0c3..4750a7a9 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -311,9 +311,9 @@ class Project(object):
 
         return plans
 
-    def pull(self, service_names=None):
+    def pull(self, service_names=None, ignore_pull_failures=False):
         for service in self.get_services(service_names, include_deps=True):
-            service.pull()
+            service.pull(ignore_pull_failures)
 
     def containers(self, service_names=None, stopped=False, one_off=False):
         if service_names:
diff --git a/compose/service.py b/compose/service.py
index cf3b6270..960d3936 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -769,7 +769,7 @@ class Service(object):
                 return True
         return False
 
-    def pull(self):
+    def pull(self, ignore_pull_failures=False):
         if 'image' not in self.options:
             return
 
@@ -781,7 +781,14 @@ class Service(object):
             tag=tag,
             stream=True,
         )
-        stream_output(output, sys.stdout)
+
+        try:
+            stream_output(output, sys.stdout)
+        except StreamOutputError as e:
+            if not ignore_pull_failures:
+                raise
+            else:
+                log.error(six.text_type(e))
 
 
 class Net(object):
diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 28d94394..ff09205c 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -212,7 +212,7 @@ _docker_compose_ps() {
 _docker_compose_pull() {
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help --ignore-pull-failures" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_from_image
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 58105dc2..99cb4dc5 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -237,6 +237,7 @@ __docker-compose_subcommand() {
         (pull)
             _arguments \
                 $opts_help \
+                '--ignore-pull-failures[Pull what it can and ignores images with pull failures.]' \
                 '*:services:__docker-compose_services_from_image' && ret=0
             ;;
         (rm)
diff --git a/docs/reference/pull.md b/docs/reference/pull.md
index d655dd93..5ec184b7 100644
--- a/docs/reference/pull.md
+++ b/docs/reference/pull.md
@@ -13,6 +13,9 @@ parent = "smn_compose_cli"
 
 ```
 Usage: pull [options] [SERVICE...]
+
+Options:
+--ignore-pull-failures  Pull what it can and ignores images with pull failures.
 ```
 
 Pulls service images.
diff --git a/tests/fixtures/simple-composefile/ignore-pull-failures.yml b/tests/fixtures/simple-composefile/ignore-pull-failures.yml
new file mode 100644
index 00000000..a28f7922
--- /dev/null
+++ b/tests/fixtures/simple-composefile/ignore-pull-failures.yml
@@ -0,0 +1,6 @@
+simple:
+  image: busybox:latest
+  command: top
+another:
+  image: nonexisting-image:latest
+  command: top
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 9dadd036..56e65a6d 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -97,6 +97,13 @@ class CLITestCase(DockerClientTestCase):
             'Pulling digest (busybox@'
             'sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d)...')
 
+    @mock.patch('compose.service.log')
+    def test_pull_with_ignore_pull_failures(self, mock_logging):
+        self.command.dispatch(['-f', 'ignore-pull-failures.yml', 'pull', '--ignore-pull-failures'], None)
+        mock_logging.info.assert_any_call('Pulling simple (busybox:latest)...')
+        mock_logging.info.assert_any_call('Pulling another (nonexisting-image:latest)...')
+        mock_logging.error.assert_any_call('Error: image library/nonexisting-image:latest not found')
+
     @mock.patch('sys.stdout', new_callable=StringIO)
     def test_build_plain(self, mock_stdout):
         self.command.base_dir = 'tests/fixtures/simple-dockerfile'

From e5eaf68490098cb89cf9d6ad8b4eaa96bafd0450 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 21 Jul 2015 15:33:45 +0100
Subject: [PATCH 0356/1265] Remove custom docker client initialization logic

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/docker_client.py | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 601b0b9a..2c634f33 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -1,9 +1,8 @@
 import logging
 import os
-import ssl
 
 from docker import Client
-from docker import tls
+from docker.utils import kwargs_from_env
 
 from ..const import HTTP_TIMEOUT
 
@@ -15,31 +14,10 @@ def docker_client():
     Returns a docker-py client configured using environment variables
     according to the same logic as the official Docker client.
     """
-    cert_path = os.environ.get('DOCKER_CERT_PATH', '')
-    if cert_path == '':
-        cert_path = os.path.join(os.environ.get('HOME', ''), '.docker')
-
-    base_url = os.environ.get('DOCKER_HOST')
-    api_version = os.environ.get('COMPOSE_API_VERSION', '1.19')
-
-    tls_config = None
-
-    if os.environ.get('DOCKER_TLS_VERIFY', '') != '':
-        parts = base_url.split('://', 1)
-        base_url = '%s://%s' % ('https', parts[1])
-
-        client_cert = (os.path.join(cert_path, 'cert.pem'), os.path.join(cert_path, 'key.pem'))
-        ca_cert = os.path.join(cert_path, 'ca.pem')
-
-        tls_config = tls.TLSConfig(
-            ssl_version=ssl.PROTOCOL_TLSv1,
-            verify=True,
-            assert_hostname=False,
-            client_cert=client_cert,
-            ca_cert=ca_cert,
-        )
-
     if 'DOCKER_CLIENT_TIMEOUT' in os.environ:
         log.warn('The DOCKER_CLIENT_TIMEOUT environment variable is deprecated. Please use COMPOSE_HTTP_TIMEOUT instead.')
 
-    return Client(base_url=base_url, tls=tls_config, version=api_version, timeout=HTTP_TIMEOUT)
+    kwargs = kwargs_from_env(assert_hostname=False)
+    kwargs['version'] = os.environ.get('COMPOSE_API_VERSION', '1.19')
+    kwargs['timeout'] = HTTP_TIMEOUT
+    return Client(**kwargs)

From 62ca8469b08250329fee613da704f0186dcdd488 Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Mon, 21 Sep 2015 08:57:01 -0700
Subject: [PATCH 0357/1265] Fixing misspelling of WordPress

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/index.md              | 4 ++--
 docs/reference/overview.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 21a8610e..67a6802b 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -196,7 +196,7 @@ your services once you've finished with them:
 At this point, you have seen the basics of how Compose works.
 
 - Next, try the quick start guide for [Django](django.md),
-  [Rails](rails.md), or [Wordpress](wordpress.md).
+  [Rails](rails.md), or [WordPress](wordpress.md).
 - See the reference guides for complete details on the [commands](/reference), the
   [configuration file](yml.md) and [environment variables](env.md).
 
@@ -224,7 +224,7 @@ For more information and resources, please visit the [Getting Help project page]
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
-- [Get started with Wordpress](wordpress.md)
+- [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
diff --git a/docs/reference/overview.md b/docs/reference/overview.md
index 00260711..9f08246e 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/overview.md
@@ -83,7 +83,7 @@ it failed. Defaults to 60 seconds.
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
-- [Get started with Wordpress](wordpress.md)
+- [Get started with WordPress](wordpress.md)
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)

From c37a0c38a2c4c9c49c5e591427d382c8a046635d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 22 Sep 2015 12:24:56 -0400
Subject: [PATCH 0358/1265] Fix a test case that assumes busybox image id.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/integration/service_test.py | 7 +++++--
 tests/integration/testcases.py    | 9 +++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 040098c9..2c9c6fc2 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -12,6 +12,7 @@ from six import text_type
 
 from .. import mock
 from .testcases import DockerClientTestCase
+from .testcases import pull_busybox
 from compose import __version__
 from compose.const import LABEL_CONTAINER_NUMBER
 from compose.const import LABEL_ONE_OFF
@@ -549,8 +550,10 @@ class ServiceTest(DockerClientTestCase):
         })
 
     def test_create_with_image_id(self):
-        # Image id for the current busybox:latest
-        service = self.create_service('foo', image='8c2e06607696')
+        # Get image id for the current busybox:latest
+        pull_busybox(self.client)
+        image_id = self.client.inspect_image('busybox:latest')['Id'][:12]
+        service = self.create_service('foo', image=image_id)
         service.create_container()
 
     def test_scale(self):
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 4557c07b..26a0a108 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -1,6 +1,8 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+from docker import errors
+
 from .. import unittest
 from compose.cli.docker_client import docker_client
 from compose.config.config import ServiceLoader
@@ -9,6 +11,13 @@ from compose.progress_stream import stream_output
 from compose.service import Service
 
 
+def pull_busybox(client):
+    try:
+        client.inspect_image('busybox:latest')
+    except errors.APIError:
+        client.pull('busybox:latest', stream=False)
+
+
 class DockerClientTestCase(unittest.TestCase):
     @classmethod
     def setUpClass(cls):

From 0058d5dd4f03317af0bacfb9e2d2e045b4bb1da0 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 22 Sep 2015 11:19:35 -0400
Subject: [PATCH 0359/1265] Add appveyor config

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 appveyor.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000..639591e9
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,15 @@
+
+install:
+  - "SET PATH=C:\\Python27-x64;C:\\Python27-x64\\Scripts;%PATH%"
+  - "python --version"
+  - "pip install tox==2.1.1"
+
+
+# Build the binary after tests
+build: false
+
+test_script:
+  - "tox -e py27,py34 -- tests/unit"
+
+after_test:
+  - ps: ".\\script\\build-windows.ps1"

From d5991761cd678dc48f2924947056fe40415592d2 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 22 Sep 2015 14:31:55 -0400
Subject: [PATCH 0360/1265] Fix building the binary on appveyor, and have it
 create an artifact.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 appveyor.yml             |  9 +++++++--
 script/build-osx         |  2 +-
 script/build-windows.ps1 | 15 ++++++++++++---
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 639591e9..acf8bff3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,9 +1,10 @@
 
+version: '{branch}-{build}'
+
 install:
   - "SET PATH=C:\\Python27-x64;C:\\Python27-x64\\Scripts;%PATH%"
   - "python --version"
-  - "pip install tox==2.1.1"
-
+  - "pip install tox==2.1.1 virtualenv==13.1.2"
 
 # Build the binary after tests
 build: false
@@ -13,3 +14,7 @@ test_script:
 
 after_test:
   - ps: ".\\script\\build-windows.ps1"
+
+artifacts:
+  - path: .\dist\docker-compose-Windows-x86_64.exe
+    name: "Compose Windows binary"
diff --git a/script/build-osx b/script/build-osx
index 11b6ecc6..15a7bbc5 100755
--- a/script/build-osx
+++ b/script/build-osx
@@ -9,7 +9,7 @@ rm -rf venv
 virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
 venv/bin/pip install -r requirements-build.txt
-venv/bin/pip install .
+venv/bin/pip install --no-deps .
 venv/bin/pyinstaller docker-compose.spec
 mv dist/docker-compose dist/docker-compose-Darwin-x86_64
 dist/docker-compose-Darwin-x86_64 version
diff --git a/script/build-windows.ps1 b/script/build-windows.ps1
index 284e44f3..63be0865 100644
--- a/script/build-windows.ps1
+++ b/script/build-windows.ps1
@@ -13,12 +13,21 @@ Get-ChildItem -Recurse -Include *.pyc | foreach ($_) { Remove-Item $_.FullName }
 virtualenv .\venv
 
 # Install dependencies
-.\venv\Scripts\easy_install "http://sourceforge.net/projects/pywin32/files/pywin32/Build%20219/pywin32-219.win32-py2.7.exe/download"
+.\venv\Scripts\pip install pypiwin32==219
 .\venv\Scripts\pip install -r requirements.txt
-.\venv\Scripts\pip install -r requirements-build.txt
-.\venv\Scripts\pip install .
+.\venv\Scripts\pip install --no-deps .
+
+# TODO: pip warns when installing from a git sha, so we need to set ErrorAction to
+# 'Continue'.  See
+# https://github.com/pypa/pip/blob/fbc4b7ae5fee00f95bce9ba4b887b22681327bb1/pip/vcs/git.py#L77
+# This can be removed once pyinstaller 3.x is released and we upgrade 
+$ErrorActionPreference = "Continue"
+.\venv\Scripts\pip install --allow-external pyinstaller -r requirements-build.txt
 
 # Build binary
+# pyinstaller has lots of warnings, so we need to run with ErrorAction = Continue
 .\venv\Scripts\pyinstaller .\docker-compose.spec
+$ErrorActionPreference = "Stop"
+
 Move-Item -Force .\dist\docker-compose .\dist\docker-compose-Windows-x86_64.exe
 .\dist\docker-compose-Windows-x86_64.exe --version

From 78c0734cbd3f553af628a5c19843dbc523cdf28f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 22 Sep 2015 17:37:14 -0400
Subject: [PATCH 0361/1265] Disable some tests in windows for now.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py              |  6 +++---
 compose/const.py                 |  2 ++
 tests/unit/cli_test.py           |  3 +++
 tests/unit/config/config_test.py | 10 ++++++++++
 tests/unit/service_test.py       |  3 +++
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index bb12b62c..60e60b79 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -16,6 +16,7 @@ from .. import legacy
 from ..config import parse_environment
 from ..const import DEFAULT_TIMEOUT
 from ..const import HTTP_TIMEOUT
+from ..const import IS_WINDOWS_PLATFORM
 from ..progress_stream import StreamOutputError
 from ..project import ConfigurationError
 from ..project import NoSuchService
@@ -30,9 +31,8 @@ from .log_printer import LogPrinter
 from .utils import get_version_info
 from .utils import yesno
 
-WINDOWS = (sys.platform == 'win32')
 
-if not WINDOWS:
+if not IS_WINDOWS_PLATFORM:
     import dockerpty
 
 log = logging.getLogger(__name__)
@@ -343,7 +343,7 @@ class TopLevelCommand(Command):
 
         detach = options['-d']
 
-        if WINDOWS and not detach:
+        if IS_WINDOWS_PLATFORM and not detach:
             raise UserError(
                 "Interactive mode is not yet supported on Windows.\n"
                 "Please pass the -d flag when using `docker-compose run`."
diff --git a/compose/const.py b/compose/const.py
index dbfa56b8..b43e655b 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -1,4 +1,5 @@
 import os
+import sys
 
 DEFAULT_TIMEOUT = 10
 LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
@@ -8,3 +9,4 @@ LABEL_SERVICE = 'com.docker.compose.service'
 LABEL_VERSION = 'com.docker.compose.version'
 LABEL_CONFIG_HASH = 'com.docker.compose.config-hash'
 HTTP_TIMEOUT = int(os.environ.get('COMPOSE_HTTP_TIMEOUT', os.environ.get('DOCKER_CLIENT_TIMEOUT', 60)))
+IS_WINDOWS_PLATFORM = (sys.platform == 'win32')
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 321df97a..0c78e6bb 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -5,6 +5,7 @@ import os
 
 import docker
 import py
+import pytest
 
 from .. import mock
 from .. import unittest
@@ -13,6 +14,7 @@ from compose.cli.command import get_project_name
 from compose.cli.docopt_command import NoSuchCommand
 from compose.cli.errors import UserError
 from compose.cli.main import TopLevelCommand
+from compose.const import IS_WINDOWS_PLATFORM
 from compose.service import Service
 
 
@@ -81,6 +83,7 @@ class CLITestCase(unittest.TestCase):
         with self.assertRaises(NoSuchCommand):
             TopLevelCommand().dispatch(['help', 'nonexistent'], None)
 
+    @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason="requires dockerpty")
     @mock.patch('compose.cli.main.dockerpty', autospec=True)
     def test_run_with_environment_merged_with_options_list(self, mock_dockerpty):
         command = TopLevelCommand()
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 79864ec7..2dfa764d 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -5,8 +5,11 @@ import shutil
 import tempfile
 from operator import itemgetter
 
+import pytest
+
 from compose.config import config
 from compose.config.errors import ConfigurationError
+from compose.const import IS_WINDOWS_PLATFORM
 from tests import mock
 from tests import unittest
 
@@ -92,6 +95,7 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
     def test_load_with_multiple_files(self):
         base_file = config.ConfigFile(
             'base.yaml',
@@ -410,6 +414,7 @@ class InterpolationTest(unittest.TestCase):
         self.assertIn('in service "web"', cm.exception.msg)
         self.assertIn('"${"', cm.exception.msg)
 
+    @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
     @mock.patch.dict(os.environ)
     def test_volume_binding_with_environment_variable(self):
         os.environ['VOLUME_PATH'] = '/host/path'
@@ -422,6 +427,7 @@ class InterpolationTest(unittest.TestCase):
         )[0]
         self.assertEqual(d['volumes'], ['/host/path:/container/path'])
 
+    @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
     @mock.patch.dict(os.environ)
     def test_volume_binding_with_home(self):
         os.environ['HOME'] = '/home/user'
@@ -817,6 +823,7 @@ class EnvTest(unittest.TestCase):
             {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''},
         )
 
+    @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
     @mock.patch.dict(os.environ)
     def test_resolve_path(self):
         os.environ['HOSTENV'] = '/tmp'
@@ -1073,6 +1080,7 @@ class ExtendsTest(unittest.TestCase):
         for service in service_dicts:
             self.assertTrue(service['hostname'], expected_interpolated_value)
 
+    @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
     def test_volume_path(self):
         dicts = load_from_filename('tests/fixtures/volume-path/docker-compose.yml')
 
@@ -1108,6 +1116,7 @@ class ExtendsTest(unittest.TestCase):
         self.assertEqual(dicts[0]['environment'], {'FOO': '1'})
 
 
+@pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class ExpandPathTest(unittest.TestCase):
     working_dir = '/home/user/somedir'
 
@@ -1129,6 +1138,7 @@ class ExpandPathTest(unittest.TestCase):
         self.assertEqual(result, user_path + 'otherdir/somefile')
 
 
+@pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class BuildPathTest(unittest.TestCase):
     def setUp(self):
         self.abs_context_path = os.path.join(os.getcwd(), 'tests/fixtures/build-ctx')
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 5f7ae948..a1c195ac 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -2,9 +2,11 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import docker
+import pytest
 
 from .. import mock
 from .. import unittest
+from compose.const import IS_WINDOWS_PLATFORM
 from compose.const import LABEL_CONFIG_HASH
 from compose.const import LABEL_ONE_OFF
 from compose.const import LABEL_PROJECT
@@ -439,6 +441,7 @@ def mock_get_image(images):
         raise NoSuchImageError()
 
 
+@pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class ServiceVolumesTest(unittest.TestCase):
 
     def setUp(self):

From bd1373f52773be08f32d89e7ac207bbae89e0e66 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 22 Sep 2015 10:31:42 -0400
Subject: [PATCH 0362/1265] Bump 1.4.2

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 CHANGELOG.md    | 6 ++++++
 docs/install.md | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a054a0ae..598f5e57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Change log
 ==========
 
+1.4.2 (2015-09-22)
+------------------
+
+-  Fixed a regression in the 1.4.1 release that would cause `docker-compose up`
+   without the `-d` option to exit immediately.
+
 1.4.1 (2015-09-10)
 ------------------
 
diff --git a/docs/install.md b/docs/install.md
index 517b2901..bc1f8f78 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -52,7 +52,7 @@ To install Compose, do the following:
 6. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.4.1
+        docker-compose version: 1.4.2
 
 ## Upgrading
 

From 91b227d133a33e2dd0b8cc06bba33bf389ff7e3f Mon Sep 17 00:00:00 2001
From: Karol Duleba <mr.fuxi@gmail.com>
Date: Wed, 9 Sep 2015 22:30:36 +0100
Subject: [PATCH 0363/1265] Allow to extend service using shorthand notation.
 Closes #1989

Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
---
 compose/config/config.py                      | 10 ++++++---
 compose/config/fields_schema.json             | 21 ++++++++++++-------
 .../extends/verbose-and-shorthand.yml         | 15 +++++++++++++
 tests/unit/config/config_test.py              | 20 ++++++++++++++++++
 4 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 tests/fixtures/extends/verbose-and-shorthand.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 94c5ab95..55c717f4 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -275,15 +275,19 @@ class ServiceLoader(object):
         self.service_dict['environment'] = env
 
     def validate_and_construct_extends(self):
+        extends = self.service_dict['extends']
+        if not isinstance(extends, dict):
+            extends = {'service': extends}
+
         validate_extends_file_path(
             self.service_name,
-            self.service_dict['extends'],
+            extends,
             self.filename
         )
         self.extended_config_path = self.get_extended_config_path(
-            self.service_dict['extends']
+            extends
         )
-        self.extended_service_name = self.service_dict['extends']['service']
+        self.extended_service_name = extends['service']
 
         full_extended_config = pre_process_config(
             load_yaml(self.extended_config_path)
diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 6fce299c..07b17cb2 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -57,14 +57,21 @@
         },
 
         "extends": {
-          "type": "object",
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "object",
 
-          "properties": {
-            "service": {"type": "string"},
-            "file": {"type": "string"}
-          },
-          "required": ["service"],
-          "additionalProperties": false
+              "properties": {
+                "service": {"type": "string"},
+                "file": {"type": "string"}
+              },
+              "required": ["service"],
+              "additionalProperties": false
+            }
+          ]
         },
 
         "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
diff --git a/tests/fixtures/extends/verbose-and-shorthand.yml b/tests/fixtures/extends/verbose-and-shorthand.yml
new file mode 100644
index 00000000..d3816302
--- /dev/null
+++ b/tests/fixtures/extends/verbose-and-shorthand.yml
@@ -0,0 +1,15 @@
+base:
+  image: busybox
+  environment:
+    - "BAR=1"
+
+verbose:
+  extends:
+    service: base
+  environment:
+    - "FOO=1"
+
+shorthand:
+  extends: base
+  environment:
+    - "FOO=2"
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 2dfa764d..2c3c5a3a 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1115,6 +1115,26 @@ class ExtendsTest(unittest.TestCase):
         dicts = load_from_filename('tests/fixtures/extends/valid-common-config.yml')
         self.assertEqual(dicts[0]['environment'], {'FOO': '1'})
 
+    def test_extended_service_with_verbose_and_shorthand_way(self):
+        services = load_from_filename('tests/fixtures/extends/verbose-and-shorthand.yml')
+        self.assertEqual(service_sort(services), service_sort([
+            {
+                'name': 'base',
+                'image': 'busybox',
+                'environment': {'BAR': '1'},
+            },
+            {
+                'name': 'verbose',
+                'image': 'busybox',
+                'environment': {'BAR': '1', 'FOO': '1'},
+            },
+            {
+                'name': 'shorthand',
+                'image': 'busybox',
+                'environment': {'BAR': '1', 'FOO': '2'},
+            },
+        ]))
+
 
 @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class ExpandPathTest(unittest.TestCase):

From bb470798d401cb6c991c4d51a0a14915b986b825 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 1 Oct 2015 12:26:55 +0100
Subject: [PATCH 0364/1265] Pass all DOCKER_ env vars to py.test

This ensures that `tox` will run against SSL-protected Docker daemons.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tox.ini b/tox.ini
index 901c1851..dbf63920 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,8 @@ usedevelop=True
 passenv =
     LD_LIBRARY_PATH
     DOCKER_HOST
+    DOCKER_CERT_PATH
+    DOCKER_TLS_VERIFY
 setenv =
     HOME=/tmp
 deps =

From e38334efbdbac3a5e0a652d4771c2e51e1d73810 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 1 Oct 2015 12:22:59 +0100
Subject: [PATCH 0365/1265] Don't expand volume names

Only expand volume host paths if they begin with a dot.

This is a breaking change. The deprecation warning preparing users for
this change has been removed.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py         | 21 ++-------
 tests/unit/config/config_test.py | 76 +++++++++++++-------------------
 2 files changed, 34 insertions(+), 63 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 94c5ab95..0444ba3a 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -78,13 +78,6 @@ SUPPORTED_FILENAMES = [
 
 DEFAULT_OVERRIDE_FILENAME = 'docker-compose.override.yml'
 
-PATH_START_CHARS = [
-    '/',
-    '.',
-    '~',
-]
-
-
 log = logging.getLogger(__name__)
 
 
@@ -495,18 +488,10 @@ def resolve_volume_path(volume, working_dir, service_name):
     container_path = os.path.expanduser(container_path)
 
     if host_path is not None:
-        if not any(host_path.startswith(c) for c in PATH_START_CHARS):
-            log.warn(
-                'Warning: the mapping "{0}:{1}" in the volumes config for '
-                'service "{2}" is ambiguous. In a future version of Docker, '
-                'it will designate a "named" volume '
-                '(see https://github.com/docker/docker/pull/14242). '
-                'To prevent unexpected behaviour, change it to "./{0}:{1}"'
-                .format(host_path, container_path, service_name)
-            )
-
+        if host_path.startswith('.'):
+            host_path = expand_path(working_dir, host_path)
         host_path = os.path.expanduser(host_path)
-        return "%s:%s" % (expand_path(working_dir, host_path), container_path)
+        return "{}:{}".format(host_path, container_path)
     else:
         return container_path
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 2dfa764d..3269cdff 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -414,6 +414,12 @@ class InterpolationTest(unittest.TestCase):
         self.assertIn('in service "web"', cm.exception.msg)
         self.assertIn('"${"', cm.exception.msg)
 
+
+class VolumeConfigTest(unittest.TestCase):
+    def test_no_binding(self):
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['/data']}, working_dir='.')
+        self.assertEqual(d['volumes'], ['/data'])
+
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
     @mock.patch.dict(os.environ)
     def test_volume_binding_with_environment_variable(self):
@@ -434,59 +440,39 @@ class InterpolationTest(unittest.TestCase):
         d = make_service_dict('foo', {'build': '.', 'volumes': ['~:/container/path']}, working_dir='.')
         self.assertEqual(d['volumes'], ['/home/user:/container/path'])
 
-    @mock.patch.dict(os.environ)
-    def test_volume_binding_with_local_dir_name_raises_warning(self):
-        def make_dict(**config):
-            config['build'] = '.'
-            make_service_dict('foo', config, working_dir='.')
+    def test_name_does_not_expand(self):
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['mydatavolume:/data']}, working_dir='.')
+        self.assertEqual(d['volumes'], ['mydatavolume:/data'])
 
-        with mock.patch('compose.config.config.log.warn') as warn:
-            make_dict(volumes=['/container/path'])
-            self.assertEqual(0, warn.call_count)
+    def test_absolute_posix_path_does_not_expand(self):
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['/var/lib/data:/data']}, working_dir='.')
+        self.assertEqual(d['volumes'], ['/var/lib/data:/data'])
 
-            make_dict(volumes=['/data:/container/path'])
-            self.assertEqual(0, warn.call_count)
+    def test_absolute_windows_path_does_not_expand(self):
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['C:\\data:/data']}, working_dir='.')
+        self.assertEqual(d['volumes'], ['C:\\data:/data'])
 
-            make_dict(volumes=['.:/container/path'])
-            self.assertEqual(0, warn.call_count)
+    @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='posix paths')
+    def test_relative_path_does_expand_posix(self):
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['./data:/data']}, working_dir='/home/me/myproject')
+        self.assertEqual(d['volumes'], ['/home/me/myproject/data:/data'])
 
-            make_dict(volumes=['..:/container/path'])
-            self.assertEqual(0, warn.call_count)
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['.:/data']}, working_dir='/home/me/myproject')
+        self.assertEqual(d['volumes'], ['/home/me/myproject:/data'])
 
-            make_dict(volumes=['./data:/container/path'])
-            self.assertEqual(0, warn.call_count)
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['../otherproject:/data']}, working_dir='/home/me/myproject')
+        self.assertEqual(d['volumes'], ['/home/me/otherproject:/data'])
 
-            make_dict(volumes=['../data:/container/path'])
-            self.assertEqual(0, warn.call_count)
+    @pytest.mark.skipif(not IS_WINDOWS_PLATFORM, reason='windows paths')
+    def test_relative_path_does_expand_windows(self):
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['./data:/data']}, working_dir='C:\\Users\\me\\myproject')
+        self.assertEqual(d['volumes'], ['C:\\Users\\me\\myproject\\data:/data'])
 
-            make_dict(volumes=['.profile:/container/path'])
-            self.assertEqual(0, warn.call_count)
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['.:/data']}, working_dir='C:\\Users\\me\\myproject')
+        self.assertEqual(d['volumes'], ['C:\\Users\\me\\myproject:/data'])
 
-            make_dict(volumes=['~:/container/path'])
-            self.assertEqual(0, warn.call_count)
-
-            make_dict(volumes=['~/data:/container/path'])
-            self.assertEqual(0, warn.call_count)
-
-            make_dict(volumes=['~tmp:/container/path'])
-            self.assertEqual(0, warn.call_count)
-
-            make_dict(volumes=['data:/container/path'], volume_driver='mydriver')
-            self.assertEqual(0, warn.call_count)
-
-            make_dict(volumes=['data:/container/path'])
-            self.assertEqual(1, warn.call_count)
-            warning = warn.call_args[0][0]
-            self.assertIn('"data:/container/path"', warning)
-            self.assertIn('"./data:/container/path"', warning)
-
-    def test_named_volume_with_driver_does_not_expand(self):
-        d = make_service_dict('foo', {
-            'build': '.',
-            'volumes': ['namedvolume:/data'],
-            'volume_driver': 'foodriver',
-        }, working_dir='.')
-        self.assertEqual(d['volumes'], ['namedvolume:/data'])
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['../otherproject:/data']}, working_dir='C:\\Users\\me\\myproject')
+        self.assertEqual(d['volumes'], ['C:\\Users\\me\\otherproject:/data'])
 
     @mock.patch.dict(os.environ)
     def test_home_directory_with_driver_does_not_expand(self):

From f4cd5b1d45f0eee1a731af1664c75d27e9b4aa18 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 22 Sep 2015 16:13:42 +0100
Subject: [PATCH 0366/1265] Handle windows volume paths

When a relative path is expanded and we're on a windows platform,
it expands to include the drive, eg C:\ , which was causing a ConfigError
as we split on ":" in parse_volume_spec and that was giving too many parts.

Use os.path.splitdrive instead of manually calculating the drive.

This should help us deal with windows drives as part of the volume
path better than us doing it manually.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py         | 11 ++++++-----
 compose/const.py                 |  1 +
 compose/service.py               | 14 ++++++++++++++
 tests/unit/config/config_test.py | 15 +++++++++++++++
 tests/unit/service_test.py       | 15 +++++++++++++++
 5 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 0444ba3a..9e9cb857 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -526,12 +526,13 @@ def path_mappings_from_dict(d):
     return [join_path_mapping(v) for v in d.items()]
 
 
-def split_path_mapping(string):
-    if ':' in string:
-        (host, container) = string.split(':', 1)
-        return (container, host)
+def split_path_mapping(volume_path):
+    drive, volume_config = os.path.splitdrive(volume_path)
+    if ':' in volume_config:
+        (host, container) = volume_config.split(':', 1)
+        return (container, drive + host)
     else:
-        return (string, None)
+        return (volume_path, None)
 
 
 def join_path_mapping(pair):
diff --git a/compose/const.py b/compose/const.py
index b43e655b..b04b7e7e 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -2,6 +2,7 @@ import os
 import sys
 
 DEFAULT_TIMEOUT = 10
+IS_WINDOWS_PLATFORM = (sys.platform == "win32")
 LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
 LABEL_ONE_OFF = 'com.docker.compose.oneoff'
 LABEL_PROJECT = 'com.docker.compose.project'
diff --git a/compose/service.py b/compose/service.py
index 960d3936..4df10fbb 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -20,6 +20,7 @@ from .config import DOCKER_CONFIG_KEYS
 from .config import merge_environment
 from .config.validation import VALID_NAME_CHARS
 from .const import DEFAULT_TIMEOUT
+from .const import IS_WINDOWS_PLATFORM
 from .const import LABEL_CONFIG_HASH
 from .const import LABEL_CONTAINER_NUMBER
 from .const import LABEL_ONE_OFF
@@ -937,7 +938,20 @@ def build_volume_binding(volume_spec):
 
 
 def parse_volume_spec(volume_config):
+    """
+    A volume_config string, which is a path, split it into external:internal[:mode]
+    parts to be returned as a valid VolumeSpec tuple.
+    """
     parts = volume_config.split(':')
+
+    if IS_WINDOWS_PLATFORM:
+        # relative paths in windows expand to include the drive, eg C:\
+        # so we join the first 2 parts back together to count as one
+        drive, volume_path = os.path.splitdrive(volume_config)
+        windows_parts = volume_path.split(":")
+        windows_parts[0] = os.path.join(drive, windows_parts[0])
+        parts = windows_parts
+
     if len(parts) > 3:
         raise ConfigError("Volume %s has incorrect format, should be "
                           "external:internal[:mode]" % volume_config)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 3269cdff..cf299738 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1124,6 +1124,21 @@ class ExpandPathTest(unittest.TestCase):
         self.assertEqual(result, user_path + 'otherdir/somefile')
 
 
+class VolumePathTest(unittest.TestCase):
+
+    @pytest.mark.xfail((not IS_WINDOWS_PLATFORM), reason='does not have a drive')
+    def test_split_path_mapping_with_windows_path(self):
+        windows_volume_path = "c:\\Users\\msamblanet\\Documents\\anvil\\connect\\config:/opt/connect/config:ro"
+        expected_mapping = (
+            "/opt/connect/config:ro",
+            "c:\\Users\\msamblanet\\Documents\\anvil\\connect\\config"
+        )
+
+        mapping = config.split_path_mapping(windows_volume_path)
+
+        self.assertEqual(mapping, expected_mapping)
+
+
 @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class BuildPathTest(unittest.TestCase):
     def setUp(self):
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index a1c195ac..b0cee1ee 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -466,6 +466,21 @@ class ServiceVolumesTest(unittest.TestCase):
         with self.assertRaises(ConfigError):
             parse_volume_spec('one:two:three:four')
 
+    @pytest.mark.xfail((not IS_WINDOWS_PLATFORM), reason='does not have a drive')
+    def test_parse_volume_windows_relative_path(self):
+        windows_relative_path = "c:\\Users\\msamblanet\\Documents\\anvil\\connect\\config:\\opt\\connect\\config:ro"
+
+        spec = parse_volume_spec(windows_relative_path)
+
+        self.assertEqual(
+            spec,
+            (
+                "c:\\Users\\msamblanet\\Documents\\anvil\\connect\\config",
+                "\\opt\\connect\\config",
+                "ro"
+            )
+        )
+
     def test_build_volume_binding(self):
         binding = build_volume_binding(parse_volume_spec('/outside:/inside'))
         self.assertEqual(binding, ('/inside', '/outside:/inside:rw'))

From 58270d88592e6a097763ce0052ef6a8d22e9bbcb Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 23 Sep 2015 17:08:41 +0100
Subject: [PATCH 0367/1265] Remove duplicate and re-order alphabetically

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/const.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/compose/const.py b/compose/const.py
index b04b7e7e..1b689418 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -2,6 +2,7 @@ import os
 import sys
 
 DEFAULT_TIMEOUT = 10
+HTTP_TIMEOUT = int(os.environ.get('COMPOSE_HTTP_TIMEOUT', os.environ.get('DOCKER_CLIENT_TIMEOUT', 60)))
 IS_WINDOWS_PLATFORM = (sys.platform == "win32")
 LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
 LABEL_ONE_OFF = 'com.docker.compose.oneoff'
@@ -9,5 +10,3 @@ LABEL_PROJECT = 'com.docker.compose.project'
 LABEL_SERVICE = 'com.docker.compose.service'
 LABEL_VERSION = 'com.docker.compose.version'
 LABEL_CONFIG_HASH = 'com.docker.compose.config-hash'
-HTTP_TIMEOUT = int(os.environ.get('COMPOSE_HTTP_TIMEOUT', os.environ.get('DOCKER_CLIENT_TIMEOUT', 60)))
-IS_WINDOWS_PLATFORM = (sys.platform == 'win32')

From 2276326d7ecc4b3bbc30d1acaaa0213669b7ad59 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 1 Oct 2015 11:06:15 +0100
Subject: [PATCH 0368/1265] volume path compatibility with engine

An expanded windows path of c:\shiny\thing:\shiny:rw
needs to be changed to be linux style path, including the drive,
like /c/shiny/thing /shiny
to be mounted successfully by the engine.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/service.py               | 47 +++++++++++++++++++++++---------
 tests/unit/config/config_test.py |  3 +-
 tests/unit/service_test.py       |  7 ++---
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 4df10fbb..c9ca00ae 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -937,33 +937,54 @@ def build_volume_binding(volume_spec):
     return volume_spec.internal, "{}:{}:{}".format(*volume_spec)
 
 
+def normalize_paths_for_engine(external_path, internal_path):
+    """
+    Windows paths, c:\my\path\shiny, need to be changed to be compatible with
+    the Engine. Volume paths are expected to be linux style /c/my/path/shiny/
+    """
+    if IS_WINDOWS_PLATFORM:
+        if external_path:
+            drive, tail = os.path.splitdrive(external_path)
+
+            if drive:
+                reformatted_drive = "/{}".format(drive.replace(":", ""))
+                external_path = reformatted_drive + tail
+
+            external_path = "/".join(external_path.split("\\"))
+
+        return external_path, "/".join(internal_path.split("\\"))
+    else:
+        return external_path, internal_path
+
+
 def parse_volume_spec(volume_config):
     """
-    A volume_config string, which is a path, split it into external:internal[:mode]
-    parts to be returned as a valid VolumeSpec tuple.
+    Parse a volume_config path and split it into external:internal[:mode]
+    parts to be returned as a valid VolumeSpec.
     """
-    parts = volume_config.split(':')
-
     if IS_WINDOWS_PLATFORM:
         # relative paths in windows expand to include the drive, eg C:\
         # so we join the first 2 parts back together to count as one
-        drive, volume_path = os.path.splitdrive(volume_config)
-        windows_parts = volume_path.split(":")
-        windows_parts[0] = os.path.join(drive, windows_parts[0])
-        parts = windows_parts
+        drive, tail = os.path.splitdrive(volume_config)
+        parts = tail.split(":")
+
+        if drive:
+            parts[0] = drive + parts[0]
+    else:
+        parts = volume_config.split(':')
 
     if len(parts) > 3:
         raise ConfigError("Volume %s has incorrect format, should be "
                           "external:internal[:mode]" % volume_config)
 
     if len(parts) == 1:
-        external = None
-        internal = os.path.normpath(parts[0])
+        external, internal = normalize_paths_for_engine(None, os.path.normpath(parts[0]))
     else:
-        external = os.path.normpath(parts[0])
-        internal = os.path.normpath(parts[1])
+        external, internal = normalize_paths_for_engine(os.path.normpath(parts[0]), os.path.normpath(parts[1]))
 
-    mode = parts[2] if len(parts) == 3 else 'rw'
+    mode = 'rw'
+    if len(parts) == 3:
+        mode = parts[2]
 
     return VolumeSpec(external, internal, mode)
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index cf299738..c06a2a32 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -420,7 +420,6 @@ class VolumeConfigTest(unittest.TestCase):
         d = make_service_dict('foo', {'build': '.', 'volumes': ['/data']}, working_dir='.')
         self.assertEqual(d['volumes'], ['/data'])
 
-    @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
     @mock.patch.dict(os.environ)
     def test_volume_binding_with_environment_variable(self):
         os.environ['VOLUME_PATH'] = '/host/path'
@@ -433,7 +432,7 @@ class VolumeConfigTest(unittest.TestCase):
         )[0]
         self.assertEqual(d['volumes'], ['/host/path:/container/path'])
 
-    @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
+    @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='posix paths')
     @mock.patch.dict(os.environ)
     def test_volume_binding_with_home(self):
         os.environ['HOME'] = '/home/user'
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index b0cee1ee..a3db0d43 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -441,7 +441,6 @@ def mock_get_image(images):
         raise NoSuchImageError()
 
 
-@pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class ServiceVolumesTest(unittest.TestCase):
 
     def setUp(self):
@@ -468,15 +467,15 @@ class ServiceVolumesTest(unittest.TestCase):
 
     @pytest.mark.xfail((not IS_WINDOWS_PLATFORM), reason='does not have a drive')
     def test_parse_volume_windows_relative_path(self):
-        windows_relative_path = "c:\\Users\\msamblanet\\Documents\\anvil\\connect\\config:\\opt\\connect\\config:ro"
+        windows_relative_path = "c:\\Users\\me\\Documents\\shiny\\config:\\opt\\shiny\\config:ro"
 
         spec = parse_volume_spec(windows_relative_path)
 
         self.assertEqual(
             spec,
             (
-                "c:\\Users\\msamblanet\\Documents\\anvil\\connect\\config",
-                "\\opt\\connect\\config",
+                "/c/Users/me/Documents/shiny/config",
+                "/opt/shiny/config",
                 "ro"
             )
         )

From af8032a5f4a5075d71c220bfafbadcbbebbcb5b7 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 1 Oct 2015 12:09:32 +0100
Subject: [PATCH 0369/1265] Fix incorrect test name

I'd written relative, when I meant absolute. D'oh.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/unit/service_test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index a3db0d43..c682b823 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -466,10 +466,10 @@ class ServiceVolumesTest(unittest.TestCase):
             parse_volume_spec('one:two:three:four')
 
     @pytest.mark.xfail((not IS_WINDOWS_PLATFORM), reason='does not have a drive')
-    def test_parse_volume_windows_relative_path(self):
-        windows_relative_path = "c:\\Users\\me\\Documents\\shiny\\config:\\opt\\shiny\\config:ro"
+    def test_parse_volume_windows_absolute_path(self):
+        windows_absolute_path = "c:\\Users\\me\\Documents\\shiny\\config:\\opt\\shiny\\config:ro"
 
-        spec = parse_volume_spec(windows_relative_path)
+        spec = parse_volume_spec(windows_absolute_path)
 
         self.assertEqual(
             spec,

From bef5c2238e7cefa12cb34b814dc536fa46e9773f Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 2 Oct 2015 15:29:26 +0100
Subject: [PATCH 0370/1265] Skip a test for now

This needs resolving outside of this PR, as it is a much bigger piece
of work.

https://github.com/docker/compose/issues/2128

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/unit/config/config_test.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index c06a2a32..b505740f 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -463,6 +463,7 @@ class VolumeConfigTest(unittest.TestCase):
         self.assertEqual(d['volumes'], ['/home/me/otherproject:/data'])
 
     @pytest.mark.skipif(not IS_WINDOWS_PLATFORM, reason='windows paths')
+    @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='waiting for this to be resolved: https://github.com/docker/compose/issues/2128')
     def test_relative_path_does_expand_windows(self):
         d = make_service_dict('foo', {'build': '.', 'volumes': ['./data:/data']}, working_dir='C:\\Users\\me\\myproject')
         self.assertEqual(d['volumes'], ['C:\\Users\\me\\myproject\\data:/data'])

From da91b81bb89907e5bffa6553540b248d0802a3ca Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 11 Sep 2015 01:44:25 -0400
Subject: [PATCH 0371/1265] Add scripts for automating parts of the release.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 project/RELEASE-PROCESS.md        | 57 +++++-------------
 script/release/cherry-pick-pr     | 28 +++++++++
 script/release/make-branch        | 96 +++++++++++++++++++++++++++++++
 script/release/push-release       | 71 +++++++++++++++++++++++
 script/release/rebase-bump-commit | 39 +++++++++++++
 script/release/utils.sh           | 20 +++++++
 6 files changed, 269 insertions(+), 42 deletions(-)
 create mode 100755 script/release/cherry-pick-pr
 create mode 100755 script/release/make-branch
 create mode 100755 script/release/push-release
 create mode 100755 script/release/rebase-bump-commit
 create mode 100644 script/release/utils.sh

diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 966e06ee..631691a0 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -3,11 +3,12 @@ Building a Compose release
 
 ## To get started with a new release
 
-1.  Create a `bump-$VERSION` branch off master:
+Create a branch, update version, and add release notes by running `make-branch`
 
-        git checkout -b bump-$VERSION master
+        git checkout -b bump-$VERSION $BASE_VERSION
 
-2.  Merge in the `release` branch on the upstream repo, discarding its tree entirely:
+`$BASE_VERSION` will default to master. Use the last version tag for a bug fix
+release.
 
         git fetch origin
         git merge --strategy=ours origin/release
@@ -58,38 +59,21 @@ Building a Compose release
 
 ## To release a version (whether RC or stable)
 
-1.  Check that CI is passing on the bump PR.
-
-2.  Check out the bump branch:
+Check out the bump branch and run the `push-release` script
 
         git checkout bump-$VERSION
+        ./script/release/push-release $VERSION
 
-3.  Build the Linux binary:
 
-        script/build-linux
+When prompted test the binaries.
 
-4.  Build the Mac binary in a Mountain Lion VM:
 
-        script/prepare-osx
-        script/build-osx
+1.  Draft a release from the tag on GitHub (the script will open the window for
+    you)
 
-5.  Test the binaries and/or get some other people to test them.
+    In the "Tag version" dropdown, select the tag you just pushed.
 
-6.  Create a tag:
-
-        TAG=$VERSION # or $VERSION-rcN, if it's an RC
-        git tag $TAG
-
-7.  Push the tag to the upstream repo:
-
-        git push git@github.com:docker/compose.git $TAG
-
-8.  Draft a release from the tag on GitHub.
-
-    - Go to https://github.com/docker/compose/releases and click "Draft a new release".
-    - In the "Tag version" dropdown, select the tag you just pushed.
-
-9.  Paste in installation instructions and release notes. Here's an example - change the Compose version and Docker version as appropriate:
+2.  Paste in installation instructions and release notes. Here's an example - change the Compose version and Docker version as appropriate:
 
         Firstly, note that Compose 1.5.0 requires Docker 1.8.0 or later.
 
@@ -108,24 +92,13 @@ Building a Compose release
 
         ...release notes go here...
 
-10.  Attach the binaries.
+3.  Attach the binaries.
 
-11. Don’t publish it just yet!
+4.  Publish the release on GitHub.
 
-12. Upload the latest version to PyPi:
+5.  Check that both binaries download (following the install instructions) and run.
 
-        python setup.py sdist upload
-
-13. Check that the pip package installs and runs (best done in a virtualenv):
-
-        pip install -U docker-compose==$TAG
-        docker-compose version
-
-14. Publish the release on GitHub.
-
-15. Check that both binaries download (following the install instructions) and run.
-
-16. Email maintainers@dockerproject.org and engineering@docker.com about the new release.
+6.  Email maintainers@dockerproject.org and engineering@docker.com about the new release.
 
 ## If it’s a stable release (not an RC)
 
diff --git a/script/release/cherry-pick-pr b/script/release/cherry-pick-pr
new file mode 100755
index 00000000..7062f7aa
--- /dev/null
+++ b/script/release/cherry-pick-pr
@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# Cherry-pick a PR into the release branch
+#
+
+set -e
+set -o pipefail
+
+
+function usage() {
+    >&2 cat << EOM
+Cherry-pick commits from a github pull request.
+
+Usage:
+
+    $0 <github PR number>
+EOM
+    exit 1
+}
+
+[ -n "$1" ] || usage
+
+
+REPO=docker/compose
+GITHUB=https://github.com/$REPO/pull
+PR=$1
+url="$GITHUB/$PR"
+hub am -3 $url
diff --git a/script/release/make-branch b/script/release/make-branch
new file mode 100755
index 00000000..99f711e1
--- /dev/null
+++ b/script/release/make-branch
@@ -0,0 +1,96 @@
+#!/bin/bash
+#
+# Prepare a new release branch
+#
+
+set -e
+set -o pipefail
+
+. script/release/utils.sh
+
+REPO=git@github.com:docker/compose
+
+
+function usage() {
+    >&2 cat << EOM
+Create a new release branch `release-<version>`
+
+Usage:
+
+    $0 <version> [<base_version>]
+
+Options:
+
+    version        version string for the release (ex: 1.6.0)
+    base_version   branch or tag to start from. Defaults to master. For
+                   bug-fix releases use the previous stage release tag.
+
+EOM
+    exit 1
+}
+
+[ -n "$1" ] || usage
+VERSION=$1
+BRANCH=bump-$VERSION
+
+if [ -z "$2" ]; then
+    BASE_VERSION="master"
+else
+    BASE_VERSION=$2
+fi
+
+
+DEFAULT_REMOTE=release
+REMOTE=$(find_remote $REPO)
+# If we don't have a docker origin add one
+if [ -z "$REMOTE" ]; then
+    echo "Creating $DEFAULT_REMOTE remote"
+    git remote add ${DEFAULT_REMOTE} ${REPO} 
+fi
+
+# handle the difference between a branch and a tag
+if [ -z "$(git name-rev $BASE_VERSION | grep tags)" ]; then
+    BASE_VERSION=$REMOTE/$BASE_VERSION
+fi
+
+echo "Creating a release branch $VERSION from $BASE_VERSION"
+read -n1 -r -p "Continue? (ctrl+c to cancel)"
+git fetch $REMOTE -p
+git checkout -b $BRANCH $BASE_VERSION
+
+
+# Store the release version for this branch in git, so that other release
+# scripts can use it
+git config "branch.${BRANCH}.release" $VERSION
+
+
+echo "Update versions in docs/install.md and compose/__init__.py"
+# TODO: automate this
+$EDITOR docs/install.md
+$EDITOR compose/__init__.py
+
+
+echo "Write release notes in CHANGELOG.md"
+browser "https://github.com/docker/compose/issues?q=milestone%3A$VERSION+is%3Aclosed"
+$EDITOR CHANGELOG.md
+
+
+echo "Verify changes before commit. Exit the shell to commit changes"
+git diff
+$SHELL
+git commit -a -m "Bump $VERSION" --signoff
+
+
+echo "Push branch to user remote"
+GITHUB_USER=$USER
+USER_REMOTE=$(find_remote $GITHUB_USER/compose)
+if [ -z "$USER_REMOTE" ]; then
+    echo "No user remote found for $GITHUB_USER"
+    read -n1 -r -p "Enter the name of your github user: " GITHUB_USER
+    # assumes there is already a user remote somewhere
+    USER_REMOTE=$(find_remote $GITHUB_USER/compose)
+fi
+
+
+git push $USER_REMOTE
+browser https://github.com/docker/compose/compare/docker:release...$GITHUB_USER:$BRANCH?expand=1
diff --git a/script/release/push-release b/script/release/push-release
new file mode 100755
index 00000000..276d67c1
--- /dev/null
+++ b/script/release/push-release
@@ -0,0 +1,71 @@
+#!/bin/bash
+#
+# Create the official release
+#
+
+set -e
+set -o pipefail
+
+. script/release/utils.sh
+
+function usage() {
+    >&2 cat << EOM
+Publish a release by building all artifacts and pushing them.
+
+This script requires that 'git config branch.${BRANCH}.release' is set to the
+release version for the release branch.
+
+EOM
+    exit 1
+}
+
+BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+VERSION="$(git config "branch.${BRANCH}.release")" || usage
+
+API=https://api.github.com/repos
+REPO=docker/compose
+GITHUB_REPO=git@github.com:$REPO
+
+# Check the build status is green
+sha=$(git rev-parse HEAD)
+url=$API/$REPO/statuses/$sha
+build_status=$(curl -s $url | jq -r '.[0].state')
+if [[ "$build_status" != "success" ]]; then
+    >&2 echo "Build status is $build_status, but it should be success."
+    exit -1
+fi
+
+
+# Build the binaries and sdists
+script/build-linux
+# TODO: build osx binary
+# script/prepare-osx
+# script/build-osx
+python setup.py sdist --formats=gztar,zip
+
+
+echo "Test those binaries! Exit the shell to continue."
+$SHELL
+
+
+echo "Tagging the release as $VERSION"
+git tag $VERSION
+git push $GITHUB_REPO $VERSION
+
+
+echo "Create a github release"
+# TODO: script more of this https://developer.github.com/v3/repos/releases/
+browser https://github.com/$REPO/releases/new
+
+echo "Uploading sdist to pypi"
+python setup.py sdist upload
+
+echo "Testing pip package"
+virtualenv venv-test
+source venv-test/bin/activate
+pip install docker-compose==$VERSION
+docker-compose version
+deactivate
+
+echo "Now publish the github release, and test the downloads."
+echo "Email maintainers@dockerproject.org and engineering@docker.com about the new release.
diff --git a/script/release/rebase-bump-commit b/script/release/rebase-bump-commit
new file mode 100755
index 00000000..732b3194
--- /dev/null
+++ b/script/release/rebase-bump-commit
@@ -0,0 +1,39 @@
+#!/bin/bash
+#
+# Move the "bump to <version>" commit to the HEAD of the branch
+#
+
+set -e
+
+
+function usage() {
+    >&2 cat << EOM
+Move the "bump to <version>" commit to the HEAD of the branch
+
+This script requires that 'git config branch.${BRANCH}.release' is set to the
+release version for the release branch.
+
+EOM
+    exit 1
+}
+
+
+BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+VERSION="$(git config "branch.${BRANCH}.release")" || usage
+
+
+COMMIT_MSG="Bump $VERSION"
+sha=$(git log --grep $COMMIT_MSG --format="%H")
+if [ -z "$sha" ]; then
+    >&2 echo "No commit with message \"$COMMIT_MSG\""
+    exit 2
+fi
+if [[ "$sha" == "$(git rev-parse HEAD)" ]]; then
+    >&2 echo "Bump commit already at HEAD"
+    exit 0
+fi
+
+commits=$(git log --format="%H" HEAD..$sha | wc -l)
+
+git rebase --onto $sha~1 HEAD~$commits $BRANCH
+git cherry-pick $sha
diff --git a/script/release/utils.sh b/script/release/utils.sh
new file mode 100644
index 00000000..d64d1161
--- /dev/null
+++ b/script/release/utils.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Util functions for release scritps
+#
+
+set -e
+
+
+function browser() {
+    local url=$1
+    xdg-open $url || open $url
+}
+
+
+function find_remote() {
+    local url=$1
+    for remote in $(git remote); do
+        git config --get remote.${remote}.url | grep $url > /dev/null && echo -n $remote
+    done
+}

From dc56e4f97ec83b2b2888b167e4bbb347d4bc9409 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 11 Sep 2015 02:02:01 -0400
Subject: [PATCH 0372/1265] Update release process docs to use scripts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 project/RELEASE-PROCESS.md | 39 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 631691a0..c9b7a78c 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -5,19 +5,18 @@ Building a Compose release
 
 Create a branch, update version, and add release notes by running `make-branch`
 
-        git checkout -b bump-$VERSION $BASE_VERSION
+        ./script/release/make-branch $VERSION [$BASE_VERSION]
 
-`$BASE_VERSION` will default to master. Use the last version tag for a bug fix
+`$BASE_VERSION` will default to master. Use the last version tag for a bug fix 
 release.
 
-        git fetch origin
-        git merge --strategy=ours origin/release
+As part of this script you'll be asked to:
 
-3.  Update the version in `docs/install.md` and `compose/__init__.py`.
+1.  Update the version in `docs/install.md` and `compose/__init__.py`.
 
     If the next release will be an RC, append `rcN`, e.g. `1.4.0rc1`.
 
-4.  Write release notes in `CHANGES.md`.
+2.  Write release notes in `CHANGES.md`.
 
     Almost every feature enhancement should be mentioned, with the most visible/exciting ones first. Use descriptive sentences and give context where appropriate.
 
@@ -25,38 +24,20 @@ release.
 
     Improvements to the code are not worth mentioning.
 
-5.   Add a bump commit:
-
-        git commit -am "Bump $VERSION"
-
-6.   Push the bump branch to your fork:
-
-        git push --set-upstream $USERNAME bump-$VERSION
-
-7.  Open a PR from the bump branch against the `release` branch on the upstream repo, **not** against master.
 
 ## When a PR is merged into master that we want in the release
 
-1.  Check out the bump branch:
+1. Check out the bump branch and run the cherry pick script
 
         git checkout bump-$VERSION
+        ./script/release/cherry-pick-pr $PR_NUMBER
 
-2.   Cherry-pick the merge commit, fixing any conflicts if necessary:
-
-        git cherry-pick -xm1 $MERGE_COMMIT_HASH
-
-3.  Add a signoff (it’s missing from merge commits):
-
-        git commit --amend --signoff
-
-4.  Move the bump commit back to the tip of the branch:
-
-        git rebase --interactive $PARENT_OF_BUMP_COMMIT
-
-5.  Force-push the bump branch to your fork:
+2. When you are done cherry-picking branches move the bump version commit to HEAD
 
+        ./script/release/rebase-bump-commit
         git push --force $USERNAME bump-$VERSION
 
+
 ## To release a version (whether RC or stable)
 
 Check out the bump branch and run the `push-release` script

From 1a2a0dd53ded656cc734f454b016c91f0ee2da10 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 22 Sep 2015 10:10:11 -0400
Subject: [PATCH 0373/1265] Fix some bugs in the release scripts

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 project/RELEASE-PROCESS.md        | 19 +++++++++------
 script/release/build-binaries     | 21 ++++++++++++++++
 script/release/cherry-pick-pr     |  6 +++++
 script/release/make-branch        | 34 +++++++++++++-------------
 script/release/push-release       | 40 +++++++++++++------------------
 script/release/rebase-bump-commit |  7 +++---
 script/release/utils.sh           |  3 +++
 7 files changed, 78 insertions(+), 52 deletions(-)
 create mode 100755 script/release/build-binaries

diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index c9b7a78c..810c3097 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -7,7 +7,7 @@ Create a branch, update version, and add release notes by running `make-branch`
 
         ./script/release/make-branch $VERSION [$BASE_VERSION]
 
-`$BASE_VERSION` will default to master. Use the last version tag for a bug fix 
+`$BASE_VERSION` will default to master. Use the last version tag for a bug fix
 release.
 
 As part of this script you'll be asked to:
@@ -40,15 +40,14 @@ As part of this script you'll be asked to:
 
 ## To release a version (whether RC or stable)
 
-Check out the bump branch and run the `push-release` script
+Check out the bump branch and run the `build-binary` script
 
         git checkout bump-$VERSION
-        ./script/release/push-release $VERSION
+        ./script/release/build-binary
 
 
 When prompted test the binaries.
 
-
 1.  Draft a release from the tag on GitHub (the script will open the window for
     you)
 
@@ -75,11 +74,17 @@ When prompted test the binaries.
 
 3.  Attach the binaries.
 
-4.  Publish the release on GitHub.
+4. If everything looks good, it's time to push the release.
 
-5.  Check that both binaries download (following the install instructions) and run.
 
-6.  Email maintainers@dockerproject.org and engineering@docker.com about the new release.
+        ./script/release/push-release
+
+
+5.  Publish the release on GitHub.
+
+6.  Check that both binaries download (following the install instructions) and run.
+
+7.  Email maintainers@dockerproject.org and engineering@docker.com about the new release.
 
 ## If it’s a stable release (not an RC)
 
diff --git a/script/release/build-binaries b/script/release/build-binaries
new file mode 100755
index 00000000..9f65b45d
--- /dev/null
+++ b/script/release/build-binaries
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# Build the release binaries
+#
+
+. "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
+
+REPO=docker/compose
+
+# Build the binaries
+script/clean
+script/build-linux
+# TODO: build osx binary
+# script/prepare-osx
+# script/build-osx
+# TODO: build or fetch the windows binary
+echo "You need to build the osx/windows binaries, that step is not automated yet."
+
+echo "Create a github release"
+# TODO: script more of this https://developer.github.com/v3/repos/releases/
+browser https://github.com/$REPO/releases/new
diff --git a/script/release/cherry-pick-pr b/script/release/cherry-pick-pr
index 7062f7aa..60460087 100755
--- a/script/release/cherry-pick-pr
+++ b/script/release/cherry-pick-pr
@@ -20,6 +20,12 @@ EOM
 
 [ -n "$1" ] || usage
 
+if [ -z "$(command -v hub 2> /dev/null)" ]; then
+    >&2 echo "$0 requires https://hub.github.com/."
+    >&2 echo "Please install it and ake sure it is available on your \$PATH."
+    exit 2
+fi
+
 
 REPO=docker/compose
 GITHUB=https://github.com/$REPO/pull
diff --git a/script/release/make-branch b/script/release/make-branch
index 99f711e1..66ed6bbf 100755
--- a/script/release/make-branch
+++ b/script/release/make-branch
@@ -3,17 +3,11 @@
 # Prepare a new release branch
 #
 
-set -e
-set -o pipefail
-
-. script/release/utils.sh
-
-REPO=git@github.com:docker/compose
-
+. "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
 
 function usage() {
     >&2 cat << EOM
-Create a new release branch `release-<version>`
+Create a new release branch 'release-<version>'
 
 Usage:
 
@@ -29,9 +23,12 @@ EOM
     exit 1
 }
 
+
 [ -n "$1" ] || usage
 VERSION=$1
 BRANCH=bump-$VERSION
+REPO=docker/compose
+GITHUB_REPO=git@github.com:$REPO
 
 if [ -z "$2" ]; then
     BASE_VERSION="master"
@@ -41,11 +38,11 @@ fi
 
 
 DEFAULT_REMOTE=release
-REMOTE=$(find_remote $REPO)
+REMOTE="$(find_remote "$GITHUB_REPO")"
 # If we don't have a docker origin add one
 if [ -z "$REMOTE" ]; then
     echo "Creating $DEFAULT_REMOTE remote"
-    git remote add ${DEFAULT_REMOTE} ${REPO} 
+    git remote add ${DEFAULT_REMOTE} ${GITHUB_REPO}
 fi
 
 # handle the difference between a branch and a tag
@@ -65,7 +62,6 @@ git config "branch.${BRANCH}.release" $VERSION
 
 
 echo "Update versions in docs/install.md and compose/__init__.py"
-# TODO: automate this
 $EDITOR docs/install.md
 $EDITOR compose/__init__.py
 
@@ -75,22 +71,26 @@ browser "https://github.com/docker/compose/issues?q=milestone%3A$VERSION+is%3Acl
 $EDITOR CHANGELOG.md
 
 
-echo "Verify changes before commit. Exit the shell to commit changes"
 git diff
-$SHELL
-git commit -a -m "Bump $VERSION" --signoff
+echo "Verify changes before commit. Exit the shell to commit changes"
+$SHELL || true
+git commit -a -m "Bump $VERSION" --signoff --no-verify
 
 
 echo "Push branch to user remote"
 GITHUB_USER=$USER
-USER_REMOTE=$(find_remote $GITHUB_USER/compose)
+USER_REMOTE="$(find_remote $GITHUB_USER/compose)"
 if [ -z "$USER_REMOTE" ]; then
     echo "No user remote found for $GITHUB_USER"
-    read -n1 -r -p "Enter the name of your github user: " GITHUB_USER
+    read -r -p "Enter the name of your github user: " GITHUB_USER
     # assumes there is already a user remote somewhere
     USER_REMOTE=$(find_remote $GITHUB_USER/compose)
 fi
+if [ -z "$USER_REMOTE" ]; then
+    >&2 echo "No user remote found. You need to 'git push' your branch."
+    exit 2
+fi
 
 
 git push $USER_REMOTE
-browser https://github.com/docker/compose/compare/docker:release...$GITHUB_USER:$BRANCH?expand=1
+browser https://github.com/$REPO/compare/docker:release...$GITHUB_USER:$BRANCH?expand=1
diff --git a/script/release/push-release b/script/release/push-release
index 276d67c1..7c448666 100755
--- a/script/release/push-release
+++ b/script/release/push-release
@@ -3,10 +3,7 @@
 # Create the official release
 #
 
-set -e
-set -o pipefail
-
-. script/release/utils.sh
+. "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
 
 function usage() {
     >&2 cat << EOM
@@ -22,6 +19,13 @@ EOM
 BRANCH="$(git rev-parse --abbrev-ref HEAD)"
 VERSION="$(git config "branch.${BRANCH}.release")" || usage
 
+if [ -z "$(command -v jq 2> /dev/null)" ]; then
+    >&2 echo "$0 requires https://stedolan.github.io/jq/"
+    >&2 echo "Please install it and ake sure it is available on your \$PATH."
+    exit 2
+fi
+
+
 API=https://api.github.com/repos
 REPO=docker/compose
 GITHUB_REPO=git@github.com:$REPO
@@ -35,30 +39,18 @@ if [[ "$build_status" != "success" ]]; then
     exit -1
 fi
 
-
-# Build the binaries and sdists
-script/build-linux
-# TODO: build osx binary
-# script/prepare-osx
-# script/build-osx
-python setup.py sdist --formats=gztar,zip
-
-
-echo "Test those binaries! Exit the shell to continue."
-$SHELL
-
-
 echo "Tagging the release as $VERSION"
 git tag $VERSION
 git push $GITHUB_REPO $VERSION
 
-
-echo "Create a github release"
-# TODO: script more of this https://developer.github.com/v3/repos/releases/
-browser https://github.com/$REPO/releases/new
-
 echo "Uploading sdist to pypi"
-python setup.py sdist upload
+python setup.py sdist
+
+if [ "$(command -v twine 2> /dev/null)" ]; then
+    twine upload ./dist/docker-compose-${VERSION}.tar.gz
+else
+    python setup.py upload
+fi
 
 echo "Testing pip package"
 virtualenv venv-test
@@ -68,4 +60,4 @@ docker-compose version
 deactivate
 
 echo "Now publish the github release, and test the downloads."
-echo "Email maintainers@dockerproject.org and engineering@docker.com about the new release.
+echo "Email maintainers@dockerproject.org and engineering@docker.com about the new release."
diff --git a/script/release/rebase-bump-commit b/script/release/rebase-bump-commit
index 732b3194..14ad22a9 100755
--- a/script/release/rebase-bump-commit
+++ b/script/release/rebase-bump-commit
@@ -3,8 +3,7 @@
 # Move the "bump to <version>" commit to the HEAD of the branch
 #
 
-set -e
-
+. "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
 
 function usage() {
     >&2 cat << EOM
@@ -23,7 +22,7 @@ VERSION="$(git config "branch.${BRANCH}.release")" || usage
 
 
 COMMIT_MSG="Bump $VERSION"
-sha=$(git log --grep $COMMIT_MSG --format="%H")
+sha="$(git log --grep "$COMMIT_MSG" --format="%H")"
 if [ -z "$sha" ]; then
     >&2 echo "No commit with message \"$COMMIT_MSG\""
     exit 2
@@ -33,7 +32,7 @@ if [[ "$sha" == "$(git rev-parse HEAD)" ]]; then
     exit 0
 fi
 
-commits=$(git log --format="%H" HEAD..$sha | wc -l)
+commits=$(git log --format="%H" "$sha..HEAD" | wc -l)
 
 git rebase --onto $sha~1 HEAD~$commits $BRANCH
 git cherry-pick $sha
diff --git a/script/release/utils.sh b/script/release/utils.sh
index d64d1161..b4e5a2e6 100644
--- a/script/release/utils.sh
+++ b/script/release/utils.sh
@@ -4,6 +4,7 @@
 #
 
 set -e
+set -o pipefail
 
 
 function browser() {
@@ -17,4 +18,6 @@ function find_remote() {
     for remote in $(git remote); do
         git config --get remote.${remote}.url | grep $url > /dev/null && echo -n $remote
     done
+    # Always return true, extra remotes cause it to return false
+    true
 }

From 04375fd566a7f52485f7c28876dcf433e6c2fa34 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 2 Oct 2015 11:25:16 -0400
Subject: [PATCH 0374/1265] Restore notes about building non-linux binaries.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 project/RELEASE-PROCESS.md | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 810c3097..30a9805a 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -45,15 +45,23 @@ Check out the bump branch and run the `build-binary` script
         git checkout bump-$VERSION
         ./script/release/build-binary
 
+When prompted build the non-linux binaries and test them.
 
-When prompted test the binaries.
+1.  Build the Mac binary in a Mountain Lion VM:
 
-1.  Draft a release from the tag on GitHub (the script will open the window for
+        script/prepare-osx
+        script/build-osx
+
+2.  Download the windows binary from AppVeyor
+
+    https://ci.appveyor.com/project/docker/compose/build/<build id>/artifacts
+
+3.  Draft a release from the tag on GitHub (the script will open the window for
     you)
 
     In the "Tag version" dropdown, select the tag you just pushed.
 
-2.  Paste in installation instructions and release notes. Here's an example - change the Compose version and Docker version as appropriate:
+4.  Paste in installation instructions and release notes. Here's an example - change the Compose version and Docker version as appropriate:
 
         Firstly, note that Compose 1.5.0 requires Docker 1.8.0 or later.
 
@@ -72,19 +80,19 @@ When prompted test the binaries.
 
         ...release notes go here...
 
-3.  Attach the binaries.
+5.  Attach the binaries.
 
-4. If everything looks good, it's time to push the release.
+6. If everything looks good, it's time to push the release.
 
 
         ./script/release/push-release
 
 
-5.  Publish the release on GitHub.
+7.  Publish the release on GitHub.
 
-6.  Check that both binaries download (following the install instructions) and run.
+8.  Check that both binaries download (following the install instructions) and run.
 
-7.  Email maintainers@dockerproject.org and engineering@docker.com about the new release.
+9.  Email maintainers@dockerproject.org and engineering@docker.com about the new release.
 
 ## If it’s a stable release (not an RC)
 

From 39cea970b8d161ce6986d5ad2f14b63cb3ff3094 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Sat, 25 Jul 2015 19:47:36 -0400
Subject: [PATCH 0375/1265] alpine docker image for running compose and a
 script to pull and run it with the correct volumes.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 .dockerignore   |  2 +-
 Dockerfile.run  | 15 +++++++++++++++
 docs/install.md | 26 ++++++++++++++++++++++----
 script/run      | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 Dockerfile.run
 create mode 100755 script/run

diff --git a/.dockerignore b/.dockerignore
index 5a4da301..055ae7ed 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,6 +4,6 @@
 .tox
 build
 coverage-html
-dist
 docs/_site
 venv
+.tox
diff --git a/Dockerfile.run b/Dockerfile.run
new file mode 100644
index 00000000..3c12fa18
--- /dev/null
+++ b/Dockerfile.run
@@ -0,0 +1,15 @@
+
+FROM    alpine:edge
+RUN     apk -U add \
+            python \
+            py-pip
+
+COPY    requirements.txt /code/requirements.txt
+RUN     pip install -r /code/requirements.txt
+
+ENV     VERSION 1.4.0dev
+
+COPY    dist/docker-compose-$VERSION.tar.gz /code/docker-compose/
+RUN     pip install /code/docker-compose/docker-compose-$VERSION/
+
+ENTRYPOINT ["/usr/bin/docker-compose"]
diff --git a/docs/install.md b/docs/install.md
index bc1f8f78..fd7b3cab 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -40,20 +40,38 @@ To install Compose, do the following:
 
         curl -L https://github.com/docker/compose/releases/download/VERSION_NUM/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 
-     If you have problems installing with `curl`, you can use `pip` instead: `pip install -U docker-compose`
+     If you have problems installing with `curl`, see
+     [Alternative Install Options](#alternative-install-options).
 
-4. Apply executable permissions to the binary:
+5. Apply executable permissions to the binary:
 
         $ chmod +x /usr/local/bin/docker-compose
 
-5.  Optionally, install [command completion](completion.md) for the
+6.  Optionally, install [command completion](completion.md) for the
 `bash` and `zsh` shell.
 
-6. Test the installation.
+7. Test the installation.
 
         $ docker-compose --version
         docker-compose version: 1.4.2
 
+
+## Alternative install options
+
+### Install using pip
+
+    $ sudo pip install -U docker-compose
+
+
+### Install as a container
+
+Compose can also be run inside a container, from a small bash script wrapper.
+To install compose as a container run:
+
+    $ curl -L https://github.com/docker/compose/releases/download/1.5.0/compose-run > /usr/local/bin/docker-compose
+    $ chmod +x /usr/local/bin/docker-compose
+
+
 ## Upgrading
 
 If you're upgrading from Compose 1.2 or earlier, you'll need to remove or migrate
diff --git a/script/run b/script/run
new file mode 100755
index 00000000..64718efd
--- /dev/null
+++ b/script/run
@@ -0,0 +1,48 @@
+#!/bin/bash
+#
+# Run docker-compose in a container
+#
+# This script will attempt to mirror the host paths by using volumes for the
+# following paths:
+#   * $(pwd)
+#   * $(dirname $COMPOSE_FILE) if it's set
+#   * $HOME if it's set
+#
+# You can add additional volumes (or any docker run options) using
+# the $COMPOSE_OPTIONS environment variable.
+#
+
+
+set -e
+
+VERSION="1.4.0dev"
+# TODO: move this to an official repo
+IMAGE="dnephin/docker-compose:$VERSION"
+
+
+# Setup options for connecting to docker host
+if [ -z "$DOCKER_HOST" ]; then
+    DOCKER_HOST="/var/run/docker.sock"
+fi
+if [ -S "$DOCKER_HOST" ]; then
+    DOCKER_ADDR="-v $DOCKER_HOST:$DOCKER_HOST -e DOCKER_HOST"
+else
+    DOCKER_ADDR="-e DOCKER_HOST"
+fi
+
+
+# Setup volume mounts for compose config and context
+VOLUMES="-v $(pwd):$(pwd)"
+if [ -n "$COMPOSE_FILE" ]; then
+    compose_dir=$(dirname $COMPOSE_FILE)
+fi
+# TODO: also check --file argument
+if [ -n "$compose_dir" ]; then
+    VOLUMES="$VOLUMES -v $compose_dir:$compose_dir"
+fi
+if [ -n "$HOME" ]; then
+    VOLUMES="$VOLUMES -v $HOME:$HOME"
+fi
+
+
+exec docker run --rm -ti $DOCKER_ADDR $COMPOSE_OPTIONS $VOLUMES -w $(pwd) $IMAGE $@

From e230142a2548ca32da4856bdf35663fad2bf4d27 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Sat, 3 Oct 2015 01:24:28 -0400
Subject: [PATCH 0376/1265] Reduce the scope of sys.stdout patching.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/integration/cli_test.py     | 51 +++++++++++++++----------------
 tests/integration/service_test.py | 12 ++++----
 2 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 5dbe3397..3774eb88 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -52,32 +52,32 @@ class CLITestCase(DockerClientTestCase):
         self.command.base_dir = old_base_dir
 
     # TODO: address the "Inappropriate ioctl for device" warnings in test output
-    @mock.patch('sys.stdout', new_callable=StringIO)
-    def test_ps(self, mock_stdout):
+    def test_ps(self):
         self.project.get_service('simple').create_container()
-        self.command.dispatch(['ps'], None)
+        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+            self.command.dispatch(['ps'], None)
         self.assertIn('simplecomposefile_simple_1', mock_stdout.getvalue())
 
-    @mock.patch('sys.stdout', new_callable=StringIO)
-    def test_ps_default_composefile(self, mock_stdout):
+    def test_ps_default_composefile(self):
         self.command.base_dir = 'tests/fixtures/multiple-composefiles'
-        self.command.dispatch(['up', '-d'], None)
-        self.command.dispatch(['ps'], None)
+        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+            self.command.dispatch(['up', '-d'], None)
+            self.command.dispatch(['ps'], None)
 
         output = mock_stdout.getvalue()
         self.assertIn('multiplecomposefiles_simple_1', output)
         self.assertIn('multiplecomposefiles_another_1', output)
         self.assertNotIn('multiplecomposefiles_yetanother_1', output)
 
-    @mock.patch('sys.stdout', new_callable=StringIO)
-    def test_ps_alternate_composefile(self, mock_stdout):
+    def test_ps_alternate_composefile(self):
         config_path = os.path.abspath(
             'tests/fixtures/multiple-composefiles/compose2.yml')
         self._project = get_project(self.command.base_dir, [config_path])
 
         self.command.base_dir = 'tests/fixtures/multiple-composefiles'
-        self.command.dispatch(['-f', 'compose2.yml', 'up', '-d'], None)
-        self.command.dispatch(['-f', 'compose2.yml', 'ps'], None)
+        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+            self.command.dispatch(['-f', 'compose2.yml', 'up', '-d'], None)
+            self.command.dispatch(['-f', 'compose2.yml', 'ps'], None)
 
         output = mock_stdout.getvalue()
         self.assertNotIn('multiplecomposefiles_simple_1', output)
@@ -105,54 +105,51 @@ class CLITestCase(DockerClientTestCase):
         mock_logging.info.assert_any_call('Pulling another (nonexisting-image:latest)...')
         mock_logging.error.assert_any_call('Error: image library/nonexisting-image:latest not found')
 
-    @mock.patch('sys.stdout', new_callable=StringIO)
-    def test_build_plain(self, mock_stdout):
+    def test_build_plain(self):
         self.command.base_dir = 'tests/fixtures/simple-dockerfile'
         self.command.dispatch(['build', 'simple'], None)
 
-        mock_stdout.truncate(0)
         cache_indicator = 'Using cache'
         pull_indicator = 'Status: Image is up to date for busybox:latest'
-        self.command.dispatch(['build', 'simple'], None)
+
+        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+            self.command.dispatch(['build', 'simple'], None)
         output = mock_stdout.getvalue()
         self.assertIn(cache_indicator, output)
         self.assertNotIn(pull_indicator, output)
 
-    @mock.patch('sys.stdout', new_callable=StringIO)
-    def test_build_no_cache(self, mock_stdout):
+    def test_build_no_cache(self):
         self.command.base_dir = 'tests/fixtures/simple-dockerfile'
         self.command.dispatch(['build', 'simple'], None)
 
-        mock_stdout.truncate(0)
         cache_indicator = 'Using cache'
         pull_indicator = 'Status: Image is up to date for busybox:latest'
-        self.command.dispatch(['build', '--no-cache', 'simple'], None)
+        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+            self.command.dispatch(['build', '--no-cache', 'simple'], None)
         output = mock_stdout.getvalue()
         self.assertNotIn(cache_indicator, output)
         self.assertNotIn(pull_indicator, output)
 
-    @mock.patch('sys.stdout', new_callable=StringIO)
-    def test_build_pull(self, mock_stdout):
+    def test_build_pull(self):
         self.command.base_dir = 'tests/fixtures/simple-dockerfile'
         self.command.dispatch(['build', 'simple'], None)
 
-        mock_stdout.truncate(0)
         cache_indicator = 'Using cache'
         pull_indicator = 'Status: Image is up to date for busybox:latest'
-        self.command.dispatch(['build', '--pull', 'simple'], None)
+        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+            self.command.dispatch(['build', '--pull', 'simple'], None)
         output = mock_stdout.getvalue()
         self.assertIn(cache_indicator, output)
         self.assertIn(pull_indicator, output)
 
-    @mock.patch('sys.stdout', new_callable=StringIO)
-    def test_build_no_cache_pull(self, mock_stdout):
+    def test_build_no_cache_pull(self):
         self.command.base_dir = 'tests/fixtures/simple-dockerfile'
         self.command.dispatch(['build', 'simple'], None)
 
-        mock_stdout.truncate(0)
         cache_indicator = 'Using cache'
         pull_indicator = 'Status: Image is up to date for busybox:latest'
-        self.command.dispatch(['build', '--no-cache', '--pull', 'simple'], None)
+        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+            self.command.dispatch(['build', '--no-cache', '--pull', 'simple'], None)
         output = mock_stdout.getvalue()
         self.assertNotIn(cache_indicator, output)
         self.assertIn(pull_indicator, output)
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 2c9c6fc2..7ea4aae5 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -597,8 +597,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertNotIn('Creating', captured_output)
         self.assertIn('Starting', captured_output)
 
-    @mock.patch('sys.stdout', new_callable=StringIO)
-    def test_scale_with_stopped_containers_and_needing_creation(self, mock_stdout):
+    def test_scale_with_stopped_containers_and_needing_creation(self):
         """
         Given there are some stopped containers and scale is called with a
         desired number that is greater than the number of stopped containers,
@@ -611,7 +610,8 @@ class ServiceTest(DockerClientTestCase):
         for container in service.containers():
             self.assertFalse(container.is_running)
 
-        service.scale(2)
+        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+            service.scale(2)
 
         self.assertEqual(len(service.containers()), 2)
         for container in service.containers():
@@ -621,8 +621,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertIn('Creating', captured_output)
         self.assertIn('Starting', captured_output)
 
-    @mock.patch('sys.stdout', new_callable=StringIO)
-    def test_scale_with_api_returns_errors(self, mock_stdout):
+    def test_scale_with_api_returns_errors(self):
         """
         Test that when scaling if the API returns an error, that error is handled
         and the remaining threads continue.
@@ -635,7 +634,8 @@ class ServiceTest(DockerClientTestCase):
             'compose.container.Container.create',
                 side_effect=APIError(message="testing", response={}, explanation="Boom")):
 
-            service.scale(3)
+            with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+                service.scale(3)
 
         self.assertEqual(len(service.containers()), 1)
         self.assertTrue(service.containers()[0].is_running)

From aefb7a44b20f51a72f9eead4297403579bed2c4f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 5 Oct 2015 15:48:35 -0400
Subject: [PATCH 0377/1265] Refactor command class hierarchy to remove an
 unnecessary intermediate base class Command.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/command.py        | 56 +++++++++++++++--------------------
 compose/cli/docopt_command.py |  3 --
 compose/cli/main.py           | 35 +++++++++++++++-------
 3 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 443b89c6..5c233df7 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import contextlib
 import logging
 import os
 import re
@@ -16,7 +17,6 @@ from .. import config
 from ..project import Project
 from ..service import ConfigError
 from .docker_client import docker_client
-from .docopt_command import DocoptCommand
 from .utils import call_silently
 from .utils import is_mac
 from .utils import is_ubuntu
@@ -24,40 +24,32 @@ from .utils import is_ubuntu
 log = logging.getLogger(__name__)
 
 
-class Command(DocoptCommand):
-    base_dir = '.'
-
-    def dispatch(self, *args, **kwargs):
-        try:
-            super(Command, self).dispatch(*args, **kwargs)
-        except SSLError as e:
-            raise errors.UserError('SSL error: %s' % e)
-        except ConnectionError:
-            if call_silently(['which', 'docker']) != 0:
-                if is_mac():
-                    raise errors.DockerNotFoundMac()
-                elif is_ubuntu():
-                    raise errors.DockerNotFoundUbuntu()
-                else:
-                    raise errors.DockerNotFoundGeneric()
-            elif call_silently(['which', 'boot2docker']) == 0:
-                raise errors.ConnectionErrorDockerMachine()
+@contextlib.contextmanager
+def friendly_error_message():
+    try:
+        yield
+    except SSLError as e:
+        raise errors.UserError('SSL error: %s' % e)
+    except ConnectionError:
+        if call_silently(['which', 'docker']) != 0:
+            if is_mac():
+                raise errors.DockerNotFoundMac()
+            elif is_ubuntu():
+                raise errors.DockerNotFoundUbuntu()
             else:
-                raise errors.ConnectionErrorGeneric(self.get_client().base_url)
+                raise errors.DockerNotFoundGeneric()
+        elif call_silently(['which', 'boot2docker']) == 0:
+            raise errors.ConnectionErrorDockerMachine()
+        else:
+            raise errors.ConnectionErrorGeneric(self.get_client().base_url)
 
-    def perform_command(self, options, handler, command_options):
-        if options['COMMAND'] in ('help', 'version'):
-            # Skip looking up the compose file.
-            handler(None, command_options)
-            return
 
-        project = get_project(
-            self.base_dir,
-            get_config_path(options.get('--file')),
-            project_name=options.get('--project-name'),
-            verbose=options.get('--verbose'))
-
-        handler(project, command_options)
+def project_from_options(base_dir, options):
+    return get_project(
+        base_dir,
+        get_config_path(options.get('--file')),
+        project_name=options.get('--project-name'),
+        verbose=options.get('--verbose'))
 
 
 def get_config_path(file_option):
diff --git a/compose/cli/docopt_command.py b/compose/cli/docopt_command.py
index 27f4b2bd..e3f4aa9e 100644
--- a/compose/cli/docopt_command.py
+++ b/compose/cli/docopt_command.py
@@ -25,9 +25,6 @@ class DocoptCommand(object):
     def dispatch(self, argv, global_options):
         self.perform_command(*self.parse(argv, global_options))
 
-    def perform_command(self, options, handler, command_options):
-        handler(command_options)
-
     def parse(self, argv, global_options):
         options = docopt_full_help(getdoc(self), argv, **self.docopt_options())
         command = options['COMMAND']
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 60e60b79..0f0a69ca 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -23,7 +23,9 @@ from ..project import NoSuchService
 from ..service import BuildError
 from ..service import ConvergenceStrategy
 from ..service import NeedsBuildError
-from .command import Command
+from .command import friendly_error_message
+from .command import project_from_options
+from .docopt_command import DocoptCommand
 from .docopt_command import NoSuchCommand
 from .errors import UserError
 from .formatter import Formatter
@@ -89,6 +91,15 @@ def setup_logging():
     logging.getLogger("requests").propagate = False
 
 
+def setup_console_handler(verbose):
+    if verbose:
+        console_handler.setFormatter(logging.Formatter('%(name)s.%(funcName)s: %(message)s'))
+        console_handler.setLevel(logging.DEBUG)
+    else:
+        console_handler.setFormatter(logging.Formatter())
+        console_handler.setLevel(logging.INFO)
+
+
 # stolen from docopt master
 def parse_doc_section(name, source):
     pattern = re.compile('^([^\n]*' + name + '[^\n]*\n?(?:[ \t].*?(?:\n|$))*)',
@@ -96,7 +107,7 @@ def parse_doc_section(name, source):
     return [s.strip() for s in pattern.findall(source)]
 
 
-class TopLevelCommand(Command):
+class TopLevelCommand(DocoptCommand):
     """Define and run multi-container applications with Docker.
 
     Usage:
@@ -130,20 +141,24 @@ class TopLevelCommand(Command):
       version            Show the Docker-Compose version information
 
     """
+    base_dir = '.'
+
     def docopt_options(self):
         options = super(TopLevelCommand, self).docopt_options()
         options['version'] = get_version_info('compose')
         return options
 
-    def perform_command(self, options, *args, **kwargs):
-        if options.get('--verbose'):
-            console_handler.setFormatter(logging.Formatter('%(name)s.%(funcName)s: %(message)s'))
-            console_handler.setLevel(logging.DEBUG)
-        else:
-            console_handler.setFormatter(logging.Formatter())
-            console_handler.setLevel(logging.INFO)
+    def perform_command(self, options, handler, command_options):
+        setup_console_handler(options.get('--verbose'))
 
-        return super(TopLevelCommand, self).perform_command(options, *args, **kwargs)
+        if options['COMMAND'] in ('help', 'version'):
+            # Skip looking up the compose file.
+            handler(None, command_options)
+            return
+
+        project = project_from_options(self.base_dir, options)
+        with friendly_error_message():
+            handler(project, command_options)
 
     def build(self, project, options):
         """

From fbaea58fc1a204d676ad098f6b51ba5de1aeccf1 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 5 Oct 2015 15:50:16 -0400
Subject: [PATCH 0378/1265] Fix #2133 - fix call to get_client()

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/command.py         |  4 ++--
 tests/unit/cli/command_test.py | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/unit/cli/command_test.py

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 5c233df7..1a9bc3dc 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -38,10 +38,10 @@ def friendly_error_message():
                 raise errors.DockerNotFoundUbuntu()
             else:
                 raise errors.DockerNotFoundGeneric()
-        elif call_silently(['which', 'boot2docker']) == 0:
+        elif call_silently(['which', 'docker-machine']) == 0:
             raise errors.ConnectionErrorDockerMachine()
         else:
-            raise errors.ConnectionErrorGeneric(self.get_client().base_url)
+            raise errors.ConnectionErrorGeneric(get_client().base_url)
 
 
 def project_from_options(base_dir, options):
diff --git a/tests/unit/cli/command_test.py b/tests/unit/cli/command_test.py
new file mode 100644
index 00000000..0d4324e3
--- /dev/null
+++ b/tests/unit/cli/command_test.py
@@ -0,0 +1,22 @@
+from __future__ import absolute_import
+
+import pytest
+from requests.exceptions import ConnectionError
+
+from compose.cli import errors
+from compose.cli.command import friendly_error_message
+from tests import mock
+from tests import unittest
+
+
+class FriendlyErrorMessageTestCase(unittest.TestCase):
+
+    def test_dispatch_generic_connection_error(self):
+        with pytest.raises(errors.ConnectionErrorGeneric):
+            with mock.patch(
+                'compose.cli.command.call_silently',
+                autospec=True,
+                side_effect=[0, 1]
+            ):
+                with friendly_error_message():
+                    raise ConnectionError()

From 018b1b1c0f21c8bb76efdc480447c7166e696242 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 6 Oct 2015 12:57:01 +0100
Subject: [PATCH 0379/1265] Add preparation instructions to Windows build
 script

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/build-windows.ps1 | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/script/build-windows.ps1 b/script/build-windows.ps1
index 63be0865..f7fd1589 100644
--- a/script/build-windows.ps1
+++ b/script/build-windows.ps1
@@ -1,3 +1,33 @@
+# Builds the Windows binary.
+#
+# From a fresh 64-bit Windows 10 install, prepare the system as follows:
+#
+# 1. Install Git:
+#
+#        http://git-scm.com/download/win
+#
+# 2. Install Python 2.7.10:
+#
+#        https://www.python.org/downloads/
+#
+# 3. Append ";C:\Python27;C:\Python27\Scripts" to the "Path" environment variable:
+#
+#        https://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/sysdm_advancd_environmnt_addchange_variable.mspx?mfr=true
+#
+# 4. In Powershell, run the following commands:
+#
+#        $ pip install virtualenv
+#        $ Set-ExecutionPolicy -Scope CurrentUser RemoteSigned
+#
+# 5. Clone the repository:
+#
+#        $ git clone https://github.com/docker/compose.git
+#        $ cd compose
+#
+# 6. Build the binary:
+#
+#        .\script\build-windows.ps1
+
 $ErrorActionPreference = "Stop"
 Set-PSDebug -trace 1
 

From 5b55a08846088d6cdbc4aca08d3143f5c9c3d3b7 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Sat, 18 Jul 2015 11:38:46 +0200
Subject: [PATCH 0380/1265] Add support for ro option in volumes_from

Fixes #1188

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 compose/project.py                | 24 +++++++++-----
 compose/service.py                | 52 ++++++++++++++++++++++++-------
 docs/yml.md                       |  4 ++-
 tests/integration/project_test.py |  5 +--
 tests/integration/service_test.py |  7 +++--
 tests/unit/project_test.py        |  6 ++--
 tests/unit/service_test.py        | 34 ++++++++++++++++----
 7 files changed, 97 insertions(+), 35 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index 4750a7a9..919a201f 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -17,8 +17,10 @@ from .legacy import check_for_legacy_containers
 from .service import ContainerNet
 from .service import ConvergenceStrategy
 from .service import Net
+from .service import parse_volume_from_spec
 from .service import Service
 from .service import ServiceNet
+from .service import VolumeFromSpec
 from .utils import parallel_execute
 
 
@@ -34,12 +36,15 @@ def sort_service_dicts(services):
     def get_service_names(links):
         return [link.split(':')[0] for link in links]
 
+    def get_service_names_from_volumes_from(volumes_from):
+        return [volume_from.split(':')[0] for volume_from in volumes_from]
+
     def get_service_dependents(service_dict, services):
         name = service_dict['name']
         return [
             service for service in services
             if (name in get_service_names(service.get('links', [])) or
-                name in service.get('volumes_from', []) or
+                name in get_service_names_from_volumes_from(service.get('volumes_from', [])) or
                 name == get_service_name_from_net(service.get('net')))
         ]
 
@@ -176,20 +181,23 @@ class Project(object):
     def get_volumes_from(self, service_dict):
         volumes_from = []
         if 'volumes_from' in service_dict:
-            for volume_name in service_dict.get('volumes_from', []):
+            for volume_from_config in service_dict.get('volumes_from', []):
+                volume_from_spec = parse_volume_from_spec(volume_from_config)
+                # Get service
                 try:
-                    service = self.get_service(volume_name)
-                    volumes_from.append(service)
+                    service_name = self.get_service(volume_from_spec.source)
+                    volume_from_spec = VolumeFromSpec(service_name, volume_from_spec.mode)
                 except NoSuchService:
                     try:
-                        container = Container.from_id(self.client, volume_name)
-                        volumes_from.append(container)
+                        container_name = Container.from_id(self.client, volume_from_spec.source)
+                        volume_from_spec = VolumeFromSpec(container_name, volume_from_spec.mode)
                     except APIError:
                         raise ConfigurationError(
                             'Service "%s" mounts volumes from "%s", which is '
                             'not the name of a service or container.' % (
-                                service_dict['name'],
-                                volume_name))
+                                volume_from_config,
+                                volume_from_spec.source))
+                volumes_from.append(volume_from_spec)
             del service_dict['volumes_from']
         return volumes_from
 
diff --git a/compose/service.py b/compose/service.py
index c9ca00ae..79a138aa 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -6,7 +6,6 @@ import os
 import re
 import sys
 from collections import namedtuple
-from operator import attrgetter
 
 import enum
 import six
@@ -82,6 +81,9 @@ class NoSuchImageError(Exception):
 VolumeSpec = namedtuple('VolumeSpec', 'external internal mode')
 
 
+VolumeFromSpec = namedtuple('VolumeFromSpec', 'source mode')
+
+
 ServiceName = namedtuple('ServiceName', 'project service number')
 
 
@@ -519,7 +521,7 @@ class Service(object):
         return [(service.name, alias) for service, alias in self.links]
 
     def get_volumes_from_names(self):
-        return [s.name for s in self.volumes_from if isinstance(s, Service)]
+        return [s.source.name for s in self.volumes_from if isinstance(s.source, Service)]
 
     def get_container_name(self, number, one_off=False):
         # TODO: Implement issue #652 here
@@ -559,16 +561,9 @@ class Service(object):
 
     def _get_volumes_from(self):
         volumes_from = []
-        for volume_source in self.volumes_from:
-            if isinstance(volume_source, Service):
-                containers = volume_source.containers(stopped=True)
-                if not containers:
-                    volumes_from.append(volume_source.create_container().id)
-                else:
-                    volumes_from.extend(map(attrgetter('id'), containers))
-
-            elif isinstance(volume_source, Container):
-                volumes_from.append(volume_source.id)
+        for volume_from_spec in self.volumes_from:
+            volumes = build_volume_from(volume_from_spec)
+            volumes_from.extend(volumes)
 
         return volumes_from
 
@@ -988,6 +983,39 @@ def parse_volume_spec(volume_config):
 
     return VolumeSpec(external, internal, mode)
 
+
+def build_volume_from(volume_from_spec):
+    volumes_from = []
+    if isinstance(volume_from_spec.source, Service):
+        containers = volume_from_spec.source.containers(stopped=True)
+        if not containers:
+            volumes_from = ["{}:{}".format(volume_from_spec.source.create_container().id, volume_from_spec.mode)]
+        else:
+            volumes_from = ["{}:{}".format(container.id, volume_from_spec.mode) for container in containers]
+    elif isinstance(volume_from_spec.source, Container):
+        volumes_from = ["{}:{}".format(volume_from_spec.source.id, volume_from_spec.mode)]
+    return volumes_from
+
+
+def parse_volume_from_spec(volume_from_config):
+    parts = volume_from_config.split(':')
+    if len(parts) > 2:
+        raise ConfigError("Volume %s has incorrect format, should be "
+                          "external:internal[:mode]" % volume_from_config)
+
+    if len(parts) == 1:
+        source = parts[0]
+        mode = 'rw'
+    else:
+        source, mode = parts
+
+    if mode not in ('rw', 'ro'):
+        raise ConfigError("VolumeFrom %s has invalid mode (%s), should be "
+                          "one of: rw, ro." % (volume_from_config, mode))
+
+    return VolumeFromSpec(source, mode)
+
+
 # Labels
 
 
diff --git a/docs/yml.md b/docs/yml.md
index 81357df3..12c9b554 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -346,11 +346,13 @@ should always begin with `.` or `..`.
 
 ### volumes_from
 
-Mount all of the volumes from another service or container.
+Mount all of the volumes from another service or container, with the
+supported flags by docker : ``ro``, ``rw``.
 
     volumes_from:
      - service_name
      - container_name
+     - service_name:rw
 
 ### cpu\_shares, cpuset, domainname, entrypoint, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, stdin\_open, tty, user, volume\_driver, working\_dir
 
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index bd7ecccb..ff50c80b 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -6,6 +6,7 @@ from compose.const import LABEL_PROJECT
 from compose.container import Container
 from compose.project import Project
 from compose.service import ConvergenceStrategy
+from compose.service import VolumeFromSpec
 
 
 def build_service_dicts(service_config):
@@ -72,7 +73,7 @@ class ProjectTest(DockerClientTestCase):
         )
         db = project.get_service('db')
         data = project.get_service('data')
-        self.assertEqual(db.volumes_from, [data])
+        self.assertEqual(db.volumes_from, [VolumeFromSpec(data, 'rw')])
 
     def test_volumes_from_container(self):
         data_container = Container.create(
@@ -93,7 +94,7 @@ class ProjectTest(DockerClientTestCase):
             client=self.client,
         )
         db = project.get_service('db')
-        self.assertEqual(db.volumes_from, [data_container])
+        self.assertEqual(db._get_volumes_from(), [data_container.id + ':rw'])
 
     def test_net_from_service(self):
         project = Project.from_dicts(
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 2c9c6fc2..30606096 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -25,6 +25,7 @@ from compose.service import ConfigError
 from compose.service import ConvergencePlan
 from compose.service import Net
 from compose.service import Service
+from compose.service import VolumeFromSpec
 
 
 def create_and_start_container(service, **override_options):
@@ -272,12 +273,12 @@ class ServiceTest(DockerClientTestCase):
             command=["top"],
             labels={LABEL_PROJECT: 'composetest'},
         )
-        host_service = self.create_service('host', volumes_from=[volume_service, volume_container_2])
+        host_service = self.create_service('host', volumes_from=[VolumeFromSpec(volume_service, 'rw'), VolumeFromSpec(volume_container_2, 'rw')])
         host_container = host_service.create_container()
         host_service.start_container(host_container)
-        self.assertIn(volume_container_1.id,
+        self.assertIn(volume_container_1.id + ':rw',
                       host_container.get('HostConfig.VolumesFrom'))
-        self.assertIn(volume_container_2.id,
+        self.assertIn(volume_container_2.id + ':rw',
                       host_container.get('HostConfig.VolumesFrom'))
 
     def test_execute_convergence_plan_recreate(self):
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index ce74eb30..f3cf9e29 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -168,7 +168,7 @@ class ProjectTest(unittest.TestCase):
                 'volumes_from': ['aaa']
             }
         ], self.mock_client)
-        self.assertEqual(project.get_service('test')._get_volumes_from(), [container_id])
+        self.assertEqual(project.get_service('test')._get_volumes_from(), [container_id + ":rw"])
 
     def test_use_volumes_from_service_no_container(self):
         container_name = 'test_vol_1'
@@ -191,7 +191,7 @@ class ProjectTest(unittest.TestCase):
                 'volumes_from': ['vol']
             }
         ], self.mock_client)
-        self.assertEqual(project.get_service('test')._get_volumes_from(), [container_name])
+        self.assertEqual(project.get_service('test')._get_volumes_from(), [container_name + ":rw"])
 
     @mock.patch.object(Service, 'containers')
     def test_use_volumes_from_service_container(self, mock_return):
@@ -211,7 +211,7 @@ class ProjectTest(unittest.TestCase):
                 'volumes_from': ['vol']
             }
         ], None)
-        self.assertEqual(project.get_service('test')._get_volumes_from(), container_ids)
+        self.assertEqual(project.get_service('test')._get_volumes_from(), [cid + ':rw' for cid in container_ids])
 
     def test_net_unset(self):
         project = Project.from_dicts('test', [
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index c682b823..f85d34d2 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -24,6 +24,7 @@ from compose.service import parse_repository_tag
 from compose.service import parse_volume_spec
 from compose.service import Service
 from compose.service import ServiceNet
+from compose.service import VolumeFromSpec
 
 
 class ServiceTest(unittest.TestCase):
@@ -75,9 +76,18 @@ class ServiceTest(unittest.TestCase):
         service = Service(
             'test',
             image='foo',
-            volumes_from=[mock.Mock(id=container_id, spec=Container)])
+            volumes_from=[VolumeFromSpec(mock.Mock(id=container_id, spec=Container), 'rw')])
 
-        self.assertEqual(service._get_volumes_from(), [container_id])
+        self.assertEqual(service._get_volumes_from(), [container_id + ':rw'])
+
+    def test_get_volumes_from_container_read_only(self):
+        container_id = 'aabbccddee'
+        service = Service(
+            'test',
+            image='foo',
+            volumes_from=[VolumeFromSpec(mock.Mock(id=container_id, spec=Container), 'ro')])
+
+        self.assertEqual(service._get_volumes_from(), [container_id + ':ro'])
 
     def test_get_volumes_from_service_container_exists(self):
         container_ids = ['aabbccddee', '12345']
@@ -86,9 +96,21 @@ class ServiceTest(unittest.TestCase):
             mock.Mock(id=container_id, spec=Container)
             for container_id in container_ids
         ]
-        service = Service('test', volumes_from=[from_service], image='foo')
+        service = Service('test', volumes_from=[VolumeFromSpec(from_service, 'rw')], image='foo')
 
-        self.assertEqual(service._get_volumes_from(), container_ids)
+        self.assertEqual(service._get_volumes_from(), [cid + ":rw" for cid in container_ids])
+
+    def test_get_volumes_from_service_container_exists_with_flags(self):
+        for mode in ['ro', 'rw', 'z', 'rw,z', 'z,rw']:
+            container_ids = ['aabbccddee:' + mode, '12345:' + mode]
+            from_service = mock.create_autospec(Service)
+            from_service.containers.return_value = [
+                mock.Mock(id=container_id.split(':')[0], spec=Container)
+                for container_id in container_ids
+            ]
+            service = Service('test', volumes_from=[VolumeFromSpec(from_service, mode)], image='foo')
+
+            self.assertEqual(service._get_volumes_from(), container_ids)
 
     def test_get_volumes_from_service_no_container(self):
         container_id = 'abababab'
@@ -97,9 +119,9 @@ class ServiceTest(unittest.TestCase):
         from_service.create_container.return_value = mock.Mock(
             id=container_id,
             spec=Container)
-        service = Service('test', image='foo', volumes_from=[from_service])
+        service = Service('test', image='foo', volumes_from=[VolumeFromSpec(from_service, 'rw')])
 
-        self.assertEqual(service._get_volumes_from(), [container_id])
+        self.assertEqual(service._get_volumes_from(), [container_id + ':rw'])
         from_service.create_container.assert_called_once_with()
 
     def test_split_domainname_none(self):

From fe65c0258d2f3412a18c07e0f701be6b292c2286 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 2 Oct 2015 19:26:45 -0400
Subject: [PATCH 0381/1265] Remove unused attach_socket function from
 Container.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/container.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/compose/container.py b/compose/container.py
index 28af093d..a03acf56 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -212,9 +212,6 @@ class Container(object):
     def attach(self, *args, **kwargs):
         return self.client.attach(self.id, *args, **kwargs)
 
-    def attach_socket(self, **kwargs):
-        return self.client.attach_socket(self.id, **kwargs)
-
     def __repr__(self):
         return '<Container: %s (%s)>' % (self.name, self.id[:6])
 

From 3661e8bc7419ae34e4639edec91df2e1db707312 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 2 Oct 2015 19:47:27 -0400
Subject: [PATCH 0382/1265] Fix build against the swarm cluster by joining
 buffered output before parsing json.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/log_printer.py      |  4 ++--
 compose/cli/utils.py            | 26 ----------------------
 compose/progress_stream.py      |  6 +-----
 compose/service.py              |  4 +++-
 compose/utils.py                | 38 +++++++++++++++++++++++++++++++++
 tests/integration/testcases.py  |  6 ++++--
 tests/unit/split_buffer_test.py |  2 +-
 7 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 845f799b..6e1499e1 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -6,8 +6,8 @@ from itertools import cycle
 
 from . import colors
 from .multiplexer import Multiplexer
-from .utils import split_buffer
 from compose import utils
+from compose.utils import split_buffer
 
 
 class LogPrinter(object):
@@ -75,7 +75,7 @@ def build_no_log_generator(container, prefix, color_func):
 def build_log_generator(container, prefix, color_func):
     # Attach to container before log printer starts running
     stream = container.attach(stdout=True, stderr=True,  stream=True, logs=True)
-    line_generator = split_buffer(stream, u'\n')
+    line_generator = split_buffer(stream)
 
     for line in line_generator:
         yield prefix + line
diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index 5840f0a8..07510e2f 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -7,7 +7,6 @@ import platform
 import ssl
 import subprocess
 
-import six
 from docker import version as docker_py_version
 from six.moves import input
 
@@ -36,31 +35,6 @@ def yesno(prompt, default=None):
         return None
 
 
-def split_buffer(reader, separator):
-    """
-    Given a generator which yields strings and a separator string,
-    joins all input, splits on the separator and yields each chunk.
-
-    Unlike string.split(), each chunk includes the trailing
-    separator, except for the last one if none was found on the end
-    of the input.
-    """
-    buffered = six.text_type('')
-    separator = six.text_type(separator)
-
-    for data in reader:
-        buffered += data.decode('utf-8')
-        while True:
-            index = buffered.find(separator)
-            if index == -1:
-                break
-            yield buffered[:index + 1]
-            buffered = buffered[index + 1:]
-
-    if len(buffered) > 0:
-        yield buffered
-
-
 def call_silently(*args, **kwargs):
     """
     Like subprocess.call(), but redirects stdout and stderr to /dev/null.
diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index c44b33e5..ca8f3513 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -1,7 +1,5 @@
 import json
 
-import six
-
 from compose import utils
 
 
@@ -16,9 +14,7 @@ def stream_output(output, stream):
     lines = {}
     diff = 0
 
-    for chunk in output:
-        if six.PY3:
-            chunk = chunk.decode('utf-8')
+    for chunk in utils.stream_as_text(output):
         event = json.loads(chunk)
         all_events.append(event)
 
diff --git a/compose/service.py b/compose/service.py
index c9ca00ae..bce2e534 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -33,6 +33,8 @@ from .progress_stream import stream_output
 from .progress_stream import StreamOutputError
 from .utils import json_hash
 from .utils import parallel_execute
+from .utils import split_buffer
+
 
 log = logging.getLogger(__name__)
 
@@ -722,7 +724,7 @@ class Service(object):
         )
 
         try:
-            all_events = stream_output(build_output, sys.stdout)
+            all_events = stream_output(split_buffer(build_output), sys.stdout)
         except StreamOutputError as e:
             raise BuildError(self, six.text_type(e))
 
diff --git a/compose/utils.py b/compose/utils.py
index e0304ba5..f201e2d6 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -83,6 +83,44 @@ def get_output_stream(stream):
     return codecs.getwriter('utf-8')(stream)
 
 
+def stream_as_text(stream):
+    """Given a stream of bytes or text, if any of the items in the stream
+    are bytes convert them to text.
+
+    This function can be removed once docker-py returns text streams instead
+    of byte streams.
+    """
+    for data in stream:
+        if not isinstance(data, six.text_type):
+            data = data.decode('utf-8')
+        yield data
+
+
+def split_buffer(reader, separator=u'\n'):
+    """
+    Given a generator which yields strings and a separator string,
+    joins all input, splits on the separator and yields each chunk.
+
+    Unlike string.split(), each chunk includes the trailing
+    separator, except for the last one if none was found on the end
+    of the input.
+    """
+    buffered = six.text_type('')
+    separator = six.text_type(separator)
+
+    for data in stream_as_text(reader):
+        buffered += data
+        while True:
+            index = buffered.find(separator)
+            if index == -1:
+                break
+            yield buffered[:index + 1]
+            buffered = buffered[index + 1:]
+
+    if len(buffered) > 0:
+        yield buffered
+
+
 def write_out_msg(stream, lines, msg_index, msg, status="done"):
     """
     Using special ANSI code characters we can write out the msg over the top of
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 26a0a108..7dec3728 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -9,6 +9,8 @@ from compose.config.config import ServiceLoader
 from compose.const import LABEL_PROJECT
 from compose.progress_stream import stream_output
 from compose.service import Service
+from compose.utils import split_buffer
+from compose.utils import stream_as_text
 
 
 def pull_busybox(client):
@@ -71,5 +73,5 @@ class DockerClientTestCase(unittest.TestCase):
 
     def check_build(self, *args, **kwargs):
         kwargs.setdefault('rm', True)
-        build_output = self.client.build(*args, **kwargs)
-        stream_output(build_output, open('/dev/null', 'w'))
+        build_output = stream_as_text(self.client.build(*args, **kwargs))
+        stream_output(split_buffer(build_output), open('/dev/null', 'w'))
diff --git a/tests/unit/split_buffer_test.py b/tests/unit/split_buffer_test.py
index 47c72f08..1775e4cb 100644
--- a/tests/unit/split_buffer_test.py
+++ b/tests/unit/split_buffer_test.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 from .. import unittest
-from compose.cli.utils import split_buffer
+from compose.utils import split_buffer
 
 
 class SplitBufferTest(unittest.TestCase):

From 15d0c60a73bf700400de826bd122f3f1c30bd0c0 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 5 Oct 2015 12:56:10 -0400
Subject: [PATCH 0383/1265] Fix split buffer with inconsistently delimited json
 objects.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/progress_stream.py      |  5 +---
 compose/service.py              |  3 +-
 compose/utils.py                | 52 ++++++++++++++++++++++++++-------
 tests/integration/testcases.py  |  6 ++--
 tests/unit/split_buffer_test.py |  2 +-
 tests/unit/utils_test.py        | 16 ++++++++++
 6 files changed, 62 insertions(+), 22 deletions(-)
 create mode 100644 tests/unit/utils_test.py

diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index ca8f3513..ac8e4b41 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -1,5 +1,3 @@
-import json
-
 from compose import utils
 
 
@@ -14,8 +12,7 @@ def stream_output(output, stream):
     lines = {}
     diff = 0
 
-    for chunk in utils.stream_as_text(output):
-        event = json.loads(chunk)
+    for event in utils.json_stream(output):
         all_events.append(event)
 
         if 'progress' in event or 'progressDetail' in event:
diff --git a/compose/service.py b/compose/service.py
index bce2e534..698ab484 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -33,7 +33,6 @@ from .progress_stream import stream_output
 from .progress_stream import StreamOutputError
 from .utils import json_hash
 from .utils import parallel_execute
-from .utils import split_buffer
 
 
 log = logging.getLogger(__name__)
@@ -724,7 +723,7 @@ class Service(object):
         )
 
         try:
-            all_events = stream_output(split_buffer(build_output), sys.stdout)
+            all_events = stream_output(build_output, sys.stdout)
         except StreamOutputError as e:
             raise BuildError(self, six.text_type(e))
 
diff --git a/compose/utils.py b/compose/utils.py
index f201e2d6..c8fddc5f 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -1,6 +1,7 @@
 import codecs
 import hashlib
 import json
+import json.decoder
 import logging
 import sys
 from threading import Thread
@@ -13,6 +14,8 @@ from six.moves.queue import Queue
 
 log = logging.getLogger(__name__)
 
+json_decoder = json.JSONDecoder()
+
 
 def parallel_execute(objects, obj_callable, msg_index, msg):
     """
@@ -96,29 +99,56 @@ def stream_as_text(stream):
         yield data
 
 
-def split_buffer(reader, separator=u'\n'):
-    """
-    Given a generator which yields strings and a separator string,
+def line_splitter(buffer, separator=u'\n'):
+    index = buffer.find(six.text_type(separator))
+    if index == -1:
+        return None, None
+    return buffer[:index + 1], buffer[index + 1:]
+
+
+def split_buffer(stream, splitter=None, decoder=lambda a: a):
+    """Given a generator which yields strings and a splitter function,
     joins all input, splits on the separator and yields each chunk.
 
     Unlike string.split(), each chunk includes the trailing
     separator, except for the last one if none was found on the end
     of the input.
     """
+    splitter = splitter or line_splitter
     buffered = six.text_type('')
-    separator = six.text_type(separator)
 
-    for data in stream_as_text(reader):
+    for data in stream_as_text(stream):
         buffered += data
         while True:
-            index = buffered.find(separator)
-            if index == -1:
+            item, rest = splitter(buffered)
+            if not item:
                 break
-            yield buffered[:index + 1]
-            buffered = buffered[index + 1:]
 
-    if len(buffered) > 0:
-        yield buffered
+            buffered = rest
+            yield item
+
+    if buffered:
+        yield decoder(buffered)
+
+
+def json_splitter(buffer):
+    """Attempt to parse a json object from a buffer. If there is at least one
+    object, return it and the rest of the buffer, otherwise return None.
+    """
+    try:
+        obj, index = json_decoder.raw_decode(buffer)
+        rest = buffer[json.decoder.WHITESPACE.match(buffer, index).end():]
+        return obj, rest
+    except ValueError:
+        return None, None
+
+
+def json_stream(stream):
+    """Given a stream of text, return a stream of json objects.
+    This handles streams which are inconsistently buffered (some entries may
+    be newline delimited, and others are not).
+    """
+    return split_buffer(stream_as_text(stream), json_splitter, json_decoder.decode)
 
 
 def write_out_msg(stream, lines, msg_index, msg, status="done"):
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 7dec3728..26a0a108 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -9,8 +9,6 @@ from compose.config.config import ServiceLoader
 from compose.const import LABEL_PROJECT
 from compose.progress_stream import stream_output
 from compose.service import Service
-from compose.utils import split_buffer
-from compose.utils import stream_as_text
 
 
 def pull_busybox(client):
@@ -73,5 +71,5 @@ class DockerClientTestCase(unittest.TestCase):
 
     def check_build(self, *args, **kwargs):
         kwargs.setdefault('rm', True)
-        build_output = stream_as_text(self.client.build(*args, **kwargs))
-        stream_output(split_buffer(build_output), open('/dev/null', 'w'))
+        build_output = self.client.build(*args, **kwargs)
+        stream_output(build_output, open('/dev/null', 'w'))
diff --git a/tests/unit/split_buffer_test.py b/tests/unit/split_buffer_test.py
index 1775e4cb..c41ea27d 100644
--- a/tests/unit/split_buffer_test.py
+++ b/tests/unit/split_buffer_test.py
@@ -47,7 +47,7 @@ class SplitBufferTest(unittest.TestCase):
         self.assert_produces(reader, [string])
 
     def assert_produces(self, reader, expectations):
-        split = split_buffer(reader(), u'\n')
+        split = split_buffer(reader())
 
         for (actual, expected) in zip(split, expectations):
             self.assertEqual(type(actual), type(expected))
diff --git a/tests/unit/utils_test.py b/tests/unit/utils_test.py
new file mode 100644
index 00000000..b272c734
--- /dev/null
+++ b/tests/unit/utils_test.py
@@ -0,0 +1,16 @@
+from .. import unittest
+from compose import utils
+
+
+class JsonSplitterTestCase(unittest.TestCase):
+
+    def test_json_splitter_no_object(self):
+        data = '{"foo": "bar'
+        self.assertEqual(utils.json_splitter(data), (None, None))
+
+    def test_json_splitter_with_object(self):
+        data = '{"foo": "bar"}\n  \n{"next": "obj"}'
+        self.assertEqual(
+            utils.json_splitter(data),
+            ({'foo': 'bar'}, '{"next": "obj"}')
+        )

From 6edb6fa262396409839bf1b30c7f7a28651e0125 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 16 Sep 2015 18:58:34 -0400
Subject: [PATCH 0384/1265] Test against a list of versions generated from
 docker/docker tags.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/test-versions |  10 ++--
 script/versions.py   | 139 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+), 4 deletions(-)
 create mode 100755 script/versions.py

diff --git a/script/test-versions b/script/test-versions
index bebc5567..89793359 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -10,13 +10,15 @@ docker run --rm \
   --entrypoint="tox" \
   "$TAG" -e pre-commit
 
-ALL_DOCKER_VERSIONS="1.7.1 1.8.2"
-DEFAULT_DOCKER_VERSION="1.8.2"
+get_versions="docker run --rm
+    --entrypoint=/code/.tox/py27/bin/python
+    $TAG
+    /code/script/versions.py docker/docker"
 
 if [ "$DOCKER_VERSIONS" == "" ]; then
-  DOCKER_VERSIONS="$DEFAULT_DOCKER_VERSION"
+  DOCKER_VERSIONS="$($get_versions default)"
 elif [ "$DOCKER_VERSIONS" == "all" ]; then
-  DOCKER_VERSIONS="$ALL_DOCKER_VERSIONS"
+  DOCKER_VERSIONS="$($get_versions recent -n 2)"
 fi
 
 
diff --git a/script/versions.py b/script/versions.py
new file mode 100755
index 00000000..513ca754
--- /dev/null
+++ b/script/versions.py
@@ -0,0 +1,139 @@
+#!/usr/bin/env python
+"""
+Query the github API for the git tags of a project, and return a list of
+version tags for recent releases, or the default release.
+
+The default release is the most recent non-RC version.
+
+Recent is a list of unqiue major.minor versions, where each is the most
+recent version in the series.
+
+For example, if the list of versions is:
+
+    1.8.0-rc2
+    1.8.0-rc1
+    1.7.1
+    1.7.0
+    1.7.0-rc1
+    1.6.2
+    1.6.1
+
+`default` would return `1.7.1` and
+`recent -n 3` would return `1.8.0-rc2 1.7.1 1.6.2`
+"""
+from __future__ import print_function
+
+import argparse
+import itertools
+import operator
+from collections import namedtuple
+
+import requests
+
+
+GITHUB_API = 'https://api.github.com/repos'
+
+
+class Version(namedtuple('_Version', 'major minor patch rc')):
+
+    @classmethod
+    def parse(cls, version):
+        version = version.lstrip('v')
+        version, _, rc = version.partition('-')
+        major, minor, patch = version.split('.', 3)
+        return cls(int(major), int(minor), int(patch), rc)
+
+    @property
+    def major_minor(self):
+        return self.major, self.minor
+
+    @property
+    def order(self):
+        """Return a representation that allows this object to be sorted
+        correctly with the default comparator.
+        """
+        # rc releases should appear before official releases
+        rc = (0, self.rc) if self.rc else (1, )
+        return (self.major, self.minor, self.patch) + rc
+
+    def __str__(self):
+        rc = '-{}'.format(self.rc) if self.rc else ''
+        return '.'.join(map(str, self[:3])) + rc
+
+
+def group_versions(versions):
+    """Group versions by `major.minor` releases.
+
+    Example:
+
+        >>> group_versions([
+                Version(1, 0, 0),
+                Version(2, 0, 0, 'rc1'),
+                Version(2, 0, 0),
+                Version(2, 1, 0),
+            ])
+
+        [
+            [Version(1, 0, 0)],
+            [Version(2, 0, 0), Version(2, 0, 0, 'rc1')],
+            [Version(2, 1, 0)],
+        ]
+    """
+    return list(
+        list(releases)
+        for _, releases
+        in itertools.groupby(versions, operator.attrgetter('major_minor'))
+    )
+
+
+def get_latest_versions(versions, num=1):
+    """Return a list of the most recent versions for each major.minor version
+    group.
+    """
+    versions = group_versions(versions)
+    return [versions[index][0] for index in range(num)]
+
+
+def get_default(versions):
+    """Return a :class:`Version` for the latest non-rc version."""
+    for version in versions:
+        if not version.rc:
+            return version
+
+
+def get_github_releases(project):
+    """Query the Github API for a list of version tags and return them in
+    sorted order.
+
+    See https://developer.github.com/v3/repos/#list-tags
+    """
+    url = '{}/{}/tags'.format(GITHUB_API, project)
+    response = requests.get(url)
+    response.raise_for_status()
+    versions = [Version.parse(tag['name']) for tag in response.json()]
+    return sorted(versions, reverse=True, key=operator.attrgetter('order'))
+
+
+def parse_args(argv):
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument('project', help="Github project name (ex: docker/docker)")
+    parser.add_argument('command', choices=['recent', 'default'])
+    parser.add_argument('-n', '--num', type=int, default=2,
+                        help="Number of versions to return from `recent`")
+    return parser.parse_args(argv)
+
+
+def main(argv=None):
+    args = parse_args(argv)
+    versions = get_github_releases(args.project)
+
+    if args.command == 'recent':
+        print(' '.join(map(str, get_latest_versions(versions, args.num))))
+    elif args.command == 'default':
+        print(get_default(versions))
+    else:
+        raise ValueError("Unknown command {}".format(args.command))
+
+
+if __name__ == "__main__":
+    main()

From 97dc4895ac76c3517902a290f392e981526aa07c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 6 Oct 2015 11:37:36 -0400
Subject: [PATCH 0385/1265] Remove unnecessary router.php from wordpress
 example.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/wordpress.md | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/docs/wordpress.md b/docs/wordpress.md
index 8de5a264..62145938 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -55,7 +55,7 @@ and a separate MySQL instance:
       environment:
         MYSQL_DATABASE: wordpress
 
-Two supporting files are needed to get this working - first, `wp-config.php` is
+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
 configuration at the `db` container:
 
@@ -85,25 +85,6 @@ configuration at the `db` container:
 
     require_once(ABSPATH . 'wp-settings.php');
 
-Second, `router.php` tells PHP's built-in web server how to run WordPress:
-
-    <?php
-
-    $root = $_SERVER['DOCUMENT_ROOT'];
-    chdir($root);
-    $path = '/'.ltrim(parse_url($_SERVER['REQUEST_URI'])['path'],'/');
-    set_include_path(get_include_path().':'.__DIR__);
-    if(file_exists($root.$path))
-    {
-        if(is_dir($root.$path) && substr($path,strlen($path) - 1, 1) !== '/')
-            $path = rtrim($path,'/').'/index.php';
-        if(strpos($path,'.php') === false) return false;
-        else {
-            chdir(dirname($root.$path));
-            require_once $root.$path;
-        }
-    }else include_once 'index.php';
-
 ### Build the project
 
 With those four files in place, run `docker-compose up` inside your WordPress

From 4ae2a0e6103849fbf9d9f412822d95c296953793 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 6 Oct 2015 15:18:58 -0400
Subject: [PATCH 0386/1265] Update release scripts for release image.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 Dockerfile.run                |  6 ++----
 docs/install.md               |  2 +-
 project/RELEASE-PROCESS.md    |  2 +-
 script/build-image            | 16 ++++++++++++++++
 script/release/build-binaries | 16 ++++++++++++++++
 script/release/push-release   |  3 +++
 script/{run => run.sh}        |  0
 7 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100755 script/build-image
 rename script/{run => run.sh} (100%)

diff --git a/Dockerfile.run b/Dockerfile.run
index 3c12fa18..9f3745fe 100644
--- a/Dockerfile.run
+++ b/Dockerfile.run
@@ -7,9 +7,7 @@ RUN     apk -U add \
 COPY    requirements.txt /code/requirements.txt
 RUN     pip install -r /code/requirements.txt
 
-ENV     VERSION 1.4.0dev
-
-COPY    dist/docker-compose-$VERSION.tar.gz /code/docker-compose/
-RUN     pip install /code/docker-compose/docker-compose-$VERSION/
+ADD     dist/docker-compose-release.tar.gz /code/docker-compose
+RUN     pip install /code/docker-compose/docker-compose-*
 
 ENTRYPOINT ["/usr/bin/docker-compose"]
diff --git a/docs/install.md b/docs/install.md
index fd7b3cab..be6a6b26 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -68,7 +68,7 @@ To install Compose, do the following:
 Compose can also be run inside a container, from a small bash script wrapper.
 To install compose as a container run:
 
-    $ curl -L https://github.com/docker/compose/releases/download/1.5.0/compose-run > /usr/local/bin/docker-compose
+    $ curl -L https://github.com/docker/compose/releases/download/1.5.0/run.sh > /usr/local/bin/docker-compose
     $ chmod +x /usr/local/bin/docker-compose
 
 
diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 30a9805a..85bbaf29 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -80,7 +80,7 @@ When prompted build the non-linux binaries and test them.
 
         ...release notes go here...
 
-5.  Attach the binaries.
+5.  Attach the binaries and `script/run.sh`
 
 6. If everything looks good, it's time to push the release.
 
diff --git a/script/build-image b/script/build-image
new file mode 100755
index 00000000..d9faddc7
--- /dev/null
+++ b/script/build-image
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+if [ -z "$1" ]; then
+    >&2 echo "First argument must be image tag."
+    exit 1
+fi
+
+TAG=$1
+VERSION="$(python setup.py --version)"
+
+python setup.py sdist
+cp dist/docker-compose-$VERSION.tar.gz dist/docker-compose-release.tar.gz
+docker build -t docker/compose:$TAG -f Dockerfile.run .
+
diff --git a/script/release/build-binaries b/script/release/build-binaries
index 9f65b45d..083f8eb5 100755
--- a/script/release/build-binaries
+++ b/script/release/build-binaries
@@ -5,6 +5,19 @@
 
 . "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
 
+function usage() {
+    >&2 cat << EOM
+Build binaries for the release.
+
+This script requires that 'git config branch.${BRANCH}.release' is set to the
+release version for the release branch.
+
+EOM
+    exit 1
+}
+
+BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+VERSION="$(git config "branch.${BRANCH}.release")" || usage
 REPO=docker/compose
 
 # Build the binaries
@@ -16,6 +29,9 @@ script/build-linux
 # TODO: build or fetch the windows binary
 echo "You need to build the osx/windows binaries, that step is not automated yet."
 
+echo "Building the container distribution"
+script/build-image $VERSION
+
 echo "Create a github release"
 # TODO: script more of this https://developer.github.com/v3/repos/releases/
 browser https://github.com/$REPO/releases/new
diff --git a/script/release/push-release b/script/release/push-release
index 7c448666..039436da 100755
--- a/script/release/push-release
+++ b/script/release/push-release
@@ -46,6 +46,9 @@ git push $GITHUB_REPO $VERSION
 echo "Uploading sdist to pypi"
 python setup.py sdist
 
+echo "Uploading the docker image"
+docker push docker/compose:$VERSION
+
 if [ "$(command -v twine 2> /dev/null)" ]; then
     twine upload ./dist/docker-compose-${VERSION}.tar.gz
 else
diff --git a/script/run b/script/run.sh
similarity index 100%
rename from script/run
rename to script/run.sh

From 467c73186996465a7bb1e5873ab829d2d1c90f42 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 25 Sep 2015 17:18:46 +0100
Subject: [PATCH 0387/1265] address PR feedback

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/project.py                | 7 +++++--
 compose/service.py                | 5 +----
 tests/integration/service_test.py | 8 +++++++-
 tests/unit/service_test.py        | 2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index 919a201f..999c2890 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -37,7 +37,10 @@ def sort_service_dicts(services):
         return [link.split(':')[0] for link in links]
 
     def get_service_names_from_volumes_from(volumes_from):
-        return [volume_from.split(':')[0] for volume_from in volumes_from]
+        return [
+            parse_volume_from_spec(volume_from).source
+            for volume_from in volumes_from
+        ]
 
     def get_service_dependents(service_dict, services):
         name = service_dict['name']
@@ -195,7 +198,7 @@ class Project(object):
                         raise ConfigurationError(
                             'Service "%s" mounts volumes from "%s", which is '
                             'not the name of a service or container.' % (
-                                volume_from_config,
+                                service_dict['name'],
                                 volume_from_spec.source))
                 volumes_from.append(volume_from_spec)
             del service_dict['volumes_from']
diff --git a/compose/service.py b/compose/service.py
index 79a138aa..f2f82f6c 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -6,6 +6,7 @@ import os
 import re
 import sys
 from collections import namedtuple
+from operator import attrgetter
 
 import enum
 import six
@@ -1009,10 +1010,6 @@ def parse_volume_from_spec(volume_from_config):
     else:
         source, mode = parts
 
-    if mode not in ('rw', 'ro'):
-        raise ConfigError("VolumeFrom %s has invalid mode (%s), should be "
-                          "one of: rw, ro." % (volume_from_config, mode))
-
     return VolumeFromSpec(source, mode)
 
 
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 30606096..64ce2c65 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -273,7 +273,13 @@ class ServiceTest(DockerClientTestCase):
             command=["top"],
             labels={LABEL_PROJECT: 'composetest'},
         )
-        host_service = self.create_service('host', volumes_from=[VolumeFromSpec(volume_service, 'rw'), VolumeFromSpec(volume_container_2, 'rw')])
+        host_service = self.create_service(
+            'host',
+            volumes_from=[
+                VolumeFromSpec(volume_service, 'rw'),
+                VolumeFromSpec(volume_container_2, 'rw')
+            ]
+        )
         host_container = host_service.create_container()
         host_service.start_container(host_container)
         self.assertIn(volume_container_1.id + ':rw',
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index f85d34d2..48e31b11 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -379,7 +379,7 @@ class ServiceTest(unittest.TestCase):
             client=self.mock_client,
             net=ServiceNet(Service('other')),
             links=[(Service('one'), 'one')],
-            volumes_from=[Service('two')])
+            volumes_from=[VolumeFromSpec(Service('two'), 'rw')])
 
         config_dict = service.config_dict()
         expected = {

From 0ff84a78c64b241ffc9cb037db0b17044bb9941d Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 6 Oct 2015 13:10:38 +0100
Subject: [PATCH 0388/1265] Use multiple returns rather than overriding.

Also added a doc string for clarity.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/service.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index f2f82f6c..a2413854 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -986,16 +986,18 @@ def parse_volume_spec(volume_config):
 
 
 def build_volume_from(volume_from_spec):
-    volumes_from = []
+    """
+    volume_from can be either a service or a container. We want to return the
+    container.id and format it into a string complete with the mode.
+    """
     if isinstance(volume_from_spec.source, Service):
         containers = volume_from_spec.source.containers(stopped=True)
         if not containers:
-            volumes_from = ["{}:{}".format(volume_from_spec.source.create_container().id, volume_from_spec.mode)]
+            return ["{}:{}".format(volume_from_spec.source.create_container().id, volume_from_spec.mode)]
         else:
-            volumes_from = ["{}:{}".format(container.id, volume_from_spec.mode) for container in containers]
+            return ["{}:{}".format(container.id, volume_from_spec.mode) for container in containers]
     elif isinstance(volume_from_spec.source, Container):
-        volumes_from = ["{}:{}".format(volume_from_spec.source.id, volume_from_spec.mode)]
-    return volumes_from
+        return ["{}:{}".format(volume_from_spec.source.id, volume_from_spec.mode)]
 
 
 def parse_volume_from_spec(volume_from_config):

From f9028703f4a527dc05302999f8d21c18f84b7055 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 6 Oct 2015 13:11:49 +0100
Subject: [PATCH 0389/1265] Pick the first container

Rather than inefficiently looping through all the containers that a
service has and overriding each volumes_from value, pick the first
one and return that.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/service.py         | 5 +++--
 tests/unit/project_test.py | 2 +-
 tests/unit/service_test.py | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index a2413854..0dbd7f8d 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -994,8 +994,9 @@ def build_volume_from(volume_from_spec):
         containers = volume_from_spec.source.containers(stopped=True)
         if not containers:
             return ["{}:{}".format(volume_from_spec.source.create_container().id, volume_from_spec.mode)]
-        else:
-            return ["{}:{}".format(container.id, volume_from_spec.mode) for container in containers]
+
+        container = containers[0]
+        return ["{}:{}".format(container.id, volume_from_spec.mode)]
     elif isinstance(volume_from_spec.source, Container):
         return ["{}:{}".format(volume_from_spec.source.id, volume_from_spec.mode)]
 
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index f3cf9e29..fc189fbb 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -211,7 +211,7 @@ class ProjectTest(unittest.TestCase):
                 'volumes_from': ['vol']
             }
         ], None)
-        self.assertEqual(project.get_service('test')._get_volumes_from(), [cid + ':rw' for cid in container_ids])
+        self.assertEqual(project.get_service('test')._get_volumes_from(), [container_ids[0] + ':rw'])
 
     def test_net_unset(self):
         project = Project.from_dicts('test', [
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 48e31b11..19d25e2e 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -98,7 +98,7 @@ class ServiceTest(unittest.TestCase):
         ]
         service = Service('test', volumes_from=[VolumeFromSpec(from_service, 'rw')], image='foo')
 
-        self.assertEqual(service._get_volumes_from(), [cid + ":rw" for cid in container_ids])
+        self.assertEqual(service._get_volumes_from(), [container_ids[0] + ":rw"])
 
     def test_get_volumes_from_service_container_exists_with_flags(self):
         for mode in ['ro', 'rw', 'z', 'rw,z', 'z,rw']:
@@ -110,7 +110,7 @@ class ServiceTest(unittest.TestCase):
             ]
             service = Service('test', volumes_from=[VolumeFromSpec(from_service, mode)], image='foo')
 
-            self.assertEqual(service._get_volumes_from(), container_ids)
+            self.assertEqual(service._get_volumes_from(), [container_ids[0]])
 
     def test_get_volumes_from_service_no_container(self):
         container_id = 'abababab'

From 21a1affc6395a524273d5788cac5e0b7c92a50ce Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 6 Oct 2015 15:43:26 +0100
Subject: [PATCH 0390/1265] Re-word docs.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/yml.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/yml.md b/docs/yml.md
index 12c9b554..a476fd33 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -346,8 +346,8 @@ should always begin with `.` or `..`.
 
 ### volumes_from
 
-Mount all of the volumes from another service or container, with the
-supported flags by docker : ``ro``, ``rw``.
+Mount all of the volumes from another service or container, optionally
+specifying read-only access(``ro``) or read-write(``rw``).
 
     volumes_from:
      - service_name

From 8efc39e616f3cc6f782b83abefe39f778fdf7731 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 7 Oct 2015 14:59:08 +0100
Subject: [PATCH 0391/1265] Improve boolean warning message.

Including examples of more boolean types, eg yes/N as it's not
always immediately clear that they are treated as booleans.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/validation.py     | 4 ++--
 tests/unit/config/config_test.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 959465e9..0fef304a 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -57,9 +57,9 @@ def format_boolean_in_environment(instance):
     """
     if isinstance(instance, bool):
         log.warn(
-            "Warning: There is a boolean value, {0} in the 'environment' key.\n"
+            "Warning: There is a boolean value in the 'environment' key.\n"
             "Environment variables can only be strings.\nPlease add quotes to any boolean values to make them string "
-            "(eg, '{0}').\nThis warning will become an error in a future release. \r\n".format(instance)
+            "(eg, 'True', 'yes', 'N').\nThis warning will become an error in a future release. \r\n"
         )
     return True
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index b505740f..d3fb4d5f 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -319,7 +319,7 @@ class ConfigTest(unittest.TestCase):
 
     @mock.patch('compose.config.validation.log')
     def test_logs_warning_for_boolean_in_environment(self, mock_logging):
-        expected_warning_msg = "Warning: There is a boolean value, True in the 'environment' key."
+        expected_warning_msg = "Warning: There is a boolean value in the 'environment' key."
         config.load(
             build_config_details(
                 {'web': {

From 34f5912bbcf5976043840482d13a2d777d40e752 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 7 Oct 2015 11:00:40 -0400
Subject: [PATCH 0392/1265] Update release script and run.sh image name.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/release/make-branch | 3 ++-
 script/run.sh              | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/script/release/make-branch b/script/release/make-branch
index 66ed6bbf..dde1fb65 100755
--- a/script/release/make-branch
+++ b/script/release/make-branch
@@ -61,9 +61,10 @@ git checkout -b $BRANCH $BASE_VERSION
 git config "branch.${BRANCH}.release" $VERSION
 
 
-echo "Update versions in docs/install.md and compose/__init__.py"
+echo "Update versions in docs/install.md, compose/__init__.py, script/run.sh"
 $EDITOR docs/install.md
 $EDITOR compose/__init__.py
+$EDITOR script/run.sh
 
 
 echo "Write release notes in CHANGELOG.md"
diff --git a/script/run.sh b/script/run.sh
index 64718efd..cf46c143 100755
--- a/script/run.sh
+++ b/script/run.sh
@@ -15,9 +15,8 @@
 
 set -e
 
-VERSION="1.4.0dev"
-# TODO: move this to an official repo
-IMAGE="dnephin/docker-compose:$VERSION"
+VERSION="1.5.0"
+IMAGE="docker/compose:$VERSION"
 
 
 # Setup options for connecting to docker host

From ad96e10938d98cefbbbe1a17774802f36f8b8ad8 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 6 Oct 2015 16:32:59 -0400
Subject: [PATCH 0393/1265] Add travis.yml for building binaries.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 .travis.yml                | 19 +++++++++++++++++++
 script/build-osx           |  1 -
 script/prepare-osx         |  2 +-
 script/travis/build-binary | 11 +++++++++++
 script/travis/ci           | 10 ++++++++++
 script/travis/install      |  9 +++++++++
 6 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 .travis.yml
 create mode 100755 script/travis/build-binary
 create mode 100755 script/travis/ci
 create mode 100755 script/travis/install

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..0f966f9d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,19 @@
+sudo: required
+
+language: python
+
+services:
+  - docker
+
+matrix:
+  include:
+    - os: linux
+    - os: osx
+      language: generic
+
+
+install: ./script/travis/install
+
+script:
+  - ./script/travis/ci
+  - ./script/travis/build-binary
diff --git a/script/build-osx b/script/build-osx
index 15a7bbc5..042964e4 100755
--- a/script/build-osx
+++ b/script/build-osx
@@ -3,7 +3,6 @@ set -ex
 
 PATH="/usr/local/bin:$PATH"
 
-./script/clean
 rm -rf venv
 
 virtualenv -p /usr/local/bin/python venv
diff --git a/script/prepare-osx b/script/prepare-osx
index ca2776b6..10bbbecc 100755
--- a/script/prepare-osx
+++ b/script/prepare-osx
@@ -24,7 +24,7 @@ if !(which brew); then
   ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 fi
 
-brew update
+brew update > /dev/null
 
 if !(python_version | grep "$desired_python_version"); then
   if brew list | grep python; then
diff --git a/script/travis/build-binary b/script/travis/build-binary
new file mode 100755
index 00000000..b3b7b925
--- /dev/null
+++ b/script/travis/build-binary
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+    script/build-linux
+    # TODO: add script/build-image
+else
+    script/prepare-osx
+    script/build-osx
+fi
diff --git a/script/travis/ci b/script/travis/ci
new file mode 100755
index 00000000..4cce1bc8
--- /dev/null
+++ b/script/travis/ci
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+    tox -e py27,py34 -- tests/unit
+else
+    # TODO: we could also install py34 and test against it
+    python -m tox -e py27 -- tests/unit
+fi
diff --git a/script/travis/install b/script/travis/install
new file mode 100755
index 00000000..a23667bf
--- /dev/null
+++ b/script/travis/install
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -ex
+
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+    pip install tox==2.1.1
+else
+    pip install --user tox==2.1.1
+fi

From 9ce18849254b29111bfe08bf844e35122b0854e4 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 6 Oct 2015 20:50:40 -0400
Subject: [PATCH 0394/1265] Add upload to bintray from travis.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 .pre-commit-config.yaml                |  1 +
 .travis.yml                            | 10 +++++++++
 script/build-image                     |  1 -
 script/build-linux                     |  2 +-
 script/travis/bintray.json.tmpl        | 29 ++++++++++++++++++++++++++
 script/travis/build-binary             |  6 ++++--
 script/travis/render-bintray-config.py |  9 ++++++++
 7 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 script/travis/bintray.json.tmpl
 create mode 100755 script/travis/render-bintray-config.py

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8913a05f..3fad8ddc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,6 +5,7 @@
     - id: check-docstring-first
     - id: check-merge-conflict
     - id: check-yaml
+    - id: check-json
     - id: debug-statements
     - id: end-of-file-fixer
     - id: flake8
diff --git a/.travis.yml b/.travis.yml
index 0f966f9d..3310e2ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,3 +17,13 @@ install: ./script/travis/install
 script:
   - ./script/travis/ci
   - ./script/travis/build-binary
+
+before_deploy:
+  - "./script/travis/render-bintray-config.py < ./script/travis/bintray.json.tmpl > ./bintray.json"
+
+deploy:
+  provider: bintray
+  user: docker-compose-roleuser
+  key: '$BINTRAY_API_KEY'
+  file: ./bintray.json
+  skip_cleanup: true
diff --git a/script/build-image b/script/build-image
index d9faddc7..3ac9729b 100755
--- a/script/build-image
+++ b/script/build-image
@@ -13,4 +13,3 @@ VERSION="$(python setup.py --version)"
 python setup.py sdist
 cp dist/docker-compose-$VERSION.tar.gz dist/docker-compose-release.tar.gz
 docker build -t docker/compose:$TAG -f Dockerfile.run .
-
diff --git a/script/build-linux b/script/build-linux
index 4b869621..ade18bc5 100755
--- a/script/build-linux
+++ b/script/build-linux
@@ -5,7 +5,7 @@ set -ex
 ./script/clean
 
 TAG="docker-compose"
-docker build -t "$TAG" .
+docker build -t "$TAG" . | tail -n 200
 docker run \
     --rm --entrypoint="script/build-linux-inner" \
     -v $(pwd)/dist:/code/dist \
diff --git a/script/travis/bintray.json.tmpl b/script/travis/bintray.json.tmpl
new file mode 100644
index 00000000..7d0adbeb
--- /dev/null
+++ b/script/travis/bintray.json.tmpl
@@ -0,0 +1,29 @@
+{
+    "package": {
+        "name": "${TRAVIS_OS_NAME}",
+        "repo": "master",
+        "subject": "docker-compose",
+        "desc": "Automated build of master branch from travis ci.",
+        "website_url": "https://github.com/docker/compose",
+        "issue_tracker_url": "https://github.com/docker/compose/issues",
+        "vcs_url": "https://github.com/docker/compose.git",
+        "licenses": ["Apache-2.0"]
+    },
+
+    "version": {
+        "name": "master",
+        "desc": "Automated build of the master branch.",
+        "released": "${DATE}",
+        "vcs_tag": "master"
+    },
+
+    "files": [
+        {
+            "includePattern": "dist/(.*)",
+            "excludePattern": ".*\.tar.gz",
+            "uploadPattern": "$1",
+            "matrixParams": { "override": 1 }
+        }
+    ],
+    "publish": true
+}
diff --git a/script/travis/build-binary b/script/travis/build-binary
index b3b7b925..0becee7f 100755
--- a/script/travis/build-binary
+++ b/script/travis/build-binary
@@ -1,10 +1,12 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     script/build-linux
-    # TODO: add script/build-image
+    script/build-image master
+    # TODO: requires auth
+    # docker push docker/compose:master
 else
     script/prepare-osx
     script/build-osx
diff --git a/script/travis/render-bintray-config.py b/script/travis/render-bintray-config.py
new file mode 100755
index 00000000..6aa468d6
--- /dev/null
+++ b/script/travis/render-bintray-config.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+import datetime
+import os.path
+import sys
+
+os.environ['DATE'] = str(datetime.date.today())
+
+for line in sys.stdin:
+    print os.path.expandvars(line),

From 23fcace36c38813fbb78b9e06fc805b73d0e8f33 Mon Sep 17 00:00:00 2001
From: ronen barzel <ronen@barzel.org>
Date: Wed, 7 Oct 2015 11:14:53 -0700
Subject: [PATCH 0395/1265] Bug fix: Use app's Gemfile.lock in Dockerfile

The Dockerfile should use the same Gemfile.lock as the app, to make sure the container gets the expected versions of gems installed.  Aside from wanting that in principle, without it you can get mysterious gem dependency errors.  Here's the scenario:

1. Suppose `Gemfile` includes `gem "some-active-gem", "~> 1.0"
2. When developing the app, you run `bundle install`, which installs the latest version--let's say, 1.0.1-and records it in `Gemfile.lock`
3. Suppose the developers of `some-active-gem` then release v1.0.2
4. Now build the container: docker runs `bundle install`, which installs v1.0.2 and records it in `Gemfile.lock` and then "ADD"s the app worktree, which replaces the `Gemfile.lock` with the one from the worktree that lists v1.0.1.
5. Immediately run your app and it fails with the error `Could not find some-active-gem-1.0.1 in any of the sources` which is a bit befuddling since you just saw it run bundle install so you expect all gem dependencies to be resolved properly.

Signed-off-by: ronen barzel <ronen@barzel.org>
---
 docs/rails.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/rails.md b/docs/rails.md
index 0a164ca7..105f0f45 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -26,6 +26,7 @@ Dockerfile consists of:
     RUN mkdir /myapp
     WORKDIR /myapp
     ADD Gemfile /myapp/Gemfile
+    ADD Gemfile.lock /myapp/Gemfile.lock
     RUN bundle install
     ADD . /myapp
 

From a3eb563f94edfbc7b3341e272f7931b9025496fa Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 8 Oct 2015 11:50:27 +0100
Subject: [PATCH 0396/1265] Put port ranges back in

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/yml.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/yml.md b/docs/yml.md
index a476fd33..c3d4a354 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -315,9 +315,12 @@ port (a random host port will be chosen).
 
     ports:
      - "3000"
+     - "3000-3005"
      - "8000:8000"
+     - "9090-9091:8080-8081"
      - "49100:22"
      - "127.0.0.1:8001:8001"
+     - "127.0.0.1:5000-5010:5000-5010"
 
 ### security_opt
 

From 94e6727831f8a6f1abdb49f5763af2b4cffbae3d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 8 Oct 2015 14:46:31 -0400
Subject: [PATCH 0397/1265] Re-order docs Makefile for better caching.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/Dockerfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/Dockerfile b/docs/Dockerfile
index d9add75c..fcd64900 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -1,11 +1,6 @@
 FROM docs/base:latest
 MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)
 
-# To get the git info for this repo
-COPY . /src
-
-COPY . /docs/content/compose/
-
 RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/docker
 RUN svn checkout https://github.com/docker/swarm/trunk/docs /docs/content/swarm
 RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine
@@ -13,6 +8,10 @@ RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content
 RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content/tutorials
 RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content
 
+# To get the git info for this repo
+COPY . /src
+
+COPY . /docs/content/compose/
 
 # Sed to process GitHub Markdown
 # 1-2 Remove comment code from metadata block

From 0e9ec8aa74a57170251b0d0bc6e861218d2bbf67 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 7 Oct 2015 16:47:27 -0400
Subject: [PATCH 0398/1265] Add publish to bintray step to appveyor.yml

Remove Set-PSDebug -trace to prevent the 9000+ lines of debug output
from spamming the logs on appveyor.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 appveyor.yml             | 12 ++++++++++--
 script/build-windows.ps1 |  1 -
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index acf8bff3..b162db1e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,12 +9,20 @@ install:
 # Build the binary after tests
 build: false
 
+environment:
+  BINTRAY_USER: "docker-compose-roleuser"
+  BINTRAY_PATH: "docker-compose/master/windows/master/docker-compose-Windows-x86_64.exe"
+
 test_script:
   - "tox -e py27,py34 -- tests/unit"
-
-after_test:
   - ps: ".\\script\\build-windows.ps1"
 
+deploy_script:
+  - "curl -sS
+        -u \"%BINTRAY_USER%:%BINTRAY_API_KEY%\"
+        -X PUT \"https://api.bintray.com/content/%BINTRAY_PATH%?override=1&publish=1\"
+        --data-binary @dist\\docker-compose-Windows-x86_64.exe"
+
 artifacts:
   - path: .\dist\docker-compose-Windows-x86_64.exe
     name: "Compose Windows binary"
diff --git a/script/build-windows.ps1 b/script/build-windows.ps1
index f7fd1589..b35fad6f 100644
--- a/script/build-windows.ps1
+++ b/script/build-windows.ps1
@@ -29,7 +29,6 @@
 #        .\script\build-windows.ps1
 
 $ErrorActionPreference = "Stop"
-Set-PSDebug -trace 1
 
 # Remove virtualenv
 if (Test-Path venv) {

From 6e838b5de17873957ede7068182b620b197d80e7 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 8 Oct 2015 10:50:15 -0400
Subject: [PATCH 0399/1265] Add link to master builds from install docs.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/install.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/install.md b/docs/install.md
index be6a6b26..4e541b8c 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -71,6 +71,13 @@ To install compose as a container run:
     $ curl -L https://github.com/docker/compose/releases/download/1.5.0/run.sh > /usr/local/bin/docker-compose
     $ chmod +x /usr/local/bin/docker-compose
 
+## Master builds
+
+If you're interested in trying out a pre-release build you can download a
+binary from https://dl.bintray.com/docker-compose/master/. Pre-release
+builds allow you to try out new features before they are released, but may
+be less stable.
+
 
 ## Upgrading
 

From cd48a7026a2e8f97ad4d94548e2b59165a398d7a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 8 Oct 2015 17:07:30 -0400
Subject: [PATCH 0400/1265] Cleanup doc reference links.

Removed 'Compose command line completion' and 'Compose environment variables' from the list. command line completion is linked to from install docs, and environment variables are deprecated.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/completion.md         |  1 -
 docs/django.md             |  2 --
 docs/env.md                |  4 ----
 docs/extends.md            |  1 -
 docs/index.md              | 13 -------------
 docs/install.md            |  2 --
 docs/production.md         |  2 --
 docs/rails.md              |  2 --
 docs/reference/overview.md |  5 -----
 docs/wordpress.md          |  2 --
 docs/yml.md                |  2 --
 11 files changed, 36 deletions(-)

diff --git a/docs/completion.md b/docs/completion.md
index bf8d1555..891813e9 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -66,4 +66,3 @@ Enjoy working with Compose faster and with less typos!
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
-- [Compose environment variables](env.md)
diff --git a/docs/django.md b/docs/django.md
index e52f5030..b11e1693 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -131,5 +131,3 @@ example, run `docker-compose up` and in another terminal run:
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
-- [Compose environment variables](env.md)
-- [Compose command line completion](completion.md)
diff --git a/docs/env.md b/docs/env.md
index a8e6e214..8886548e 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -41,9 +41,5 @@ Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
 
 - [User guide](/)
 - [Installing Compose](install.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
-- [Compose command line completion](completion.md)
diff --git a/docs/extends.md b/docs/extends.md
index 7b4d5b20..8c35c7a6 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -360,4 +360,3 @@ locally-defined bindings taking precedence:
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
-- [Compose command line completion](completion.md)
diff --git a/docs/index.md b/docs/index.md
index 67a6802b..7900b4f0 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -55,8 +55,6 @@ Compose has commands for managing the whole lifecycle of your application:
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
-- [Compose environment variables](env.md)
-- [Compose command line completion](completion.md)
 
 ## Quick start
 
@@ -218,14 +216,3 @@ like-minded individuals, we have a number of open channels for communication.
 * To contribute code or documentation changes: please submit a [pull request on Github](https://github.com/docker/compose/pulls).
 
 For more information and resources, please visit the [Getting Help project page](https://docs.docker.com/project/get-help/).
-
-## Where to go next
-
-- [Installing Compose](install.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
-- [Command line reference](/reference)
-- [Yaml file reference](yml.md)
-- [Compose environment variables](env.md)
-- [Compose command line completion](completion.md)
diff --git a/docs/install.md b/docs/install.md
index be6a6b26..363a2b29 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -117,5 +117,3 @@ To uninstall Docker Compose if you installed using `pip`:
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
-- [Compose environment variables](env.md)
-- [Compose command line completion](completion.md)
diff --git a/docs/production.md b/docs/production.md
index 29e3fd34..3e4169e3 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -91,5 +91,3 @@ guide</a>.
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
-- [Compose environment variables](env.md)
-- [Compose command line completion](completion.md)
diff --git a/docs/rails.md b/docs/rails.md
index 0a164ca7..c2410410 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -129,5 +129,3 @@ That's it. Your app should now be running on port 3000 on your Docker daemon. If
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
-- [Compose environment variables](env.md)
-- [Compose command line completion](completion.md)
diff --git a/docs/reference/overview.md b/docs/reference/overview.md
index 9f08246e..f6496bf7 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/overview.md
@@ -81,9 +81,4 @@ it failed. Defaults to 60 seconds.
 
 - [User guide](/)
 - [Installing Compose](install.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
 - [Yaml file reference](yml.md)
-- [Compose environment variables](env.md)
-- [Compose command line completion](completion.md)
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 62145938..7ac06289 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -100,5 +100,3 @@ database containers. If you're using [Docker Machine](https://docs.docker.com/ma
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
 - [Yaml file reference](yml.md)
-- [Compose environment variables](env.md)
-- [Compose command line completion](completion.md)
diff --git a/docs/yml.md b/docs/yml.md
index a476fd33..185b31cf 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -418,5 +418,3 @@ dollar sign (`$$`).
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](/reference)
-- [Compose environment variables](env.md)
-- [Compose command line completion](completion.md)

From 182c2537d031f822229eca48b9a2b1985191f573 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 8 Oct 2015 17:22:42 -0400
Subject: [PATCH 0401/1265] Fix links between reference sections

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/reference/docker-compose.md | 4 ++--
 docs/reference/index.md          | 4 ++--
 docs/reference/overview.md       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/reference/docker-compose.md b/docs/reference/docker-compose.md
index 32fcbe70..b7cca5b0 100644
--- a/docs/reference/docker-compose.md
+++ b/docs/reference/docker-compose.md
@@ -100,5 +100,5 @@ directory name.
 
 ## Where to go next
 
-* [CLI environment variables](overview.md)
-* [Command line reference](index.md)
+* [CLI environment variables](/reference/overview.md)
+* [Command line reference](/reference)
diff --git a/docs/reference/index.md b/docs/reference/index.md
index 7a1fb9b4..961dbb86 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -30,5 +30,5 @@ The following pages describe the usage information for the [docker-compose](/ref
 
 ## Where to go next
 
-* [CLI environment variables](overview.md)
-* [docker-compose Command](docker-compose.md)
+* [CLI environment variables](/reference/overview)
+* [docker-compose Command](/reference/docker-compose)
diff --git a/docs/reference/overview.md b/docs/reference/overview.md
index f6496bf7..019525a5 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/overview.md
@@ -17,8 +17,8 @@ This section describes the subcommands you can use with the `docker-compose` com
 
 ## Commands
 
-* [docker-compose Command](docker-compose.md)
-* [CLI Reference](index.md)
+* [docker-compose Command](/reference/docker-compose.md)
+* [CLI Reference](/reference)
 
 
 ## Environment Variables

From e90d2b418d7571cf32178d04258f04cecb70dd92 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 8 Oct 2015 18:32:05 -0400
Subject: [PATCH 0402/1265] Update title for command-line completion docs.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/completion.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/completion.md b/docs/completion.md
index 891813e9..30c555c3 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -1,6 +1,6 @@
 <!--[metadata]>
 +++
-title = "Command Completion"
+title = "Command-line Completion"
 description = "Compose CLI reference"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
 [menu.main]
@@ -9,7 +9,7 @@ weight=3
 +++
 <![end-metadata]-->
 
-# Command Completion
+# Command-line Completion
 
 Compose comes with [command completion](http://en.wikipedia.org/wiki/Command-line_completion)
 for the bash and zsh shell.

From 9b9c8f9cbcfca5458cfe54daff9a953d5969055a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 8 Oct 2015 19:09:01 -0400
Subject: [PATCH 0403/1265] Clarify irc details, and remove "infancy"
 statement.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/index.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 7900b4f0..4b9f29d2 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -205,13 +205,14 @@ Compose, please refer to the [CHANGELOG](https://github.com/docker/compose/blob/
 
 ## Getting help
 
-Docker Compose is still in its infancy and under active development. If you need
-help, would like to contribute, or simply want to talk about the project with
-like-minded individuals, we have a number of open channels for communication.
+Docker Compose is under active development. If you need help, would like to
+contribute, or simply want to talk about the project with like-minded
+individuals, we have a number of open channels for communication.
 
 * To report bugs or file feature requests: please use the [issue tracker on Github](https://github.com/docker/compose/issues).
 
-* To talk about the project with people in real time: please join the `#docker-compose` channel on IRC.
+* To talk about the project with people in real time: please join the
+  `#docker-compose` channel on freenode IRC.
 
 * To contribute code or documentation changes: please submit a [pull request on Github](https://github.com/docker/compose/pulls).
 

From bc6b3f970b5fd0fa646dbf166d02d16b556731c5 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 13 Oct 2015 17:03:09 +0100
Subject: [PATCH 0404/1265] container paths don't need to be expanded

They should not ever be relative.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 9e9cb857..373299fd 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -485,7 +485,6 @@ def resolve_volume_paths(service_dict, working_dir=None):
 
 def resolve_volume_path(volume, working_dir, service_name):
     container_path, host_path = split_path_mapping(volume)
-    container_path = os.path.expanduser(container_path)
 
     if host_path is not None:
         if host_path.startswith('.'):

From 9aaecf95a490436deff190c77546162118145050 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 8 Oct 2015 11:10:51 -0400
Subject: [PATCH 0405/1265] Update pip install instructions to be more
 reliable.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/install.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/install.md b/docs/install.md
index 7842efb4..a701f298 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -60,7 +60,14 @@ To install Compose, do the following:
 
 ### Install using pip
 
-    $ sudo pip install -U docker-compose
+Compose can be installed from [pypi](https://pypi.python.org/pypi/docker-compose)
+using `pip`.  If you install using `pip` it is highly recommended that you use a
+[virtualenv](https://virtualenv.pypa.io/en/latest/) because many operating systems
+have python system packages that conflict with docker-compose dependencies. See
+the [virtualenv tutorial](http://docs.python-guide.org/en/latest/dev/virtualenvs/)
+to get started.
+
+    $ pip install docker-compose
 
 
 ### Install as a container

From c1d5ecaafe3e2e7b1f06342cbeeaef77d72fbac5 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 13 Oct 2015 17:27:25 +0100
Subject: [PATCH 0406/1265] Workaround splitdrive limitations

splitdrive doesn't handle relative paths, so if volume_path contains
a relative path, we handle that differently and manually set drive to ''.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py         | 13 ++++++++++++-
 tests/unit/config/config_test.py |  1 -
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 373299fd..adba3bda 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -526,7 +526,18 @@ def path_mappings_from_dict(d):
 
 
 def split_path_mapping(volume_path):
-    drive, volume_config = os.path.splitdrive(volume_path)
+    """
+    Ascertain if the volume_path contains a host path as well as a container
+    path. Using splitdrive so windows absolute paths won't cause issues with
+    splitting on ':'.
+    """
+    # splitdrive has limitations when it comes to relative paths, so when it's
+    # relative, handle special case to set the drive to ''
+    if volume_path.startswith('.') or volume_path.startswith('~'):
+        drive, volume_config = '', volume_path
+    else:
+        drive, volume_config = os.path.splitdrive(volume_path)
+
     if ':' in volume_config:
         (host, container) = volume_config.split(':', 1)
         return (container, drive + host)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index d3fb4d5f..00282105 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -463,7 +463,6 @@ class VolumeConfigTest(unittest.TestCase):
         self.assertEqual(d['volumes'], ['/home/me/otherproject:/data'])
 
     @pytest.mark.skipif(not IS_WINDOWS_PLATFORM, reason='windows paths')
-    @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='waiting for this to be resolved: https://github.com/docker/compose/issues/2128')
     def test_relative_path_does_expand_windows(self):
         d = make_service_dict('foo', {'build': '.', 'volumes': ['./data:/data']}, working_dir='C:\\Users\\me\\myproject')
         self.assertEqual(d['volumes'], ['C:\\Users\\me\\myproject\\data:/data'])

From 0e9c542865215a7ff8333e11e9eaa45b4e5a92c1 Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Tue, 13 Oct 2015 04:01:19 -0700
Subject: [PATCH 0407/1265] Updating to new tooling:supports Github source
 linking Fixing HEAD Updating to match daniel Fixing the index link

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/Dockerfile                  | 16 ++-------
 docs/completion.md               |  4 +--
 docs/django.md                   |  4 +--
 docs/env.md                      |  6 ++--
 docs/extends.md                  |  2 +-
 docs/index.md                    |  4 +--
 docs/install.md                  |  2 +-
 docs/pre-process.sh              | 60 --------------------------------
 docs/production.md               |  2 +-
 docs/rails.md                    |  2 +-
 docs/reference/docker-compose.md |  4 +--
 docs/reference/index.md          | 34 +++++++++---------
 docs/reference/overview.md       | 12 +++----
 docs/wordpress.md                |  2 +-
 docs/yml.md                      |  6 ++--
 15 files changed, 46 insertions(+), 114 deletions(-)
 delete mode 100755 docs/pre-process.sh

diff --git a/docs/Dockerfile b/docs/Dockerfile
index fcd64900..0114f04e 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -1,10 +1,11 @@
-FROM docs/base:latest
+FROM docs/base:hugo-github-linking
 MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)
 
-RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/docker
+RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/engine
 RUN svn checkout https://github.com/docker/swarm/trunk/docs /docs/content/swarm
 RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine
 RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content/registry
+RUN svn checkout https://github.com/kitematic/kitematic/trunk/docs /docs/content/kitematic
 RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content/tutorials
 RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content
 
@@ -12,14 +13,3 @@ RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content
 COPY . /src
 
 COPY . /docs/content/compose/
-
-# Sed to process GitHub Markdown
-# 1-2 Remove comment code from metadata block
-# 3 Change ](/word to ](/project/ in links
-# 4 Change ](word.md) to ](/project/word)
-# 5 Remove .md extension from link text
-# 6 Change ](../ to ](/project/word) 
-# 7 Change ](../../ to ](/project/ --> not implemented
-# 
-# 
-RUN /src/pre-process.sh /docs
diff --git a/docs/completion.md b/docs/completion.md
index 30c555c3..6e7b42c2 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -59,10 +59,10 @@ Enjoy working with Compose faster and with less typos!
 
 ## Compose documentation
 
-- [User guide](/)
+- [User guide](index.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
-- [Command line reference](/reference)
+- [Command line reference](./reference/index.md)
 - [Yaml file reference](yml.md)
diff --git a/docs/django.md b/docs/django.md
index b11e1693..f4775c4e 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -124,10 +124,10 @@ example, run `docker-compose up` and in another terminal run:
 
 ## More Compose documentation
 
-- [User guide](/)
+- [User guide](../index.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
-- [Command line reference](/reference)
+- [Command line reference](./reference/index.md)
 - [Yaml file reference](yml.md)
diff --git a/docs/env.md b/docs/env.md
index 8886548e..984a340b 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -37,9 +37,9 @@ Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
 
 [Docker links]: http://docs.docker.com/userguide/dockerlinks/
 
-## Compose documentation
+## Related Information
 
-- [User guide](/)
+- [User guide](index.md)
 - [Installing Compose](install.md)
-- [Command line reference](/reference)
+- [Command line reference](./reference/index.md)
 - [Yaml file reference](yml.md)
diff --git a/docs/extends.md b/docs/extends.md
index 8c35c7a6..88fb24a5 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -358,5 +358,5 @@ locally-defined bindings taking precedence:
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
-- [Command line reference](/reference)
+- [Command line reference](./reference/index.md)
 - [Yaml file reference](yml.md)
diff --git a/docs/index.md b/docs/index.md
index 4b9f29d2..bff741b6 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -53,7 +53,7 @@ Compose has commands for managing the whole lifecycle of your application:
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
-- [Command line reference](/reference)
+- [Command line reference](./reference/index.md)
 - [Yaml file reference](yml.md)
 
 ## Quick start
@@ -195,7 +195,7 @@ At this point, you have seen the basics of how Compose works.
 
 - Next, try the quick start guide for [Django](django.md),
   [Rails](rails.md), or [WordPress](wordpress.md).
-- See the reference guides for complete details on the [commands](/reference), the
+- See the reference guides for complete details on the [commands](./reference/index.md), the
   [configuration file](yml.md) and [environment variables](env.md).
 
 ## Release Notes
diff --git a/docs/install.md b/docs/install.md
index a701f298..654f6421 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -129,5 +129,5 @@ To uninstall Docker Compose if you installed using `pip`:
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
-- [Command line reference](/reference)
+- [Command line reference](./reference/index.md)
 - [Yaml file reference](yml.md)
diff --git a/docs/pre-process.sh b/docs/pre-process.sh
deleted file mode 100755
index f1f6b7fe..00000000
--- a/docs/pre-process.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash -e
-
-# Populate an array with just docker dirs and one with content dirs
-docker_dir=(`ls -d /docs/content/docker/*`)
-content_dir=(`ls -d /docs/content/*`)
-
-# Loop content not of docker/
-#
-# Sed to process GitHub Markdown
-# 1-2 Remove comment code from metadata block
-# 3 Remove .md extension from link text
-# 4 Change ](/ to ](/project/ in links
-# 5 Change ](word) to ](/project/word)
-# 6 Change ](../../ to ](/project/
-# 7 Change ](../ to ](/project/word)
-#
-for i in "${content_dir[@]}"
-do
-   :
-   case $i in
-      "/docs/content/windows")
-      ;;
-      "/docs/content/mac")
-      ;;
-      "/docs/content/linux")
-      ;;
-      "/docs/content/docker")
-         y=${i##*/}
-         find $i -type f -name "*.md" -exec sed -i.old \
-         -e '/^<!.*metadata]>/g' \
-         -e '/^<!.*end-metadata.*>/g' {} \;
-      ;;
-      *)
-        y=${i##*/}
-        find $i -type f -name "*.md" -exec sed -i.old \
-        -e '/^<!.*metadata]>/g' \
-        -e '/^<!.*end-metadata.*>/g' \
-        -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/'$y'\//g' \
-        -e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/'$y'\/\2/g' \
-        -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g'  \
-        -e 's/\(\][(]\)\(\.\/\)/\1\/'$y'\//g' \
-        -e 's/\(\][(]\)\(\.\.\/\.\.\/\)/\1\/'$y'\//g' \
-        -e 's/\(\][(]\)\(\.\.\/\)/\1\/'$y'\//g' {} \;
-      ;;
-      esac
-done
-
-#
-#  Move docker directories to content
-#
-for i in "${docker_dir[@]}"
-do
-   :
-    if [ -d $i ]
-      then
-        mv $i /docs/content/
-      fi
-done
-
-rm -rf /docs/content/docker
diff --git a/docs/production.md b/docs/production.md
index 3e4169e3..5faa1c69 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -89,5 +89,5 @@ guide</a>.
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
-- [Command line reference](/reference)
+- [Command line reference](./reference/index.md)
 - [Yaml file reference](yml.md)
diff --git a/docs/rails.md b/docs/rails.md
index 3782368d..74c179b5 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -128,5 +128,5 @@ That's it. Your app should now be running on port 3000 on your Docker daemon. If
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
-- [Command line reference](/reference)
+- [Command line reference](./reference/index.md)
 - [Yaml file reference](yml.md)
diff --git a/docs/reference/docker-compose.md b/docs/reference/docker-compose.md
index b7cca5b0..32fcbe70 100644
--- a/docs/reference/docker-compose.md
+++ b/docs/reference/docker-compose.md
@@ -100,5 +100,5 @@ directory name.
 
 ## Where to go next
 
-* [CLI environment variables](/reference/overview.md)
-* [Command line reference](/reference)
+* [CLI environment variables](overview.md)
+* [Command line reference](index.md)
diff --git a/docs/reference/index.md b/docs/reference/index.md
index 961dbb86..b2fb5bca 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -11,24 +11,24 @@ parent = "smn_compose_ref"
 
 ## Compose CLI reference
 
-The following pages describe the usage information for the [docker-compose](/reference/docker-compose.md) subcommands. You can also see this information by running `docker-compose [SUBCOMMAND] --help` from the command line.
+The following pages describe the usage information for the [docker-compose](docker-compose.md) subcommands. You can also see this information by running `docker-compose [SUBCOMMAND] --help` from the command line.
 
-* [build](/reference/build.md)
-* [help](/reference/help.md)
-* [kill](/reference/kill.md)
-* [ps](/reference/ps.md)
-* [restart](/reference/restart.md)
-* [run](/reference/run.md)
-* [start](/reference/start.md)
-* [up](/reference/up.md)
-* [logs](/reference/logs.md)
-* [port](/reference/port.md)
-* [pull](/reference/pull.md)
-* [rm](/reference/rm.md)
-* [scale](/reference/scale.md)
-* [stop](/reference/stop.md)
+* [build](build.md)
+* [help](help.md)
+* [kill](kill.md)
+* [ps](ps.md)
+* [restart](restart.md)
+* [run](run.md)
+* [start](start.md)
+* [up](up.md)
+* [logs](logs.md)
+* [port](port.md)
+* [pull](pull.md)
+* [rm](rm.md)
+* [scale](scale.md)
+* [stop](stop.md)
 
 ## Where to go next
 
-* [CLI environment variables](/reference/overview)
-* [docker-compose Command](/reference/docker-compose)
+* [CLI environment variables](overview.md)
+* [docker-compose Command](docker-compose.md)
diff --git a/docs/reference/overview.md b/docs/reference/overview.md
index 019525a5..1a4c268b 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/overview.md
@@ -17,8 +17,8 @@ This section describes the subcommands you can use with the `docker-compose` com
 
 ## Commands
 
-* [docker-compose Command](/reference/docker-compose.md)
-* [CLI Reference](/reference)
+* [docker-compose Command](docker-compose.md)
+* [CLI Reference](index.md)
 
 
 ## Environment Variables
@@ -77,8 +77,8 @@ Configures the time (in seconds) a request to the Docker daemon is allowed to ha
 it failed. Defaults to 60 seconds.
 
 
-## Compose documentation
+## Related Information
 
-- [User guide](/)
-- [Installing Compose](install.md)
-- [Yaml file reference](yml.md)
+- [User guide](../index.md)
+- [Installing Compose](../install.md)
+- [Yaml file reference](../yml.md)
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 7ac06289..8c407e44 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -98,5 +98,5 @@ database containers. If you're using [Docker Machine](https://docs.docker.com/ma
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
-- [Command line reference](/reference)
+- [Command line reference](./reference/index.md)
 - [Yaml file reference](yml.md)
diff --git a/docs/yml.md b/docs/yml.md
index 73fa35df..f6ad8b1b 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -415,9 +415,11 @@ dollar sign (`$$`).
 
 ## Compose documentation
 
-- [User guide](/)
+- [User guide](index.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
-- [Command line reference](/reference)
+- [Command line reference](./reference/index.md)
+- [Compose environment variables](env.md)
+- [Compose command line completion](completion.md)

From e9ee244e5aab6b686c5b9ae317c37f58d6a6891a Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Tue, 13 Oct 2015 15:06:37 -0700
Subject: [PATCH 0408/1265] Aaaaaaaaaaaargh

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/yml.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/yml.md b/docs/yml.md
index f6ad8b1b..209d2f18 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -421,5 +421,3 @@ dollar sign (`$$`).
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose environment variables](env.md)
-- [Compose command line completion](completion.md)

From 5fa5ea0e1637e02e162a4891b4ec84276e573878 Mon Sep 17 00:00:00 2001
From: Charles Chan <charleswhchan@users.noreply.github.com>
Date: Sat, 5 Sep 2015 16:44:52 -0700
Subject: [PATCH 0409/1265] Touchup "Quickstart Guide: Compose and Django"

Also incorporated the structural changes by @moxiegirl in PR #1994 as well as subsequent issues reported by @aanand.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
---
 docs/django.md | 206 ++++++++++++++++++++++++++++---------------------
 1 file changed, 120 insertions(+), 86 deletions(-)

diff --git a/docs/django.md b/docs/django.md
index f4775c4e..c5e23e76 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -10,124 +10,158 @@ weight=4
 <![end-metadata]-->
 
 
-## Quickstart Guide: Compose and Django
+# Quickstart Guide: Compose and Django
 
-
-This Quick-start Guide will demonstrate how to use Compose to set up and run a
+This quick-start guide demonstrates how to use Compose to set up and run a
 simple Django/PostgreSQL app. Before starting, you'll need to have
 [Compose installed](install.md).
 
-### Define the project
+## Define the project components
 
-Start by setting up the three files you'll need to build the app. First, since
-your app is going to run inside a Docker container containing all of its
-dependencies, you'll need to define exactly what needs to be included in the
-container. This is done using a file called `Dockerfile`. To begin with, the
-Dockerfile consists of:
+For this project, you need to create a Dockerfile, a Python dependencies file,
+and a `docker-compose.yml` file.
 
-    FROM python:2.7
-    ENV PYTHONUNBUFFERED 1
-    RUN mkdir /code
-    WORKDIR /code
-    ADD requirements.txt /code/
-    RUN pip install -r requirements.txt
-    ADD . /code/
+1. Create an empty project directory.
 
-This Dockerfile will define an image that is used to build a container that
-includes your application and has Python installed alongside all of your Python
-dependencies. For more information on how to write Dockerfiles, see the
-[Docker user guide](https://docs.docker.com/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](http://docs.docker.com/reference/builder/).
+    You can name the directory something easy for you to remember. This directory is the context for your application image. The directory should only contain resources to build that image.
 
-Second, you'll define your Python dependencies in a file called
-`requirements.txt`:
+2. Create a new file called `Dockerfile` in your project directory.
 
-    Django
-    psycopg2
+    The Dockerfile defines an application's image content via one or more build
+    commands that configure that image. Once built, you can run the image in a
+    container.  For more information on `Dockerfiles`, see the [Docker user
+    guide](https://docs.docker.com/userguide/dockerimages/#building-an-image-from-a-dockerfile)
+    and the [Dockerfile reference](http://docs.docker.com/reference/builder/).
 
-Finally, this is all tied together with a file called `docker-compose.yml`. It
-describes the services that comprise your app (here, a web server and database),
-which Docker images they use, how they link together, what volumes will be
-mounted inside the containers, and what ports they expose.
+3. Add the following content to the `Dockerfile`.
 
-    db:
-      image: postgres
-    web:
-      build: .
-      command: python manage.py runserver 0.0.0.0:8000
-      volumes:
-        - .:/code
-      ports:
-        - "8000:8000"
-      links:
-        - db
+        FROM python:2.7
+        ENV PYTHONUNBUFFERED 1
+        RUN mkdir /code
+        WORKDIR /code
+        ADD requirements.txt /code/
+        RUN pip install -r requirements.txt
+        ADD . /code/
 
-See the [`docker-compose.yml` reference](yml.md) for more information on how
-this file works.
+    This `Dockerfile` starts with a Python 2.7 base image. The base image is
+    modified by adding a new `code` directory. The base image is further modified
+    by installing the Python requirements defined in the `requirements.txt` file.
 
-### Build the project
+4. Save and close the `Dockerfile`.
 
-You can now start a Django project with `docker-compose run`:
+5. Create a `requirements.txt` in your project directory.
 
-    $ docker-compose run web django-admin.py startproject composeexample .
+    This file is used by the `RUN pip install -r requirements.txt` command in your `Dockerfile`.
 
-First, Compose will build an image for the `web` service using the `Dockerfile`.
-It will then run `django-admin.py startproject composeexample .` inside a
-container built using that image.
+6. Add the required software in the file.
 
-This will generate a Django app inside the current directory:
+        Django
+        psycopg2
 
-    $ ls
-    Dockerfile       docker-compose.yml          composeexample       manage.py        requirements.txt
+7. Save and close the `requirements.txt` file.
 
-### Connect the database
+8. Create a file called `docker-compose.yml` in your project directory.
 
-Now you need to set up the database connection. Replace the `DATABASES = ...`
-definition in `composeexample/settings.py` to read:
+    The `docker-compose.yml` file describes the services that make your app. In
+    this example those services are a web server and database.  The compose file
+    also describes which Docker images these services use, how they link
+    together, any volumes they might need mounted inside the containers.
+    Finally, the `docker-compose.yml` file describes which ports these services
+    expose. See the [`docker-compose.yml` reference](yml.md) for more
+    information on how this file works.
 
-    DATABASES = {
-        'default': {
-            'ENGINE': 'django.db.backends.postgresql_psycopg2',
-            'NAME': 'postgres',
-            'USER': 'postgres',
-            'HOST': 'db',
-            'PORT': 5432,
+9. Add the following configuration to the file.
+
+        db:
+          image: postgres
+        web:
+          build: .
+          command: python manage.py runserver 0.0.0.0:8000
+          volumes:
+            - .:/code
+          ports:
+            - "8000:8000"
+          links:
+            - db
+
+    This file defines two services: The `db` service and the `web` service.
+
+10. Save and close the `docker-compose.yml` file.
+
+## Create a Django project
+
+In this step, you create a Django started project by building the image from the build context defined in the previous procedure.
+
+1. Change to the root of your project directory.
+
+2. Create the Django project using the `docker-compose` command.
+
+        $ docker-compose run web django-admin.py startproject composeexample .
+
+    This instructs Compose to run `django-admin.py startproject composeeexample`
+    in a container, using the `web` service's image and configuration. Because
+    the `web` image doesn't exist yet, Compose builds it from the current
+    directory, as specified by the `build: .` line in `docker-compose.yml`.
+
+    Once the `web` service image is built, Compose runs it and executes the
+    `django-admin.py startproject` command in the container. This command
+    instructs Django to create a set of files and directories representing a
+    Django project.
+
+3. After the `docker-compose` command completes, list the contents of your project.
+
+        $ ls
+        Dockerfile       docker-compose.yml          composeexample       manage.py        requirements.txt
+
+## Connect the database
+
+In this section, you set up the database connection for Django.
+
+1. In your project dirctory, edit the `composeexample/settings.py` file.
+
+2. Replace the `DATABASES = ...` with the following:
+
+        DATABASES = {
+            'default': {
+                'ENGINE': 'django.db.backends.postgresql_psycopg2',
+                'NAME': 'postgres',
+                'USER': 'postgres',
+                'HOST': 'db',
+                'PORT': 5432,
+            }
         }
-    }
 
-These settings are determined by the
-[postgres](https://registry.hub.docker.com/_/postgres/) Docker image specified
-in the Dockerfile.
+    These settings are determined by the
+    [postgres](https://registry.hub.docker.com/_/postgres/) Docker image
+    specified in `docker-compose.yml`.
 
-Then, run `docker-compose up`:
+3. Save and close the file.
 
-    Recreating myapp_db_1...
-    Recreating myapp_web_1...
-    Attaching to myapp_db_1, myapp_web_1
-    myapp_db_1 |
-    myapp_db_1 | PostgreSQL stand-alone backend 9.1.11
-    myapp_db_1 | 2014-01-27 12:17:03 UTC LOG:  database system is ready to accept connections
-    myapp_db_1 | 2014-01-27 12:17:03 UTC LOG:  autovacuum launcher started
-    myapp_web_1 | Validating models...
-    myapp_web_1 |
-    myapp_web_1 | 0 errors found
-    myapp_web_1 | January 27, 2014 - 12:12:40
-    myapp_web_1 | Django version 1.6.1, using settings 'composeexample.settings'
-    myapp_web_1 | Starting development server at http://0.0.0.0:8000/
-    myapp_web_1 | Quit the server with CONTROL-C.
+4. Run the `docker-compose up` command.
 
-Your Django app should nw be running at port 8000 on your Docker daemon. If you are using a Docker Machine VM, you can use the `docker-machine ip MACHINE_NAME` to get the IP address.
+        $ docker-compose up
+        Starting composepractice_db_1...
+        Starting composepractice_web_1...
+        Attaching to composepractice_db_1, composepractice_web_1
+        ...
+        db_1  | PostgreSQL init process complete; ready for start up.
+        ...
+        db_1  | LOG:  database system is ready to accept connections
+        db_1  | LOG:  autovacuum launcher started
+        ..
+        web_1 | Django version 1.8.4, using settings 'composeexample.settings'
+        web_1 | Starting development server at http://0.0.0.0:8000/
+        web_1 | Quit the server with CONTROL-C.
 
-You can also run management commands with Docker. To set up your database, for
-example, run `docker-compose up` and in another terminal run:
-
-    $ docker-compose run web python manage.py syncdb
+    At this point, your Django app should be running at port `8000` on your
+    Docker host. If you are using a Docker Machine VM, you can use the
+    `docker-machine ip MACHINE_NAME` to get the IP address.
 
 ## More Compose documentation
 
 - [User guide](../index.md)
 - [Installing Compose](install.md)
-- [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Yaml file reference](yml.md)
+- [YAML file reference](yml.md)

From c7ffbf97c8827025a5d7567cf076a83894eb256a Mon Sep 17 00:00:00 2001
From: Karol Duleba <mr.fuxi@gmail.com>
Date: Thu, 24 Sep 2015 22:49:38 +0100
Subject: [PATCH 0410/1265] Extend oneOf error handling. Issue #1989

Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
---
 compose/config/validation.py     | 18 +++++++++++++++++-
 tests/unit/config/config_test.py | 12 +++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 959465e9..33b66026 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -4,6 +4,7 @@ import os
 import sys
 from functools import wraps
 
+import six
 from docker.utils.ports import split_port
 from jsonschema import Draft4Validator
 from jsonschema import FormatChecker
@@ -162,10 +163,25 @@ def process_errors(errors, service_name=None):
         Inspecting the context value of a ValidationError gives us information about
         which sub schema failed and which kind of error it is.
         """
+
+        required = [context for context in error.context if context.validator == 'required']
+        if required:
+            return required[0].message
+
+        additionalProperties = [context for context in error.context if context.validator == 'additionalProperties']
+        if additionalProperties:
+            invalid_config_key = _parse_key_from_error_msg(additionalProperties[0])
+            return "contains unsupported option: '{}'".format(invalid_config_key)
+
         constraint = [context for context in error.context if len(context.path) > 0]
         if constraint:
             valid_types = _parse_valid_types_from_validator(constraint[0].validator_value)
-            msg = "contains {}, which is an invalid type, it should be {}".format(
+            invalid_config_key = "".join(
+                "'{}' ".format(fragment) for fragment in constraint[0].path
+                if isinstance(fragment, six.string_types)
+            )
+            msg = "{}contains {}, which is an invalid type, it should be {}".format(
+                invalid_config_key,
                 constraint[0].instance,
                 valid_types
             )
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 2c3c5a3a..7b31038f 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -335,7 +335,7 @@ class ConfigTest(unittest.TestCase):
         self.assertTrue(expected_warning_msg in mock_logging.warn.call_args[0][0])
 
     def test_config_invalid_environment_dict_key_raises_validation_error(self):
-        expected_error_msg = "Service 'web' configuration key 'environment' contains an invalid type"
+        expected_error_msg = "Service 'web' configuration key 'environment' contains unsupported option: '---'"
 
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
@@ -957,7 +957,10 @@ class ExtendsTest(unittest.TestCase):
             )
 
     def test_extends_validation_invalid_key(self):
-        expected_error_msg = "Unsupported config option for 'web' service: 'rogue_key'"
+        expected_error_msg = (
+            "Service 'web' configuration key 'extends' "
+            "contains unsupported option: 'rogue_key'"
+        )
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 build_config_details(
@@ -977,7 +980,10 @@ class ExtendsTest(unittest.TestCase):
             )
 
     def test_extends_validation_sub_property_key(self):
-        expected_error_msg = "Service 'web' configuration key 'extends' 'file' contains an invalid type"
+        expected_error_msg = (
+            "Service 'web' configuration key 'extends' 'file' contains 1, "
+            "which is an invalid type, it should be a string"
+        )
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 build_config_details(

From e6344f819a01102248a1c1c6504e38a17eaa9b0e Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 9 Oct 2015 11:25:16 -0400
Subject: [PATCH 0411/1265] Rename yaml reference to compose file reference.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/completion.md         |  2 +-
 docs/django.md             |  2 +-
 docs/env.md                |  2 +-
 docs/extends.md            |  2 +-
 docs/index.md              |  2 +-
 docs/install.md            |  2 +-
 docs/production.md         |  2 +-
 docs/rails.md              |  2 +-
 docs/reference/overview.md |  2 +-
 docs/wordpress.md          |  2 +-
 docs/yml.md                | 12 ++++++++----
 11 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/docs/completion.md b/docs/completion.md
index 6e7b42c2..0234f0e9 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -65,4 +65,4 @@ Enjoy working with Compose faster and with less typos!
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Yaml file reference](yml.md)
+- [Compose file reference](yml.md)
diff --git a/docs/django.md b/docs/django.md
index c5e23e76..e6d31ea0 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -164,4 +164,4 @@ In this section, you set up the database connection for Django.
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [YAML file reference](yml.md)
+- [Compose file reference](yml.md)
diff --git a/docs/env.md b/docs/env.md
index 984a340b..d32a8ba3 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -42,4 +42,4 @@ Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
 - [User guide](index.md)
 - [Installing Compose](install.md)
 - [Command line reference](./reference/index.md)
-- [Yaml file reference](yml.md)
+- [Compose file reference](yml.md)
diff --git a/docs/extends.md b/docs/extends.md
index 88fb24a5..e9ea2073 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -359,4 +359,4 @@ locally-defined bindings taking precedence:
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Yaml file reference](yml.md)
+- [Compose file reference](yml.md)
diff --git a/docs/index.md b/docs/index.md
index bff741b6..a881bfa2 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -54,7 +54,7 @@ Compose has commands for managing the whole lifecycle of your application:
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Yaml file reference](yml.md)
+- [Compose file reference](yml.md)
 
 ## Quick start
 
diff --git a/docs/install.md b/docs/install.md
index 654f6421..66ccfe7c 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -130,4 +130,4 @@ To uninstall Docker Compose if you installed using `pip`:
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Yaml file reference](yml.md)
+- [Compose file reference](yml.md)
diff --git a/docs/production.md b/docs/production.md
index 5faa1c69..d18beb7b 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -90,4 +90,4 @@ guide</a>.
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Yaml file reference](yml.md)
+- [Compose file reference](yml.md)
diff --git a/docs/rails.md b/docs/rails.md
index 74c179b5..31d5a225 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -129,4 +129,4 @@ That's it. Your app should now be running on port 3000 on your Docker daemon. If
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Yaml file reference](yml.md)
+- [Compose file reference](yml.md)
diff --git a/docs/reference/overview.md b/docs/reference/overview.md
index 1a4c268b..51bc39b9 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/overview.md
@@ -81,4 +81,4 @@ it failed. Defaults to 60 seconds.
 
 - [User guide](../index.md)
 - [Installing Compose](../install.md)
-- [Yaml file reference](../yml.md)
+- [Compose file reference](../yml.md)
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 8c407e44..b8c8f6b6 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -99,4 +99,4 @@ database containers. If you're using [Docker Machine](https://docs.docker.com/ma
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Yaml file reference](yml.md)
+- [Compose file reference](yml.md)
diff --git a/docs/yml.md b/docs/yml.md
index 209d2f18..1b97d853 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -1,15 +1,19 @@
 <!--[metadata]>
 +++
-title = "docker-compose.yml reference"
-description = "docker-compose.yml reference"
-keywords = ["fig, composition, compose,  docker"]
+title = "Compose file reference"
+description = "Compose file reference"
+keywords = ["fig, composition, compose, docker"]
 [menu.main]
 parent="smn_compose_ref"
 +++
 <![end-metadata]-->
 
 
-# docker-compose.yml reference
+# Compose file reference
+
+The compose file is a [YAML](http://yaml.org/) file where all the top level
+keys are the name of a service, and the values are the service definition.
+The default path for a compose file is `./docker-compose.yml`.
 
 Each service defined in `docker-compose.yml` must specify exactly one of
 `image` or `build`. Other keys are optional, and are analogous to their

From 01f44efe0db34541a77db041fdc2093ca849aba9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 9 Oct 2015 11:32:26 -0400
Subject: [PATCH 0412/1265] Re-arrange volume_driver in compose file reference.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/yml.md | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/yml.md b/docs/yml.md
index 1b97d853..4f10cf5b 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -334,7 +334,7 @@ Override the default labeling scheme for each container.
         - label:user:USER
         - label:role:ROLE
 
-### volumes
+### volumes, volume\_driver
 
 Mount paths as volumes, optionally specifying a path on the host machine
 (`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`).
@@ -348,9 +348,19 @@ You can mount a relative path on the host, which will expand relative to
 the directory of the Compose configuration file being used. Relative paths
 should always begin with `.` or `..`.
 
+If you use a volume name (instead of a volume path), you may also specify
+a `volume_driver`.
+
+    volume_driver: mydriver
+
+
 > Note: No path expansion will be done if you have also specified a
 > `volume_driver`.
 
+See [Docker Volumes](https://docs.docker.com/userguide/dockervolumes/) and
+[Volume Plugins](https://docs.docker.com/extend/plugins_volume/) for more
+information.
+
 ### volumes_from
 
 Mount all of the volumes from another service or container, optionally
@@ -361,7 +371,7 @@ specifying read-only access(``ro``) or read-write(``rw``).
      - container_name
      - service_name:rw
 
-### cpu\_shares, cpuset, domainname, entrypoint, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, stdin\_open, tty, user, volume\_driver, working\_dir
+### cpu\_shares, cpuset, domainname, entrypoint, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, stdin\_open, tty, user, working\_dir
 
 Each of these is a single value, analogous to its
 [docker run](https://docs.docker.com/reference/run/) counterpart.
@@ -388,8 +398,6 @@ Each of these is a single value, analogous to its
     stdin_open: true
     tty: true
 
-    volume_driver: mydriver
-
 ## Variable substitution
 
 Your configuration options can contain environment variables. Compose uses the

From fbfbe60246de0a86f84da859c07ee1a64e32ea05 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 13 Oct 2015 15:23:27 -0400
Subject: [PATCH 0413/1265] Rename yml.md to compose-file.md and add an alias
 for the old url.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/completion.md               | 2 +-
 docs/{yml.md => compose-file.md} | 1 +
 docs/django.md                   | 2 +-
 docs/env.md                      | 2 +-
 docs/extends.md                  | 2 +-
 docs/index.md                    | 4 ++--
 docs/install.md                  | 2 +-
 docs/production.md               | 2 +-
 docs/rails.md                    | 2 +-
 docs/reference/overview.md       | 2 +-
 docs/wordpress.md                | 2 +-
 11 files changed, 12 insertions(+), 11 deletions(-)
 rename docs/{yml.md => compose-file.md} (99%)

diff --git a/docs/completion.md b/docs/completion.md
index 0234f0e9..bc8bedc9 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -65,4 +65,4 @@ Enjoy working with Compose faster and with less typos!
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](yml.md)
+- [Compose file reference](compose-file.md)
diff --git a/docs/yml.md b/docs/compose-file.md
similarity index 99%
rename from docs/yml.md
rename to docs/compose-file.md
index 4f10cf5b..725130f7 100644
--- a/docs/yml.md
+++ b/docs/compose-file.md
@@ -3,6 +3,7 @@
 title = "Compose file reference"
 description = "Compose file reference"
 keywords = ["fig, composition, compose, docker"]
+aliases = ["/compose/yml"]
 [menu.main]
 parent="smn_compose_ref"
 +++
diff --git a/docs/django.md b/docs/django.md
index e6d31ea0..c7ebf58b 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -164,4 +164,4 @@ In this section, you set up the database connection for Django.
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](yml.md)
+- [Compose file reference](compose-file.md)
diff --git a/docs/env.md b/docs/env.md
index d32a8ba3..8f3cc3cc 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -42,4 +42,4 @@ Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
 - [User guide](index.md)
 - [Installing Compose](install.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](yml.md)
+- [Compose file reference](compose-file.md)
diff --git a/docs/extends.md b/docs/extends.md
index e9ea2073..d88ce61c 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -359,4 +359,4 @@ locally-defined bindings taking precedence:
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](yml.md)
+- [Compose file reference](compose-file.md)
diff --git a/docs/index.md b/docs/index.md
index a881bfa2..2e10e080 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -54,7 +54,7 @@ Compose has commands for managing the whole lifecycle of your application:
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](yml.md)
+- [Compose file reference](compose-file.md)
 
 ## Quick start
 
@@ -196,7 +196,7 @@ At this point, you have seen the basics of how Compose works.
 - Next, try the quick start guide for [Django](django.md),
   [Rails](rails.md), or [WordPress](wordpress.md).
 - See the reference guides for complete details on the [commands](./reference/index.md), the
-  [configuration file](yml.md) and [environment variables](env.md).
+  [configuration file](compose-file.md) and [environment variables](env.md).
 
 ## Release Notes
 
diff --git a/docs/install.md b/docs/install.md
index 66ccfe7c..2d4d6cad 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -130,4 +130,4 @@ To uninstall Docker Compose if you installed using `pip`:
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](yml.md)
+- [Compose file reference](compose-file.md)
diff --git a/docs/production.md b/docs/production.md
index d18beb7b..8793f927 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -90,4 +90,4 @@ guide</a>.
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](yml.md)
+- [Compose file reference](compose-file.md)
diff --git a/docs/rails.md b/docs/rails.md
index 31d5a225..a33cac26 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -129,4 +129,4 @@ That's it. Your app should now be running on port 3000 on your Docker daemon. If
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](yml.md)
+- [Compose file reference](compose-file.md)
diff --git a/docs/reference/overview.md b/docs/reference/overview.md
index 51bc39b9..3f589a9d 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/overview.md
@@ -81,4 +81,4 @@ it failed. Defaults to 60 seconds.
 
 - [User guide](../index.md)
 - [Installing Compose](../install.md)
-- [Compose file reference](../yml.md)
+- [Compose file reference](../compose-file.md)
diff --git a/docs/wordpress.md b/docs/wordpress.md
index b8c8f6b6..8c1f5b0a 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -99,4 +99,4 @@ database containers. If you're using [Docker Machine](https://docs.docker.com/ma
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](yml.md)
+- [Compose file reference](compose-file.md)

From f4efa293779e7b6a39fef2aab6ebad1b337007bc Mon Sep 17 00:00:00 2001
From: Mohit Soni <mosoni@paypal.com>
Date: Wed, 30 Sep 2015 00:25:26 -0700
Subject: [PATCH 0414/1265] Added support for cgroup_parent

This change adds cgroup-parent support to compose project. It allows
each service to specify a 'cgroup_parent' option.

Signed-off-by: Mohit Soni <mosoni@paypal.com>
---
 compose/config/config.py          | 1 +
 compose/config/fields_schema.json | 1 +
 compose/service.py                | 5 ++++-
 docs/compose-file.md              | 6 ++++++
 tests/unit/service_test.py        | 7 +++++++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 9e9cb857..1a995fa8 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -21,6 +21,7 @@ from .validation import validate_top_level_object
 DOCKER_CONFIG_KEYS = [
     'cap_add',
     'cap_drop',
+    'cgroup_parent',
     'command',
     'cpu_shares',
     'cpuset',
diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 6fce299c..da67774f 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -17,6 +17,7 @@
         "build": {"type": "string"},
         "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "cgroup_parent": {"type": "string"},
         "command": {
           "oneOf": [
             {"type": "string"},
diff --git a/compose/service.py b/compose/service.py
index 044b34ad..0d89afc0 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -41,6 +41,7 @@ log = logging.getLogger(__name__)
 DOCKER_START_KEYS = [
     'cap_add',
     'cap_drop',
+    'cgroup_parent',
     'devices',
     'dns',
     'dns_search',
@@ -675,6 +676,7 @@ class Service(object):
         read_only = options.get('read_only', None)
 
         devices = options.get('devices', None)
+        cgroup_parent = options.get('cgroup_parent', None)
 
         return self.client.create_host_config(
             links=self._get_links(link_to_self=one_off),
@@ -696,7 +698,8 @@ class Service(object):
             read_only=read_only,
             pid_mode=pid,
             security_opt=security_opt,
-            ipc_mode=options.get('ipc')
+            ipc_mode=options.get('ipc'),
+            cgroup_parent=cgroup_parent
         )
 
     def build(self, no_cache=False, pull=False):
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 725130f7..67322335 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -56,6 +56,12 @@ Override the default command.
 
     command: bundle exec thin -p 3000
 
+### cgroup_parent
+
+Specify an optional parent cgroup for the container.
+
+    cgroup_parent: m-executor-abcd
+
 ### container_name
 
 Specify a custom container name, rather than a generated default name.
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 19d25e2e..15a9b7c0 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -353,6 +353,13 @@ class ServiceTest(unittest.TestCase):
         service.create_container(do_build=False)
         self.assertFalse(self.mock_client.build.called)
 
+    def test_create_container_no_build_cgroup_parent(self):
+        service = Service('foo', client=self.mock_client, build='.')
+        service.image = lambda: {'Id': 'abc123'}
+
+        service.create_container(do_build=False, cgroup_parent='test')
+        self.assertFalse(self.mock_client.build.called)
+
     def test_create_container_no_build_but_needs_build(self):
         service = Service('foo', client=self.mock_client, build='.')
         service.image = lambda *args, **kwargs: mock_get_image([])

From ca36628a0e3ff1f68a033ca2747cae62fae847c9 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 14 Oct 2015 14:57:37 +0100
Subject: [PATCH 0415/1265] Test cgroup_parent option is being sent.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/unit/service_test.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 15a9b7c0..84ede755 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -146,6 +146,18 @@ class ServiceTest(unittest.TestCase):
             2000000000
         )
 
+    def test_cgroup_parent(self):
+        self.mock_client.create_host_config.return_value = {}
+
+        service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, cgroup_parent='test')
+        service._get_container_create_options({'some': 'overrides'}, 1)
+
+        self.assertTrue(self.mock_client.create_host_config.called)
+        self.assertEqual(
+            self.mock_client.create_host_config.call_args[1]['cgroup_parent'],
+            'test'
+        )
+
     def test_log_opt(self):
         self.mock_client.create_host_config.return_value = {}
 
@@ -353,13 +365,6 @@ class ServiceTest(unittest.TestCase):
         service.create_container(do_build=False)
         self.assertFalse(self.mock_client.build.called)
 
-    def test_create_container_no_build_cgroup_parent(self):
-        service = Service('foo', client=self.mock_client, build='.')
-        service.image = lambda: {'Id': 'abc123'}
-
-        service.create_container(do_build=False, cgroup_parent='test')
-        self.assertFalse(self.mock_client.build.called)
-
     def test_create_container_no_build_but_needs_build(self):
         service = Service('foo', client=self.mock_client, build='.')
         service.image = lambda *args, **kwargs: mock_get_image([])

From 7c6e7e0dced516c860cd5a930217c2bcbcab556b Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 13 Oct 2015 14:24:19 -0400
Subject: [PATCH 0416/1265] Update docker-py to 1.5.0

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4f2ea9d1..daaaa950 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 PyYAML==3.10
-docker-py==1.4.0
+docker-py==1.5.0
 dockerpty==0.3.4
 docopt==0.6.1
 enum34==1.0.4
diff --git a/setup.py b/setup.py
index 0313fbd0..4020122b 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.8',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.4.0, < 2',
+    'docker-py >= 1.5.0, < 2',
     'dockerpty >= 0.3.4, < 0.4',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

From f228173660feb9961e39637d8133cc66c3dc1b33 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 13 Oct 2015 17:31:44 -0400
Subject: [PATCH 0417/1265] Print docker version.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/ci | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/script/ci b/script/ci
index 58144ea3..12dc3c47 100755
--- a/script/ci
+++ b/script/ci
@@ -6,7 +6,9 @@
 # $ docker build -t "$TAG" .
 # $ docker run --rm --volume="/var/run/docker.sock:/var/run/docker.sock" --volume="$(pwd)/.git:/code/.git" -e "TAG=$TAG" --entrypoint="script/ci" "$TAG"
 
-set -e
+set -ex
+
+docker version
 
 export DOCKER_VERSIONS=all
 export DOCKER_DAEMON_ARGS="--storage-driver=overlay"

From d5f5eb19243d7c2f04839b232067cdf028ba856d Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 7 Oct 2015 16:10:08 +0100
Subject: [PATCH 0418/1265] Enable use of Docker networking with the
 --x-networking flag

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/command.py         | 13 ++++--
 compose/cli/main.py            |  4 ++
 compose/project.py             | 58 +++++++++++++++++++++--
 compose/service.py             |  5 ++
 docs/django.md                 |  7 +--
 docs/index.md                  |  3 --
 docs/networking.md             | 84 ++++++++++++++++++++++++++++++++++
 docs/rails.md                  |  4 +-
 docs/wordpress.md              |  2 -
 script/build-windows.ps1       |  7 ++-
 tests/integration/cli_test.py  | 43 +++++++++++++++++
 tests/integration/testcases.py | 11 +++++
 tests/unit/service_test.py     | 20 ++++++++
 tox.ini                        |  3 +-
 14 files changed, 240 insertions(+), 24 deletions(-)
 create mode 100644 docs/networking.md

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 1a9bc3dc..dd7548b7 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -49,7 +49,10 @@ def project_from_options(base_dir, options):
         base_dir,
         get_config_path(options.get('--file')),
         project_name=options.get('--project-name'),
-        verbose=options.get('--verbose'))
+        verbose=options.get('--verbose'),
+        use_networking=options.get('--x-networking'),
+        network_driver=options.get('--x-network-driver'),
+    )
 
 
 def get_config_path(file_option):
@@ -76,14 +79,18 @@ def get_client(verbose=False):
     return client
 
 
-def get_project(base_dir, config_path=None, project_name=None, verbose=False):
+def get_project(base_dir, config_path=None, project_name=None, verbose=False,
+                use_networking=False, network_driver=None):
     config_details = config.find(base_dir, config_path)
 
     try:
         return Project.from_dicts(
             get_project_name(config_details.working_dir, project_name),
             config.load(config_details),
-            get_client(verbose=verbose))
+            get_client(verbose=verbose),
+            use_networking=use_networking,
+            network_driver=network_driver,
+        )
     except ConfigError as e:
         raise errors.UserError(six.text_type(e))
 
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 0f0a69ca..c800d95f 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -117,6 +117,10 @@ class TopLevelCommand(DocoptCommand):
     Options:
       -f, --file FILE           Specify an alternate compose file (default: docker-compose.yml)
       -p, --project-name NAME   Specify an alternate project name (default: directory name)
+      --x-networking            (EXPERIMENTAL) Use new Docker networking functionality.
+                                Requires Docker 1.9 or later.
+      --x-network-driver DRIVER (EXPERIMENTAL) Specify a network driver (default: "bridge").
+                                Requires Docker 1.9 or later.
       --verbose                 Show more output
       -v, --version             Print version and exit
 
diff --git a/compose/project.py b/compose/project.py
index 999c2890..0e20a4ce 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -77,10 +77,12 @@ class Project(object):
     """
     A collection of services.
     """
-    def __init__(self, name, services, client):
+    def __init__(self, name, services, client, use_networking=False, network_driver=None):
         self.name = name
         self.services = services
         self.client = client
+        self.use_networking = use_networking
+        self.network_driver = network_driver or 'bridge'
 
     def labels(self, one_off=False):
         return [
@@ -89,11 +91,15 @@ class Project(object):
         ]
 
     @classmethod
-    def from_dicts(cls, name, service_dicts, client):
+    def from_dicts(cls, name, service_dicts, client, use_networking=False, network_driver=None):
         """
         Construct a ServiceCollection from a list of dicts representing services.
         """
-        project = cls(name, [], client)
+        project = cls(name, [], client, use_networking=use_networking, network_driver=network_driver)
+
+        if use_networking:
+            remove_links(service_dicts)
+
         for service_dict in sort_service_dicts(service_dicts):
             links = project.get_links(service_dict)
             volumes_from = project.get_volumes_from(service_dict)
@@ -103,6 +109,7 @@ class Project(object):
                 Service(
                     client=client,
                     project=name,
+                    use_networking=use_networking,
                     links=links,
                     net=net,
                     volumes_from=volumes_from,
@@ -207,6 +214,8 @@ class Project(object):
     def get_net(self, service_dict):
         net = service_dict.pop('net', None)
         if not net:
+            if self.use_networking:
+                return Net(self.name)
             return Net(None)
 
         net_name = get_service_name_from_net(net)
@@ -289,6 +298,9 @@ class Project(object):
 
         plans = self._get_convergence_plans(services, strategy)
 
+        if self.use_networking:
+            self.ensure_network_exists()
+
         return [
             container
             for service in services
@@ -350,6 +362,26 @@ class Project(object):
 
         return [c for c in containers if matches_service_names(c)]
 
+    def get_network(self):
+        networks = self.client.networks(names=[self.name])
+        if networks:
+            return networks[0]
+        return None
+
+    def ensure_network_exists(self):
+        # TODO: recreate network if driver has changed?
+        if self.get_network() is None:
+            log.info(
+                'Creating network "{}" with driver "{}"'
+                .format(self.name, self.network_driver)
+            )
+            self.client.create_network(self.name, driver=self.network_driver)
+
+    def remove_network(self):
+        network = self.get_network()
+        if network:
+            self.client.remove_network(network['id'])
+
     def _inject_deps(self, acc, service):
         dep_names = service.get_dependency_names()
 
@@ -365,6 +397,26 @@ class Project(object):
         return acc + dep_services
 
 
+def remove_links(service_dicts):
+    services_with_links = [s for s in service_dicts if 'links' in s]
+    if not services_with_links:
+        return
+
+    if len(services_with_links) == 1:
+        prefix = '"{}" defines'.format(services_with_links[0]['name'])
+    else:
+        prefix = 'Some services ({}) define'.format(
+            ", ".join('"{}"'.format(s['name']) for s in services_with_links))
+
+    log.warn(
+        '\n{} links, which are not compatible with Docker networking and will be ignored.\n'
+        'Future versions of Docker will not support links - you should remove them for '
+        'forwards-compatibility.\n'.format(prefix))
+
+    for s in services_with_links:
+        del s['links']
+
+
 class NoSuchService(Exception):
     def __init__(self, name):
         self.name = name
diff --git a/compose/service.py b/compose/service.py
index 0d89afc0..5f1d5946 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -113,6 +113,7 @@ class Service(object):
         name,
         client=None,
         project='default',
+        use_networking=False,
         links=None,
         volumes_from=None,
         net=None,
@@ -124,6 +125,7 @@ class Service(object):
         self.name = name
         self.client = client
         self.project = project
+        self.use_networking = use_networking
         self.links = links or []
         self.volumes_from = volumes_from or []
         self.net = net or Net(None)
@@ -602,6 +604,9 @@ class Service(object):
             container_options['hostname'] = parts[0]
             container_options['domainname'] = parts[2]
 
+        if 'hostname' not in container_options and self.use_networking:
+            container_options['hostname'] = self.name
+
         if 'ports' in container_options or 'expose' in self.options:
             ports = []
             all_ports = container_options.get('ports', []) + self.options.get('expose', [])
diff --git a/docs/django.md b/docs/django.md
index c7ebf58b..2ebf4b4b 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -64,9 +64,8 @@ and a `docker-compose.yml` file.
 
     The `docker-compose.yml` file describes the services that make your app. In
     this example those services are a web server and database.  The compose file
-    also describes which Docker images these services use, how they link
-    together, any volumes they might need mounted inside the containers.
-    Finally, the `docker-compose.yml` file describes which ports these services
+    also describes which Docker images these services use, any volumes they might
+    need mounted inside the containers, and any ports they might
     expose. See the [`docker-compose.yml` reference](yml.md) for more
     information on how this file works.
 
@@ -81,8 +80,6 @@ and a `docker-compose.yml` file.
             - .:/code
           ports:
             - "8000:8000"
-          links:
-            - db
 
     This file defines two services: The `db` service and the `web` service.
 
diff --git a/docs/index.md b/docs/index.md
index 2e10e080..e19e7d7f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -128,8 +128,6 @@ Next, define a set of services using `docker-compose.yml`:
        - "5000:5000"
       volumes:
        - .:/code
-      links:
-       - redis
     redis:
       image: redis
 
@@ -138,7 +136,6 @@ This template defines two services, `web` and `redis`. The `web` service:
 * Builds from the `Dockerfile` in the current directory.
 * Forwards the exposed port 5000 on the container to port 5000 on the host machine.
 * Mounts the current directory on the host to `/code` inside the container allowing you to modify the code without having to rebuild the image.
-* Links the web container to the Redis service.
 
 The `redis` service uses the latest public [Redis](https://registry.hub.docker.com/_/redis/) image pulled from the Docker Hub registry.
 
diff --git a/docs/networking.md b/docs/networking.md
new file mode 100644
index 00000000..f4227917
--- /dev/null
+++ b/docs/networking.md
@@ -0,0 +1,84 @@
+<!--[metadata]>
++++
+title = "Networking in Compose"
+description = "How Compose sets up networking between containers"
+keywords = ["documentation, docs,  docker, compose, orchestration, containers, networking"]
+[menu.main]
+parent="smn_workw_compose"
+weight=6
++++
+<![end-metadata]-->
+
+
+# Networking in Compose
+
+> **Note:** Compose’s networking support is experimental, and must be explicitly enabled with the `docker-compose --x-networking` flag.
+
+Compose sets up a single default [network](http://TODO/docker-networking-docs) for your app. Each container for a service joins the default network and is both *reachable* by other containers on that network, and *discoverable* by them at a hostname identical to the service's name.
+
+> **Note:** Your app's network is given the same name as the "project name", which is based on the name of the directory it lives in. See the [CLI docs](cli.md#p-project-name-name) for how to override it.
+
+For example, suppose your app is in a directory called `myapp`, and your `docker-compose.yml` looks like this:
+
+    web:
+      build: .
+      ports:
+        - "8000:8000"
+    db:
+      image: postgres
+
+When you run `docker-compose --x-networking up`, the following happens:
+
+1. A network called `myapp` is created.
+2. A container is created using `web`'s configuration. It joins the network `myapp` under the name `web`.
+3. A container is created using `db`'s configuration. It joins the network `myapp` under the name `db`.
+
+Each container can now look up the hostname `web` or `db` and get back the appropriate container's IP address. For example, `web`'s application code could connect to the URL `postgres://db:5432` and start using the Postgres database.
+
+Because `web` explicitly maps a port, it's also accessible from the outside world via port 8000 on your Docker host's network interface.
+
+## Updating containers
+
+If you make a configuration change to a service and run `docker-compose up` to update it, the old container will be removed and the new one will join the network under a different IP address but the same name. Running containers will be able to look up that name and connect to the new address, but the old address will stop working.
+
+If any containers have connections open to the old container, they will be closed. It is a container's responsibility to detect this condition, look up the name again and reconnect.
+
+## Configure how services are published
+
+By default, containers for each service are published on the network with the same name as the service. If you want to change the name, or stop containers from being discoverable at all, you can use the `hostname` option:
+
+    web:
+      build: .
+      hostname: "my-web-application"
+
+This will also change the hostname inside the container, so that the `hostname` command will return `my-web-application`.
+
+## Scaling services
+
+If you create multiple containers for a service with `docker-compose scale`, each container will join the network with the same name. For example, if you run `docker-compose scale web=3`, then 3 containers will join the network under the name `web`. Inside any container on the network, looking up the name `web` will return the IP address of one of them, but Docker and Compose do not provide any guarantees about which one.
+
+This limitation will be addressed in a future version of Compose, where a load balancer will join under the service name and balance traffic between the service's containers in a configurable manner.
+
+## Links
+
+Docker links are a one-way, single-host communication system. They should now be considered deprecated, and you should update your app to use networking instead. In the majority of cases, this will simply involve removing the `links` sections from your `docker-compose.yml`.
+
+## Specifying the network driver
+
+By default, Compose uses the `bridge` driver when creating the app’s network. The Docker Engine provides one other driver out-of-the-box: `overlay`, which implements secure communication between containers on different hosts (see the next section for how to set up and use the `overlay` driver). Docker also allows you to install [custom network drivers](http://TODO/custom-driver-docs).
+
+You can specify which one to use with the `--x-network-driver` flag:
+
+    $ docker-compose --x-networking --x-network-driver=overlay up
+
+## Multi-host networking
+
+(TODO: talk about Swarm and the overlay driver)
+
+## Custom container network modes
+
+Compose allows you to specify a custom network mode for a service with the `net` option - for example, `net: "host"` specifies that its containers should use the same network namespace as the Docker host, and `net: "none"` specifies that they should have no networking capabilities.
+
+If a service specifies the `net` option, its containers will *not* join the app’s network and will not be able to communicate with other services in the app.
+
+If *all* services in an app specify the `net` option, a network will not be created at all.
diff --git a/docs/rails.md b/docs/rails.md
index a33cac26..9801ef74 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -37,7 +37,7 @@ Next, create a bootstrap `Gemfile` which just loads Rails. It'll be overwritten
     source 'https://rubygems.org'
     gem 'rails', '4.2.0'
 
-Finally, `docker-compose.yml` is where the magic happens. This file describes the services that comprise your app (a database and a web app), how to get each 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.
+Finally, `docker-compose.yml` is where the magic happens. This file describes the services that comprise your app (a database and a web app), how to get each 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 expose the web app's port.
 
     db:
       image: postgres
@@ -48,8 +48,6 @@ Finally, `docker-compose.yml` is where the magic happens. This file describes th
         - .:/myapp
       ports:
         - "3000:3000"
-      links:
-        - db
 
 ### Build the project
 
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 8c1f5b0a..5c9bcdbd 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -46,8 +46,6 @@ and a separate MySQL instance:
       command: php -S 0.0.0.0:8000 -t /code
       ports:
         - "8000:8000"
-      links:
-        - db
       volumes:
         - .:/code
     db:
diff --git a/script/build-windows.ps1 b/script/build-windows.ps1
index b35fad6f..6e8a7c5a 100644
--- a/script/build-windows.ps1
+++ b/script/build-windows.ps1
@@ -42,15 +42,14 @@ Get-ChildItem -Recurse -Include *.pyc | foreach ($_) { Remove-Item $_.FullName }
 virtualenv .\venv
 
 # Install dependencies
-.\venv\Scripts\pip install pypiwin32==219
-.\venv\Scripts\pip install -r requirements.txt
-.\venv\Scripts\pip install --no-deps .
-
 # TODO: pip warns when installing from a git sha, so we need to set ErrorAction to
 # 'Continue'.  See
 # https://github.com/pypa/pip/blob/fbc4b7ae5fee00f95bce9ba4b887b22681327bb1/pip/vcs/git.py#L77
 # This can be removed once pyinstaller 3.x is released and we upgrade 
 $ErrorActionPreference = "Continue"
+.\venv\Scripts\pip install pypiwin32==219
+.\venv\Scripts\pip install -r requirements.txt
+.\venv\Scripts\pip install --no-deps .
 .\venv\Scripts\pip install --allow-external pyinstaller -r requirements-build.txt
 
 # Build binary
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 3774eb88..a18b69f5 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -185,6 +185,49 @@ class CLITestCase(DockerClientTestCase):
             set(self.project.containers())
         )
 
+    def test_up_without_networking(self):
+        self.require_engine_version("1.9")
+
+        self.command.base_dir = 'tests/fixtures/links-composefile'
+        self.command.dispatch(['up', '-d'], None)
+
+        networks = [n for n in self.client.networks(names=[self.project.name])]
+        self.assertEqual(len(networks), 0)
+
+        for service in self.project.get_services():
+            containers = service.containers()
+            self.assertEqual(len(containers), 1)
+            self.assertNotEqual(containers[0].get('Config.Hostname'), service.name)
+
+        web_container = self.project.get_service('web').containers()[0]
+        self.assertTrue(web_container.get('HostConfig.Links'))
+
+    def test_up_with_networking(self):
+        self.require_engine_version("1.9")
+
+        self.command.base_dir = 'tests/fixtures/links-composefile'
+        self.command.dispatch(['--x-networking', 'up', '-d'], None)
+
+        services = self.project.get_services()
+
+        networks = [n for n in self.client.networks(names=[self.project.name])]
+        for n in networks:
+            self.addCleanup(self.client.remove_network, n['id'])
+        self.assertEqual(len(networks), 1)
+        self.assertEqual(networks[0]['driver'], 'bridge')
+
+        network = self.client.inspect_network(networks[0]['id'])
+        self.assertEqual(len(network['containers']), len(services))
+
+        for service in services:
+            containers = service.containers()
+            self.assertEqual(len(containers), 1)
+            self.assertIn(containers[0].id, network['containers'])
+            self.assertEqual(containers[0].get('Config.Hostname'), service.name)
+
+        web_container = self.project.get_service('web').containers()[0]
+        self.assertFalse(web_container.get('HostConfig.Links'))
+
     def test_up_with_links(self):
         self.command.base_dir = 'tests/fixtures/links-composefile'
         self.command.dispatch(['up', '-d', 'web'], None)
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 26a0a108..a412fb04 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -2,6 +2,8 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 from docker import errors
+from docker.utils import version_lt
+from pytest import skip
 
 from .. import unittest
 from compose.cli.docker_client import docker_client
@@ -73,3 +75,12 @@ class DockerClientTestCase(unittest.TestCase):
         kwargs.setdefault('rm', True)
         build_output = self.client.build(*args, **kwargs)
         stream_output(build_output, open('/dev/null', 'w'))
+
+    def require_engine_version(self, minimum):
+        # Drop '-dev' or '-rcN' suffix
+        engine = self.client.version()['Version'].split('-', 1)[0]
+        if version_lt(engine, minimum):
+            skip(
+                "Engine version is too low ({} < {})"
+                .format(engine, minimum)
+            )
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 84ede755..c5e1a9fb 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -203,6 +203,26 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(opts['hostname'], 'name.sub', 'hostname')
         self.assertEqual(opts['domainname'], 'domain.tld', 'domainname')
 
+    def test_no_default_hostname_when_not_using_networking(self):
+        service = Service(
+            'foo',
+            image='foo',
+            use_networking=False,
+            client=self.mock_client,
+        )
+        opts = service._get_container_create_options({'image': 'foo'}, 1)
+        self.assertIsNone(opts.get('hostname'))
+
+    def test_hostname_defaults_to_service_name_when_using_networking(self):
+        service = Service(
+            'foo',
+            image='foo',
+            use_networking=True,
+            client=self.mock_client,
+        )
+        opts = service._get_container_create_options({'image': 'foo'}, 1)
+        self.assertEqual(opts['hostname'], 'foo')
+
     def test_get_container_create_options_with_name_option(self):
         service = Service(
             'foo',
diff --git a/tox.ini b/tox.ini
index dbf63920..f05c5ed2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,9 +11,10 @@ passenv =
 setenv =
     HOME=/tmp
 deps =
+    -rrequirements.txt
     -rrequirements-dev.txt
 commands =
-    py.test -v \
+    py.test -v -rxs \
         --cov=compose \
         --cov-report html \
         --cov-report term \

From e2f792c4f43314fed2dca0f5a06ce7fecebead64 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 14 Oct 2015 12:09:50 -0400
Subject: [PATCH 0419/1265] If -x-networking is used, set the correct API
 version.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/command.py        |  7 ++++---
 compose/cli/docker_client.py  |  9 +++++++--
 tests/integration/cli_test.py | 11 +++++++----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index dd7548b7..525217ee 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -67,8 +67,8 @@ def get_config_path(file_option):
     return [config_file] if config_file else None
 
 
-def get_client(verbose=False):
-    client = docker_client()
+def get_client(verbose=False, version=None):
+    client = docker_client(version=version)
     if verbose:
         version_info = six.iteritems(client.version())
         log.info("Compose version %s", __version__)
@@ -83,11 +83,12 @@ def get_project(base_dir, config_path=None, project_name=None, verbose=False,
                 use_networking=False, network_driver=None):
     config_details = config.find(base_dir, config_path)
 
+    api_version = '1.21' if use_networking else None
     try:
         return Project.from_dicts(
             get_project_name(config_details.working_dir, project_name),
             config.load(config_details),
-            get_client(verbose=verbose),
+            get_client(verbose=verbose, version=api_version),
             use_networking=use_networking,
             network_driver=network_driver,
         )
diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 2c634f33..734f4237 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -9,7 +9,10 @@ from ..const import HTTP_TIMEOUT
 log = logging.getLogger(__name__)
 
 
-def docker_client():
+DEFAULT_API_VERSION = '1.19'
+
+
+def docker_client(version=None):
     """
     Returns a docker-py client configured using environment variables
     according to the same logic as the official Docker client.
@@ -18,6 +21,8 @@ def docker_client():
         log.warn('The DOCKER_CLIENT_TIMEOUT environment variable is deprecated. Please use COMPOSE_HTTP_TIMEOUT instead.')
 
     kwargs = kwargs_from_env(assert_hostname=False)
-    kwargs['version'] = os.environ.get('COMPOSE_API_VERSION', '1.19')
+    kwargs['version'] = version or os.environ.get(
+        'COMPOSE_API_VERSION',
+        DEFAULT_API_VERSION)
     kwargs['timeout'] = HTTP_TIMEOUT
     return Client(**kwargs)
diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index a18b69f5..78519d14 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -10,6 +10,7 @@ from six import StringIO
 from .. import mock
 from .testcases import DockerClientTestCase
 from compose.cli.command import get_project
+from compose.cli.docker_client import docker_client
 from compose.cli.errors import UserError
 from compose.cli.main import TopLevelCommand
 from compose.project import NoSuchService
@@ -190,8 +191,9 @@ class CLITestCase(DockerClientTestCase):
 
         self.command.base_dir = 'tests/fixtures/links-composefile'
         self.command.dispatch(['up', '-d'], None)
+        client = docker_client(version='1.21')
 
-        networks = [n for n in self.client.networks(names=[self.project.name])]
+        networks = client.networks(names=[self.project.name])
         self.assertEqual(len(networks), 0)
 
         for service in self.project.get_services():
@@ -207,16 +209,17 @@ class CLITestCase(DockerClientTestCase):
 
         self.command.base_dir = 'tests/fixtures/links-composefile'
         self.command.dispatch(['--x-networking', 'up', '-d'], None)
+        client = docker_client(version='1.21')
 
         services = self.project.get_services()
 
-        networks = [n for n in self.client.networks(names=[self.project.name])]
+        networks = client.networks(names=[self.project.name])
         for n in networks:
-            self.addCleanup(self.client.remove_network, n['id'])
+            self.addCleanup(client.remove_network, n['id'])
         self.assertEqual(len(networks), 1)
         self.assertEqual(networks[0]['driver'], 'bridge')
 
-        network = self.client.inspect_network(networks[0]['id'])
+        network = client.inspect_network(networks[0]['id'])
         self.assertEqual(len(network['containers']), len(services))
 
         for service in services:

From 338f2f4507919bda988be076f1654b4eb9dea497 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 14 Oct 2015 15:14:04 -0400
Subject: [PATCH 0420/1265] Add a script to generate contributor list.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 project/RELEASE-PROCESS.md  | 11 +++++++----
 script/release/contributors | 27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100755 script/release/contributors

diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 85bbaf29..a7fea69e 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -82,17 +82,20 @@ When prompted build the non-linux binaries and test them.
 
 5.  Attach the binaries and `script/run.sh`
 
-6. If everything looks good, it's time to push the release.
+6.  Add "Thanks" with a list of contributors. The contributor list can be generated
+    by running `./script/release/contributors`.
+
+7.  If everything looks good, it's time to push the release.
 
 
         ./script/release/push-release
 
 
-7.  Publish the release on GitHub.
+8.  Publish the release on GitHub.
 
-8.  Check that both binaries download (following the install instructions) and run.
+9.  Check that both binaries download (following the install instructions) and run.
 
-9.  Email maintainers@dockerproject.org and engineering@docker.com about the new release.
+10. Email maintainers@dockerproject.org and engineering@docker.com about the new release.
 
 ## If it’s a stable release (not an RC)
 
diff --git a/script/release/contributors b/script/release/contributors
new file mode 100755
index 00000000..bb9fe871
--- /dev/null
+++ b/script/release/contributors
@@ -0,0 +1,27 @@
+#!/bin/bash
+set -e
+
+
+function usage() {
+    >&2 cat << EOM
+Print the list of github contributors for the release
+
+Usage:
+
+    $0 <previous release tag>
+EOM
+    exit 1
+}
+
+[[ -n "$1" ]] || usage
+PREV_RELEASE=$1
+VERSION=HEAD
+URL="https://api.github.com/repos/docker/compose/compare"
+
+curl -sf "$URL/$PREV_RELEASE...$VERSION" | \
+    jq -r '.commits[].author.login' | \
+    sort | \
+    uniq -c | \
+    sort -nr | \
+    awk '{print "@"$2","}' | \
+    xargs echo

From 58e6d4487abca4f0da7260fac6e2e6ed503d8d3b Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 14 Oct 2015 15:16:58 -0400
Subject: [PATCH 0421/1265] Fix some release docs.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 project/RELEASE-PROCESS.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index a7fea69e..ffa18077 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -54,7 +54,7 @@ When prompted build the non-linux binaries and test them.
 
 2.  Download the windows binary from AppVeyor
 
-    https://ci.appveyor.com/project/docker/compose/build/<build id>/artifacts
+    https://ci.appveyor.com/project/docker/compose
 
 3.  Draft a release from the tag on GitHub (the script will open the window for
     you)
@@ -93,7 +93,7 @@ When prompted build the non-linux binaries and test them.
 
 8.  Publish the release on GitHub.
 
-9.  Check that both binaries download (following the install instructions) and run.
+9.  Check that all the binaries download (following the install instructions) and run.
 
 10. Email maintainers@dockerproject.org and engineering@docker.com about the new release.
 

From fbe8e769028cca49401101b0bfed88d6f838d186 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 14 Oct 2015 15:20:57 -0400
Subject: [PATCH 0422/1265] Add missing merge for release branch.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/release/make-branch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/script/release/make-branch b/script/release/make-branch
index dde1fb65..e2eae4d5 100755
--- a/script/release/make-branch
+++ b/script/release/make-branch
@@ -39,7 +39,7 @@ fi
 
 DEFAULT_REMOTE=release
 REMOTE="$(find_remote "$GITHUB_REPO")"
-# If we don't have a docker origin add one
+# If we don't have a docker remote add one
 if [ -z "$REMOTE" ]; then
     echo "Creating $DEFAULT_REMOTE remote"
     git remote add ${DEFAULT_REMOTE} ${GITHUB_REPO}
@@ -55,6 +55,8 @@ read -n1 -r -p "Continue? (ctrl+c to cancel)"
 git fetch $REMOTE -p
 git checkout -b $BRANCH $BASE_VERSION
 
+echo "Merging remote release branch into new release branch"
+git merge --strategy=ours --no-edit $REMOTE/release
 
 # Store the release version for this branch in git, so that other release
 # scripts can use it

From 7e59a7ea32e2eb8eace45d69c4f01689fbc81fab Mon Sep 17 00:00:00 2001
From: Tim Butler <tim.butler.au@gmail.com>
Date: Thu, 15 Oct 2015 17:09:57 +1000
Subject: [PATCH 0423/1265] Fix link to Release Process doc in README.md

Signed-off-by: Tim Butler <tim.butler.au@gmail.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3c776a71..d779d607 100644
--- a/README.md
+++ b/README.md
@@ -56,4 +56,4 @@ Want to help build Compose? Check out our [contributing documentation](https://g
 Releasing
 ---------
 
-Releases are built by maintainers, following an outline of the [release process](https://github.com/docker/compose/blob/master/RELEASE_PROCESS.md).
+Releases are built by maintainers, following an outline of the [release process](https://github.com/docker/compose/blob/master/project/RELEASE-PROCESS.md).

From c6ff81fe302a6472037b9e8796544c3ce923314f Mon Sep 17 00:00:00 2001
From: Per Persson <md2perpe+github@gmail.com>
Date: Thu, 15 Oct 2015 15:13:27 +0200
Subject: [PATCH 0424/1265] Remove incorrectly placed comment

I'm not sure if it should be there at all, but at least it should hardly be where it currently is located.

Signed-off-by: Per Persson <per.persson@exertisztorm.com>
---
 docs/compose-file.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 67322335..90730fec 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -48,8 +48,6 @@ See `man 7 capabilities` for a full list.
       - NET_ADMIN
       - SYS_ADMIN
 
-Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
-
 ### command
 
 Override the default command.
@@ -106,6 +104,8 @@ Compose will use an alternate file to build with.
 
     dockerfile: Dockerfile-alternate
 
+Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
+
 ### env_file
 
 Add environment variables from a file. Can be a single value or a list.

From ccfb6e6fa863614190b8290aab8fe6bfed5f0d06 Mon Sep 17 00:00:00 2001
From: Karol Duleba <mr.fuxi@gmail.com>
Date: Wed, 14 Oct 2015 19:06:05 +0100
Subject: [PATCH 0425/1265] Docs for shorthand notation of extends. Issue #1989

Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
---
 docs/extends.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/extends.md b/docs/extends.md
index d88ce61c..f0b9e9ea 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -59,6 +59,10 @@ You can go further and define (or re-define) configuration locally in
         - DEBUG=1
       cpu_shares: 5
 
+    important_web:
+      extends: web
+      cpu_shares: 10
+
 You can also write other services and link your `web` service to them:
 
     web:
@@ -233,7 +237,8 @@ manually keep both environments in sync.
 ### Reference
 
 You can use `extends` on any service together with other configuration keys. It
-always expects a dictionary that should always contain the key: `service` and optionally the `file` key.
+expects a dictionary that contains a `service` key and optionally a `file` key.
+The `extends` key can also take a string, whose value is the name of a `service` defined in the same file.
 
 The `file` key specifies the location of a Compose configuration file defining
 the extension. The `file` value can be an absolute or relative path. If you

From 53fc6d06f69fbe78b4b175487bd6371d323588c9 Mon Sep 17 00:00:00 2001
From: Cameron Eagans <me@cweagans.net>
Date: Thu, 15 Oct 2015 16:58:27 -0600
Subject: [PATCH 0426/1265] docker-compose pull SERVICE should not pull
 SERVICE's dependencies

Signed-off-by: Cameron Eagans <me@cweagans.net>
---
 compose/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/project.py b/compose/project.py
index 0e20a4ce..fdd70caf 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -335,7 +335,7 @@ class Project(object):
         return plans
 
     def pull(self, service_names=None, ignore_pull_failures=False):
-        for service in self.get_services(service_names, include_deps=True):
+        for service in self.get_services(service_names, include_deps=False):
             service.pull(ignore_pull_failures)
 
     def containers(self, service_names=None, stopped=False, one_off=False):

From 1ed23fb2de1b3e44658ab7439763b879f439acc7 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 16 Oct 2015 11:58:27 +0530
Subject: [PATCH 0427/1265] Revert networking-related changes to getting
 started guides

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/django.md    | 7 +++++--
 docs/rails.md     | 4 +++-
 docs/wordpress.md | 2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs/django.md b/docs/django.md
index 2ebf4b4b..c7ebf58b 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -64,8 +64,9 @@ and a `docker-compose.yml` file.
 
     The `docker-compose.yml` file describes the services that make your app. In
     this example those services are a web server and database.  The compose file
-    also describes which Docker images these services use, any volumes they might
-    need mounted inside the containers, and any ports they might
+    also describes which Docker images these services use, how they link
+    together, any volumes they might need mounted inside the containers.
+    Finally, the `docker-compose.yml` file describes which ports these services
     expose. See the [`docker-compose.yml` reference](yml.md) for more
     information on how this file works.
 
@@ -80,6 +81,8 @@ and a `docker-compose.yml` file.
             - .:/code
           ports:
             - "8000:8000"
+          links:
+            - db
 
     This file defines two services: The `db` service and the `web` service.
 
diff --git a/docs/rails.md b/docs/rails.md
index 9801ef74..a33cac26 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -37,7 +37,7 @@ Next, create a bootstrap `Gemfile` which just loads Rails. It'll be overwritten
     source 'https://rubygems.org'
     gem 'rails', '4.2.0'
 
-Finally, `docker-compose.yml` is where the magic happens. This file describes the services that comprise your app (a database and a web app), how to get each 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 expose the web app's port.
+Finally, `docker-compose.yml` is where the magic happens. This file describes the services that comprise your app (a database and a web app), how to get each 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:
       image: postgres
@@ -48,6 +48,8 @@ Finally, `docker-compose.yml` is where the magic happens. This file describes th
         - .:/myapp
       ports:
         - "3000:3000"
+      links:
+        - db
 
 ### Build the project
 
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 5c9bcdbd..8c1f5b0a 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -46,6 +46,8 @@ and a separate MySQL instance:
       command: php -S 0.0.0.0:8000 -t /code
       ports:
         - "8000:8000"
+      links:
+        - db
       volumes:
         - .:/code
     db:

From 7b109bc02617222fe8b9ae64435b77920200a00e Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Fri, 16 Oct 2015 12:57:54 +0100
Subject: [PATCH 0428/1265] Attempt to document escaping env vars

People are likely to run into their env vars being set to empty strings,
if they're not aware that they need to escape them for Compose to not
interpolate them.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/compose-file.md | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 90730fec..b72a7cc4 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -428,9 +428,18 @@ Both `$VARIABLE` and `${VARIABLE}` syntax are supported. Extended shell-style
 features, such as `${VARIABLE-default}` and `${VARIABLE/foo/bar}`, are not
 supported.
 
-If you need to put a literal dollar sign in a configuration value, use a double
-dollar sign (`$$`).
+You can use a `$$` (double-dollar sign) when your configuration needs a literal
+dollar sign. This also prevents Compose from interpolating a value, so a `$$`
+allows you to refer to environment variables that you don't want processed by
+Compose.
 
+    web:
+      build: .
+      command: "$$VAR_NOT_INTERPOLATED_BY_COMPOSE"
+
+If you forget and use a single dollar sign (`$`), Compose interprets the value as an environment variable and will warn you:
+
+  The VAR_NOT_INTERPOLATED_BY_COMPOSE is not set. Substituting an empty string.
 
 ## Compose documentation
 

From 26dc0b785b064a60d8438e386358a5c051a89907 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 16 Oct 2015 14:47:04 -0400
Subject: [PATCH 0429/1265] Give the user a better error message (without a
 stack trace) when there is a yaml error.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         |  5 +++--
 tests/unit/config/config_test.py | 13 +++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 3bcd769a..59b98f60 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -610,5 +610,6 @@ def load_yaml(filename):
     try:
         with open(filename, 'r') as fh:
             return yaml.safe_load(fh)
-    except IOError as e:
-        raise ConfigurationError(six.text_type(e))
+    except (IOError, yaml.YAMLError) as e:
+        error_name = getattr(e, '__module__', '') + '.' + e.__class__.__name__
+        raise ConfigurationError(u"{}: {}".format(error_name, e))
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 20ae7fa3..b4bd9c71 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -5,6 +5,7 @@ import shutil
 import tempfile
 from operator import itemgetter
 
+import py
 import pytest
 
 from compose.config import config
@@ -349,6 +350,18 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_load_yaml_with_yaml_error(self):
+        tmpdir = py.test.ensuretemp('invalid_yaml_test')
+        invalid_yaml_file = tmpdir.join('docker-compose.yml')
+        invalid_yaml_file.write("""
+            web:
+              this is bogus: ok: what
+        """)
+        with pytest.raises(ConfigurationError) as exc:
+            config.load_yaml(str(invalid_yaml_file))
+
+        assert 'line 3, column 32' in exc.exconly()
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)

From 43a89e1702b15a3322b084bb9bcc390dd62ada7d Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Sat, 17 Oct 2015 09:26:32 -0700
Subject: [PATCH 0430/1265] bash completion for networking options

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index e64b24a0..0eed1f18 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -105,11 +105,15 @@ _docker_compose_docker_compose() {
 		--project-name|-p)
 			return
 			;;
+		--x-network-driver)
+			COMPREPLY=( $( compgen -W "bridge host none overlay" -- "$cur" ) )
+			return
+			;;
 	esac
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--help -h --verbose --version -v --file -f --project-name -p" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--file -f --help -h --project-name -p --verbose --version -v --x-networking --x-network-driver" -- "$cur" ) )
 			;;
 		*)
 			COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
@@ -410,6 +414,9 @@ _docker_compose() {
 				(( counter++ ))
 				compose_project="${words[$counter]}"
 				;;
+			--x-network-driver)
+				(( counter++ ))
+				;;
 			-*)
 				;;
 			*)

From fa44a5fac23e5b5685d355c033e12d07d2e7f0ef Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Sat, 17 Oct 2015 09:51:37 -0700
Subject: [PATCH 0431/1265] fix problem with bash completion in old bash

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index e64b24a0..7184ec00 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -17,6 +17,12 @@
 #    . ~/.docker-compose-completion.sh
 
 
+# suppress trailing whitespace
+__docker_compose_nospace() {
+	# compopt is not available in ancient bash versions
+	type compopt &>/dev/null && compopt -o nospace
+}
+
 # For compatibility reasons, Compose and therefore its completion supports several
 # stack compositon files as listed here, in descending priority.
 # Support for these filenames might be dropped in some future version.
@@ -255,7 +261,7 @@ _docker_compose_run() {
 	case "$prev" in
 		-e)
 			COMPREPLY=( $( compgen -e -- "$cur" ) )
-			compopt -o nospace
+			__docker_compose_nospace
 			return
 			;;
 		--entrypoint|--name|--user|-u)
@@ -291,7 +297,7 @@ _docker_compose_scale() {
 			;;
 		*)
 			COMPREPLY=( $(compgen -S "=" -W "$(___docker_compose_all_services_in_compose_file)" -- "$cur") )
-			compopt -o nospace
+			__docker_compose_nospace
 			;;
 	esac
 }

From 258c8bc54d30622a8b731d1b8f50fdd5544d2da0 Mon Sep 17 00:00:00 2001
From: Viranch Mehta <viranch.mehta@gmail.com>
Date: Sun, 18 Oct 2015 00:40:51 +0530
Subject: [PATCH 0432/1265] Fix specifies_host_port() to handle port binding
 with host IP but no host port

Signed-off-by: Viranch Mehta <viranch.mehta@gmail.com>
---
 compose/service.py         | 24 +++++++++++++--
 tests/unit/service_test.py | 62 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 5f1d5946..aa2e4f78 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -770,10 +770,28 @@ class Service(object):
         return self.options.get('container_name')
 
     def specifies_host_port(self):
-        for port in self.options.get('ports', []):
-            if ':' in str(port):
+        def has_host_port(binding):
+            _, external_bindings = split_port(binding)
+
+            # there are no external bindings
+            if external_bindings is None:
+                return False
+
+            # we only need to check the first binding from the range
+            external_binding = external_bindings[0]
+
+            # non-tuple binding means there is a host port specified
+            if not isinstance(external_binding, tuple):
                 return True
-        return False
+
+            # extract actual host port from tuple of (host_ip, host_port)
+            _, host_port = external_binding
+            if host_port is not None:
+                return True
+
+            return False
+
+        return any(has_host_port(binding) for binding in self.options.get('ports', []))
 
     def pull(self, ignore_pull_failures=False):
         if 'image' not in self.options:
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index c5e1a9fb..2c46ce40 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -444,6 +444,68 @@ class ServiceTest(unittest.TestCase):
         }
         self.assertEqual(config_dict, expected)
 
+    def test_specifies_host_port_with_no_ports(self):
+        service = Service(
+            'foo',
+            image='foo')
+        self.assertEqual(service.specifies_host_port(), False)
+
+    def test_specifies_host_port_with_container_port(self):
+        service = Service(
+            'foo',
+            image='foo',
+            ports=["2000"])
+        self.assertEqual(service.specifies_host_port(), False)
+
+    def test_specifies_host_port_with_host_port(self):
+        service = Service(
+            'foo',
+            image='foo',
+            ports=["1000:2000"])
+        self.assertEqual(service.specifies_host_port(), True)
+
+    def test_specifies_host_port_with_host_ip_no_port(self):
+        service = Service(
+            'foo',
+            image='foo',
+            ports=["127.0.0.1::2000"])
+        self.assertEqual(service.specifies_host_port(), False)
+
+    def test_specifies_host_port_with_host_ip_and_port(self):
+        service = Service(
+            'foo',
+            image='foo',
+            ports=["127.0.0.1:1000:2000"])
+        self.assertEqual(service.specifies_host_port(), True)
+
+    def test_specifies_host_port_with_container_port_range(self):
+        service = Service(
+            'foo',
+            image='foo',
+            ports=["2000-3000"])
+        self.assertEqual(service.specifies_host_port(), False)
+
+    def test_specifies_host_port_with_host_port_range(self):
+        service = Service(
+            'foo',
+            image='foo',
+            ports=["1000-2000:2000-3000"])
+        self.assertEqual(service.specifies_host_port(), True)
+
+    def test_specifies_host_port_with_host_ip_no_port_range(self):
+        service = Service(
+            'foo',
+            image='foo',
+            ports=["127.0.0.1::2000-3000"])
+        self.assertEqual(service.specifies_host_port(), False)
+
+    def test_specifies_host_port_with_host_ip_and_port_range(self):
+        service = Service(
+            'foo',
+            image='foo',
+            ports=["127.0.0.1:1000-2000:2000-3000"])
+        self.assertEqual(service.specifies_host_port(), True)
+
 
 class NetTestCase(unittest.TestCase):
 

From 07e9f6500ce2f695920d0a2786c308fba750cc2e Mon Sep 17 00:00:00 2001
From: Viranch Mehta <viranch.mehta@gmail.com>
Date: Sun, 18 Oct 2015 01:06:50 +0530
Subject: [PATCH 0433/1265] Pipe curl's download directly to extract/execute
 program to reduce number of commands

Signed-off-by: Viranch Mehta <viranch.mehta@gmail.com>
---
 Dockerfile | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c6dbdefd..b28a438d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,46 +22,38 @@ RUN curl https://get.docker.com/builds/Linux/x86_64/docker-latest \
 
 # Build Python 2.7.9 from source
 RUN set -ex; \
-    curl -LO https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz; \
-    tar -xzf Python-2.7.9.tgz; \
+    curl -L https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz | tar -xz; \
     cd Python-2.7.9; \
     ./configure --enable-shared; \
     make; \
     make install; \
     cd ..; \
-    rm -rf /Python-2.7.9; \
-    rm Python-2.7.9.tgz
+    rm -rf /Python-2.7.9
 
 # Build python 3.4 from source
 RUN set -ex; \
-    curl -LO https://www.python.org/ftp/python/3.4.3/Python-3.4.3.tgz; \
-    tar -xzf Python-3.4.3.tgz; \
+    curl -L https://www.python.org/ftp/python/3.4.3/Python-3.4.3.tgz | tar -xz; \
     cd Python-3.4.3; \
     ./configure --enable-shared; \
     make; \
     make install; \
     cd ..; \
-    rm -rf /Python-3.4.3; \
-    rm Python-3.4.3.tgz
+    rm -rf /Python-3.4.3
 
 # Make libpython findable
 ENV LD_LIBRARY_PATH /usr/local/lib
 
 # Install setuptools
 RUN set -ex; \
-    curl -LO https://bootstrap.pypa.io/ez_setup.py; \
-    python ez_setup.py; \
-    rm ez_setup.py
+    curl -L https://bootstrap.pypa.io/ez_setup.py | python
 
 # Install pip
 RUN set -ex; \
-    curl -LO https://pypi.python.org/packages/source/p/pip/pip-7.0.1.tar.gz; \
-    tar -xzf pip-7.0.1.tar.gz; \
+    curl -L https://pypi.python.org/packages/source/p/pip/pip-7.0.1.tar.gz | tar -xz; \
     cd pip-7.0.1; \
     python setup.py install; \
     cd ..; \
-    rm -rf pip-7.0.1; \
-    rm pip-7.0.1.tar.gz
+    rm -rf pip-7.0.1
 
 # Python3 requires a valid locale
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen

From 37921b40dd9ca76d585af6613388fe9fdc6e147c Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas.delaby@lock8.me>
Date: Mon, 19 Oct 2015 10:43:30 +0200
Subject: [PATCH 0434/1265] Add trove classifier to declare supported python
 versions.

Signed-off-by: Nicolas Delaby <nicolas.delaby@lock8.me>
---
 setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup.py b/setup.py
index 4020122b..bf2ee07f 100644
--- a/setup.py
+++ b/setup.py
@@ -66,4 +66,8 @@ setup(
     [console_scripts]
     docker-compose=compose.cli.main:main
     """,
+    classifiers=[
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.4',
+    ],
 )

From ac06366ef9081fa83c8d1fef4c67e99f28bee8ea Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Thu, 15 Oct 2015 23:02:40 +0200
Subject: [PATCH 0435/1265] Add zsh completion for 'docker-compose
 --x-networking --x-network-driver'

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index cefcb109..d79b25d1 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -330,6 +330,8 @@ _docker-compose() {
         '(- :)'{-v,--version}'[Print version and exit]' \
         '(-f --file)'{-f,--file}'[Specify an alternate docker-compose file (default: docker-compose.yml)]:file:_files -g "*.yml"' \
         '(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \
+        '--x-networking[(EXPERIMENTAL) Use new Docker networking functionality. Requires Docker 1.9 or later.]' \
+        '--x-network-driver[(EXPERIMENTAL) Specify a network driver (default: "bridge"). Requires Docker 1.9 or later.]:Network Driver:(bridge host none overlay)' \
         '(-): :->command' \
         '(-)*:: :->option-or-argument' && ret=0
 

From 4d8e667c3e475e811b8072647833067740c810c2 Mon Sep 17 00:00:00 2001
From: Corin Lawson <corin@phiware.com.au>
Date: Mon, 19 Oct 2015 21:47:01 +1100
Subject: [PATCH 0436/1265] Powershell script to run compose in a container.

This script assumes the typical environment that Windows users operate,
namely, VirtualBox running the boot2docker ISO, managed by
docker-machine. I wrote this script for my Windows using colleagues and
first placed it in the public domain as a gist:
https://gist.github.com/au-phiware/25213e72c80040f398ba
In short, that script works for me.

I have adapted that script to use the (yet to be) official image
(docker/compose:latest) and also added an extra environment variable to
provide additional options to docker run.

Signed-off-by: Corin Lawson <corin@phiware.com.au>
---
 script/run.ps1 | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 script/run.ps1

diff --git a/script/run.ps1 b/script/run.ps1
new file mode 100644
index 00000000..47ec5469
--- /dev/null
+++ b/script/run.ps1
@@ -0,0 +1,22 @@
+# Run docker-compose in a container via boot2docker.
+#
+# The current directory will be mirrored as a volume and additional
+# volumes (or any other options) can be mounted by using
+# $Env:DOCKER_COMPOSE_OPTIONS.
+
+if ($Env:DOCKER_COMPOSE_VERSION -eq $null -or $Env:DOCKER_COMPOSE_VERSION.Length -eq 0) {
+    $Env:DOCKER_COMPOSE_VERSION = "latest"
+}
+
+if ($Env:DOCKER_COMPOSE_OPTIONS -eq $null) {
+    $Env:DOCKER_COMPOSE_OPTIONS = ""
+}
+
+if (-not $Env:DOCKER_HOST) {
+    docker-machine env --shell=powershell default | Invoke-Expression
+    if (-not $?) { exit $LastExitCode }
+}
+
+$local="/$($PWD -replace '^(.):(.*)$', '"$1".ToLower()+"$2".Replace("\","/")' | Invoke-Expression)"
+docker run --rm -ti -v /var/run/docker.sock:/var/run/docker.sock -v "${local}:$local" -w "$local" $Env:DOCKER_COMPOSE_OPTIONS "docker/compose:$Env:DOCKER_COMPOSE_VERSION" $args
+exit $LastExitCode

From ff83c459d04491faedb69db9ef74f65e00c2d116 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 19 Oct 2015 14:36:56 +0100
Subject: [PATCH 0437/1265] Improve error message for type constraints

It was missing a space between the different types, when there
were 3 possible type values.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/validation.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 46b891b7..19faa0bc 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -143,7 +143,7 @@ def process_errors(errors, service_name=None):
             if len(validator) >= 2:
                 first_type = anglicize_validator(validator[0])
                 last_type = anglicize_validator(validator[-1])
-                types_from_validator = "{}{}".format(first_type, ", ".join(validator[1:-1]))
+                types_from_validator = "{}".format(", ".join([first_type] + validator[1:-1]))
 
                 msg = "{} or {}".format(
                     types_from_validator,
@@ -163,7 +163,6 @@ def process_errors(errors, service_name=None):
         Inspecting the context value of a ValidationError gives us information about
         which sub schema failed and which kind of error it is.
         """
-
         required = [context for context in error.context if context.validator == 'required']
         if required:
             return required[0].message

From 08add665e98044279ead90e093d40eb2161efb27 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 19 Oct 2015 15:15:24 +0100
Subject: [PATCH 0438/1265] Environment keys can contain empty values

Environment keys that contain no value, get populated with values taken
from the environment not from the build phase but from running the command `up`.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/fields_schema.json |  2 +-
 compose/config/validation.py      |  2 +-
 tests/unit/config/config_test.py  | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index cc37f444..e254e353 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -41,7 +41,7 @@
               "type": "object",
               "patternProperties": {
                 "^[^-]+$": {
-                  "type": ["string", "number", "boolean"],
+                  "type": ["string", "number", "boolean", "null"],
                   "format": "environment"
                 }
               },
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 19faa0bc..427f21ad 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -143,7 +143,7 @@ def process_errors(errors, service_name=None):
             if len(validator) >= 2:
                 first_type = anglicize_validator(validator[0])
                 last_type = anglicize_validator(validator[-1])
-                types_from_validator = "{}".format(", ".join([first_type] + validator[1:-1]))
+                types_from_validator = ", ".join([first_type] + validator[1:-1])
 
                 msg = "{} or {}".format(
                     types_from_validator,
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 20ae7fa3..935e2f9d 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -414,6 +414,23 @@ class InterpolationTest(unittest.TestCase):
         self.assertIn('in service "web"', cm.exception.msg)
         self.assertIn('"${"', cm.exception.msg)
 
+    def test_empty_environment_key_allowed(self):
+        service_dict = config.load(
+            build_config_details(
+                {
+                    'web': {
+                        'build': '.',
+                        'environment': {
+                            'POSTGRES_PASSWORD': ''
+                        },
+                    },
+                },
+                '.',
+                None,
+            )
+        )[0]
+        self.assertEquals(service_dict['environment']['POSTGRES_PASSWORD'], '')
+
 
 class VolumeConfigTest(unittest.TestCase):
     def test_no_binding(self):

From 129e2f94826ad01b559c5b0e7f1ebc70ec7c97d8 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 16 Oct 2015 12:54:31 -0400
Subject: [PATCH 0439/1265] Fix check for tags.

If there is a branch with the same name as a tag it fails without the
--tags. This was only a problem when we're branching from a git tag.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/release/make-branch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/release/make-branch b/script/release/make-branch
index e2eae4d5..48fa771b 100755
--- a/script/release/make-branch
+++ b/script/release/make-branch
@@ -46,7 +46,7 @@ if [ -z "$REMOTE" ]; then
 fi
 
 # handle the difference between a branch and a tag
-if [ -z "$(git name-rev $BASE_VERSION | grep tags)" ]; then
+if [ -z "$(git name-rev --tags $BASE_VERSION | grep tags)" ]; then
     BASE_VERSION=$REMOTE/$BASE_VERSION
 fi
 

From 937e087c6cf78d3a12ce940ad96344fbb296b005 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 16 Oct 2015 15:45:56 -0400
Subject: [PATCH 0440/1265] Fixes #2203 - properly validate files when multiple
 files are used.

Remove the single-use decorators so the functionality can be used directly as a function.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         | 22 +++++++-------------
 compose/config/validation.py     | 35 +++++++++++++-------------------
 tests/unit/config/config_test.py | 22 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 59b98f60..05e57258 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -14,7 +14,6 @@ from .validation import validate_against_fields_schema
 from .validation import validate_against_service_schema
 from .validation import validate_extended_service_exists
 from .validation import validate_extends_file_path
-from .validation import validate_service_names
 from .validation import validate_top_level_object
 
 
@@ -165,16 +164,6 @@ def find_candidates_in_parent_dirs(filenames, path):
     return (candidates, path)
 
 
-@validate_top_level_object
-@validate_service_names
-def pre_process_config(config):
-    """
-    Pre validation checks and processing of the config file to interpolate env
-    vars returning a config dict ready to be tested against the schema.
-    """
-    return interpolate_environment_variables(config)
-
-
 def load(config_details):
     """Load the configuration from a working directory and a list of
     configuration files.  Files are loaded in order, and merged on top
@@ -194,7 +183,7 @@ def load(config_details):
         return service_dict
 
     def load_file(filename, config):
-        processed_config = pre_process_config(config)
+        processed_config = interpolate_environment_variables(config)
         validate_against_fields_schema(processed_config)
         return [
             build_service(filename, name, service_config)
@@ -209,7 +198,10 @@ def load(config_details):
         }
 
     config_file = config_details.config_files[0]
+    validate_top_level_object(config_file.config)
     for next_file in config_details.config_files[1:]:
+        validate_top_level_object(next_file.config)
+
         config_file = ConfigFile(
             config_file.filename,
             merge_services(config_file.config, next_file.config))
@@ -283,9 +275,9 @@ class ServiceLoader(object):
         )
         self.extended_service_name = extends['service']
 
-        full_extended_config = pre_process_config(
-            load_yaml(self.extended_config_path)
-        )
+        config = load_yaml(self.extended_config_path)
+        validate_top_level_object(config)
+        full_extended_config = interpolate_environment_variables(config)
 
         validate_extended_service_exists(
             self.extended_service_name,
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 46b891b7..aea72286 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -2,7 +2,6 @@ import json
 import logging
 import os
 import sys
-from functools import wraps
 
 import six
 from docker.utils.ports import split_port
@@ -65,27 +64,21 @@ def format_boolean_in_environment(instance):
     return True
 
 
-def validate_service_names(func):
-    @wraps(func)
-    def func_wrapper(config):
-        for service_name in config.keys():
-            if type(service_name) is int:
-                raise ConfigurationError(
-                    "Service name: {} needs to be a string, eg '{}'".format(service_name, service_name)
-                )
-        return func(config)
-    return func_wrapper
-
-
-def validate_top_level_object(func):
-    @wraps(func)
-    def func_wrapper(config):
-        if not isinstance(config, dict):
+def validate_service_names(config):
+    for service_name in config.keys():
+        if not isinstance(service_name, six.string_types):
             raise ConfigurationError(
-                "Top level object needs to be a dictionary. Check your .yml file that you have defined a service at the top level."
-            )
-        return func(config)
-    return func_wrapper
+                "Service name: {} needs to be a string, eg '{}'".format(
+                    service_name,
+                    service_name))
+
+
+def validate_top_level_object(config):
+    if not isinstance(config, dict):
+        raise ConfigurationError(
+            "Top level object needs to be a dictionary. Check your .yml file "
+            "that you have defined a service at the top level.")
+    validate_service_names(config)
 
 
 def validate_extends_file_path(service_name, extends_options, filename):
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index b4bd9c71..e8caea81 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -134,6 +134,28 @@ class ConfigTest(unittest.TestCase):
         ]
         self.assertEqual(service_sort(service_dicts), service_sort(expected))
 
+    def test_load_with_multiple_files_and_empty_override(self):
+        base_file = config.ConfigFile(
+            'base.yaml',
+            {'web': {'image': 'example/web'}})
+        override_file = config.ConfigFile('override.yaml', None)
+        details = config.ConfigDetails('.', [base_file, override_file])
+
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(details)
+        assert 'Top level object needs to be a dictionary' in exc.exconly()
+
+    def test_load_with_multiple_files_and_empty_base(self):
+        base_file = config.ConfigFile('base.yaml', None)
+        override_file = config.ConfigFile(
+            'override.yaml',
+            {'web': {'image': 'example/web'}})
+        details = config.ConfigDetails('.', [base_file, override_file])
+
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(details)
+        assert 'Top level object needs to be a dictionary' in exc.exconly()
+
     def test_config_valid_service_names(self):
         for valid_name in ['_', '-', '.__.', '_what-up.', 'what_.up----', 'whatup']:
             config.load(

From 938d49cbdc81665de26c7148befc833b50e867e9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 16 Oct 2015 11:18:07 -0400
Subject: [PATCH 0441/1265] Fixes #2205 - extends must be copied from override
 file.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         | 19 ++++++++++++----
 tests/unit/config/config_test.py | 37 ++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 05e57258..ff8861b5 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -193,7 +193,9 @@ def load(config_details):
     def merge_services(base, override):
         all_service_names = set(base) | set(override)
         return {
-            name: merge_service_dicts(base.get(name, {}), override.get(name, {}))
+            name: merge_service_dicts_from_files(
+                base.get(name, {}),
+                override.get(name, {}))
             for name in all_service_names
         }
 
@@ -270,9 +272,7 @@ class ServiceLoader(object):
             extends,
             self.filename
         )
-        self.extended_config_path = self.get_extended_config_path(
-            extends
-        )
+        self.extended_config_path = self.get_extended_config_path(extends)
         self.extended_service_name = extends['service']
 
         config = load_yaml(self.extended_config_path)
@@ -355,6 +355,17 @@ def process_container_options(service_dict, working_dir=None):
     return service_dict
 
 
+def merge_service_dicts_from_files(base, override):
+    """When merging services from multiple files we need to merge the `extends`
+    field. This is not handled by `merge_service_dicts()` which is used to
+    perform the `extends`.
+    """
+    new_service = merge_service_dicts(base, override)
+    if 'extends' in override:
+        new_service['extends'] = override['extends']
+    return new_service
+
+
 def merge_service_dicts(base, override):
     d = base.copy()
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index e8caea81..eea3451f 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -156,6 +156,43 @@ class ConfigTest(unittest.TestCase):
             config.load(details)
         assert 'Top level object needs to be a dictionary' in exc.exconly()
 
+    def test_load_with_multiple_files_and_extends_in_override_file(self):
+        base_file = config.ConfigFile(
+            'base.yaml',
+            {
+                'web': {'image': 'example/web'},
+            })
+        override_file = config.ConfigFile(
+            'override.yaml',
+            {
+                'web': {
+                    'extends': {
+                        'file': 'common.yml',
+                        'service': 'base',
+                    },
+                    'volumes': ['/home/user/project:/code'],
+                },
+            })
+        details = config.ConfigDetails('.', [base_file, override_file])
+
+        tmpdir = py.test.ensuretemp('config_test')
+        tmpdir.join('common.yml').write("""
+            base:
+              labels: ['label=one']
+        """)
+        with tmpdir.as_cwd():
+            service_dicts = config.load(details)
+
+        expected = [
+            {
+                'name': 'web',
+                'image': 'example/web',
+                'volumes': ['/home/user/project:/code'],
+                'labels': {'label': 'one'},
+            },
+        ]
+        self.assertEqual(service_sort(service_dicts), service_sort(expected))
+
     def test_config_valid_service_names(self):
         for valid_name in ['_', '-', '.__.', '_what-up.', 'what_.up----', 'whatup']:
             config.load(

From 3f0e0835850462b750167f708d17793b45dc9ef6 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 20 Oct 2015 11:39:06 -0400
Subject: [PATCH 0442/1265] Force windows drives to be lowercase.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py               |  2 +-
 tests/unit/config/config_test.py | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 5f1d5946..7daf7f2f 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -952,7 +952,7 @@ def normalize_paths_for_engine(external_path, internal_path):
             drive, tail = os.path.splitdrive(external_path)
 
             if drive:
-                reformatted_drive = "/{}".format(drive.replace(":", ""))
+                reformatted_drive = "/{}".format(drive.lower().replace(":", ""))
                 external_path = reformatted_drive + tail
 
             external_path = "/".join(external_path.split("\\"))
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index c8b76f36..d15cd9a6 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -537,8 +537,8 @@ class VolumeConfigTest(unittest.TestCase):
         self.assertEqual(d['volumes'], ['/var/lib/data:/data'])
 
     def test_absolute_windows_path_does_not_expand(self):
-        d = make_service_dict('foo', {'build': '.', 'volumes': ['C:\\data:/data']}, working_dir='.')
-        self.assertEqual(d['volumes'], ['C:\\data:/data'])
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['c:\\data:/data']}, working_dir='.')
+        self.assertEqual(d['volumes'], ['c:\\data:/data'])
 
     @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='posix paths')
     def test_relative_path_does_expand_posix(self):
@@ -553,14 +553,14 @@ class VolumeConfigTest(unittest.TestCase):
 
     @pytest.mark.skipif(not IS_WINDOWS_PLATFORM, reason='windows paths')
     def test_relative_path_does_expand_windows(self):
-        d = make_service_dict('foo', {'build': '.', 'volumes': ['./data:/data']}, working_dir='C:\\Users\\me\\myproject')
-        self.assertEqual(d['volumes'], ['C:\\Users\\me\\myproject\\data:/data'])
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['./data:/data']}, working_dir='c:\\Users\\me\\myproject')
+        self.assertEqual(d['volumes'], ['c:\\Users\\me\\myproject\\data:/data'])
 
-        d = make_service_dict('foo', {'build': '.', 'volumes': ['.:/data']}, working_dir='C:\\Users\\me\\myproject')
-        self.assertEqual(d['volumes'], ['C:\\Users\\me\\myproject:/data'])
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['.:/data']}, working_dir='c:\\Users\\me\\myproject')
+        self.assertEqual(d['volumes'], ['c:\\Users\\me\\myproject:/data'])
 
-        d = make_service_dict('foo', {'build': '.', 'volumes': ['../otherproject:/data']}, working_dir='C:\\Users\\me\\myproject')
-        self.assertEqual(d['volumes'], ['C:\\Users\\me\\otherproject:/data'])
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['../otherproject:/data']}, working_dir='c:\\Users\\me\\myproject')
+        self.assertEqual(d['volumes'], ['c:\\Users\\me\\otherproject:/data'])
 
     @mock.patch.dict(os.environ)
     def test_home_directory_with_driver_does_not_expand(self):

From 5523c3d7457f69732e269f7dc45eec9808ba2170 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 20 Oct 2015 11:49:10 -0400
Subject: [PATCH 0443/1265] Minor refactor to use guard and replace instead of
 split+join

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 7daf7f2f..f18afa48 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -943,24 +943,22 @@ def build_volume_binding(volume_spec):
 
 
 def normalize_paths_for_engine(external_path, internal_path):
-    """
-    Windows paths, c:\my\path\shiny, need to be changed to be compatible with
+    """Windows paths, c:\my\path\shiny, need to be changed to be compatible with
     the Engine. Volume paths are expected to be linux style /c/my/path/shiny/
     """
-    if IS_WINDOWS_PLATFORM:
-        if external_path:
-            drive, tail = os.path.splitdrive(external_path)
-
-            if drive:
-                reformatted_drive = "/{}".format(drive.lower().replace(":", ""))
-                external_path = reformatted_drive + tail
-
-            external_path = "/".join(external_path.split("\\"))
-
-        return external_path, "/".join(internal_path.split("\\"))
-    else:
+    if not IS_WINDOWS_PLATFORM:
         return external_path, internal_path
 
+    if external_path:
+        drive, tail = os.path.splitdrive(external_path)
+
+        if drive:
+            external_path = '/' + drive.lower().rstrip(':') + tail
+
+        external_path = external_path.replace('\\', '/')
+
+    return external_path, internal_path.replace('\\', '/')
+
 
 def parse_volume_spec(volume_config):
     """

From b1f8ed84a303d5300d3b27a387799d582c55ae2d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 20 Oct 2015 13:10:32 -0400
Subject: [PATCH 0444/1265] Cleanup some unit tests and whitespace.

Remove some unnecessary newlines.
Remove a unittest that was attempting to test behaviour that was removed a while ago, so isn't testing anything.
Updated some unit tests to use mocks instead of a custom fake.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py         | 12 +++------
 tests/unit/service_test.py | 50 ++++++++++++++------------------------
 2 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 5f1d5946..7862867f 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -300,9 +300,7 @@ class Service(object):
         Create a container for this service. If the image doesn't exist, attempt to pull
         it.
         """
-        self.ensure_image_exists(
-            do_build=do_build,
-        )
+        self.ensure_image_exists(do_build=do_build)
 
         container_options = self._get_container_create_options(
             override_options,
@@ -316,9 +314,7 @@ class Service(object):
 
         return Container.create(self.client, **container_options)
 
-    def ensure_image_exists(self,
-                            do_build=True):
-
+    def ensure_image_exists(self, do_build=True):
         try:
             self.image()
             return
@@ -403,9 +399,7 @@ class Service(object):
         (action, containers) = plan
 
         if action == 'create':
-            container = self.create_container(
-                do_build=do_build,
-            )
+            container = self.create_container(do_build=do_build)
             self.start_container(container)
 
             return [container]
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index c5e1a9fb..03575f93 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -351,44 +351,37 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(parse_repository_tag("user/repo@sha256:digest"), ("user/repo", "sha256:digest", "@"))
         self.assertEqual(parse_repository_tag("url:5000/repo@sha256:digest"), ("url:5000/repo", "sha256:digest", "@"))
 
-    @mock.patch('compose.service.Container', autospec=True)
-    def test_create_container_latest_is_used_when_no_tag_specified(self, mock_container):
-        service = Service('foo', client=self.mock_client, image='someimage')
-        images = []
-
-        def pull(repo, tag=None, **kwargs):
-            self.assertEqual('someimage', repo)
-            self.assertEqual('latest', tag)
-            images.append({'Id': 'abc123'})
-            return []
-
-        service.image = lambda *args, **kwargs: mock_get_image(images)
-        self.mock_client.pull = pull
-
-        service.create_container()
-        self.assertEqual(1, len(images))
-
     def test_create_container_with_build(self):
         service = Service('foo', client=self.mock_client, build='.')
-
-        images = []
-        service.image = lambda *args, **kwargs: mock_get_image(images)
-        service.build = lambda: images.append({'Id': 'abc123'})
+        self.mock_client.inspect_image.side_effect = [
+            NoSuchImageError,
+            {'Id': 'abc123'},
+        ]
+        self.mock_client.build.return_value = [
+            '{"stream": "Successfully built abcd"}',
+        ]
 
         service.create_container(do_build=True)
-        self.assertEqual(1, len(images))
+        self.mock_client.build.assert_called_once_with(
+            tag='default_foo',
+            dockerfile=None,
+            stream=True,
+            path='.',
+            pull=False,
+            nocache=False,
+            rm=True,
+        )
 
     def test_create_container_no_build(self):
         service = Service('foo', client=self.mock_client, build='.')
-        service.image = lambda: {'Id': 'abc123'}
+        self.mock_client.inspect_image.return_value = {'Id': 'abc123'}
 
         service.create_container(do_build=False)
         self.assertFalse(self.mock_client.build.called)
 
     def test_create_container_no_build_but_needs_build(self):
         service = Service('foo', client=self.mock_client, build='.')
-        service.image = lambda *args, **kwargs: mock_get_image([])
-
+        self.mock_client.inspect_image.side_effect = NoSuchImageError
         with self.assertRaises(NeedsBuildError):
             service.create_container(do_build=False)
 
@@ -488,13 +481,6 @@ class NetTestCase(unittest.TestCase):
         self.assertEqual(net.service_name, service_name)
 
 
-def mock_get_image(images):
-    if images:
-        return images[0]
-    else:
-        raise NoSuchImageError()
-
-
 class ServiceVolumesTest(unittest.TestCase):
 
     def setUp(self):

From 45056322748514cf66632409d7fe4ad12aeef533 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 19 Oct 2015 12:52:38 -0400
Subject: [PATCH 0445/1265] Some minor style cleanup

- fixed a docstring to make it PEP257 compliant
- wrapped some long lines
- used a more specific error

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index ff8861b5..440f3920 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -212,9 +212,16 @@ def load(config_details):
 
 
 class ServiceLoader(object):
-    def __init__(self, working_dir, filename, service_name, service_dict, already_seen=None):
+    def __init__(
+        self,
+        working_dir,
+        filename,
+        service_name,
+        service_dict,
+        already_seen=None
+    ):
         if working_dir is None:
-            raise Exception("No working_dir passed to ServiceLoader()")
+            raise ValueError("No working_dir passed to ServiceLoader()")
 
         self.working_dir = os.path.abspath(working_dir)
 
@@ -311,33 +318,33 @@ class ServiceLoader(object):
         return merge_service_dicts(other_service_dict, self.service_dict)
 
     def get_extended_config_path(self, extends_options):
-        """
-        Service we are extending either has a value for 'file' set, which we
+        """Service we are extending either has a value for 'file' set, which we
         need to obtain a full path too or we are extending from a service
         defined in our own file.
         """
         if 'file' in extends_options:
-            extends_from_filename = extends_options['file']
-            return expand_path(self.working_dir, extends_from_filename)
-
+            return expand_path(self.working_dir, extends_options['file'])
         return self.filename
 
     def signature(self, name):
-        return (self.filename, name)
+        return self.filename, name
 
 
 def validate_extended_service_dict(service_dict, filename, service):
     error_prefix = "Cannot extend service '%s' in %s:" % (service, filename)
 
     if 'links' in service_dict:
-        raise ConfigurationError("%s services with 'links' cannot be extended" % error_prefix)
+        raise ConfigurationError(
+            "%s services with 'links' cannot be extended" % error_prefix)
 
     if 'volumes_from' in service_dict:
-        raise ConfigurationError("%s services with 'volumes_from' cannot be extended" % error_prefix)
+        raise ConfigurationError(
+            "%s services with 'volumes_from' cannot be extended" % error_prefix)
 
     if 'net' in service_dict:
         if get_service_name_from_net(service_dict['net']) is not None:
-            raise ConfigurationError("%s services with 'net: container' cannot be extended" % error_prefix)
+            raise ConfigurationError(
+                "%s services with 'net: container' cannot be extended" % error_prefix)
 
 
 def process_container_options(service_dict, working_dir=None):

From b500fa235128d56ea41a8c018f75d81e8722f74d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 19 Oct 2015 13:40:13 -0400
Subject: [PATCH 0446/1265] Refactor ServiceLoader to be immutable.

Mutable objects are harder to debug and harder to reason about. ServiceLoader was almost immutable. There was just a single function which set fields for a second function. Instead of mutating the object, we can pass those values as parameters to the next function.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py | 89 +++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 440f3920..1a3b30ac 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -239,80 +239,61 @@ class ServiceLoader(object):
             raise CircularReference(self.already_seen + [self.signature(name)])
 
     def make_service_dict(self):
-        self.resolve_environment()
-        if 'extends' in self.service_dict:
-            self.validate_and_construct_extends()
-            self.service_dict = self.resolve_extends()
+        service_dict = dict(self.service_dict)
+        env = resolve_environment(self.working_dir, self.service_dict)
+        if env:
+            service_dict['environment'] = env
+            service_dict.pop('env_file', None)
+
+        if 'extends' in service_dict:
+            service_dict = self.resolve_extends(*self.validate_and_construct_extends())
 
         if not self.already_seen:
-            validate_against_service_schema(self.service_dict, self.service_name)
+            validate_against_service_schema(service_dict, self.service_name)
 
-        return process_container_options(self.service_dict, working_dir=self.working_dir)
-
-    def resolve_environment(self):
-        """
-        Unpack any environment variables from an env_file, if set.
-        Interpolate environment values if set.
-        """
-        if 'environment' not in self.service_dict and 'env_file' not in self.service_dict:
-            return
-
-        env = {}
-
-        if 'env_file' in self.service_dict:
-            for f in get_env_files(self.service_dict, working_dir=self.working_dir):
-                env.update(env_vars_from_file(f))
-            del self.service_dict['env_file']
-
-        env.update(parse_environment(self.service_dict.get('environment')))
-        env = dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
-
-        self.service_dict['environment'] = env
+        return process_container_options(service_dict, working_dir=self.working_dir)
 
     def validate_and_construct_extends(self):
         extends = self.service_dict['extends']
         if not isinstance(extends, dict):
             extends = {'service': extends}
 
-        validate_extends_file_path(
-            self.service_name,
-            extends,
-            self.filename
-        )
-        self.extended_config_path = self.get_extended_config_path(extends)
-        self.extended_service_name = extends['service']
+        validate_extends_file_path(self.service_name, extends, self.filename)
+        config_path = self.get_extended_config_path(extends)
+        service_name = extends['service']
 
-        config = load_yaml(self.extended_config_path)
+        config = load_yaml(config_path)
         validate_top_level_object(config)
         full_extended_config = interpolate_environment_variables(config)
 
         validate_extended_service_exists(
-            self.extended_service_name,
+            service_name,
             full_extended_config,
-            self.extended_config_path
+            config_path
         )
         validate_against_fields_schema(full_extended_config)
 
-        self.extended_config = full_extended_config[self.extended_service_name]
+        service_config = full_extended_config[service_name]
+        return config_path, service_config, service_name
 
-    def resolve_extends(self):
-        other_working_dir = os.path.dirname(self.extended_config_path)
+    def resolve_extends(self, extended_config_path, service_config, service_name):
+        other_working_dir = os.path.dirname(extended_config_path)
         other_already_seen = self.already_seen + [self.signature(self.service_name)]
 
         other_loader = ServiceLoader(
-            working_dir=other_working_dir,
-            filename=self.extended_config_path,
-            service_name=self.service_name,
-            service_dict=self.extended_config,
+            other_working_dir,
+            extended_config_path,
+            self.service_name,
+            service_config,
             already_seen=other_already_seen,
         )
 
-        other_loader.detect_cycle(self.extended_service_name)
+        other_loader.detect_cycle(service_name)
         other_service_dict = other_loader.make_service_dict()
         validate_extended_service_dict(
             other_service_dict,
-            filename=self.extended_config_path,
-            service=self.extended_service_name,
+            extended_config_path,
+            service_name,
         )
 
         return merge_service_dicts(other_service_dict, self.service_dict)
@@ -330,6 +311,22 @@ class ServiceLoader(object):
         return self.filename, name
 
 
+def resolve_environment(working_dir, service_dict):
+    """Unpack any environment variables from an env_file, if set.
+    Interpolate environment values if set.
+    """
+    if 'environment' not in service_dict and 'env_file' not in service_dict:
+        return {}
+
+    env = {}
+    if 'env_file' in service_dict:
+        for env_file in get_env_files(service_dict, working_dir=working_dir):
+            env.update(env_vars_from_file(env_file))
+
+    env.update(parse_environment(service_dict.get('environment')))
+    return dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
+
+
 def validate_extended_service_dict(service_dict, filename, service):
     error_prefix = "Cannot extend service '%s' in %s:" % (service, filename)
 

From 0fed5e686438aefd9968733fc3c480e7c1339568 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 21 Oct 2015 13:05:14 -0400
Subject: [PATCH 0447/1265] Use inspect network to query for an existing
 network.

And more tests for get_network()

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/project.py                |  9 +++++----
 tests/integration/project_test.py | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index fdd70caf..d4934c26 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -5,6 +5,7 @@ import logging
 from functools import reduce
 
 from docker.errors import APIError
+from docker.errors import NotFound
 
 from .config import ConfigurationError
 from .config import get_service_name_from_net
@@ -363,10 +364,10 @@ class Project(object):
         return [c for c in containers if matches_service_names(c)]
 
     def get_network(self):
-        networks = self.client.networks(names=[self.name])
-        if networks:
-            return networks[0]
-        return None
+        try:
+            return self.client.inspect_network(self.name)
+        except NotFound:
+            return None
 
     def ensure_network_exists(self):
         # TODO: recreate network if driver has changed?
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index ff50c80b..ac0f121c 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 from .testcases import DockerClientTestCase
+from compose.cli.docker_client import docker_client
 from compose.config import config
 from compose.const import LABEL_PROJECT
 from compose.container import Container
@@ -96,6 +97,22 @@ class ProjectTest(DockerClientTestCase):
         db = project.get_service('db')
         self.assertEqual(db._get_volumes_from(), [data_container.id + ':rw'])
 
+    def test_get_network_does_not_exist(self):
+        self.require_engine_version("1.9")
+        client = docker_client(version='1.21')
+
+        project = Project('composetest', [], client)
+        assert project.get_network() is None
+
+    def test_get_network(self):
+        self.require_engine_version("1.9")
+        client = docker_client(version='1.21')
+
+        network_name = 'network_does_exist'
+        project = Project(network_name, [], client)
+        client.create_network(network_name)
+        assert project.get_network()['name'] == network_name
+
     def test_net_from_service(self):
         project = Project.from_dicts(
             name='composetest',

From 1bc3c97f2a770d8268b817f0d8f17160e7b322b2 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 21 Oct 2015 15:26:44 -0400
Subject: [PATCH 0448/1265] Make storage driver configurable in CI

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/ci | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/script/ci b/script/ci
index 12dc3c47..f30265c0 100755
--- a/script/ci
+++ b/script/ci
@@ -11,7 +11,9 @@ set -ex
 docker version
 
 export DOCKER_VERSIONS=all
-export DOCKER_DAEMON_ARGS="--storage-driver=overlay"
+STORAGE_DRIVER=${STORAGE_DRIVER:-overlay}
+export DOCKER_DAEMON_ARGS="--storage-driver=$STORAGE_DRIVER"
+
 GIT_VOLUME="--volumes-from=$(hostname)"
 . script/test-versions
 

From f7100b2ef3cf7eb275548bf4c437653b266cf66d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 21 Oct 2015 15:40:50 -0400
Subject: [PATCH 0449/1265] Change version check from engine version to api
 version.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/integration/cli_test.py     |  4 ++--
 tests/integration/project_test.py |  4 ++--
 tests/integration/testcases.py    | 12 ++++--------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 78519d14..19cc822e 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -187,7 +187,7 @@ class CLITestCase(DockerClientTestCase):
         )
 
     def test_up_without_networking(self):
-        self.require_engine_version("1.9")
+        self.require_api_version('1.21')
 
         self.command.base_dir = 'tests/fixtures/links-composefile'
         self.command.dispatch(['up', '-d'], None)
@@ -205,7 +205,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertTrue(web_container.get('HostConfig.Links'))
 
     def test_up_with_networking(self):
-        self.require_engine_version("1.9")
+        self.require_api_version('1.21')
 
         self.command.base_dir = 'tests/fixtures/links-composefile'
         self.command.dispatch(['--x-networking', 'up', '-d'], None)
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index ac0f121c..fd45b939 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -98,14 +98,14 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(db._get_volumes_from(), [data_container.id + ':rw'])
 
     def test_get_network_does_not_exist(self):
-        self.require_engine_version("1.9")
+        self.require_api_version('1.21')
         client = docker_client(version='1.21')
 
         project = Project('composetest', [], client)
         assert project.get_network() is None
 
     def test_get_network(self):
-        self.require_engine_version("1.9")
+        self.require_api_version('1.21')
         client = docker_client(version='1.21')
 
         network_name = 'network_does_exist'
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index a412fb04..686a2b69 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -76,11 +76,7 @@ class DockerClientTestCase(unittest.TestCase):
         build_output = self.client.build(*args, **kwargs)
         stream_output(build_output, open('/dev/null', 'w'))
 
-    def require_engine_version(self, minimum):
-        # Drop '-dev' or '-rcN' suffix
-        engine = self.client.version()['Version'].split('-', 1)[0]
-        if version_lt(engine, minimum):
-            skip(
-                "Engine version is too low ({} < {})"
-                .format(engine, minimum)
-            )
+    def require_api_version(self, minimum):
+        api_version = self.client.version()['ApiVersion']
+        if version_lt(api_version, minimum):
+            skip("API version is too low ({} < {})".format(api_version, minimum))

From ae47435425e3922fac0cf4faaa89269ea0efc6e3 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 22 Oct 2015 12:12:43 -0400
Subject: [PATCH 0450/1265] Fix unicode in environment variables for python2.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         | 5 ++++-
 tests/fixtures/env/resolve.env   | 2 +-
 tests/unit/cli_test.py           | 5 +++--
 tests/unit/config/config_test.py | 8 +++++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 1a3b30ac..40b4ffa4 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -1,3 +1,4 @@
+import codecs
 import logging
 import os
 import sys
@@ -455,6 +456,8 @@ def parse_environment(environment):
 
 
 def split_env(env):
+    if isinstance(env, six.binary_type):
+        env = env.decode('utf-8')
     if '=' in env:
         return env.split('=', 1)
     else:
@@ -477,7 +480,7 @@ def env_vars_from_file(filename):
     if not os.path.exists(filename):
         raise ConfigurationError("Couldn't find env file: %s" % filename)
     env = {}
-    for line in open(filename, 'r'):
+    for line in codecs.open(filename, 'r', 'utf-8'):
         line = line.strip()
         if line and not line.startswith('#'):
             k, v = split_env(line)
diff --git a/tests/fixtures/env/resolve.env b/tests/fixtures/env/resolve.env
index 720520d2..b4f76b29 100644
--- a/tests/fixtures/env/resolve.env
+++ b/tests/fixtures/env/resolve.env
@@ -1,4 +1,4 @@
-FILE_DEF=F1
+FILE_DEF=bär
 FILE_DEF_EMPTY=
 ENV_DEF
 NO_DEF
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 0c78e6bb..5b63d2e8 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -1,3 +1,4 @@
+# encoding: utf-8
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
@@ -98,7 +99,7 @@ class CLITestCase(unittest.TestCase):
         command.run(mock_project, {
             'SERVICE': 'service',
             'COMMAND': None,
-            '-e': ['BAR=NEW', 'OTHER=THREE'],
+            '-e': ['BAR=NEW', 'OTHER=bär'.encode('utf-8')],
             '--user': None,
             '--no-deps': None,
             '--allow-insecure-ssl': None,
@@ -114,7 +115,7 @@ class CLITestCase(unittest.TestCase):
         _, _, call_kwargs = mock_client.create_container.mock_calls[0]
         self.assertEqual(
             call_kwargs['environment'],
-            {'FOO': 'ONE', 'BAR': 'NEW', 'OTHER': 'THREE'})
+            {'FOO': 'ONE', 'BAR': 'NEW', 'OTHER': u'bär'})
 
     def test_run_service_with_restart_always(self):
         command = TopLevelCommand()
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index d15cd9a6..a54b006f 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1,3 +1,4 @@
+# encoding: utf-8
 from __future__ import print_function
 
 import os
@@ -894,7 +895,12 @@ class EnvTest(unittest.TestCase):
         )
         self.assertEqual(
             service_dict['environment'],
-            {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''},
+            {
+                'FILE_DEF': u'bär',
+                'FILE_DEF_EMPTY': '',
+                'ENV_DEF': 'E3',
+                'NO_DEF': ''
+            },
         )
 
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')

From cf197253cdc10c2860c558412d4646d1795b7160 Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Thu, 22 Oct 2015 17:17:11 +1000
Subject: [PATCH 0451/1265] Possible link fixes

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 docs/django.md     | 2 +-
 docs/env.md        | 2 +-
 docs/index.md      | 2 +-
 docs/networking.md | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/django.md b/docs/django.md
index c7ebf58b..fd18784e 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -67,7 +67,7 @@ and a `docker-compose.yml` file.
     also describes which Docker images these services use, how they link
     together, any volumes they might need mounted inside the containers.
     Finally, the `docker-compose.yml` file describes which ports these services
-    expose. See the [`docker-compose.yml` reference](yml.md) for more
+    expose. See the [`docker-compose.yml` reference](compose-file.md) for more
     information on how this file works.
 
 9. Add the following configuration to the file.
diff --git a/docs/env.md b/docs/env.md
index 8f3cc3cc..d7b51ba2 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -11,7 +11,7 @@ weight=3
 
 # Compose environment variables reference
 
-**Note:** Environment variables are no longer the recommended method for connecting to linked services. Instead, you should use the link name (by default, the name of the linked service) as the hostname to connect to. See the [docker-compose.yml documentation](yml.md#links) for details.
+**Note:** Environment variables are no longer the recommended method for connecting to linked services. Instead, you should use the link name (by default, the name of the linked service) as the hostname to connect to. See the [docker-compose.yml documentation](compose-file.md#links) for details.
 
 Compose uses [Docker links] to expose services' containers to one another. Each linked container injects a set of environment variables, each of which begins with the uppercase name of the container.
 
diff --git a/docs/index.md b/docs/index.md
index e19e7d7f..62c78d68 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -154,7 +154,7 @@ Now, when you run `docker-compose up`, Compose will pull a Redis image, build an
 
 If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` will tell you its address and you can open `http://MACHINE_VM_IP:5000` in a browser.
 
-If you're using Docker on Linux natively, then the web app should now be listening on port 5000 on your Docker daemon host. If http://0.0.0.0:5000 doesn't resolve, you can also try http://localhost:5000.
+If you're using Docker on Linux natively, then the web app should now be listening on port 5000 on your Docker daemon host. If `http://0.0.0.0:5000` doesn't resolve, you can also try `http://localhost:5000`.
 
 You should get a message in your browser saying:
 
diff --git a/docs/networking.md b/docs/networking.md
index f4227917..9a6d792d 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -12,11 +12,11 @@ weight=6
 
 # Networking in Compose
 
-> **Note:** Compose’s networking support is experimental, and must be explicitly enabled with the `docker-compose --x-networking` flag.
+> **Note:** Compose's networking support is experimental, and must be explicitly enabled with the `docker-compose --x-networking` flag.
 
-Compose sets up a single default [network](http://TODO/docker-networking-docs) for your app. Each container for a service joins the default network and is both *reachable* by other containers on that network, and *discoverable* by them at a hostname identical to the service's name.
+Compose sets up a single default [network](/engine/reference/commandline/network_create.md) for your app. Each container for a service joins the default network and is both *reachable* by other containers on that network, and *discoverable* by them at a hostname identical to the service's name.
 
-> **Note:** Your app's network is given the same name as the "project name", which is based on the name of the directory it lives in. See the [CLI docs](cli.md#p-project-name-name) for how to override it.
+> **Note:** Your app's network is given the same name as the "project name", which is based on the name of the directory it lives in. See the [Command line overview](reference/docker-compose.md) for how to override it.
 
 For example, suppose your app is in a directory called `myapp`, and your `docker-compose.yml` looks like this:
 
@@ -65,7 +65,7 @@ Docker links are a one-way, single-host communication system. They should now be
 
 ## Specifying the network driver
 
-By default, Compose uses the `bridge` driver when creating the app’s network. The Docker Engine provides one other driver out-of-the-box: `overlay`, which implements secure communication between containers on different hosts (see the next section for how to set up and use the `overlay` driver). Docker also allows you to install [custom network drivers](http://TODO/custom-driver-docs).
+By default, Compose uses the `bridge` driver when creating the app’s network. The Docker Engine provides one other driver out-of-the-box: `overlay`, which implements secure communication between containers on different hosts (see the next section for how to set up and use the `overlay` driver). Docker also allows you to install [custom network drivers](/engine/extend/plugins_network.md).
 
 You can specify which one to use with the `--x-network-driver` flag:
 

From 0340361f56e7bf80fe0961d387b7d58fb7098e06 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 22 Sep 2015 16:42:43 -0400
Subject: [PATCH 0452/1265] Upgrade pyinstaller to 3.0

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 requirements-build.txt   | 2 +-
 script/build-windows.ps1 | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/requirements-build.txt b/requirements-build.txt
index 5da6fa49..20aad420 100644
--- a/requirements-build.txt
+++ b/requirements-build.txt
@@ -1 +1 @@
-git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
+pyinstaller==3.0
diff --git a/script/build-windows.ps1 b/script/build-windows.ps1
index 6e8a7c5a..42a4a501 100644
--- a/script/build-windows.ps1
+++ b/script/build-windows.ps1
@@ -42,11 +42,6 @@ Get-ChildItem -Recurse -Include *.pyc | foreach ($_) { Remove-Item $_.FullName }
 virtualenv .\venv
 
 # Install dependencies
-# TODO: pip warns when installing from a git sha, so we need to set ErrorAction to
-# 'Continue'.  See
-# https://github.com/pypa/pip/blob/fbc4b7ae5fee00f95bce9ba4b887b22681327bb1/pip/vcs/git.py#L77
-# This can be removed once pyinstaller 3.x is released and we upgrade 
-$ErrorActionPreference = "Continue"
 .\venv\Scripts\pip install pypiwin32==219
 .\venv\Scripts\pip install -r requirements.txt
 .\venv\Scripts\pip install --no-deps .
@@ -54,8 +49,9 @@ $ErrorActionPreference = "Continue"
 
 # Build binary
 # pyinstaller has lots of warnings, so we need to run with ErrorAction = Continue
+$ErrorActionPreference = "Continue"
 .\venv\Scripts\pyinstaller .\docker-compose.spec
 $ErrorActionPreference = "Stop"
 
-Move-Item -Force .\dist\docker-compose .\dist\docker-compose-Windows-x86_64.exe
+Move-Item -Force .\dist\docker-compose.exe .\dist\docker-compose-Windows-x86_64.exe
 .\dist\docker-compose-Windows-x86_64.exe --version

From fe760a7b62719f61fccf30e4b806ffae39b163ae Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 26 Oct 2015 17:08:45 +0000
Subject: [PATCH 0453/1265] Include additional classifiers

I've included Python 2/3 as they are not parent classifiers but
sibling classifiers. They denote that this project will work with
*some* versions of python and by having them, they'll show up for
people searching for python 2 or 3 projects.

According to the internet :)

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 setup.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setup.py b/setup.py
index bf2ee07f..bd6f201d 100644
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,13 @@ setup(
     docker-compose=compose.cli.main:main
     """,
     classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
     ],
 )

From 7878d38deeac394e220cab294c3783eac63f17b5 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 26 Oct 2015 13:29:59 -0400
Subject: [PATCH 0454/1265] Fix running one-off containers with --x-networking
 by disabling linking to self.

docker create fails if networking and links are used together.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py         | 3 +++
 tests/unit/service_test.py | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/compose/service.py b/compose/service.py
index 3bb47432..370ab1eb 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -539,6 +539,9 @@ class Service(object):
         return 1 if not numbers else max(numbers) + 1
 
     def _get_links(self, link_to_self):
+        if self.use_networking:
+            return []
+
         links = []
         for service, link_name in self.links:
             for container in service.containers():
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index b5bac291..c7a5a355 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -499,6 +499,14 @@ class ServiceTest(unittest.TestCase):
             ports=["127.0.0.1:1000-2000:2000-3000"])
         self.assertEqual(service.specifies_host_port(), True)
 
+    def test_get_links_with_networking(self):
+        service = Service(
+            'foo',
+            image='foo',
+            links=[(Service('one'), 'one')],
+            use_networking=True)
+        self.assertEqual(service._get_links(link_to_self=True), [])
+
 
 class NetTestCase(unittest.TestCase):
 

From 7603ebea9b2f484f3cf8f193f64748fb91b67bf6 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 21 Oct 2015 17:28:16 +0100
Subject: [PATCH 0455/1265] Attach to a container's log_stream before they're
 started

So we're not displaying output of all previous logs for a container, we attach,
if possible, to a container before the container is started.

LogPrinter checks if a container has a log_stream already attached and
print from that rather than always attempting to attach one itself.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/cli/log_printer.py      | 10 ++++--
 compose/cli/main.py             | 11 +++++--
 compose/container.py            |  8 +++++
 compose/project.py              |  6 ++--
 compose/service.py              | 54 ++++++++++++++++++++++-----------
 tests/integration/state_test.py |  4 ++-
 6 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 6e1499e1..66920726 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -73,9 +73,13 @@ def build_no_log_generator(container, prefix, color_func):
 
 
 def build_log_generator(container, prefix, color_func):
-    # Attach to container before log printer starts running
-    stream = container.attach(stdout=True, stderr=True,  stream=True, logs=True)
-    line_generator = split_buffer(stream)
+    # if the container doesn't have a log_stream we need to attach to container
+    # before log printer starts running
+    if container.log_stream is None:
+        stream = container.attach(stdout=True, stderr=True,  stream=True, logs=True)
+        line_generator = split_buffer(stream)
+    else:
+        line_generator = split_buffer(container.log_stream)
 
     for line in line_generator:
         yield prefix + line
diff --git a/compose/cli/main.py b/compose/cli/main.py
index c800d95f..5505b89f 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -565,16 +565,18 @@ class TopLevelCommand(DocoptCommand):
         start_deps = not options['--no-deps']
         service_names = options['SERVICE']
         timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
+        detached = options.get('-d')
 
         to_attach = project.up(
             service_names=service_names,
             start_deps=start_deps,
             strategy=convergence_strategy_from_opts(options),
             do_build=not options['--no-build'],
-            timeout=timeout
+            timeout=timeout,
+            detached=detached
         )
 
-        if not options['-d']:
+        if not detached:
             log_printer = build_log_printer(to_attach, service_names, monochrome)
             attach_to_logs(project, log_printer, service_names, timeout)
 
@@ -636,7 +638,10 @@ def convergence_strategy_from_opts(options):
 
 def build_log_printer(containers, service_names, monochrome):
     if service_names:
-        containers = [c for c in containers if c.service in service_names]
+        containers = [
+            container
+            for container in containers if container.service in service_names
+        ]
     return LogPrinter(containers, monochrome=monochrome)
 
 
diff --git a/compose/container.py b/compose/container.py
index a03acf56..64773b9e 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -19,6 +19,7 @@ class Container(object):
         self.client = client
         self.dictionary = dictionary
         self.has_been_inspected = has_been_inspected
+        self.log_stream = None
 
     @classmethod
     def from_ps(cls, client, dictionary, **kwargs):
@@ -146,6 +147,13 @@ class Container(object):
         log_type = self.log_driver
         return not log_type or log_type == 'json-file'
 
+    def attach_log_stream(self):
+        """A log stream can only be attached if the container uses a json-file
+        log driver.
+        """
+        if self.has_api_logs:
+            self.log_stream = self.attach(stdout=True, stderr=True, stream=True)
+
     def get(self, key):
         """Return a value from the container or None if the value is not set.
 
diff --git a/compose/project.py b/compose/project.py
index d4934c26..68edaddc 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -290,7 +290,8 @@ class Project(object):
            start_deps=True,
            strategy=ConvergenceStrategy.changed,
            do_build=True,
-           timeout=DEFAULT_TIMEOUT):
+           timeout=DEFAULT_TIMEOUT,
+           detached=False):
 
         services = self.get_services(service_names, include_deps=start_deps)
 
@@ -308,7 +309,8 @@ class Project(object):
             for container in service.execute_convergence_plan(
                 plans[service.name],
                 do_build=do_build,
-                timeout=timeout
+                timeout=timeout,
+                detached=detached
             )
         ]
 
diff --git a/compose/service.py b/compose/service.py
index 3bb47432..aefeda31 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -395,11 +395,17 @@ class Service(object):
     def execute_convergence_plan(self,
                                  plan,
                                  do_build=True,
-                                 timeout=DEFAULT_TIMEOUT):
+                                 timeout=DEFAULT_TIMEOUT,
+                                 detached=False):
         (action, containers) = plan
+        should_attach_logs = not detached
 
         if action == 'create':
             container = self.create_container(do_build=do_build)
+
+            if should_attach_logs:
+                container.attach_log_stream()
+
             self.start_container(container)
 
             return [container]
@@ -407,15 +413,16 @@ class Service(object):
         elif action == 'recreate':
             return [
                 self.recreate_container(
-                    c,
-                    timeout=timeout
+                    container,
+                    timeout=timeout,
+                    attach_logs=should_attach_logs
                 )
-                for c in containers
+                for container in containers
             ]
 
         elif action == 'start':
-            for c in containers:
-                self.start_container_if_stopped(c)
+            for container in containers:
+                self.start_container_if_stopped(container, attach_logs=should_attach_logs)
 
             return containers
 
@@ -428,16 +435,7 @@ class Service(object):
         else:
             raise Exception("Invalid action: {}".format(action))
 
-    def recreate_container(self,
-                           container,
-                           timeout=DEFAULT_TIMEOUT):
-        """Recreate a container.
-
-        The original container is renamed to a temporary name so that data
-        volumes can be copied to the new container, before the original
-        container is removed.
-        """
-        log.info("Recreating %s" % container.name)
+    def _recreate_stop_container(self, container, timeout):
         try:
             container.stop(timeout=timeout)
         except APIError as e:
@@ -448,26 +446,46 @@ class Service(object):
             else:
                 raise
 
+    def _recreate_rename_container(self, container):
         # Use a hopefully unique container name by prepending the short id
         self.client.rename(
             container.id,
-            '%s_%s' % (container.short_id, container.name))
+            '%s_%s' % (container.short_id, container.name)
+        )
 
+    def recreate_container(self,
+                           container,
+                           timeout=DEFAULT_TIMEOUT,
+                           attach_logs=False):
+        """Recreate a container.
+
+        The original container is renamed to a temporary name so that data
+        volumes can be copied to the new container, before the original
+        container is removed.
+        """
+        log.info("Recreating %s" % container.name)
+
+        self._recreate_stop_container(container, timeout)
+        self._recreate_rename_container(container)
         new_container = self.create_container(
             do_build=False,
             previous_container=container,
             number=container.labels.get(LABEL_CONTAINER_NUMBER),
             quiet=True,
         )
+        if attach_logs:
+            new_container.attach_log_stream()
         self.start_container(new_container)
         container.remove()
         return new_container
 
-    def start_container_if_stopped(self, container):
+    def start_container_if_stopped(self, container, attach_logs=False):
         if container.is_running:
             return container
         else:
             log.info("Starting %s" % container.name)
+            if attach_logs:
+                container.attach_log_stream()
             return self.start_container(container)
 
     def start_container(self, container):
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index ef7276bd..02e9d315 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -18,6 +18,7 @@ from compose.service import ConvergenceStrategy
 class ProjectTestCase(DockerClientTestCase):
     def run_up(self, cfg, **kwargs):
         kwargs.setdefault('timeout', 1)
+        kwargs.setdefault('detached', True)
 
         project = self.make_project(cfg)
         project.up(**kwargs)
@@ -184,7 +185,8 @@ def converge(service,
              do_build=True):
     """Create a converge plan from a strategy and execute the plan."""
     plan = service.convergence_plan(strategy)
-    return service.execute_convergence_plan(plan, do_build=do_build, timeout=1)
+    containers, logging_threads = zip(*service.execute_convergence_plan(plan, do_build=do_build, timeout=1))
+    return containers
 
 
 class ServiceStateTest(DockerClientTestCase):

From bee063c07dd8ca8c7f0295a9a319c14b815c4422 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Mon, 26 Oct 2015 10:27:57 +0000
Subject: [PATCH 0456/1265] Fix tests

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 tests/integration/service_test.py  | 1 +
 tests/integration/state_test.py    | 3 +--
 tests/unit/cli/log_printer_test.py | 1 +
 tests/unit/service_test.py         | 4 +---
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 8a8e4d54..38d7d5b5 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -362,6 +362,7 @@ class ServiceTest(DockerClientTestCase):
 
         new_container, = service.execute_convergence_plan(
             ConvergencePlan('recreate', [old_container]))
+
         self.assertEqual(list(new_container.get('Volumes')), ['/data'])
         self.assertEqual(new_container.get('Volumes')['/data'], volume_path)
 
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index 02e9d315..3230aefc 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -185,8 +185,7 @@ def converge(service,
              do_build=True):
     """Create a converge plan from a strategy and execute the plan."""
     plan = service.convergence_plan(strategy)
-    containers, logging_threads = zip(*service.execute_convergence_plan(plan, do_build=do_build, timeout=1))
-    return containers
+    return service.execute_convergence_plan(plan, do_build=do_build, timeout=1)
 
 
 class ServiceStateTest(DockerClientTestCase):
diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py
index 2c916898..575fcaf7 100644
--- a/tests/unit/cli/log_printer_test.py
+++ b/tests/unit/cli/log_printer_test.py
@@ -16,6 +16,7 @@ def build_mock_container(reader):
         name='myapp_web_1',
         name_without_project='web_1',
         has_api_logs=True,
+        log_stream=None,
         attach=reader,
         wait=mock.Mock(return_value=0),
     )
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index b5bac291..494c2cde 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -323,9 +323,7 @@ class ServiceTest(unittest.TestCase):
         new_container = service.recreate_container(mock_container)
 
         mock_container.stop.assert_called_once_with(timeout=10)
-        self.mock_client.rename.assert_called_once_with(
-            mock_container.id,
-            '%s_%s' % (mock_container.short_id, mock_container.name))
+        mock_container.rename_to_tmp_name.assert_called_once_with()
 
         new_container.start.assert_called_once_with()
         mock_container.remove.assert_called_once_with()

From 30a84f1be6c68d1cbeaad865242f891f5cff82df Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 27 Oct 2015 11:55:35 +0000
Subject: [PATCH 0457/1265] Move rename functionality into Container

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/container.py | 9 +++++++++
 compose/service.py   | 9 +--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/compose/container.py b/compose/container.py
index 64773b9e..dd69e8dd 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -192,6 +192,15 @@ class Container(object):
     def remove(self, **options):
         return self.client.remove_container(self.id, **options)
 
+    def rename_to_tmp_name(self):
+        """Rename the container to a hopefully unique temporary container name
+        by prepending the short id.
+        """
+        self.client.rename(
+            self.id,
+            '%s_%s' % (self.short_id, self.name)
+        )
+
     def inspect_if_not_inspected(self):
         if not self.has_been_inspected:
             self.inspect()
diff --git a/compose/service.py b/compose/service.py
index aefeda31..518a0d27 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -446,13 +446,6 @@ class Service(object):
             else:
                 raise
 
-    def _recreate_rename_container(self, container):
-        # Use a hopefully unique container name by prepending the short id
-        self.client.rename(
-            container.id,
-            '%s_%s' % (container.short_id, container.name)
-        )
-
     def recreate_container(self,
                            container,
                            timeout=DEFAULT_TIMEOUT,
@@ -466,7 +459,7 @@ class Service(object):
         log.info("Recreating %s" % container.name)
 
         self._recreate_stop_container(container, timeout)
-        self._recreate_rename_container(container)
+        container.rename_to_tmp_name()
         new_container = self.create_container(
             do_build=False,
             previous_container=container,

From 76d52b1c5f02e526010468c22d5a438883ab4777 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 27 Oct 2015 11:59:09 +0000
Subject: [PATCH 0458/1265] Remove redundant try/except

Code cleanup. We no longer need this as the api returns a 304 for any
stopped containers, which doesn't raise an error.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/service.py | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 518a0d27..2ca004cf 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -435,17 +435,6 @@ class Service(object):
         else:
             raise Exception("Invalid action: {}".format(action))
 
-    def _recreate_stop_container(self, container, timeout):
-        try:
-            container.stop(timeout=timeout)
-        except APIError as e:
-            if (e.response.status_code == 500
-                    and e.explanation
-                    and 'no such process' in str(e.explanation)):
-                pass
-            else:
-                raise
-
     def recreate_container(self,
                            container,
                            timeout=DEFAULT_TIMEOUT,
@@ -458,7 +447,7 @@ class Service(object):
         """
         log.info("Recreating %s" % container.name)
 
-        self._recreate_stop_container(container, timeout)
+        container.stop(timeout=timeout)
         container.rename_to_tmp_name()
         new_container = self.create_container(
             do_build=False,

From 379af594dab93e608d9589bb41c755429190a71d Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 28 Oct 2015 14:59:43 +0000
Subject: [PATCH 0459/1265] Include link to github for code&issues

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index d779d607..ed176550 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,8 @@ Installation and documentation
 
 - Full documentation is available on [Docker's website](http://docs.docker.com/compose/).
 - If you have any questions, you can talk in real-time with other developers in the #docker-compose IRC channel on Freenode. [Click here to join using IRCCloud.](https://www.irccloud.com/invite?hostname=irc.freenode.net&channel=%23docker-compose)
+- Code repository for Compose is on [Github](https://github.com/docker/compose)
+- If you find any problems please fill out an [issue](https://github.com/docker/compose/issues/new)
 
 Contributing
 ------------

From c4f0f24c57365a2bada4be295778bf93f506ece4 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 28 Oct 2015 12:01:34 -0400
Subject: [PATCH 0460/1265] Fix release script notes about software and typos.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 project/RELEASE-PROCESS.md    | 12 ++++++++++--
 script/release/cherry-pick-pr |  2 +-
 script/release/push-release   |  5 ++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index ffa18077..040a2602 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -1,6 +1,14 @@
 Building a Compose release
 ==========================
 
+## Prerequisites
+
+The release scripts require the following tools installed on the host:
+
+* https://hub.github.com/
+* https://stedolan.github.io/jq/
+* http://pandoc.org/
+
 ## To get started with a new release
 
 Create a branch, update version, and add release notes by running `make-branch`
@@ -40,10 +48,10 @@ As part of this script you'll be asked to:
 
 ## To release a version (whether RC or stable)
 
-Check out the bump branch and run the `build-binary` script
+Check out the bump branch and run the `build-binaries` script
 
         git checkout bump-$VERSION
-        ./script/release/build-binary
+        ./script/release/build-binaries
 
 When prompted build the non-linux binaries and test them.
 
diff --git a/script/release/cherry-pick-pr b/script/release/cherry-pick-pr
index 60460087..f4a5a740 100755
--- a/script/release/cherry-pick-pr
+++ b/script/release/cherry-pick-pr
@@ -22,7 +22,7 @@ EOM
 
 if [ -z "$(command -v hub 2> /dev/null)" ]; then
     >&2 echo "$0 requires https://hub.github.com/."
-    >&2 echo "Please install it and ake sure it is available on your \$PATH."
+    >&2 echo "Please install it and make sure it is available on your \$PATH."
     exit 2
 fi
 
diff --git a/script/release/push-release b/script/release/push-release
index 039436da..9229f093 100755
--- a/script/release/push-release
+++ b/script/release/push-release
@@ -34,7 +34,9 @@ GITHUB_REPO=git@github.com:$REPO
 sha=$(git rev-parse HEAD)
 url=$API/$REPO/statuses/$sha
 build_status=$(curl -s $url | jq -r '.[0].state')
-if [[ "$build_status" != "success" ]]; then
+if [ -n "$SKIP_BUILD_CHECK" ]; then
+    echo "Skipping build status check..."
+elif [[ "$build_status" != "success" ]]; then
     >&2 echo "Build status is $build_status, but it should be success."
     exit -1
 fi
@@ -61,6 +63,7 @@ source venv-test/bin/activate
 pip install docker-compose==$VERSION
 docker-compose version
 deactivate
+rm -rf venv-test
 
 echo "Now publish the github release, and test the downloads."
 echo "Email maintainers@dockerproject.org and engineering@docker.com about the new release."

From bbc76e6034d426e75dba9f2c2517e7f82f7ea1f8 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 28 Oct 2015 12:11:29 -0400
Subject: [PATCH 0461/1265] Convert the README to rst and fix the logo url
 before packaging it up for pypi.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 .gitignore                  |  1 +
 MANIFEST.in                 |  2 ++
 script/release/push-release | 15 +++++++++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b0c5011..83a08a0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /dist
 /docs/_site
 /venv
+README.rst
diff --git a/MANIFEST.in b/MANIFEST.in
index 43ae06d3..0342e35b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,8 @@ include requirements.txt
 include requirements-dev.txt
 include tox.ini
 include *.md
+exclude README.md
+include README.rst
 include compose/config/*.json
 recursive-include contrib/completion *
 recursive-include tests *
diff --git a/script/release/push-release b/script/release/push-release
index 9229f093..ccdf2496 100755
--- a/script/release/push-release
+++ b/script/release/push-release
@@ -21,11 +21,17 @@ VERSION="$(git config "branch.${BRANCH}.release")" || usage
 
 if [ -z "$(command -v jq 2> /dev/null)" ]; then
     >&2 echo "$0 requires https://stedolan.github.io/jq/"
-    >&2 echo "Please install it and ake sure it is available on your \$PATH."
+    >&2 echo "Please install it and make sure it is available on your \$PATH."
     exit 2
 fi
 
 
+if [ -z "$(command -v pandoc 2> /dev/null)" ]; then
+    >&2 echo "$0 requires http://pandoc.org/"
+    >&2 echo "Please install it and make sure it is available on your \$PATH."
+    exit 2
+fi
+
 API=https://api.github.com/repos
 REPO=docker/compose
 GITHUB_REPO=git@github.com:$REPO
@@ -45,12 +51,13 @@ echo "Tagging the release as $VERSION"
 git tag $VERSION
 git push $GITHUB_REPO $VERSION
 
-echo "Uploading sdist to pypi"
-python setup.py sdist
-
 echo "Uploading the docker image"
 docker push docker/compose:$VERSION
 
+echo "Uploading sdist to pypi"
+pandoc -f markdown -t rst README.md -o README.rst
+sed -i -e 's/logo.png?raw=true/https:\/\/github.com\/docker\/compose\/raw\/master\/logo.png?raw=true/' README.rst
+python setup.py sdist
 if [ "$(command -v twine 2> /dev/null)" ]; then
     twine upload ./dist/docker-compose-${VERSION}.tar.gz
 else

From 830640534053df40d06e63e04b63c15d8929ae9c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 28 Oct 2015 12:40:59 -0400
Subject: [PATCH 0462/1265] On error print daemon logs

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/test-versions | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/script/test-versions b/script/test-versions
index 89793359..43326ccb 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -28,10 +28,15 @@ for version in $DOCKER_VERSIONS; do
   >&2 echo "Running tests against Docker $version"
 
   daemon_container="compose-dind-$version-$BUILD_NUMBER"
-  trap "docker rm -vf $daemon_container" EXIT
 
-  # TODO: remove when we stop testing against 1.7.x
-  daemon=$([[ "$version" == "1.7"* ]] && echo "-d" || echo "daemon")
+  function on_exit() {
+    if [[ "$?" != "0" ]]; then
+        docker logs "$daemon_container"
+    fi
+    docker rm -vf "$daemon_container"
+  }
+
+  trap "on_exit" EXIT
 
   docker run \
     -d \
@@ -39,7 +44,7 @@ for version in $DOCKER_VERSIONS; do
     --privileged \
     --volume="/var/lib/docker" \
     dockerswarm/dind:$version \
-    docker $daemon -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
+    docker daemon -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
 
   docker run \
     --rm \

From c341860d113e4ec042fa4d9bb7340fed9d9db66d Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 28 Oct 2015 16:48:35 +0000
Subject: [PATCH 0463/1265] Clarify `dockerfile` requires `build` key

Credit to @funkyfuture for the first PR addressing the clarification.
https://github.com/docker/compose/pull/1767

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/compose-file.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index b72a7cc4..d4591608 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -100,8 +100,10 @@ Custom DNS search domains. Can be a single value or a list.
 
 Alternate Dockerfile.
 
-Compose will use an alternate file to build with.
+Compose will use an alternate file to build with. A build path must also be
+specified using the `build` key.
 
+    build: /path/to/build/dir
     dockerfile: Dockerfile-alternate
 
 Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.

From e13b8949b0546a4c2028b3457f5934c2ae4c1f0b Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 28 Oct 2015 16:27:14 +0000
Subject: [PATCH 0464/1265] Add cross references for env/cli

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/reference/docker-compose.md | 15 +++++++++------
 docs/reference/overview.md       |  9 +++++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/docs/reference/docker-compose.md b/docs/reference/docker-compose.md
index 32fcbe70..8712072e 100644
--- a/docs/reference/docker-compose.md
+++ b/docs/reference/docker-compose.md
@@ -87,15 +87,18 @@ relative to the current working directory.
 
 The `-f` flag is optional. If you don't provide this flag on the command line,
 Compose traverses the working directory and its subdirectories looking for a
-`docker-compose.yml` and a `docker-compose.override.yml` file. You must supply
-at least the `docker-compose.yml` file. If both files are present, Compose
-combines the two files into a single configuration. The configuration in the
-`docker-compose.override.yml` file is applied over and in addition to the values
-in the `docker-compose.yml` file.
+`docker-compose.yml` and a `docker-compose.override.yml` file. You must
+supply at least the `docker-compose.yml` file. If both files are present,
+Compose combines the two files into a single configuration. The configuration
+in the `docker-compose.override.yml` file is applied over and in addition to
+the values in the `docker-compose.yml` file.
+
+See also the `COMPOSE_FILE` [environment variable](overview.md#compose-file).
 
 Each configuration has a project name. If you supply a `-p` flag, you can
 specify a project name. If you don't specify the flag, Compose uses the current
-directory name.
+directory name. See also the `COMPOSE_PROJECT_NAME` [environment variable](
+overview.md#compose-project-name)
 
 
 ## Where to go next
diff --git a/docs/reference/overview.md b/docs/reference/overview.md
index 3f589a9d..8e3967b2 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/overview.md
@@ -32,11 +32,16 @@ Docker command-line client. If you're using `docker-machine`, then the `eval "$(
 
 Sets the project name. This value is prepended along with the service name to the container container on start up. For example, if you project name is `myapp` and it includes two services `db` and `web` then compose starts containers named  `myapp_db_1` and `myapp_web_1` respectively.
 
-Setting this is optional. If you do not set this, the `COMPOSE_PROJECT_NAME` defaults to the `basename` of the current working directory.
+Setting this is optional. If you do not set this, the `COMPOSE_PROJECT_NAME`
+defaults to the `basename` of the project directory. See also the `-p`
+[command-line option](docker-compose.md).
 
 ### COMPOSE\_FILE
 
-Specify the file containing the compose configuration. If not provided, Compose looks for a file named  `docker-compose.yml` in the current directory and then each parent directory in succession until a file by that name is found.
+Specify the file containing the compose configuration. If not provided,
+Compose looks for a file named  `docker-compose.yml` in the current directory
+and then each parent directory in succession until a file by that name is
+found. See also the `-f` [command-line option](docker-compose.md).
 
 ### COMPOSE\_API\_VERSION
 

From 0ef3b47f74afe2a835ae0b9ad60c92b8c27612f2 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 28 Oct 2015 15:17:11 -0400
Subject: [PATCH 0465/1265] Update docs about networking for current release.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/networking.md      | 36 ++++++++++++++++++++++--------------
 project/ISSUE-TRIAGE.md | 25 +++++++++++++------------
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/docs/networking.md b/docs/networking.md
index 9a6d792d..718d56c7 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -14,7 +14,11 @@ weight=6
 
 > **Note:** Compose's networking support is experimental, and must be explicitly enabled with the `docker-compose --x-networking` flag.
 
-Compose sets up a single default [network](/engine/reference/commandline/network_create.md) for your app. Each container for a service joins the default network and is both *reachable* by other containers on that network, and *discoverable* by them at a hostname identical to the service's name.
+Compose sets up a single default
+[network](/engine/reference/commandline/network_create.md) for your app. Each
+container for a service joins the default network and is both *reachable* by
+other containers on that network, and *discoverable* by them at a hostname
+identical to the container name.
 
 > **Note:** Your app's network is given the same name as the "project name", which is based on the name of the directory it lives in. See the [Command line overview](reference/docker-compose.md) for how to override it.
 
@@ -30,13 +34,23 @@ For example, suppose your app is in a directory called `myapp`, and your `docker
 When you run `docker-compose --x-networking up`, the following happens:
 
 1. A network called `myapp` is created.
-2. A container is created using `web`'s configuration. It joins the network `myapp` under the name `web`.
-3. A container is created using `db`'s configuration. It joins the network `myapp` under the name `db`.
+2. A container is created using `web`'s configuration. It joins the network
+`myapp` under the name `myapp_web_1`.
+3. A container is created using `db`'s configuration. It joins the network
+`myapp` under the name `myapp_db_1`.
 
-Each container can now look up the hostname `web` or `db` and get back the appropriate container's IP address. For example, `web`'s application code could connect to the URL `postgres://db:5432` and start using the Postgres database.
+Each container can now look up the hostname `myapp_web_1` or `myapp_db_1` and
+get back the appropriate container's IP address. For example, `web`'s
+application code could connect to the URL `postgres://myapp_db_1:5432` and start
+using the Postgres database.
 
 Because `web` explicitly maps a port, it's also accessible from the outside world via port 8000 on your Docker host's network interface.
 
+> **Note:** in the next release there will be additional aliases for the
+> container, including a short name without the project name and container
+> index. The full container name will remain as one of the alias for backwards
+> compatibility.
+
 ## Updating containers
 
 If you make a configuration change to a service and run `docker-compose up` to update it, the old container will be removed and the new one will join the network under a different IP address but the same name. Running containers will be able to look up that name and connect to the new address, but the old address will stop working.
@@ -45,19 +59,13 @@ If any containers have connections open to the old container, they will be close
 
 ## Configure how services are published
 
-By default, containers for each service are published on the network with the same name as the service. If you want to change the name, or stop containers from being discoverable at all, you can use the `hostname` option:
+By default, containers for each service are published on the network with the
+container name. If you want to change the name, or stop containers from being
+discoverable at all, you can use the `container_name` option:
 
     web:
       build: .
-      hostname: "my-web-application"
-
-This will also change the hostname inside the container, so that the `hostname` command will return `my-web-application`.
-
-## Scaling services
-
-If you create multiple containers for a service with `docker-compose scale`, each container will join the network with the same name. For example, if you run `docker-compose scale web=3`, then 3 containers will join the network under the name `web`. Inside any container on the network, looking up the name `web` will return the IP address of one of them, but Docker and Compose do not provide any guarantees about which one.
-
-This limitation will be addressed in a future version of Compose, where a load balancer will join under the service name and balance traffic between the service's containers in a configurable manner.
+      container_name: "my-web-application"
 
 ## Links
 
diff --git a/project/ISSUE-TRIAGE.md b/project/ISSUE-TRIAGE.md
index 58312a60..b89cdc24 100644
--- a/project/ISSUE-TRIAGE.md
+++ b/project/ISSUE-TRIAGE.md
@@ -20,15 +20,16 @@ The following labels are provided in additional to the standard labels:
 
 Most issues should fit into one of the following functional areas:
 
-| Area           |
-|----------------|
-| area/build     |
-| area/cli       |
-| area/config    |
-| area/logs      |
-| area/packaging |
-| area/run       |
-| area/scale     |
-| area/tests     |
-| area/up        |
-| area/volumes   |
+| Area            |
+|-----------------|
+| area/build      |
+| area/cli        |
+| area/config     |
+| area/logs       |
+| area/networking |
+| area/packaging  |
+| area/run        |
+| area/scale      |
+| area/tests      |
+| area/up         |
+| area/volumes    |

From a71d9af522611947a74ffd7e0d45b720e9b69f98 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 28 Oct 2015 17:54:38 -0400
Subject: [PATCH 0466/1265] Disable a test against docker 1.8.3 because it
 fails due to a bug in docker engine.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/integration/service_test.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 38d7d5b5..4ac04545 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -693,10 +693,11 @@ class ServiceTest(DockerClientTestCase):
 
     @mock.patch('compose.service.log')
     def test_scale_with_custom_container_name_outputs_warning(self, mock_log):
-        """
-        Test that calling scale on a service that has a custom container name
+        """Test that calling scale on a service that has a custom container name
         results in warning output.
         """
+        # Disable this test against earlier versions because it is flaky
+        self.require_api_version('1.21')
         service = self.create_service('app', container_name='custom-container')
         self.assertEqual(service.custom_container_name(), 'custom-container')
 

From 5dc14f39254a25cf87b104c9f2577f37e48c6de4 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 27 Oct 2015 17:37:48 +0000
Subject: [PATCH 0467/1265] Handle non-ascii chars in volume directories

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/config.py         | 2 +-
 tests/unit/config/config_test.py | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 40b4ffa4..5bc534fe 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -505,7 +505,7 @@ def resolve_volume_path(volume, working_dir, service_name):
         if host_path.startswith('.'):
             host_path = expand_path(working_dir, host_path)
         host_path = os.path.expanduser(host_path)
-        return "{}:{}".format(host_path, container_path)
+        return u"{}:{}".format(host_path, container_path)
     else:
         return container_path
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index a54b006f..5ad7e1c0 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -573,6 +573,11 @@ class VolumeConfigTest(unittest.TestCase):
         }, working_dir='.')
         self.assertEqual(d['volumes'], ['~:/data'])
 
+    def test_volume_path_with_non_ascii_directory(self):
+        volume = u'/Füü/data:/data'
+        container_path = config.resolve_volume_path(volume, ".", "test")
+        self.assertEqual(container_path, volume)
+
 
 class MergePathMappingTest(object):
     def config_name(self):

From eab9d86a3d016e7f846514ae81d7fd5b16c23257 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 29 Oct 2015 11:28:17 -0400
Subject: [PATCH 0468/1265] Logs are available for all log drivers except for
 none.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/container.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/container.py b/compose/container.py
index dd69e8dd..1ca48380 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -145,7 +145,7 @@ class Container(object):
     @property
     def has_api_logs(self):
         log_type = self.log_driver
-        return not log_type or log_type == 'json-file'
+        return not log_type or log_type != 'none'
 
     def attach_log_stream(self):
         """A log stream can only be attached if the container uses a json-file

From 983dc12160915f1148c35296712290702cb32338 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Thu, 29 Oct 2015 16:52:00 +0000
Subject: [PATCH 0469/1265] Clarify the command is an example

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 docs/install.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/install.md b/docs/install.md
index 2d4d6cad..944ce349 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -30,13 +30,14 @@ To install Compose, do the following:
 
 3. Go to the <a href="https://github.com/docker/compose/releases" target="_blank">Compose repository release page on GitHub</a>.
 
-4. Follow the instructions from the release page and run the `curl` command in your terminal.
+4. Follow the instructions from the release page and run the `curl` command,
+which the release page specifies, in your terminal.
 
      > Note: If you get a "Permission denied" error, your `/usr/local/bin` directory
      probably isn't writable and you'll need to install Compose as the superuser. Run
      `sudo -i`, then the two commands below, then `exit`.
 
-     The command has the following format:
+     The following is an example command illustrating the format:
 
         curl -L https://github.com/docker/compose/releases/download/VERSION_NUM/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 

From 596261e75985ffa7ed07c2dedfdc9d763e988db0 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 29 Oct 2015 17:56:01 +0100
Subject: [PATCH 0470/1265] Ensure network exists when calling run before up

Otherwise the daemon will error out because the network doesn't exist
yet.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 5505b89f..4369aa70 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -380,6 +380,8 @@ class TopLevelCommand(DocoptCommand):
                     start_deps=True,
                     strategy=ConvergenceStrategy.never,
                 )
+            elif project.use_networking:
+                project.ensure_network_exists()
 
         tty = True
         if detach or options['-T'] or not sys.stdin.isatty():

From d836973a04fbba01e693e74c4124f2dbceb4b57b Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 29 Oct 2015 14:06:50 -0400
Subject: [PATCH 0471/1265] Use colors when logging warnings or errors, so they
 are more obvious.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/formatter.py        | 23 +++++++++++++++++++++++
 compose/cli/main.py             | 22 ++++++++++++++--------
 compose/config/interpolation.py |  2 +-
 tests/unit/cli/main_test.py     | 29 +++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/compose/cli/formatter.py b/compose/cli/formatter.py
index 9ed52c4a..d0ed0f87 100644
--- a/compose/cli/formatter.py
+++ b/compose/cli/formatter.py
@@ -1,10 +1,13 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import logging
 import os
 
 import texttable
 
+from compose.cli import colors
+
 
 def get_tty_width():
     tty_size = os.popen('stty size', 'r').read().split()
@@ -15,6 +18,7 @@ def get_tty_width():
 
 
 class Formatter(object):
+    """Format tabular data for printing."""
     def table(self, headers, rows):
         table = texttable.Texttable(max_width=get_tty_width())
         table.set_cols_dtype(['t' for h in headers])
@@ -23,3 +27,22 @@ class Formatter(object):
         table.set_chars(['-', '|', '+', '-'])
 
         return table.draw()
+
+
+class ConsoleWarningFormatter(logging.Formatter):
+    """A logging.Formatter which prints WARNING and ERROR messages with
+    a prefix of the log level colored appropriate for the log level.
+    """
+
+    def get_level_message(self, record):
+        separator = ': '
+        if record.levelno == logging.WARNING:
+            return colors.yellow(record.levelname) + separator
+        if record.levelno == logging.ERROR:
+            return colors.red(record.levelname) + separator
+
+        return ''
+
+    def format(self, record):
+        message = super(ConsoleWarningFormatter, self).format(record)
+        return self.get_level_message(record) + message
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 5505b89f..1542f52f 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -28,6 +28,7 @@ from .command import project_from_options
 from .docopt_command import DocoptCommand
 from .docopt_command import NoSuchCommand
 from .errors import UserError
+from .formatter import ConsoleWarningFormatter
 from .formatter import Formatter
 from .log_printer import LogPrinter
 from .utils import get_version_info
@@ -41,7 +42,7 @@ log = logging.getLogger(__name__)
 console_handler = logging.StreamHandler(sys.stderr)
 
 INSECURE_SSL_WARNING = """
-Warning: --allow-insecure-ssl is deprecated and has no effect.
+--allow-insecure-ssl is deprecated and has no effect.
 It will be removed in a future version of Compose.
 """
 
@@ -91,13 +92,18 @@ def setup_logging():
     logging.getLogger("requests").propagate = False
 
 
-def setup_console_handler(verbose):
-    if verbose:
-        console_handler.setFormatter(logging.Formatter('%(name)s.%(funcName)s: %(message)s'))
-        console_handler.setLevel(logging.DEBUG)
+def setup_console_handler(handler, verbose):
+    if handler.stream.isatty():
+        format_class = ConsoleWarningFormatter
     else:
-        console_handler.setFormatter(logging.Formatter())
-        console_handler.setLevel(logging.INFO)
+        format_class = logging.Formatter
+
+    if verbose:
+        handler.setFormatter(format_class('%(name)s.%(funcName)s: %(message)s'))
+        handler.setLevel(logging.DEBUG)
+    else:
+        handler.setFormatter(format_class())
+        handler.setLevel(logging.INFO)
 
 
 # stolen from docopt master
@@ -153,7 +159,7 @@ class TopLevelCommand(DocoptCommand):
         return options
 
     def perform_command(self, options, handler, command_options):
-        setup_console_handler(options.get('--verbose'))
+        setup_console_handler(console_handler, options.get('--verbose'))
 
         if options['COMMAND'] in ('help', 'version'):
             # Skip looking up the compose file.
diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index f870ab4b..f8e1da61 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -78,7 +78,7 @@ class BlankDefaultDict(dict):
         except KeyError:
             if key not in self.missing_keys:
                 log.warn(
-                    "The {} variable is not set. Substituting a blank string."
+                    "The {} variable is not set. Defaulting to a blank string."
                     .format(key)
                 )
                 self.missing_keys.append(key)
diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py
index a5b36980..ee837fcd 100644
--- a/tests/unit/cli/main_test.py
+++ b/tests/unit/cli/main_test.py
@@ -1,11 +1,15 @@
 from __future__ import absolute_import
 
+import logging
+
 from compose import container
 from compose.cli.errors import UserError
+from compose.cli.formatter import ConsoleWarningFormatter
 from compose.cli.log_printer import LogPrinter
 from compose.cli.main import attach_to_logs
 from compose.cli.main import build_log_printer
 from compose.cli.main import convergence_strategy_from_opts
+from compose.cli.main import setup_console_handler
 from compose.project import Project
 from compose.service import ConvergenceStrategy
 from tests import mock
@@ -60,6 +64,31 @@ class CLIMainTestCase(unittest.TestCase):
             timeout=timeout)
 
 
+class SetupConsoleHandlerTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.stream = mock.Mock()
+        self.stream.isatty.return_value = True
+        self.handler = logging.StreamHandler(stream=self.stream)
+
+    def test_with_tty_verbose(self):
+        setup_console_handler(self.handler, True)
+        assert type(self.handler.formatter) == ConsoleWarningFormatter
+        assert '%(name)s' in self.handler.formatter._fmt
+        assert '%(funcName)s' in self.handler.formatter._fmt
+
+    def test_with_tty_not_verbose(self):
+        setup_console_handler(self.handler, False)
+        assert type(self.handler.formatter) == ConsoleWarningFormatter
+        assert '%(name)s' not in self.handler.formatter._fmt
+        assert '%(funcName)s' not in self.handler.formatter._fmt
+
+    def test_with_not_a_tty(self):
+        self.stream.isatty.return_value = False
+        setup_console_handler(self.handler, False)
+        assert type(self.handler.formatter) == logging.Formatter
+
+
 class ConvergeStrategyFromOptsTestCase(unittest.TestCase):
 
     def test_invalid_opts(self):

From 841ed4ed218e9d281a10a098d5f2ca81a5d4c46c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 29 Oct 2015 14:15:08 -0400
Subject: [PATCH 0472/1265] Remove the duplicate 'Warning' prefix now that the
 logger adds the prefix.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py              |  5 ++---
 compose/config/validation.py     |  8 +++++---
 compose/service.py               |  2 +-
 tests/unit/cli/formatter_test.py | 35 ++++++++++++++++++++++++++++++++
 tests/unit/config/config_test.py |  2 +-
 5 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 tests/unit/cli/formatter_test.py

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 1542f52f..34c63e77 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -59,9 +59,8 @@ def main():
         log.error(e.msg)
         sys.exit(1)
     except NoSuchCommand as e:
-        log.error("No such command: %s", e.command)
-        log.error("")
-        log.error("\n".join(parse_doc_section("commands:", getdoc(e.supercommand))))
+        commands = "\n".join(parse_doc_section("commands:", getdoc(e.supercommand)))
+        log.error("No such command: %s\n\n%s", e.command, commands)
         sys.exit(1)
     except APIError as e:
         log.error(e.explanation)
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 8cfc405f..542081d5 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -57,9 +57,11 @@ def format_boolean_in_environment(instance):
     """
     if isinstance(instance, bool):
         log.warn(
-            "Warning: There is a boolean value in the 'environment' key.\n"
-            "Environment variables can only be strings.\nPlease add quotes to any boolean values to make them string "
-            "(eg, 'True', 'yes', 'N').\nThis warning will become an error in a future release. \r\n"
+            "There is a boolean value in the 'environment' key.\n"
+            "Environment variables can only be strings.\n"
+            "Please add quotes to any boolean values to make them string "
+            "(eg, 'True', 'yes', 'N').\n"
+            "This warning will become an error in a future release. \r\n"
         )
     return True
 
diff --git a/compose/service.py b/compose/service.py
index ad29f87f..8d716c0b 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -862,7 +862,7 @@ class ServiceNet(object):
         if containers:
             return 'container:' + containers[0].id
 
-        log.warn("Warning: Service %s is trying to use reuse the network stack "
+        log.warn("Service %s is trying to use reuse the network stack "
                  "of another service that is not running." % (self.id))
         return None
 
diff --git a/tests/unit/cli/formatter_test.py b/tests/unit/cli/formatter_test.py
new file mode 100644
index 00000000..1c3b6a68
--- /dev/null
+++ b/tests/unit/cli/formatter_test.py
@@ -0,0 +1,35 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import logging
+
+from compose.cli import colors
+from compose.cli.formatter import ConsoleWarningFormatter
+from tests import unittest
+
+
+MESSAGE = 'this is the message'
+
+
+def makeLogRecord(level):
+    return logging.LogRecord('name', level, 'pathame', 0, MESSAGE, (), None)
+
+
+class ConsoleWarningFormatterTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.formatter = ConsoleWarningFormatter()
+
+    def test_format_warn(self):
+        output = self.formatter.format(makeLogRecord(logging.WARN))
+        expected = colors.yellow('WARNING') + ': '
+        assert output == expected + MESSAGE
+
+    def test_format_error(self):
+        output = self.formatter.format(makeLogRecord(logging.ERROR))
+        expected = colors.red('ERROR') + ': '
+        assert output == expected + MESSAGE
+
+    def test_format_info(self):
+        output = self.formatter.format(makeLogRecord(logging.INFO))
+        assert output == MESSAGE
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 5ad7e1c0..7246b661 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -380,7 +380,7 @@ class ConfigTest(unittest.TestCase):
 
     @mock.patch('compose.config.validation.log')
     def test_logs_warning_for_boolean_in_environment(self, mock_logging):
-        expected_warning_msg = "Warning: There is a boolean value in the 'environment' key."
+        expected_warning_msg = "There is a boolean value in the 'environment' key."
         config.load(
             build_config_details(
                 {'web': {

From 072e7687ae1e710ee8b82b44f5baba8f20caa4cb Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 30 Oct 2015 14:15:47 +0100
Subject: [PATCH 0473/1265] Integration test for run command with networking
 enabled

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/integration/cli_test.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 19cc822e..45f45645 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -508,6 +508,20 @@ class CLITestCase(DockerClientTestCase):
         container, = service.containers(stopped=True, one_off=True)
         self.assertEqual(container.name, name)
 
+    @mock.patch('dockerpty.start')
+    def test_run_with_networking(self, _):
+        self.require_api_version('1.21')
+        client = docker_client(version='1.21')
+        self.command.base_dir = 'tests/fixtures/simple-dockerfile'
+        self.command.dispatch(['--x-networking', 'run', 'simple', 'true'], None)
+        service = self.project.get_service('simple')
+        container, = service.containers(stopped=True, one_off=True)
+        networks = client.networks(names=[self.project.name])
+        for n in networks:
+            self.addCleanup(client.remove_network, n['id'])
+        self.assertEqual(len(networks), 1)
+        self.assertEqual(container.human_readable_command, u'true')
+
     def test_rm(self):
         service = self.project.get_service('simple')
         service.create_container()

From 491d052088c3c5d66dba0bde175047748c44c73f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 30 Oct 2015 11:53:36 -0400
Subject: [PATCH 0474/1265] Don't set a default network driver, let the server
 decide.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/project.py b/compose/project.py
index 68edaddc..1e01eaf6 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -83,7 +83,7 @@ class Project(object):
         self.services = services
         self.client = client
         self.use_networking = use_networking
-        self.network_driver = network_driver or 'bridge'
+        self.network_driver = network_driver
 
     def labels(self, one_off=False):
         return [

From c7d164d01c82e1349a1d9ef2beae1754dbc3500a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 27 Oct 2015 15:04:35 -0400
Subject: [PATCH 0475/1265] Fixes #1843, #1936 - chown files back to host user
 in django example.

Also add a missing 'touch Gemfile.lock' to fix the rails tutorial.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/django.md | 16 ++++++++++++++--
 docs/rails.md  | 14 ++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/docs/django.md b/docs/django.md
index fd18784e..2bb67399 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -110,8 +110,20 @@ In this step, you create a Django started project by building the image from the
 
 3. After the `docker-compose` command completes, list the contents of your project.
 
-        $ ls
-        Dockerfile       docker-compose.yml          composeexample       manage.py        requirements.txt
+        $ ls -l
+        drwxr-xr-x 2 root   root   composeexample
+        -rw-rw-r-- 1 user   user   docker-compose.yml
+        -rw-rw-r-- 1 user   user   Dockerfile
+        -rwxr-xr-x 1 root   root   manage.py
+        -rw-rw-r-- 1 user   user   requirements.txt
+
+    The files `django-admin` created are owned by root. This happens because
+    the container runs as the `root` user.
+
+4. Change the ownership of the new files.
+
+        sudo chown -R $USER:$USER .
+
 
 ## Connect the database
 
diff --git a/docs/rails.md b/docs/rails.md
index a33cac26..e81675c5 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -37,6 +37,10 @@ Next, create a bootstrap `Gemfile` which just loads Rails. It'll be overwritten
     source 'https://rubygems.org'
     gem 'rails', '4.2.0'
 
+You'll need an empty `Gemfile.lock` in order to build our `Dockerfile`.
+
+    $ touch Gemfile.lock
+
 Finally, `docker-compose.yml` is where the magic happens. This file describes the services that comprise your app (a database and a web app), how to get each 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:
@@ -69,6 +73,12 @@ image. Once it's done, you should have generated a fresh app:
     README.rdoc  config.ru    public
     Rakefile     db           test
 
+
+The files `rails new` created are owned by root. This happens because the
+container runs as the `root` user.  Change the ownership of the new files.
+
+    sudo chown -R $USER:$USER .
+
 Uncomment the line in your new `Gemfile` which loads `therubyracer`, so you've
 got a Javascript runtime:
 
@@ -80,6 +90,7 @@ rebuild.)
 
     $ docker-compose build
 
+
 ### Connect the database
 
 The app is now bootable, but you're not quite there yet. By default, Rails
@@ -87,8 +98,7 @@ expects a database to be running on `localhost` - so you need to point it at the
 `db` container instead. You also need to change the database and username to
 align with the defaults set by the `postgres` image.
 
-Open up your newly-generated `database.yml` file. Replace its contents with the
-following:
+Replace the contents of `config/database.yml` with the following:
 
     development: &default
       adapter: postgresql

From 1b5b40761943bf9e358f7f70859d62097cdb4f1b Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 30 Oct 2015 15:26:56 -0400
Subject: [PATCH 0476/1265] Fix networking tests to work with new API in engine
 rc4 (https://github.com/docker/docker/pull/17536)

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/integration/cli_test.py     | 12 ++++++------
 tests/integration/project_test.py |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index 45f45645..d621f2d1 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -215,17 +215,17 @@ class CLITestCase(DockerClientTestCase):
 
         networks = client.networks(names=[self.project.name])
         for n in networks:
-            self.addCleanup(client.remove_network, n['id'])
+            self.addCleanup(client.remove_network, n['Id'])
         self.assertEqual(len(networks), 1)
-        self.assertEqual(networks[0]['driver'], 'bridge')
+        self.assertEqual(networks[0]['Driver'], 'bridge')
 
-        network = client.inspect_network(networks[0]['id'])
-        self.assertEqual(len(network['containers']), len(services))
+        network = client.inspect_network(networks[0]['Id'])
+        self.assertEqual(len(network['Containers']), len(services))
 
         for service in services:
             containers = service.containers()
             self.assertEqual(len(containers), 1)
-            self.assertIn(containers[0].id, network['containers'])
+            self.assertIn(containers[0].id, network['Containers'])
             self.assertEqual(containers[0].get('Config.Hostname'), service.name)
 
         web_container = self.project.get_service('web').containers()[0]
@@ -518,7 +518,7 @@ class CLITestCase(DockerClientTestCase):
         container, = service.containers(stopped=True, one_off=True)
         networks = client.networks(names=[self.project.name])
         for n in networks:
-            self.addCleanup(client.remove_network, n['id'])
+            self.addCleanup(client.remove_network, n['Id'])
         self.assertEqual(len(networks), 1)
         self.assertEqual(container.human_readable_command, u'true')
 
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index fd45b939..95052387 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -111,7 +111,7 @@ class ProjectTest(DockerClientTestCase):
         network_name = 'network_does_exist'
         project = Project(network_name, [], client)
         client.create_network(network_name)
-        assert project.get_network()['name'] == network_name
+        assert project.get_network()['Name'] == network_name
 
     def test_net_from_service(self):
         project = Project.from_dicts(

From abde64d610135e957aeb76958fdf384882fcc717 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 2 Nov 2015 13:43:29 -0500
Subject: [PATCH 0477/1265] On a test failure only show the last 100 lines of
 daemon output.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/build-linux-inner | 2 +-
 script/test-versions     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/script/build-linux-inner b/script/build-linux-inner
index 1d0f7905..01137ff2 100755
--- a/script/build-linux-inner
+++ b/script/build-linux-inner
@@ -8,7 +8,7 @@ VENV=/code/.tox/py27
 mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 
-$VENV/bin/pip install -r requirements-build.txt
+$VENV/bin/pip install -q -r requirements-build.txt
 su -c "$VENV/bin/pyinstaller docker-compose.spec" user
 mv dist/docker-compose $TARGET
 $TARGET version
diff --git a/script/test-versions b/script/test-versions
index 43326ccb..623b107b 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -31,7 +31,7 @@ for version in $DOCKER_VERSIONS; do
 
   function on_exit() {
     if [[ "$?" != "0" ]]; then
-        docker logs "$daemon_container"
+        docker logs "$daemon_container" 2>&1 | tail -n 100
     fi
     docker rm -vf "$daemon_container"
   }
@@ -45,6 +45,7 @@ for version in $DOCKER_VERSIONS; do
     --volume="/var/lib/docker" \
     dockerswarm/dind:$version \
     docker daemon -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
+    2>&1 | tail -n 10
 
   docker run \
     --rm \

From 53a0de7cf2231da88c7501bb367eb4e7f1c4d425 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 27 Oct 2015 16:29:36 -0400
Subject: [PATCH 0478/1265] Add missing title to compose file reference.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/compose-file.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index d4591608..7723a784 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -24,6 +24,11 @@ As with `docker run`, options specified in the Dockerfile (e.g., `CMD`,
 `EXPOSE`, `VOLUME`, `ENV`) are respected by default - you don't need to
 specify them again in `docker-compose.yml`.
 
+## Service configuration reference
+
+This section contains a list of all configuration options supported by a service
+definition.
+
 ### build
 
 Path to a directory containing a Dockerfile. When the value supplied is a

From 186d43c59f82e4210b379885368eb73a4162003d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 9 Oct 2015 10:49:41 -0400
Subject: [PATCH 0479/1265] Extract the getting started guide from the index
 page.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/completion.md     |   2 +-
 docs/django.md         |   1 +
 docs/extends.md        |   1 +
 docs/gettingstarted.md | 163 +++++++++++++++++++++++++++++++++++++++++
 docs/index.md          | 139 +----------------------------------
 docs/install.md        |   1 +
 docs/production.md     |   3 -
 docs/rails.md          |   2 +-
 docs/wordpress.md      |   2 +-
 9 files changed, 170 insertions(+), 144 deletions(-)
 create mode 100644 docs/gettingstarted.md

diff --git a/docs/completion.md b/docs/completion.md
index bc8bedc9..3c2022d8 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -5,7 +5,7 @@ description = "Compose CLI reference"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
 [menu.main]
 parent="smn_workw_compose"
-weight=3
+weight=10
 +++
 <![end-metadata]-->
 
diff --git a/docs/django.md b/docs/django.md
index 2bb67399..d4d2bd1e 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -173,6 +173,7 @@ In this section, you set up the database connection for Django.
 
 - [User guide](../index.md)
 - [Installing Compose](install.md)
+- [Getting Started](gettingstarted.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
diff --git a/docs/extends.md b/docs/extends.md
index f0b9e9ea..e63cf466 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -360,6 +360,7 @@ locally-defined bindings taking precedence:
 
 - [User guide](/)
 - [Installing Compose](install.md)
+- [Getting Started](gettingstarted.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md
new file mode 100644
index 00000000..f2024b39
--- /dev/null
+++ b/docs/gettingstarted.md
@@ -0,0 +1,163 @@
+<!--[metadata]>
++++
+title = "Getting Started"
+description = "Getting started with Docker Compose"
+keywords = ["documentation, docs,  docker, compose, orchestration, containers"]
+[menu.main]
+parent="smn_workw_compose"
+weight=3
++++
+<![end-metadata]-->
+
+
+## Getting Started
+
+Let's get started with a walkthrough of getting a simple Python web app running
+on Compose. It assumes a little knowledge of Python, but the concepts
+demonstrated here should be understandable even if you're not familiar with
+Python.
+
+### Installation and set-up
+
+First, [install Docker and Compose](install.md).
+
+Next, you'll want to make a directory for the project:
+
+    $ mkdir composetest
+    $ cd composetest
+
+Inside this directory, create `app.py`, a simple Python web app that uses the Flask
+framework and increments a value in Redis. Don't worry if you don't have Redis installed, docker is going to take care of that for you when we [define services](#define-services):
+
+    from flask import Flask
+    from redis import Redis
+
+    app = Flask(__name__)
+    redis = Redis(host='redis', port=6379)
+
+    @app.route('/')
+    def hello():
+        redis.incr('hits')
+        return 'Hello World! I have been seen %s times.' % redis.get('hits')
+
+    if __name__ == "__main__":
+        app.run(host="0.0.0.0", debug=True)
+
+Next, define the Python dependencies in a file called `requirements.txt`:
+
+    flask
+    redis
+
+### Create a Docker image
+
+Now, create a Docker image containing all of your app's dependencies. You
+specify how to build the image using a file called
+[`Dockerfile`](http://docs.docker.com/reference/builder/):
+
+    FROM python:2.7
+    ADD . /code
+    WORKDIR /code
+    RUN pip install -r requirements.txt
+    CMD python app.py
+
+This tells Docker to:
+
+* Build an image starting with the Python 2.7 image.
+* Add the current directory `.` into the path `/code` in the image.
+* Set the working directory to `/code`.
+* Install the Python dependencies.
+* Set the default command for the container to `python app.py`
+
+For more information on how to write Dockerfiles, see the [Docker user guide](https://docs.docker.com/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](http://docs.docker.com/reference/builder/).
+
+You can build the image by running `docker build -t web .`.
+
+### Define services
+
+Next, define a set of services using `docker-compose.yml`:
+
+    web:
+      build: .
+      ports:
+       - "5000:5000"
+      volumes:
+       - .:/code
+      links:
+       - redis
+    redis:
+      image: redis
+
+This template defines two services, `web` and `redis`. The `web` service:
+
+* Builds from the `Dockerfile` in the current directory.
+* Forwards the exposed port 5000 on the container to port 5000 on the host machine.
+* Mounts the current directory on the host to `/code` inside the container allowing you to modify the code without having to rebuild the image.
+* Links the web container to the Redis service.
+
+The `redis` service uses the latest public [Redis](https://registry.hub.docker.com/_/redis/) image pulled from the Docker Hub registry.
+
+### Build and run your app with Compose
+
+Now, when you run `docker-compose up`, Compose will pull a Redis image, build an image for your code, and start everything up:
+
+    $ docker-compose up
+    Pulling image redis...
+    Building web...
+    Starting composetest_redis_1...
+    Starting composetest_web_1...
+    redis_1 | [8] 02 Jan 18:43:35.576 # Server started, Redis version 2.8.3
+    web_1   |  * Running on http://0.0.0.0:5000/
+    web_1   |  * Restarting with stat
+
+If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` will tell you its address and you can open `http://MACHINE_VM_IP:5000` in a browser.
+
+If you're using Docker on Linux natively, then the web app should now be listening on port 5000 on your Docker daemon host. If `http://0.0.0.0:5000` doesn't resolve, you can also try `http://localhost:5000`.
+
+You should get a message in your browser saying:
+
+`Hello World! I have been seen 1 times.`
+
+Refreshing the page will increment the number.
+
+If you want to run your services in the background, you can pass the `-d` flag
+(for "detached" mode) to `docker-compose up` and use `docker-compose ps` to
+see what is currently running:
+
+    $ docker-compose up -d
+    Starting composetest_redis_1...
+    Starting composetest_web_1...
+    $ docker-compose ps
+	    Name                 Command            State       Ports
+    -------------------------------------------------------------------
+    composetest_redis_1   /usr/local/bin/run         Up
+    composetest_web_1     /bin/sh -c python app.py   Up      5000->5000/tcp
+
+The `docker-compose run` command allows you to run one-off commands for your
+services. For example, to see what environment variables are available to the
+`web` service:
+
+    $ docker-compose run web env
+
+See `docker-compose --help` to see other available commands. You can also install [command completion](completion.md) for the bash and zsh shell, which will also show you available commands.
+
+If you started Compose with `docker-compose up -d`, you'll probably want to stop
+your services once you've finished with them:
+
+    $ docker-compose stop
+
+At this point, you have seen the basics of how Compose works.
+
+- Next, try the quick start guide for [Django](django.md),
+  [Rails](rails.md), or [WordPress](wordpress.md).
+- See the reference guides for complete details on the [commands](./reference/index.md), the
+  [configuration file](compose-file.md) and [environment variables](env.md).
+
+## More Compose documentation
+
+- [User guide](/)
+- [Installing Compose](install.md)
+- [Get started with Django](django.md)
+- [Get started with Rails](rails.md)
+- [Get started with WordPress](wordpress.md)
+- [Command line reference](./reference/index.md)
+- [Compose file reference](compose-file.md)
diff --git a/docs/index.md b/docs/index.md
index 62c78d68..19a6c801 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -50,150 +50,13 @@ Compose has commands for managing the whole lifecycle of your application:
 ## Compose documentation
 
 - [Installing Compose](install.md)
+- [Getting Started](gettingstarted.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
 - [Compose file reference](compose-file.md)
 
-## Quick start
-
-Let's get started with a walkthrough of getting a simple Python web app running
-on Compose. It assumes a little knowledge of Python, but the concepts
-demonstrated here should be understandable even if you're not familiar with
-Python.
-
-### Installation and set-up
-
-First, [install Docker and Compose](install.md).
-
-Next, you'll want to make a directory for the project:
-
-    $ mkdir composetest
-    $ cd composetest
-
-Inside this directory, create `app.py`, a simple Python web app that uses the Flask
-framework and increments a value in Redis. Don't worry if you don't have Redis installed, docker is going to take care of that for you when we [define services](#define-services):
-
-    from flask import Flask
-    from redis import Redis
-
-    app = Flask(__name__)
-    redis = Redis(host='redis', port=6379)
-
-    @app.route('/')
-    def hello():
-        redis.incr('hits')
-        return 'Hello World! I have been seen %s times.' % redis.get('hits')
-
-    if __name__ == "__main__":
-        app.run(host="0.0.0.0", debug=True)
-
-Next, define the Python dependencies in a file called `requirements.txt`:
-
-    flask
-    redis
-
-### Create a Docker image
-
-Now, create a Docker image containing all of your app's dependencies. You
-specify how to build the image using a file called
-[`Dockerfile`](http://docs.docker.com/reference/builder/):
-
-    FROM python:2.7
-    ADD . /code
-    WORKDIR /code
-    RUN pip install -r requirements.txt
-    CMD python app.py
-
-This tells Docker to:
-
-* Build an image starting with the Python 2.7 image.
-* Add the current directory `.` into the path `/code` in the image.
-* Set the working directory to `/code`.
-* Install the Python dependencies.
-* Set the default command for the container to `python app.py`
-
-For more information on how to write Dockerfiles, see the [Docker user guide](https://docs.docker.com/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](http://docs.docker.com/reference/builder/).
-
-You can build the image by running `docker build -t web .`.
-
-### Define services
-
-Next, define a set of services using `docker-compose.yml`:
-
-    web:
-      build: .
-      ports:
-       - "5000:5000"
-      volumes:
-       - .:/code
-    redis:
-      image: redis
-
-This template defines two services, `web` and `redis`. The `web` service:
-
-* Builds from the `Dockerfile` in the current directory.
-* Forwards the exposed port 5000 on the container to port 5000 on the host machine.
-* Mounts the current directory on the host to `/code` inside the container allowing you to modify the code without having to rebuild the image.
-
-The `redis` service uses the latest public [Redis](https://registry.hub.docker.com/_/redis/) image pulled from the Docker Hub registry.
-
-### Build and run your app with Compose
-
-Now, when you run `docker-compose up`, Compose will pull a Redis image, build an image for your code, and start everything up:
-
-    $ docker-compose up
-    Pulling image redis...
-    Building web...
-    Starting composetest_redis_1...
-    Starting composetest_web_1...
-    redis_1 | [8] 02 Jan 18:43:35.576 # Server started, Redis version 2.8.3
-    web_1   |  * Running on http://0.0.0.0:5000/
-    web_1   |  * Restarting with stat
-
-If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` will tell you its address and you can open `http://MACHINE_VM_IP:5000` in a browser.
-
-If you're using Docker on Linux natively, then the web app should now be listening on port 5000 on your Docker daemon host. If `http://0.0.0.0:5000` doesn't resolve, you can also try `http://localhost:5000`.
-
-You should get a message in your browser saying:
-
-`Hello World! I have been seen 1 times.`
-
-Refreshing the page will increment the number.
-
-If you want to run your services in the background, you can pass the `-d` flag
-(for "detached" mode) to `docker-compose up` and use `docker-compose ps` to
-see what is currently running:
-
-    $ docker-compose up -d
-    Starting composetest_redis_1...
-    Starting composetest_web_1...
-    $ docker-compose ps
-	    Name                 Command            State       Ports
-    -------------------------------------------------------------------
-    composetest_redis_1   /usr/local/bin/run         Up
-    composetest_web_1     /bin/sh -c python app.py   Up      5000->5000/tcp
-
-The `docker-compose run` command allows you to run one-off commands for your
-services. For example, to see what environment variables are available to the
-`web` service:
-
-    $ docker-compose run web env
-
-See `docker-compose --help` to see other available commands. You can also install [command completion](completion.md) for the bash and zsh shell, which will also show you available commands.
-
-If you started Compose with `docker-compose up -d`, you'll probably want to stop
-your services once you've finished with them:
-
-    $ docker-compose stop
-
-At this point, you have seen the basics of how Compose works.
-
-- Next, try the quick start guide for [Django](django.md),
-  [Rails](rails.md), or [WordPress](wordpress.md).
-- See the reference guides for complete details on the [commands](./reference/index.md), the
-  [configuration file](compose-file.md) and [environment variables](env.md).
 
 ## Release Notes
 
diff --git a/docs/install.md b/docs/install.md
index 944ce349..e19bda0f 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -127,6 +127,7 @@ To uninstall Docker Compose if you installed using `pip`:
 ## Where to go next
 
 - [User guide](/)
+- [Getting Started](gettingstarted.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
diff --git a/docs/production.md b/docs/production.md
index 8793f927..0b0e46c3 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -86,8 +86,5 @@ guide</a>.
 ## Compose documentation
 
 - [Installing Compose](install.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
 - [Compose file reference](compose-file.md)
diff --git a/docs/rails.md b/docs/rails.md
index e81675c5..8e16af64 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -135,8 +135,8 @@ That's it. Your app should now be running on port 3000 on your Docker daemon. If
 
 - [User guide](/)
 - [Installing Compose](install.md)
+- [Getting Started](gettingstarted.md)
 - [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
 - [Compose file reference](compose-file.md)
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 8c1f5b0a..373ef4d0 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -95,8 +95,8 @@ database containers. If you're using [Docker Machine](https://docs.docker.com/ma
 
 - [User guide](/)
 - [Installing Compose](install.md)
+- [Getting Started](gettingstarted.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
 - [Compose file reference](compose-file.md)

From 86d845fde3ec63d762a2dbd0dbcfc21eb8011f52 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 9 Oct 2015 11:08:23 -0400
Subject: [PATCH 0480/1265] Flush out features and use cases.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 README.md     | 17 ++++++----
 docs/index.md | 94 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index ed176550..55346f24 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,15 @@ Docker Compose
 
 *(Previously known as Fig)*
 
-Compose is a tool for defining and running multi-container applications with
-Docker. With Compose, you define a multi-container application in a single
-file, then spin your application up in a single command which does everything
-that needs to be done to get it running.
+Compose is a tool for defining and running multi-container Docker applications.
+With Compose, you define a multi-container application in a compose
+file then, using a single command, you create and start all the containers
+from your configuration. To learn more about all the features of Compose
+see [the list of features](#features)
 
-Compose is great for development environments, staging servers, and CI. We don't
-recommend that you use it in production yet.
+Compose is great for development, testing, and staging environments, as well as
+CI workflows. You can learn more about each case in
+[Common Use Cases](#common-use-cases).
 
 Using Compose is basically a three-step process.
 
@@ -33,6 +35,9 @@ A `docker-compose.yml` looks like this:
     redis:
       image: redis
 
+For more information about the Compose file, see the
+[Compose file reference](docs/yml.md)
+
 Compose has commands for managing the whole lifecycle of your application:
 
  * Start, stop and rebuild services
diff --git a/docs/index.md b/docs/index.md
index 19a6c801..ac7e07f9 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -11,20 +11,22 @@ parent="smn_workw_compose"
 
 # Overview of Docker Compose
 
-Compose is a tool for defining and running multi-container applications with
-Docker. With Compose, you define a multi-container application in a single
-file, then spin your application up in a single command which does everything
-that needs to be done to get it running.
+Compose is a tool for defining and running multi-container Docker applications.
+With Compose, you define a multi-container application in a compose
+file then, using a single command, you create and start all the containers
+from your configuration. To learn more about all the features of Compose
+see [the list of features](#features)
 
-Compose is great for development environments, staging servers, and CI. We don't
-recommend that you use it in production yet.
+Compose is great for development, testing, and staging environments, as well as
+CI workflows. You can learn more about each case in
+[Common Use Cases](#common-use-cases).
 
 Using Compose is basically a three-step process.
 
 1. Define your app's environment with a `Dockerfile` so it can be
 reproduced anywhere.
 2. Define the services that make up your app in `docker-compose.yml` so
-they can be run together in an isolated environment:
+they can be run together in an isolated environment.
 3. Lastly, run `docker-compose up` and Compose will start and run your entire app.
 
 A `docker-compose.yml` looks like this:
@@ -40,6 +42,9 @@ A `docker-compose.yml` looks like this:
     redis:
       image: redis
 
+For more information about the Compose file, see the
+[Compose file reference](yml.md)
+
 Compose has commands for managing the whole lifecycle of your application:
 
  * Start, stop and rebuild services
@@ -57,11 +62,84 @@ Compose has commands for managing the whole lifecycle of your application:
 - [Command line reference](./reference/index.md)
 - [Compose file reference](compose-file.md)
 
+## Features
+
+#### Preserve volume data
+
+Compose preserves all volumes used by your services. When `docker-compose up`
+runs, if it finds any containers from previous runs, it copies the volumes from
+the old container to the new container. This process ensures that any data
+you've created in volumes isn't lost.
+
+
+#### Only recreate containers that have changed
+
+Compose caches the configuration used to create a container. When you
+restart a service that has not changed, Compose re-uses the existing
+containers. Re-using containers means that you can make changes to your
+environment very quickly.
+
+
+#### Variables and moving a composition to different environments
+
+> New in `docker-compose` 1.5
+
+Compose supports variables in the Compose file. You can use these variables
+to customize your composition for different environments, or different users.
+See [Variable substitution](compose-file.md#variable-substitution) for more
+details.
+
+Compose files can also be extended from other files using the `extends`
+field in a compose file, or by using multiple files. See [extends](extends.md)
+for more details.
+
+
+## Common Use Cases
+
+Compose can be used in many different ways. Some common use cases are outlined
+below.
+
+### Development environments
+
+When you're developing software it is often helpful to be able to run the
+application and interact with it. If the application has any service dependencies
+(databases, queues, caches, web services, etc) you need a way to document the
+dependencies, configuration and operation of each. Compose provides a convenient
+format for definition these dependencies (the [Compose file](yml.md)) and a CLI
+tool for starting an isolated environment. Compose can replace a multi-page
+"developer getting started guide" with a single machine readable configuration
+file and a single command `docker-compose up`.
+
+### Automated testing environments
+
+An important part of any Continuous Deployment or Continuous Integration process
+is the automated test suite. Automated end-to-end testing requires an
+environment in which to run tests. Compose provides a convenient way to create
+and destroy isolated testing environments for your test suite. By defining the full
+environment in a [Compose file](yml.md) you can create and destroy these
+environments in just a few commands:
+
+    $ docker-compose up -d
+    $ ./run_tests
+    $ docker-compose stop
+    $ docker-compose rm -f
+
+### Single host deployments
+
+Compose has traditionally been focused on development and testing workflows,
+but with each release we're making progress on more production-oriented features.
+Compose can be used to deploy to a remote docker engine, for example a cloud
+instance provisioned with [Docker Machine](https://docs.docker.com/machine/) or
+a [Docker Swarm](https://docs.docker.com/swarm/) cluster.
+
+See [compose in production](production.md) for more details.
+
 
 ## Release Notes
 
 To see a detailed list of changes for past and current releases of Docker
-Compose, please refer to the [CHANGELOG](https://github.com/docker/compose/blob/master/CHANGELOG.md).
+Compose, please refer to the
+[CHANGELOG](https://github.com/docker/compose/blob/master/CHANGELOG.md).
 
 ## Getting help
 

From db3b90b84efa1ddd39b282e67f775f75609d14a3 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 21 Oct 2015 16:28:47 -0400
Subject: [PATCH 0481/1265] Updates to gettingstarted guide from PR feedback.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/gettingstarted.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md
index f2024b39..9cc478d7 100644
--- a/docs/gettingstarted.md
+++ b/docs/gettingstarted.md
@@ -21,13 +21,13 @@ Python.
 
 First, [install Docker and Compose](install.md).
 
-Next, you'll want to make a directory for the project:
+Create a directory for the project:
 
     $ mkdir composetest
     $ cd composetest
 
 Inside this directory, create `app.py`, a simple Python web app that uses the Flask
-framework and increments a value in Redis. Don't worry if you don't have Redis installed, docker is going to take care of that for you when we [define services](#define-services):
+framework and increments a value in Redis.
 
     from flask import Flask
     from redis import Redis
@@ -74,7 +74,7 @@ You can build the image by running `docker build -t web .`.
 
 ### Define services
 
-Next, define a set of services using `docker-compose.yml`:
+Define a set of services using `docker-compose.yml`:
 
     web:
       build: .
@@ -91,8 +91,8 @@ This template defines two services, `web` and `redis`. The `web` service:
 
 * Builds from the `Dockerfile` in the current directory.
 * Forwards the exposed port 5000 on the container to port 5000 on the host machine.
-* Mounts the current directory on the host to `/code` inside the container allowing you to modify the code without having to rebuild the image.
-* Links the web container to the Redis service.
+* Mounts the project directory on the host to `/code` inside the container allowing you to modify the code without having to rebuild the image.
+* Links the web service to the Redis service.
 
 The `redis` service uses the latest public [Redis](https://registry.hub.docker.com/_/redis/) image pulled from the Docker Hub registry.
 
@@ -113,7 +113,7 @@ If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-
 
 If you're using Docker on Linux natively, then the web app should now be listening on port 5000 on your Docker daemon host. If `http://0.0.0.0:5000` doesn't resolve, you can also try `http://localhost:5000`.
 
-You should get a message in your browser saying:
+You will see a message in your browser saying:
 
 `Hello World! I have been seen 1 times.`
 

From d9bc91b7cc0a8cc867caaac1bf36c1eab2b6cb4b Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 23 Oct 2015 16:51:03 -0400
Subject: [PATCH 0482/1265] Update intro docs based on feedback.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 README.md              |   4 +-
 docs/gettingstarted.md | 207 +++++++++++++++++++++++------------------
 docs/index.md          |  50 ++++++----
 3 files changed, 147 insertions(+), 114 deletions(-)

diff --git a/README.md b/README.md
index 55346f24..bd110307 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,6 @@ Docker Compose
 ==============
 ![Docker Compose](logo.png?raw=true "Docker Compose Logo")
 
-*(Previously known as Fig)*
-
 Compose is a tool for defining and running multi-container Docker applications.
 With Compose, you define a multi-container application in a compose
 file then, using a single command, you create and start all the containers
@@ -36,7 +34,7 @@ A `docker-compose.yml` looks like this:
       image: redis
 
 For more information about the Compose file, see the
-[Compose file reference](docs/yml.md)
+[Compose file reference](docs/compose-file.md)
 
 Compose has commands for managing the whole lifecycle of your application:
 
diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md
index 9cc478d7..f685bf38 100644
--- a/docs/gettingstarted.md
+++ b/docs/gettingstarted.md
@@ -10,84 +10,103 @@ weight=3
 <![end-metadata]-->
 
 
-## Getting Started
+# Getting Started
 
-Let's get started with a walkthrough of getting a simple Python web app running
-on Compose. It assumes a little knowledge of Python, but the concepts
-demonstrated here should be understandable even if you're not familiar with
-Python.
+On this page you build a simple Python web application running on Compose. The
+application uses the Flask framework and increments a value in Redis. While the
+sample uses Python, the concepts demonstrated here should be understandable even
+if you're not familiar with it.
 
-### Installation and set-up
+## Prerequisites
 
-First, [install Docker and Compose](install.md).
+Make sure you have already
+[installed both Docker Engine and Docker Compose](install.md). You
+don't need to install Python, it is provided by a Docker image.
 
-Create a directory for the project:
+## Step 1: Setup
 
-    $ mkdir composetest
-    $ cd composetest
+1. Create a directory for the project:
 
-Inside this directory, create `app.py`, a simple Python web app that uses the Flask
-framework and increments a value in Redis.
+        $ mkdir composetest
+        $ cd composetest
 
-    from flask import Flask
-    from redis import Redis
+2. With your favorite text editor create a file called `app.py` in your project
+   directory.
 
-    app = Flask(__name__)
-    redis = Redis(host='redis', port=6379)
+        from flask import Flask
+        from redis import Redis
 
-    @app.route('/')
-    def hello():
-        redis.incr('hits')
-        return 'Hello World! I have been seen %s times.' % redis.get('hits')
+        app = Flask(__name__)
+        redis = Redis(host='redis', port=6379)
 
-    if __name__ == "__main__":
-        app.run(host="0.0.0.0", debug=True)
+        @app.route('/')
+        def hello():
+            redis.incr('hits')
+            return 'Hello World! I have been seen %s times.' % redis.get('hits')
 
-Next, define the Python dependencies in a file called `requirements.txt`:
+        if __name__ == "__main__":
+            app.run(host="0.0.0.0", debug=True)
 
-    flask
-    redis
+3. Create another file called `requirements.txt` in your project directory and
+   add the following:
 
-### Create a Docker image
+        flask
+        redis
 
-Now, create a Docker image containing all of your app's dependencies. You
-specify how to build the image using a file called
-[`Dockerfile`](http://docs.docker.com/reference/builder/):
+   These define the applications dependencies.
 
-    FROM python:2.7
-    ADD . /code
-    WORKDIR /code
-    RUN pip install -r requirements.txt
-    CMD python app.py
+## Step 2: Create a Docker image
 
-This tells Docker to:
+In this step, you build a new Docker image. The image contains all the
+dependencies the Python application requires, including Python itself.
 
-* Build an image starting with the Python 2.7 image.
-* Add the current directory `.` into the path `/code` in the image.
-* Set the working directory to `/code`.
-* Install the Python dependencies.
-* Set the default command for the container to `python app.py`
+1. In your project directory create a file named `Dockerfile` and add the
+   following:
 
-For more information on how to write Dockerfiles, see the [Docker user guide](https://docs.docker.com/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](http://docs.docker.com/reference/builder/).
+        FROM python:2.7
+        ADD . /code
+        WORKDIR /code
+        RUN pip install -r requirements.txt
+        CMD python app.py
 
-You can build the image by running `docker build -t web .`.
+  This tells Docker to:
 
-### Define services
+  * Build an image starting with the Python 2.7 image.
+  * Add the current directory `.` into the path `/code` in the image.
+  * Set the working directory to `/code`.
+  * Install the Python dependencies.
+  * Set the default command for the container to `python app.py`
+
+  For more information on how to write Dockerfiles, see the [Docker user guide](https://docs.docker.com/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](http://docs.docker.com/reference/builder/).
+
+2. Build the image.
+
+        $ docker build -t web .
+
+  This command builds an image named `web` from the contents of the current
+  directory. The command automatically locates the `Dockerfile`, `app.py`, and
+  `requirements.txt` files.
+
+
+## Step 3: Define services
 
 Define a set of services using `docker-compose.yml`:
 
-    web:
-      build: .
-      ports:
-       - "5000:5000"
-      volumes:
-       - .:/code
-      links:
-       - redis
-    redis:
-      image: redis
+1. Create a file called docker-compose.yml in your project directory and add
+   the following:
 
-This template defines two services, `web` and `redis`. The `web` service:
+        web:
+          build: .
+          ports:
+           - "5000:5000"
+          volumes:
+           - .:/code
+          links:
+           - redis
+        redis:
+          image: redis
+
+This Compose file defines two services, `web` and `redis`. The web service:
 
 * Builds from the `Dockerfile` in the current directory.
 * Forwards the exposed port 5000 on the container to port 5000 on the host machine.
@@ -96,68 +115,74 @@ This template defines two services, `web` and `redis`. The `web` service:
 
 The `redis` service uses the latest public [Redis](https://registry.hub.docker.com/_/redis/) image pulled from the Docker Hub registry.
 
-### Build and run your app with Compose
+## Step 4: Build and run your app with Compose
 
-Now, when you run `docker-compose up`, Compose will pull a Redis image, build an image for your code, and start everything up:
+1. From your project directory, start up your application.
 
-    $ docker-compose up
-    Pulling image redis...
-    Building web...
-    Starting composetest_redis_1...
-    Starting composetest_web_1...
-    redis_1 | [8] 02 Jan 18:43:35.576 # Server started, Redis version 2.8.3
-    web_1   |  * Running on http://0.0.0.0:5000/
-    web_1   |  * Restarting with stat
+        $ docker-compose up
+        Pulling image redis...
+        Building web...
+        Starting composetest_redis_1...
+        Starting composetest_web_1...
+        redis_1 | [8] 02 Jan 18:43:35.576 # Server started, Redis version 2.8.3
+        web_1   |  * Running on http://0.0.0.0:5000/
+        web_1   |  * Restarting with stat
 
-If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` will tell you its address and you can open `http://MACHINE_VM_IP:5000` in a browser.
+   Compose pulls a Redis image, builds an image for your code, and start the
+   services you defined.
 
-If you're using Docker on Linux natively, then the web app should now be listening on port 5000 on your Docker daemon host. If `http://0.0.0.0:5000` doesn't resolve, you can also try `http://localhost:5000`.
+2. Enter `http://0.0.0.0:5000/` in a browser to see the application running.
 
-You will see a message in your browser saying:
+   If you're using Docker on Linux natively, then the web app should now be
+   listening on port 5000 on your Docker daemon host. If http://0.0.0.0:5000
+   doesn't resolve, you can also try http://localhost:5000.
 
-`Hello World! I have been seen 1 times.`
+   If you're using Docker Machine on a Mac, use `docker-machine ip MACHINE_VM` to get
+   the IP address of your Docker host. Then, `open http://MACHINE_VM_IP:5000` in a
+   browser.
 
-Refreshing the page will increment the number.
+   You should see a message in your browser saying:
+
+   `Hello World! I have been seen 1 times.`
+
+3. Refresh the page.
+
+   The number should increment.
+
+## Step 5: Experiment with some other commands
 
 If you want to run your services in the background, you can pass the `-d` flag
 (for "detached" mode) to `docker-compose up` and use `docker-compose ps` to
 see what is currently running:
 
-    $ docker-compose up -d
-    Starting composetest_redis_1...
-    Starting composetest_web_1...
-    $ docker-compose ps
-	    Name                 Command            State       Ports
-    -------------------------------------------------------------------
-    composetest_redis_1   /usr/local/bin/run         Up
-    composetest_web_1     /bin/sh -c python app.py   Up      5000->5000/tcp
+        $ docker-compose up -d
+        Starting composetest_redis_1...
+        Starting composetest_web_1...
+        $ docker-compose ps
+        Name                 Command            State       Ports
+        -------------------------------------------------------------------
+        composetest_redis_1   /usr/local/bin/run         Up
+        composetest_web_1     /bin/sh -c python app.py   Up      5000->5000/tcp
 
 The `docker-compose run` command allows you to run one-off commands for your
 services. For example, to see what environment variables are available to the
 `web` service:
 
-    $ docker-compose run web env
+        $ docker-compose run web env
 
 See `docker-compose --help` to see other available commands. You can also install [command completion](completion.md) for the bash and zsh shell, which will also show you available commands.
 
 If you started Compose with `docker-compose up -d`, you'll probably want to stop
 your services once you've finished with them:
 
-    $ docker-compose stop
+        $ docker-compose stop
 
 At this point, you have seen the basics of how Compose works.
 
+
+## Where to go next
+
 - Next, try the quick start guide for [Django](django.md),
   [Rails](rails.md), or [WordPress](wordpress.md).
-- See the reference guides for complete details on the [commands](./reference/index.md), the
-  [configuration file](compose-file.md) and [environment variables](env.md).
-
-## More Compose documentation
-
-- [User guide](/)
-- [Installing Compose](install.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
+- [Explore the full list of Compose commands](./reference/index.md)
+- [Compose configuration file reference](compose-file.md)
diff --git a/docs/index.md b/docs/index.md
index ac7e07f9..6ea0e99a 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -43,7 +43,7 @@ A `docker-compose.yml` looks like this:
       image: redis
 
 For more information about the Compose file, see the
-[Compose file reference](yml.md)
+[Compose file reference](compose-file.md)
 
 Compose has commands for managing the whole lifecycle of your application:
 
@@ -64,6 +64,12 @@ Compose has commands for managing the whole lifecycle of your application:
 
 ## Features
 
+The features of Compose that make it effective are:
+
+* [Preserve volume data](#preserve-volume-data)
+* [Only recreate containers that have changed](#only-recreate-containers-that-have-changed)
+* [Variables and moving a composition between environments](#variables-and-moving-a-composition-between-environments)
+
 #### Preserve volume data
 
 Compose preserves all volumes used by your services. When `docker-compose up`
@@ -80,18 +86,15 @@ containers. Re-using containers means that you can make changes to your
 environment very quickly.
 
 
-#### Variables and moving a composition to different environments
-
-> New in `docker-compose` 1.5
+#### Variables and moving a composition between environments
 
 Compose supports variables in the Compose file. You can use these variables
 to customize your composition for different environments, or different users.
 See [Variable substitution](compose-file.md#variable-substitution) for more
 details.
 
-Compose files can also be extended from other files using the `extends`
-field in a compose file, or by using multiple files. See [extends](extends.md)
-for more details.
+You can extend a Compose file using the `extends` field or by creating multiple
+Compose files. See [extends](extends.md) for more details.
 
 
 ## Common Use Cases
@@ -101,14 +104,19 @@ below.
 
 ### Development environments
 
-When you're developing software it is often helpful to be able to run the
-application and interact with it. If the application has any service dependencies
-(databases, queues, caches, web services, etc) you need a way to document the
-dependencies, configuration and operation of each. Compose provides a convenient
-format for definition these dependencies (the [Compose file](yml.md)) and a CLI
-tool for starting an isolated environment. Compose can replace a multi-page
-"developer getting started guide" with a single machine readable configuration
-file and a single command `docker-compose up`.
+When you're developing software, the ability to run an application in an
+isolated environment and interact with it is crucial.  The Compose command
+line tool can be used to create the environment and interact with it.
+
+The [Compose file](compose-file.md) provides a way to document and configure
+all of the application's service dependencies (databases, queues, caches,
+web service APIs, etc). Using the Compose command line tool you can create
+and start one or more containers for each dependency with a single command
+(`docker-compose up`).
+
+Together, these features provide a convenient way for developers to get
+started on a project.  Compose can reduce a multi-page "developer getting
+started guide" to a single machine readable Compose file and a few commands.
 
 ### Automated testing environments
 
@@ -116,7 +124,7 @@ An important part of any Continuous Deployment or Continuous Integration process
 is the automated test suite. Automated end-to-end testing requires an
 environment in which to run tests. Compose provides a convenient way to create
 and destroy isolated testing environments for your test suite. By defining the full
-environment in a [Compose file](yml.md) you can create and destroy these
+environment in a [Compose file](compose-file.md) you can create and destroy these
 environments in just a few commands:
 
     $ docker-compose up -d
@@ -128,11 +136,13 @@ environments in just a few commands:
 
 Compose has traditionally been focused on development and testing workflows,
 but with each release we're making progress on more production-oriented features.
-Compose can be used to deploy to a remote docker engine, for example a cloud
-instance provisioned with [Docker Machine](https://docs.docker.com/machine/) or
-a [Docker Swarm](https://docs.docker.com/swarm/) cluster.
+You can use Compose to deploy to a remote Docker Engine. The Docker Engine may
+be a single instance provisioned with
+[Docker Machine](https://docs.docker.com/machine/) or an entire
+[Docker Swarm](https://docs.docker.com/swarm/) cluster.
 
-See [compose in production](production.md) for more details.
+For details on using production-oriented features, see
+[compose in production](production.md) in this documentation.
 
 
 ## Release Notes

From a3fb13e14195835d08006f23a9f26f6907f77262 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 27 Oct 2015 16:51:49 -0400
Subject: [PATCH 0483/1265] Add another feature to the docs - multiple
 environments per host.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/index.md | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 6ea0e99a..ebc1320e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -66,11 +66,29 @@ Compose has commands for managing the whole lifecycle of your application:
 
 The features of Compose that make it effective are:
 
-* [Preserve volume data](#preserve-volume-data)
+* [Multiple isolated environments on a single host](#Multiple-isolated-environments-on-a-single-host)
+* [Preserve volume data when containers are created](#preserve-volume-data-when-containers-are-created)
 * [Only recreate containers that have changed](#only-recreate-containers-that-have-changed)
 * [Variables and moving a composition between environments](#variables-and-moving-a-composition-between-environments)
 
-#### Preserve volume data
+#### Multiple isolated environments on a single host
+
+Compose uses a project name to isolate environments from each other. You can use
+this project name to:
+
+* on a dev host, to create multiple copies of a single environment (ex: you want
+  to run a stable copy for each feature branch of a project)
+* on a CI server, to keep builds from interfering with each other, you can set
+  the project name to a unique build number
+* on a shared host or dev host, to prevent different projects which may use the
+  same service names, from interfering with each other
+
+The default project name is the basename of the project directory. You can set
+a custom project name by using the
+[`-p` command line option](./reference/docker-compose.md) or the
+[`COMPOSE_PROJECT_NAME` environment variable](./reference/overview.md#compose-project-name).
+
+#### Preserve volume data when containers are created
 
 Compose preserves all volumes used by your services. When `docker-compose up`
 runs, if it finds any containers from previous runs, it copies the volumes from

From c58cf036e34b34a7c435f0c4c80b13f058788d70 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 30 Oct 2015 13:27:06 -0400
Subject: [PATCH 0484/1265] Touch up intro paragraph with feedback from
 @moxiegirl.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 README.md     | 6 +++---
 docs/index.md | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index bd110307..5052db39 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,10 @@ Docker Compose
 ![Docker Compose](logo.png?raw=true "Docker Compose Logo")
 
 Compose is a tool for defining and running multi-container Docker applications.
-With Compose, you define a multi-container application in a compose
-file then, using a single command, you create and start all the containers
+With Compose, you use a Compose file to configure your application's services.
+Then, using a single command, you create and start all the services
 from your configuration. To learn more about all the features of Compose
-see [the list of features](#features)
+see [the list of features](docs/index.md#features).
 
 Compose is great for development, testing, and staging environments, as well as
 CI workflows. You can learn more about each case in
diff --git a/docs/index.md b/docs/index.md
index ebc1320e..279154ee 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -12,10 +12,10 @@ parent="smn_workw_compose"
 # Overview of Docker Compose
 
 Compose is a tool for defining and running multi-container Docker applications.
-With Compose, you define a multi-container application in a compose
-file then, using a single command, you create and start all the containers
+With Compose, you use a Compose file to configure your application's services.
+Then, using a single command, you create and start all the services
 from your configuration. To learn more about all the features of Compose
-see [the list of features](#features)
+see [the list of features](#features).
 
 Compose is great for development, testing, and staging environments, as well as
 CI workflows. You can learn more about each case in

From 8057bb3fcce2c99126db365671753bc0af003d8c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 2 Nov 2015 16:46:49 -0500
Subject: [PATCH 0485/1265] Update cli tests to use subprocess.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/integration/cli_test.py | 447 ++++++++++++++++------------------
 1 file changed, 209 insertions(+), 238 deletions(-)

diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py
index d621f2d1..7ae187b2 100644
--- a/tests/integration/cli_test.py
+++ b/tests/integration/cli_test.py
@@ -2,30 +2,32 @@ from __future__ import absolute_import
 
 import os
 import shlex
-import sys
+import subprocess
+from collections import namedtuple
 from operator import attrgetter
 
-from six import StringIO
+import pytest
 
 from .. import mock
 from .testcases import DockerClientTestCase
 from compose.cli.command import get_project
 from compose.cli.docker_client import docker_client
-from compose.cli.errors import UserError
-from compose.cli.main import TopLevelCommand
-from compose.project import NoSuchService
+
+
+ProcessResult = namedtuple('ProcessResult', 'stdout stderr')
+
+
+BUILD_CACHE_TEXT = 'Using cache'
+BUILD_PULL_TEXT = 'Status: Image is up to date for busybox:latest'
 
 
 class CLITestCase(DockerClientTestCase):
+
     def setUp(self):
         super(CLITestCase, self).setUp()
-        self.old_sys_exit = sys.exit
-        sys.exit = lambda code=0: None
-        self.command = TopLevelCommand()
-        self.command.base_dir = 'tests/fixtures/simple-composefile'
+        self.base_dir = 'tests/fixtures/simple-composefile'
 
     def tearDown(self):
-        sys.exit = self.old_sys_exit
         self.project.kill()
         self.project.remove_stopped()
         for container in self.project.containers(stopped=True, one_off=True):
@@ -34,129 +36,121 @@ class CLITestCase(DockerClientTestCase):
 
     @property
     def project(self):
-        # Hack: allow project to be overridden. This needs refactoring so that
-        # the project object is built exactly once, by the command object, and
-        # accessed by the test case object.
-        if hasattr(self, '_project'):
-            return self._project
+        # Hack: allow project to be overridden
+        if not hasattr(self, '_project'):
+            self._project = get_project(self.base_dir)
+        return self._project
 
-        return get_project(self.command.base_dir)
+    def dispatch(self, options, project_options=None, returncode=0):
+        project_options = project_options or []
+        proc = subprocess.Popen(
+            ['docker-compose'] + project_options + options,
+            # Note: this might actually be a patched sys.stdout, so we have
+            # to specify it here, even though it's the default
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            cwd=self.base_dir)
+        print("Running process: %s" % proc.pid)
+        stdout, stderr = proc.communicate()
+        if proc.returncode != returncode:
+            print(stderr)
+            assert proc.returncode == returncode
+        return ProcessResult(stdout.decode('utf-8'), stderr.decode('utf-8'))
 
     def test_help(self):
-        old_base_dir = self.command.base_dir
-        self.command.base_dir = 'tests/fixtures/no-composefile'
-        with self.assertRaises(SystemExit) as exc_context:
-            self.command.dispatch(['help', 'up'], None)
-            self.assertIn('Usage: up [options] [SERVICE...]', str(exc_context.exception))
+        old_base_dir = self.base_dir
+        self.base_dir = 'tests/fixtures/no-composefile'
+        result = self.dispatch(['help', 'up'], returncode=1)
+        assert 'Usage: up [options] [SERVICE...]' in result.stderr
         # self.project.kill() fails during teardown
         # unless there is a composefile.
-        self.command.base_dir = old_base_dir
+        self.base_dir = old_base_dir
 
-    # TODO: address the "Inappropriate ioctl for device" warnings in test output
     def test_ps(self):
         self.project.get_service('simple').create_container()
-        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
-            self.command.dispatch(['ps'], None)
-        self.assertIn('simplecomposefile_simple_1', mock_stdout.getvalue())
+        result = self.dispatch(['ps'])
+        assert 'simplecomposefile_simple_1' in result.stdout
 
     def test_ps_default_composefile(self):
-        self.command.base_dir = 'tests/fixtures/multiple-composefiles'
-        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
-            self.command.dispatch(['up', '-d'], None)
-            self.command.dispatch(['ps'], None)
+        self.base_dir = 'tests/fixtures/multiple-composefiles'
+        self.dispatch(['up', '-d'])
+        result = self.dispatch(['ps'])
 
-        output = mock_stdout.getvalue()
-        self.assertIn('multiplecomposefiles_simple_1', output)
-        self.assertIn('multiplecomposefiles_another_1', output)
-        self.assertNotIn('multiplecomposefiles_yetanother_1', output)
+        self.assertIn('multiplecomposefiles_simple_1', result.stdout)
+        self.assertIn('multiplecomposefiles_another_1', result.stdout)
+        self.assertNotIn('multiplecomposefiles_yetanother_1', result.stdout)
 
     def test_ps_alternate_composefile(self):
         config_path = os.path.abspath(
             'tests/fixtures/multiple-composefiles/compose2.yml')
-        self._project = get_project(self.command.base_dir, [config_path])
+        self._project = get_project(self.base_dir, [config_path])
 
-        self.command.base_dir = 'tests/fixtures/multiple-composefiles'
-        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
-            self.command.dispatch(['-f', 'compose2.yml', 'up', '-d'], None)
-            self.command.dispatch(['-f', 'compose2.yml', 'ps'], None)
+        self.base_dir = 'tests/fixtures/multiple-composefiles'
+        self.dispatch(['-f', 'compose2.yml', 'up', '-d'])
+        result = self.dispatch(['-f', 'compose2.yml', 'ps'])
 
-        output = mock_stdout.getvalue()
-        self.assertNotIn('multiplecomposefiles_simple_1', output)
-        self.assertNotIn('multiplecomposefiles_another_1', output)
-        self.assertIn('multiplecomposefiles_yetanother_1', output)
+        self.assertNotIn('multiplecomposefiles_simple_1', result.stdout)
+        self.assertNotIn('multiplecomposefiles_another_1', result.stdout)
+        self.assertIn('multiplecomposefiles_yetanother_1', result.stdout)
 
-    @mock.patch('compose.service.log')
-    def test_pull(self, mock_logging):
-        self.command.dispatch(['pull'], None)
-        mock_logging.info.assert_any_call('Pulling simple (busybox:latest)...')
-        mock_logging.info.assert_any_call('Pulling another (busybox:latest)...')
+    def test_pull(self):
+        result = self.dispatch(['pull'])
+        assert sorted(result.stderr.split('\n'))[1:] == [
+            'Pulling another (busybox:latest)...',
+            'Pulling simple (busybox:latest)...',
+        ]
 
-    @mock.patch('compose.service.log')
-    def test_pull_with_digest(self, mock_logging):
-        self.command.dispatch(['-f', 'digest.yml', 'pull'], None)
-        mock_logging.info.assert_any_call('Pulling simple (busybox:latest)...')
-        mock_logging.info.assert_any_call(
-            'Pulling digest (busybox@'
-            'sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d)...')
+    def test_pull_with_digest(self):
+        result = self.dispatch(['-f', 'digest.yml', 'pull'])
 
-    @mock.patch('compose.service.log')
-    def test_pull_with_ignore_pull_failures(self, mock_logging):
-        self.command.dispatch(['-f', 'ignore-pull-failures.yml', 'pull', '--ignore-pull-failures'], None)
-        mock_logging.info.assert_any_call('Pulling simple (busybox:latest)...')
-        mock_logging.info.assert_any_call('Pulling another (nonexisting-image:latest)...')
-        mock_logging.error.assert_any_call('Error: image library/nonexisting-image:latest not found')
+        assert 'Pulling simple (busybox:latest)...' in result.stderr
+        assert ('Pulling digest (busybox@'
+                'sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b520'
+                '04ee8502d)...') in result.stderr
+
+    def test_pull_with_ignore_pull_failures(self):
+        result = self.dispatch([
+            '-f', 'ignore-pull-failures.yml',
+            'pull', '--ignore-pull-failures'])
+
+        assert 'Pulling simple (busybox:latest)...' in result.stderr
+        assert 'Pulling another (nonexisting-image:latest)...' in result.stderr
+        assert 'Error: image library/nonexisting-image:latest not found' in result.stderr
 
     def test_build_plain(self):
-        self.command.base_dir = 'tests/fixtures/simple-dockerfile'
-        self.command.dispatch(['build', 'simple'], None)
+        self.base_dir = 'tests/fixtures/simple-dockerfile'
+        self.dispatch(['build', 'simple'])
 
-        cache_indicator = 'Using cache'
-        pull_indicator = 'Status: Image is up to date for busybox:latest'
-
-        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
-            self.command.dispatch(['build', 'simple'], None)
-        output = mock_stdout.getvalue()
-        self.assertIn(cache_indicator, output)
-        self.assertNotIn(pull_indicator, output)
+        result = self.dispatch(['build', 'simple'])
+        assert BUILD_CACHE_TEXT in result.stdout
+        assert BUILD_PULL_TEXT not in result.stdout
 
     def test_build_no_cache(self):
-        self.command.base_dir = 'tests/fixtures/simple-dockerfile'
-        self.command.dispatch(['build', 'simple'], None)
+        self.base_dir = 'tests/fixtures/simple-dockerfile'
+        self.dispatch(['build', 'simple'])
 
-        cache_indicator = 'Using cache'
-        pull_indicator = 'Status: Image is up to date for busybox:latest'
-        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
-            self.command.dispatch(['build', '--no-cache', 'simple'], None)
-        output = mock_stdout.getvalue()
-        self.assertNotIn(cache_indicator, output)
-        self.assertNotIn(pull_indicator, output)
+        result = self.dispatch(['build', '--no-cache', 'simple'])
+        assert BUILD_CACHE_TEXT not in result.stdout
+        assert BUILD_PULL_TEXT not in result.stdout
 
     def test_build_pull(self):
-        self.command.base_dir = 'tests/fixtures/simple-dockerfile'
-        self.command.dispatch(['build', 'simple'], None)
+        self.base_dir = 'tests/fixtures/simple-dockerfile'
+        self.dispatch(['build', 'simple'], None)
 
-        cache_indicator = 'Using cache'
-        pull_indicator = 'Status: Image is up to date for busybox:latest'
-        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
-            self.command.dispatch(['build', '--pull', 'simple'], None)
-        output = mock_stdout.getvalue()
-        self.assertIn(cache_indicator, output)
-        self.assertIn(pull_indicator, output)
+        result = self.dispatch(['build', '--pull', 'simple'])
+        assert BUILD_CACHE_TEXT in result.stdout
+        assert BUILD_PULL_TEXT in result.stdout
 
     def test_build_no_cache_pull(self):
-        self.command.base_dir = 'tests/fixtures/simple-dockerfile'
-        self.command.dispatch(['build', 'simple'], None)
+        self.base_dir = 'tests/fixtures/simple-dockerfile'
+        self.dispatch(['build', 'simple'])
 
-        cache_indicator = 'Using cache'
-        pull_indicator = 'Status: Image is up to date for busybox:latest'
-        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
-            self.command.dispatch(['build', '--no-cache', '--pull', 'simple'], None)
-        output = mock_stdout.getvalue()
-        self.assertNotIn(cache_indicator, output)
-        self.assertIn(pull_indicator, output)
+        result = self.dispatch(['build', '--no-cache', '--pull', 'simple'])
+        assert BUILD_CACHE_TEXT not in result.stdout
+        assert BUILD_PULL_TEXT in result.stdout
 
     def test_up_detached(self):
-        self.command.dispatch(['up', '-d'], None)
+        self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
         another = self.project.get_service('another')
         self.assertEqual(len(service.containers()), 1)
@@ -168,12 +162,14 @@ class CLITestCase(DockerClientTestCase):
         self.assertFalse(container.get('Config.AttachStdout'))
         self.assertFalse(container.get('Config.AttachStdin'))
 
+    # TODO: needs rework
+    @pytest.mark.skipif(True, reason="runs top")
     def test_up_attached(self):
         with mock.patch(
             'compose.cli.main.attach_to_logs',
             autospec=True
         ) as mock_attach:
-            self.command.dispatch(['up'], None)
+            self.dispatch(['up'], None)
             _, args, kwargs = mock_attach.mock_calls[0]
             _project, log_printer, _names, _timeout = args
 
@@ -189,8 +185,8 @@ class CLITestCase(DockerClientTestCase):
     def test_up_without_networking(self):
         self.require_api_version('1.21')
 
-        self.command.base_dir = 'tests/fixtures/links-composefile'
-        self.command.dispatch(['up', '-d'], None)
+        self.base_dir = 'tests/fixtures/links-composefile'
+        self.dispatch(['up', '-d'], None)
         client = docker_client(version='1.21')
 
         networks = client.networks(names=[self.project.name])
@@ -207,8 +203,8 @@ class CLITestCase(DockerClientTestCase):
     def test_up_with_networking(self):
         self.require_api_version('1.21')
 
-        self.command.base_dir = 'tests/fixtures/links-composefile'
-        self.command.dispatch(['--x-networking', 'up', '-d'], None)
+        self.base_dir = 'tests/fixtures/links-composefile'
+        self.dispatch(['--x-networking', 'up', '-d'], None)
         client = docker_client(version='1.21')
 
         services = self.project.get_services()
@@ -232,8 +228,8 @@ class CLITestCase(DockerClientTestCase):
         self.assertFalse(web_container.get('HostConfig.Links'))
 
     def test_up_with_links(self):
-        self.command.base_dir = 'tests/fixtures/links-composefile'
-        self.command.dispatch(['up', '-d', 'web'], None)
+        self.base_dir = 'tests/fixtures/links-composefile'
+        self.dispatch(['up', '-d', 'web'], None)
         web = self.project.get_service('web')
         db = self.project.get_service('db')
         console = self.project.get_service('console')
@@ -242,8 +238,8 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(console.containers()), 0)
 
     def test_up_with_no_deps(self):
-        self.command.base_dir = 'tests/fixtures/links-composefile'
-        self.command.dispatch(['up', '-d', '--no-deps', 'web'], None)
+        self.base_dir = 'tests/fixtures/links-composefile'
+        self.dispatch(['up', '-d', '--no-deps', 'web'], None)
         web = self.project.get_service('web')
         db = self.project.get_service('db')
         console = self.project.get_service('console')
@@ -252,13 +248,13 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(console.containers()), 0)
 
     def test_up_with_force_recreate(self):
-        self.command.dispatch(['up', '-d'], None)
+        self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
         self.assertEqual(len(service.containers()), 1)
 
         old_ids = [c.id for c in service.containers()]
 
-        self.command.dispatch(['up', '-d', '--force-recreate'], None)
+        self.dispatch(['up', '-d', '--force-recreate'], None)
         self.assertEqual(len(service.containers()), 1)
 
         new_ids = [c.id for c in service.containers()]
@@ -266,13 +262,13 @@ class CLITestCase(DockerClientTestCase):
         self.assertNotEqual(old_ids, new_ids)
 
     def test_up_with_no_recreate(self):
-        self.command.dispatch(['up', '-d'], None)
+        self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
         self.assertEqual(len(service.containers()), 1)
 
         old_ids = [c.id for c in service.containers()]
 
-        self.command.dispatch(['up', '-d', '--no-recreate'], None)
+        self.dispatch(['up', '-d', '--no-recreate'], None)
         self.assertEqual(len(service.containers()), 1)
 
         new_ids = [c.id for c in service.containers()]
@@ -280,11 +276,12 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(old_ids, new_ids)
 
     def test_up_with_force_recreate_and_no_recreate(self):
-        with self.assertRaises(UserError):
-            self.command.dispatch(['up', '-d', '--force-recreate', '--no-recreate'], None)
+        self.dispatch(
+            ['up', '-d', '--force-recreate', '--no-recreate'],
+            returncode=1)
 
     def test_up_with_timeout(self):
-        self.command.dispatch(['up', '-d', '-t', '1'], None)
+        self.dispatch(['up', '-d', '-t', '1'], None)
         service = self.project.get_service('simple')
         another = self.project.get_service('another')
         self.assertEqual(len(service.containers()), 1)
@@ -296,10 +293,9 @@ class CLITestCase(DockerClientTestCase):
         self.assertFalse(config['AttachStdout'])
         self.assertFalse(config['AttachStdin'])
 
-    @mock.patch('dockerpty.start')
-    def test_run_service_without_links(self, mock_stdout):
-        self.command.base_dir = 'tests/fixtures/links-composefile'
-        self.command.dispatch(['run', 'console', '/bin/true'], None)
+    def test_run_service_without_links(self):
+        self.base_dir = 'tests/fixtures/links-composefile'
+        self.dispatch(['run', 'console', '/bin/true'])
         self.assertEqual(len(self.project.containers()), 0)
 
         # Ensure stdin/out was open
@@ -309,44 +305,40 @@ class CLITestCase(DockerClientTestCase):
         self.assertTrue(config['AttachStdout'])
         self.assertTrue(config['AttachStdin'])
 
-    @mock.patch('dockerpty.start')
-    def test_run_service_with_links(self, _):
-        self.command.base_dir = 'tests/fixtures/links-composefile'
-        self.command.dispatch(['run', 'web', '/bin/true'], None)
+    def test_run_service_with_links(self):
+        self.base_dir = 'tests/fixtures/links-composefile'
+        self.dispatch(['run', 'web', '/bin/true'], None)
         db = self.project.get_service('db')
         console = self.project.get_service('console')
         self.assertEqual(len(db.containers()), 1)
         self.assertEqual(len(console.containers()), 0)
 
-    @mock.patch('dockerpty.start')
-    def test_run_with_no_deps(self, _):
-        self.command.base_dir = 'tests/fixtures/links-composefile'
-        self.command.dispatch(['run', '--no-deps', 'web', '/bin/true'], None)
+    def test_run_with_no_deps(self):
+        self.base_dir = 'tests/fixtures/links-composefile'
+        self.dispatch(['run', '--no-deps', 'web', '/bin/true'])
         db = self.project.get_service('db')
         self.assertEqual(len(db.containers()), 0)
 
-    @mock.patch('dockerpty.start')
-    def test_run_does_not_recreate_linked_containers(self, _):
-        self.command.base_dir = 'tests/fixtures/links-composefile'
-        self.command.dispatch(['up', '-d', 'db'], None)
+    def test_run_does_not_recreate_linked_containers(self):
+        self.base_dir = 'tests/fixtures/links-composefile'
+        self.dispatch(['up', '-d', 'db'])
         db = self.project.get_service('db')
         self.assertEqual(len(db.containers()), 1)
 
         old_ids = [c.id for c in db.containers()]
 
-        self.command.dispatch(['run', 'web', '/bin/true'], None)
+        self.dispatch(['run', 'web', '/bin/true'], None)
         self.assertEqual(len(db.containers()), 1)
 
         new_ids = [c.id for c in db.containers()]
 
         self.assertEqual(old_ids, new_ids)
 
-    @mock.patch('dockerpty.start')
-    def test_run_without_command(self, _):
-        self.command.base_dir = 'tests/fixtures/commands-composefile'
+    def test_run_without_command(self):
+        self.base_dir = 'tests/fixtures/commands-composefile'
         self.check_build('tests/fixtures/simple-dockerfile', tag='composetest_test')
 
-        self.command.dispatch(['run', 'implicit'], None)
+        self.dispatch(['run', 'implicit'])
         service = self.project.get_service('implicit')
         containers = service.containers(stopped=True, one_off=True)
         self.assertEqual(
@@ -354,7 +346,7 @@ class CLITestCase(DockerClientTestCase):
             [u'/bin/sh -c echo "success"'],
         )
 
-        self.command.dispatch(['run', 'explicit'], None)
+        self.dispatch(['run', 'explicit'])
         service = self.project.get_service('explicit')
         containers = service.containers(stopped=True, one_off=True)
         self.assertEqual(
@@ -362,14 +354,10 @@ class CLITestCase(DockerClientTestCase):
             [u'/bin/true'],
         )
 
-    @mock.patch('dockerpty.start')
-    def test_run_service_with_entrypoint_overridden(self, _):
-        self.command.base_dir = 'tests/fixtures/dockerfile_with_entrypoint'
+    def test_run_service_with_entrypoint_overridden(self):
+        self.base_dir = 'tests/fixtures/dockerfile_with_entrypoint'
         name = 'service'
-        self.command.dispatch(
-            ['run', '--entrypoint', '/bin/echo', name, 'helloworld'],
-            None
-        )
+        self.dispatch(['run', '--entrypoint', '/bin/echo', name, 'helloworld'])
         service = self.project.get_service(name)
         container = service.containers(stopped=True, one_off=True)[0]
         self.assertEqual(
@@ -377,37 +365,34 @@ class CLITestCase(DockerClientTestCase):
             [u'/bin/echo', u'helloworld'],
         )
 
-    @mock.patch('dockerpty.start')
-    def test_run_service_with_user_overridden(self, _):
-        self.command.base_dir = 'tests/fixtures/user-composefile'
+    def test_run_service_with_user_overridden(self):
+        self.base_dir = 'tests/fixtures/user-composefile'
         name = 'service'
         user = 'sshd'
-        args = ['run', '--user={user}'.format(user=user), name]
-        self.command.dispatch(args, None)
+        self.dispatch(['run', '--user={user}'.format(user=user), name], returncode=1)
         service = self.project.get_service(name)
         container = service.containers(stopped=True, one_off=True)[0]
         self.assertEqual(user, container.get('Config.User'))
 
-    @mock.patch('dockerpty.start')
-    def test_run_service_with_user_overridden_short_form(self, _):
-        self.command.base_dir = 'tests/fixtures/user-composefile'
+    def test_run_service_with_user_overridden_short_form(self):
+        self.base_dir = 'tests/fixtures/user-composefile'
         name = 'service'
         user = 'sshd'
-        args = ['run', '-u', user, name]
-        self.command.dispatch(args, None)
+        self.dispatch(['run', '-u', user, name], returncode=1)
         service = self.project.get_service(name)
         container = service.containers(stopped=True, one_off=True)[0]
         self.assertEqual(user, container.get('Config.User'))
 
-    @mock.patch('dockerpty.start')
-    def test_run_service_with_environement_overridden(self, _):
+    def test_run_service_with_environement_overridden(self):
         name = 'service'
-        self.command.base_dir = 'tests/fixtures/environment-composefile'
-        self.command.dispatch(
-            ['run', '-e', 'foo=notbar', '-e', 'allo=moto=bobo',
-             '-e', 'alpha=beta', name],
-            None
-        )
+        self.base_dir = 'tests/fixtures/environment-composefile'
+        self.dispatch([
+            'run', '-e', 'foo=notbar',
+            '-e', 'allo=moto=bobo',
+            '-e', 'alpha=beta',
+            name,
+            '/bin/true',
+        ])
         service = self.project.get_service(name)
         container = service.containers(stopped=True, one_off=True)[0]
         # env overriden
@@ -419,11 +404,10 @@ class CLITestCase(DockerClientTestCase):
         # make sure a value with a = don't crash out
         self.assertEqual('moto=bobo', container.environment['allo'])
 
-    @mock.patch('dockerpty.start')
-    def test_run_service_without_map_ports(self, _):
+    def test_run_service_without_map_ports(self):
         # create one off container
-        self.command.base_dir = 'tests/fixtures/ports-composefile'
-        self.command.dispatch(['run', '-d', 'simple'], None)
+        self.base_dir = 'tests/fixtures/ports-composefile'
+        self.dispatch(['run', '-d', 'simple'])
         container = self.project.get_service('simple').containers(one_off=True)[0]
 
         # get port information
@@ -437,12 +421,10 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_random, None)
         self.assertEqual(port_assigned, None)
 
-    @mock.patch('dockerpty.start')
-    def test_run_service_with_map_ports(self, _):
-
+    def test_run_service_with_map_ports(self):
         # create one off container
-        self.command.base_dir = 'tests/fixtures/ports-composefile'
-        self.command.dispatch(['run', '-d', '--service-ports', 'simple'], None)
+        self.base_dir = 'tests/fixtures/ports-composefile'
+        self.dispatch(['run', '-d', '--service-ports', 'simple'])
         container = self.project.get_service('simple').containers(one_off=True)[0]
 
         # get port information
@@ -460,12 +442,10 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_range[0], "0.0.0.0:49153")
         self.assertEqual(port_range[1], "0.0.0.0:49154")
 
-    @mock.patch('dockerpty.start')
-    def test_run_service_with_explicitly_maped_ports(self, _):
-
+    def test_run_service_with_explicitly_maped_ports(self):
         # create one off container
-        self.command.base_dir = 'tests/fixtures/ports-composefile'
-        self.command.dispatch(['run', '-d', '-p', '30000:3000', '--publish', '30001:3001', 'simple'], None)
+        self.base_dir = 'tests/fixtures/ports-composefile'
+        self.dispatch(['run', '-d', '-p', '30000:3000', '--publish', '30001:3001', 'simple'])
         container = self.project.get_service('simple').containers(one_off=True)[0]
 
         # get port information
@@ -479,12 +459,10 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_short, "0.0.0.0:30000")
         self.assertEqual(port_full, "0.0.0.0:30001")
 
-    @mock.patch('dockerpty.start')
-    def test_run_service_with_explicitly_maped_ip_ports(self, _):
-
+    def test_run_service_with_explicitly_maped_ip_ports(self):
         # create one off container
-        self.command.base_dir = 'tests/fixtures/ports-composefile'
-        self.command.dispatch(['run', '-d', '-p', '127.0.0.1:30000:3000', '--publish', '127.0.0.1:30001:3001', 'simple'], None)
+        self.base_dir = 'tests/fixtures/ports-composefile'
+        self.dispatch(['run', '-d', '-p', '127.0.0.1:30000:3000', '--publish', '127.0.0.1:30001:3001', 'simple'], None)
         container = self.project.get_service('simple').containers(one_off=True)[0]
 
         # get port information
@@ -498,22 +476,20 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_short, "127.0.0.1:30000")
         self.assertEqual(port_full, "127.0.0.1:30001")
 
-    @mock.patch('dockerpty.start')
-    def test_run_with_custom_name(self, _):
-        self.command.base_dir = 'tests/fixtures/environment-composefile'
+    def test_run_with_custom_name(self):
+        self.base_dir = 'tests/fixtures/environment-composefile'
         name = 'the-container-name'
-        self.command.dispatch(['run', '--name', name, 'service'], None)
+        self.dispatch(['run', '--name', name, 'service', '/bin/true'])
 
         service = self.project.get_service('service')
         container, = service.containers(stopped=True, one_off=True)
         self.assertEqual(container.name, name)
 
-    @mock.patch('dockerpty.start')
-    def test_run_with_networking(self, _):
+    def test_run_with_networking(self):
         self.require_api_version('1.21')
         client = docker_client(version='1.21')
-        self.command.base_dir = 'tests/fixtures/simple-dockerfile'
-        self.command.dispatch(['--x-networking', 'run', 'simple', 'true'], None)
+        self.base_dir = 'tests/fixtures/simple-dockerfile'
+        self.dispatch(['--x-networking', 'run', 'simple', 'true'], None)
         service = self.project.get_service('simple')
         container, = service.containers(stopped=True, one_off=True)
         networks = client.networks(names=[self.project.name])
@@ -527,71 +503,70 @@ class CLITestCase(DockerClientTestCase):
         service.create_container()
         service.kill()
         self.assertEqual(len(service.containers(stopped=True)), 1)
-        self.command.dispatch(['rm', '--force'], None)
+        self.dispatch(['rm', '--force'], None)
         self.assertEqual(len(service.containers(stopped=True)), 0)
         service = self.project.get_service('simple')
         service.create_container()
         service.kill()
         self.assertEqual(len(service.containers(stopped=True)), 1)
-        self.command.dispatch(['rm', '-f'], None)
+        self.dispatch(['rm', '-f'], None)
         self.assertEqual(len(service.containers(stopped=True)), 0)
 
     def test_stop(self):
-        self.command.dispatch(['up', '-d'], None)
+        self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
         self.assertEqual(len(service.containers()), 1)
         self.assertTrue(service.containers()[0].is_running)
 
-        self.command.dispatch(['stop', '-t', '1'], None)
+        self.dispatch(['stop', '-t', '1'], None)
 
         self.assertEqual(len(service.containers(stopped=True)), 1)
         self.assertFalse(service.containers(stopped=True)[0].is_running)
 
     def test_pause_unpause(self):
-        self.command.dispatch(['up', '-d'], None)
+        self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
         self.assertFalse(service.containers()[0].is_paused)
 
-        self.command.dispatch(['pause'], None)
+        self.dispatch(['pause'], None)
         self.assertTrue(service.containers()[0].is_paused)
 
-        self.command.dispatch(['unpause'], None)
+        self.dispatch(['unpause'], None)
         self.assertFalse(service.containers()[0].is_paused)
 
     def test_logs_invalid_service_name(self):
-        with self.assertRaises(NoSuchService):
-            self.command.dispatch(['logs', 'madeupname'], None)
+        self.dispatch(['logs', 'madeupname'], returncode=1)
 
     def test_kill(self):
-        self.command.dispatch(['up', '-d'], None)
+        self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
         self.assertEqual(len(service.containers()), 1)
         self.assertTrue(service.containers()[0].is_running)
 
-        self.command.dispatch(['kill'], None)
+        self.dispatch(['kill'], None)
 
         self.assertEqual(len(service.containers(stopped=True)), 1)
         self.assertFalse(service.containers(stopped=True)[0].is_running)
 
     def test_kill_signal_sigstop(self):
-        self.command.dispatch(['up', '-d'], None)
+        self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
         self.assertEqual(len(service.containers()), 1)
         self.assertTrue(service.containers()[0].is_running)
 
-        self.command.dispatch(['kill', '-s', 'SIGSTOP'], None)
+        self.dispatch(['kill', '-s', 'SIGSTOP'], None)
 
         self.assertEqual(len(service.containers()), 1)
         # The container is still running. It has only been paused
         self.assertTrue(service.containers()[0].is_running)
 
     def test_kill_stopped_service(self):
-        self.command.dispatch(['up', '-d'], None)
+        self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
-        self.command.dispatch(['kill', '-s', 'SIGSTOP'], None)
+        self.dispatch(['kill', '-s', 'SIGSTOP'], None)
         self.assertTrue(service.containers()[0].is_running)
 
-        self.command.dispatch(['kill', '-s', 'SIGKILL'], None)
+        self.dispatch(['kill', '-s', 'SIGKILL'], None)
 
         self.assertEqual(len(service.containers(stopped=True)), 1)
         self.assertFalse(service.containers(stopped=True)[0].is_running)
@@ -601,7 +576,7 @@ class CLITestCase(DockerClientTestCase):
         container = service.create_container()
         service.start_container(container)
         started_at = container.dictionary['State']['StartedAt']
-        self.command.dispatch(['restart', '-t', '1'], None)
+        self.dispatch(['restart', '-t', '1'], None)
         container.inspect()
         self.assertNotEqual(
             container.dictionary['State']['FinishedAt'],
@@ -615,53 +590,51 @@ class CLITestCase(DockerClientTestCase):
     def test_scale(self):
         project = self.project
 
-        self.command.scale(project, {'SERVICE=NUM': ['simple=1']})
+        self.dispatch(['scale', 'simple=1'])
         self.assertEqual(len(project.get_service('simple').containers()), 1)
 
-        self.command.scale(project, {'SERVICE=NUM': ['simple=3', 'another=2']})
+        self.dispatch(['scale', 'simple=3', 'another=2'])
         self.assertEqual(len(project.get_service('simple').containers()), 3)
         self.assertEqual(len(project.get_service('another').containers()), 2)
 
-        self.command.scale(project, {'SERVICE=NUM': ['simple=1', 'another=1']})
+        self.dispatch(['scale', 'simple=1', 'another=1'])
         self.assertEqual(len(project.get_service('simple').containers()), 1)
         self.assertEqual(len(project.get_service('another').containers()), 1)
 
-        self.command.scale(project, {'SERVICE=NUM': ['simple=1', 'another=1']})
+        self.dispatch(['scale', 'simple=1', 'another=1'])
         self.assertEqual(len(project.get_service('simple').containers()), 1)
         self.assertEqual(len(project.get_service('another').containers()), 1)
 
-        self.command.scale(project, {'SERVICE=NUM': ['simple=0', 'another=0']})
+        self.dispatch(['scale', 'simple=0', 'another=0'])
         self.assertEqual(len(project.get_service('simple').containers()), 0)
         self.assertEqual(len(project.get_service('another').containers()), 0)
 
     def test_port(self):
-        self.command.base_dir = 'tests/fixtures/ports-composefile'
-        self.command.dispatch(['up', '-d'], None)
+        self.base_dir = 'tests/fixtures/ports-composefile'
+        self.dispatch(['up', '-d'], None)
         container = self.project.get_service('simple').get_container()
 
-        @mock.patch('sys.stdout', new_callable=StringIO)
-        def get_port(number, mock_stdout):
-            self.command.dispatch(['port', 'simple', str(number)], None)
-            return mock_stdout.getvalue().rstrip()
+        def get_port(number):
+            result = self.dispatch(['port', 'simple', str(number)])
+            return result.stdout.rstrip()
 
         self.assertEqual(get_port(3000), container.get_local_port(3000))
         self.assertEqual(get_port(3001), "0.0.0.0:49152")
         self.assertEqual(get_port(3002), "0.0.0.0:49153")
 
     def test_port_with_scale(self):
-        self.command.base_dir = 'tests/fixtures/ports-composefile-scale'
-        self.command.dispatch(['scale', 'simple=2'], None)
+        self.base_dir = 'tests/fixtures/ports-composefile-scale'
+        self.dispatch(['scale', 'simple=2'], None)
         containers = sorted(
             self.project.containers(service_names=['simple']),
             key=attrgetter('name'))
 
-        @mock.patch('sys.stdout', new_callable=StringIO)
-        def get_port(number, mock_stdout, index=None):
+        def get_port(number, index=None):
             if index is None:
-                self.command.dispatch(['port', 'simple', str(number)], None)
+                result = self.dispatch(['port', 'simple', str(number)])
             else:
-                self.command.dispatch(['port', '--index=' + str(index), 'simple', str(number)], None)
-            return mock_stdout.getvalue().rstrip()
+                result = self.dispatch(['port', '--index=' + str(index), 'simple', str(number)])
+            return result.stdout.rstrip()
 
         self.assertEqual(get_port(3000), containers[0].get_local_port(3000))
         self.assertEqual(get_port(3000, index=1), containers[0].get_local_port(3000))
@@ -670,8 +643,8 @@ class CLITestCase(DockerClientTestCase):
 
     def test_env_file_relative_to_compose_file(self):
         config_path = os.path.abspath('tests/fixtures/env-file/docker-compose.yml')
-        self.command.dispatch(['-f', config_path, 'up', '-d'], None)
-        self._project = get_project(self.command.base_dir, [config_path])
+        self.dispatch(['-f', config_path, 'up', '-d'], None)
+        self._project = get_project(self.base_dir, [config_path])
 
         containers = self.project.containers(stopped=True)
         self.assertEqual(len(containers), 1)
@@ -681,20 +654,18 @@ class CLITestCase(DockerClientTestCase):
     def test_home_and_env_var_in_volume_path(self):
         os.environ['VOLUME_NAME'] = 'my-volume'
         os.environ['HOME'] = '/tmp/home-dir'
-        expected_host_path = os.path.join(os.environ['HOME'], os.environ['VOLUME_NAME'])
 
-        self.command.base_dir = 'tests/fixtures/volume-path-interpolation'
-        self.command.dispatch(['up', '-d'], None)
+        self.base_dir = 'tests/fixtures/volume-path-interpolation'
+        self.dispatch(['up', '-d'], None)
 
         container = self.project.containers(stopped=True)[0]
         actual_host_path = container.get('Volumes')['/container-path']
         components = actual_host_path.split('/')
-        self.assertTrue(components[-2:] == ['home-dir', 'my-volume'],
-                        msg="Last two components differ: %s, %s" % (actual_host_path, expected_host_path))
+        assert components[-2:] == ['home-dir', 'my-volume']
 
     def test_up_with_default_override_file(self):
-        self.command.base_dir = 'tests/fixtures/override-files'
-        self.command.dispatch(['up', '-d'], None)
+        self.base_dir = 'tests/fixtures/override-files'
+        self.dispatch(['up', '-d'], None)
 
         containers = self.project.containers()
         self.assertEqual(len(containers), 2)
@@ -704,15 +675,15 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(db.human_readable_command, 'top')
 
     def test_up_with_multiple_files(self):
-        self.command.base_dir = 'tests/fixtures/override-files'
+        self.base_dir = 'tests/fixtures/override-files'
         config_paths = [
             'docker-compose.yml',
             'docker-compose.override.yml',
             'extra.yml',
 
         ]
-        self._project = get_project(self.command.base_dir, config_paths)
-        self.command.dispatch(
+        self._project = get_project(self.base_dir, config_paths)
+        self.dispatch(
             [
                 '-f', config_paths[0],
                 '-f', config_paths[1],
@@ -731,8 +702,8 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(other.human_readable_command, 'top')
 
     def test_up_with_extends(self):
-        self.command.base_dir = 'tests/fixtures/extends'
-        self.command.dispatch(['up', '-d'], None)
+        self.base_dir = 'tests/fixtures/extends'
+        self.dispatch(['up', '-d'], None)
 
         self.assertEqual(
             set([s.name for s in self.project.services]),

From 45635f709781f4fccec15af19fb60e8c96cf6639 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 2 Nov 2015 17:52:37 -0500
Subject: [PATCH 0486/1265] Move cli tests to a new testing package.

These cli tests are now a different kind of that that run the compose binary. They are not the same as integration tests that test some internal interface.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/acceptance/__init__.py                  |  0
 tests/{integration => acceptance}/cli_test.py | 29 ++++---------------
 .../fixtures/echo-services/docker-compose.yml |  6 ++++
 3 files changed, 12 insertions(+), 23 deletions(-)
 create mode 100644 tests/acceptance/__init__.py
 rename tests/{integration => acceptance}/cli_test.py (96%)
 create mode 100644 tests/fixtures/echo-services/docker-compose.yml

diff --git a/tests/acceptance/__init__.py b/tests/acceptance/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/integration/cli_test.py b/tests/acceptance/cli_test.py
similarity index 96%
rename from tests/integration/cli_test.py
rename to tests/acceptance/cli_test.py
index 7ae187b2..0add049e 100644
--- a/tests/integration/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -6,12 +6,10 @@ import subprocess
 from collections import namedtuple
 from operator import attrgetter
 
-import pytest
-
 from .. import mock
-from .testcases import DockerClientTestCase
 from compose.cli.command import get_project
 from compose.cli.docker_client import docker_client
+from tests.integration.testcases import DockerClientTestCase
 
 
 ProcessResult = namedtuple('ProcessResult', 'stdout stderr')
@@ -45,8 +43,6 @@ class CLITestCase(DockerClientTestCase):
         project_options = project_options or []
         proc = subprocess.Popen(
             ['docker-compose'] + project_options + options,
-            # Note: this might actually be a patched sys.stdout, so we have
-            # to specify it here, even though it's the default
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             cwd=self.base_dir)
@@ -150,7 +146,7 @@ class CLITestCase(DockerClientTestCase):
         assert BUILD_PULL_TEXT in result.stdout
 
     def test_up_detached(self):
-        self.dispatch(['up', '-d'], None)
+        self.dispatch(['up', '-d'])
         service = self.project.get_service('simple')
         another = self.project.get_service('another')
         self.assertEqual(len(service.containers()), 1)
@@ -162,25 +158,12 @@ class CLITestCase(DockerClientTestCase):
         self.assertFalse(container.get('Config.AttachStdout'))
         self.assertFalse(container.get('Config.AttachStdin'))
 
-    # TODO: needs rework
-    @pytest.mark.skipif(True, reason="runs top")
     def test_up_attached(self):
-        with mock.patch(
-            'compose.cli.main.attach_to_logs',
-            autospec=True
-        ) as mock_attach:
-            self.dispatch(['up'], None)
-            _, args, kwargs = mock_attach.mock_calls[0]
-            _project, log_printer, _names, _timeout = args
+        self.base_dir = 'tests/fixtures/echo-services'
+        result = self.dispatch(['up', '--no-color'])
 
-        service = self.project.get_service('simple')
-        another = self.project.get_service('another')
-        self.assertEqual(len(service.containers()), 1)
-        self.assertEqual(len(another.containers()), 1)
-        self.assertEqual(
-            set(log_printer.containers),
-            set(self.project.containers())
-        )
+        assert 'simple_1  | simple' in result.stdout
+        assert 'another_1 | another' in result.stdout
 
     def test_up_without_networking(self):
         self.require_api_version('1.21')
diff --git a/tests/fixtures/echo-services/docker-compose.yml b/tests/fixtures/echo-services/docker-compose.yml
new file mode 100644
index 00000000..8014f3d9
--- /dev/null
+++ b/tests/fixtures/echo-services/docker-compose.yml
@@ -0,0 +1,6 @@
+simple:
+  image: busybox:latest
+  command: echo simple
+another:
+  image: busybox:latest
+  command: echo another

From 3d9e3d08779c38e52f9892eea20f05afb115ffa1 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 2 Nov 2015 13:33:13 -0500
Subject: [PATCH 0487/1265] Remove service.start_container()

It has been an unnecessary wrapper around container.start() for a little while now, so we can call it directly.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py                  |  2 +-
 compose/service.py                   | 13 ++++---------
 tests/acceptance/cli_test.py         |  2 +-
 tests/integration/resilience_test.py |  4 ++--
 tests/integration/service_test.py    | 27 ++++++++++++++-------------
 5 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index b54b307e..11aeac38 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -448,7 +448,7 @@ class TopLevelCommand(DocoptCommand):
             raise e
 
         if detach:
-            service.start_container(container)
+            container.start()
             print(container.name)
         else:
             dockerpty.start(project.client, container.id, interactive=not options['-T'])
diff --git a/compose/service.py b/compose/service.py
index 8d716c0b..e121ee95 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -406,7 +406,7 @@ class Service(object):
             if should_attach_logs:
                 container.attach_log_stream()
 
-            self.start_container(container)
+            container.start()
 
             return [container]
 
@@ -457,21 +457,16 @@ class Service(object):
         )
         if attach_logs:
             new_container.attach_log_stream()
-        self.start_container(new_container)
+        new_container.start()
         container.remove()
         return new_container
 
     def start_container_if_stopped(self, container, attach_logs=False):
-        if container.is_running:
-            return container
-        else:
+        if not container.is_running:
             log.info("Starting %s" % container.name)
             if attach_logs:
                 container.attach_log_stream()
-            return self.start_container(container)
-
-    def start_container(self, container):
-        container.start()
+            container.start()
         return container
 
     def remove_duplicate_containers(self, timeout=DEFAULT_TIMEOUT):
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 0add049e..41e9718b 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -557,7 +557,7 @@ class CLITestCase(DockerClientTestCase):
     def test_restart(self):
         service = self.project.get_service('simple')
         container = service.create_container()
-        service.start_container(container)
+        container.start()
         started_at = container.dictionary['State']['StartedAt']
         self.dispatch(['restart', '-t', '1'], None)
         container.inspect()
diff --git a/tests/integration/resilience_test.py b/tests/integration/resilience_test.py
index befd72c7..53aedfec 100644
--- a/tests/integration/resilience_test.py
+++ b/tests/integration/resilience_test.py
@@ -13,7 +13,7 @@ class ResilienceTest(DockerClientTestCase):
         self.project = Project('composetest', [self.db], self.client)
 
         container = self.db.create_container()
-        self.db.start_container(container)
+        container.start()
         self.host_path = container.get('Volumes')['/var/db']
 
     def test_successful_recreate(self):
@@ -31,7 +31,7 @@ class ResilienceTest(DockerClientTestCase):
         self.assertEqual(container.get('Volumes')['/var/db'], self.host_path)
 
     def test_start_failure(self):
-        with mock.patch('compose.service.Service.start_container', crash):
+        with mock.patch('compose.container.Container.start', crash):
             with self.assertRaises(Crash):
                 self.project.up(strategy=ConvergenceStrategy.always)
 
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 4ac04545..f083908b 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -30,7 +30,8 @@ from compose.service import VolumeFromSpec
 
 def create_and_start_container(service, **override_options):
     container = service.create_container(**override_options)
-    return service.start_container(container)
+    container.start()
+    return container
 
 
 class ServiceTest(DockerClientTestCase):
@@ -115,19 +116,19 @@ class ServiceTest(DockerClientTestCase):
     def test_create_container_with_unspecified_volume(self):
         service = self.create_service('db', volumes=['/var/db'])
         container = service.create_container()
-        service.start_container(container)
+        container.start()
         self.assertIn('/var/db', container.get('Volumes'))
 
     def test_create_container_with_volume_driver(self):
         service = self.create_service('db', volume_driver='foodriver')
         container = service.create_container()
-        service.start_container(container)
+        container.start()
         self.assertEqual('foodriver', container.get('Config.VolumeDriver'))
 
     def test_create_container_with_cpu_shares(self):
         service = self.create_service('db', cpu_shares=73)
         container = service.create_container()
-        service.start_container(container)
+        container.start()
         self.assertEqual(container.get('HostConfig.CpuShares'), 73)
 
     def test_build_extra_hosts(self):
@@ -165,7 +166,7 @@ class ServiceTest(DockerClientTestCase):
         extra_hosts = ['somehost:162.242.195.82', 'otherhost:50.31.209.229']
         service = self.create_service('db', extra_hosts=extra_hosts)
         container = service.create_container()
-        service.start_container(container)
+        container.start()
         self.assertEqual(set(container.get('HostConfig.ExtraHosts')), set(extra_hosts))
 
     def test_create_container_with_extra_hosts_dicts(self):
@@ -173,33 +174,33 @@ class ServiceTest(DockerClientTestCase):
         extra_hosts_list = ['somehost:162.242.195.82', 'otherhost:50.31.209.229']
         service = self.create_service('db', extra_hosts=extra_hosts)
         container = service.create_container()
-        service.start_container(container)
+        container.start()
         self.assertEqual(set(container.get('HostConfig.ExtraHosts')), set(extra_hosts_list))
 
     def test_create_container_with_cpu_set(self):
         service = self.create_service('db', cpuset='0')
         container = service.create_container()
-        service.start_container(container)
+        container.start()
         self.assertEqual(container.get('HostConfig.CpusetCpus'), '0')
 
     def test_create_container_with_read_only_root_fs(self):
         read_only = True
         service = self.create_service('db', read_only=read_only)
         container = service.create_container()
-        service.start_container(container)
+        container.start()
         self.assertEqual(container.get('HostConfig.ReadonlyRootfs'), read_only, container.get('HostConfig'))
 
     def test_create_container_with_security_opt(self):
         security_opt = ['label:disable']
         service = self.create_service('db', security_opt=security_opt)
         container = service.create_container()
-        service.start_container(container)
+        container.start()
         self.assertEqual(set(container.get('HostConfig.SecurityOpt')), set(security_opt))
 
     def test_create_container_with_mac_address(self):
         service = self.create_service('db', mac_address='02:42:ac:11:65:43')
         container = service.create_container()
-        service.start_container(container)
+        container.start()
         self.assertEqual(container.inspect()['Config']['MacAddress'], '02:42:ac:11:65:43')
 
     def test_create_container_with_specified_volume(self):
@@ -208,7 +209,7 @@ class ServiceTest(DockerClientTestCase):
 
         service = self.create_service('db', volumes=['%s:%s' % (host_path, container_path)])
         container = service.create_container()
-        service.start_container(container)
+        container.start()
 
         volumes = container.inspect()['Volumes']
         self.assertIn(container_path, volumes)
@@ -281,7 +282,7 @@ class ServiceTest(DockerClientTestCase):
             ]
         )
         host_container = host_service.create_container()
-        host_service.start_container(host_container)
+        host_container.start()
         self.assertIn(volume_container_1.id + ':rw',
                       host_container.get('HostConfig.VolumesFrom'))
         self.assertIn(volume_container_2.id + ':rw',
@@ -300,7 +301,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(old_container.get('Config.Cmd'), ['-d', '1'])
         self.assertIn('FOO=1', old_container.get('Config.Env'))
         self.assertEqual(old_container.name, 'composetest_db_1')
-        service.start_container(old_container)
+        old_container.start()
         old_container.inspect()  # reload volume data
         volume_path = old_container.get('Volumes')['/etc']
 

From 7014cabb04fed3e31fe65c034604f1224195a2fa Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 9 Oct 2015 12:34:55 -0400
Subject: [PATCH 0488/1265] Remove duplication from extends docs.

Start restructuring extends docs in preparation for adding documentation about using multiple compose files.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/compose-file.md |  51 ++++-----
 docs/extends.md      | 240 +++++++++++--------------------------------
 2 files changed, 80 insertions(+), 211 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 7723a784..00b04d58 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -168,44 +168,29 @@ accessible to linked services. Only the internal port can be specified.
 Extend another service, in the current file or another, optionally overriding
 configuration.
 
-Here's a simple example. Suppose we have 2 files - **common.yml** and
-**development.yml**. We can use `extends` to define a service in
-**development.yml** which uses configuration defined in **common.yml**:
+You can use `extends` on any service together with other configuration keys.
+The value must be a dictionary with the key: `service` and may optionally have
+the `file` key.
 
-**common.yml**
+    extends:
+      file: common.yml
+      service: webapp
 
-    webapp:
-      build: ./webapp
-      environment:
-        - DEBUG=false
-        - SEND_EMAILS=false
+The `file` key specifies the location of a Compose configuration file defining
+the service which is being extended. The `file` value can be an absolute or
+relative path. If you specify a relative path, Docker Compose treats it as
+relative to the location of the current file. If you don't specify a `file`,
+Compose looks in the current configuration file.
 
-**development.yml**
+The `service` key specifies the name of the service to extend, for example `web`
+or `database`.
 
-    web:
-      extends:
-        file: common.yml
-        service: webapp
-      ports:
-        - "8000:8000"
-      links:
-        - db
-      environment:
-        - DEBUG=true
-    db:
-      image: postgres
+You can extend a service that itself extends another. You can extend
+indefinitely. Compose does not support circular references and `docker-compose`
+returns an error if it encounters one.
 
-Here, the `web` service in **development.yml** inherits the configuration of
-the `webapp` service in **common.yml** - the `build` and `environment` keys -
-and adds `ports` and `links` configuration. It overrides one of the defined
-environment variables (DEBUG) with a new value, and the other one
-(SEND_EMAILS) is left untouched.
-
-The `file` key is optional, if it is not set then Compose will look for the
-service within the current file.
-
-For more on `extends`, see the [tutorial](extends.md#example) and
-[reference](extends.md#reference).
+For more on `extends`, see the
+[the extends documentation](extends.md#extending-services).
 
 ### external_links
 
diff --git a/docs/extends.md b/docs/extends.md
index e63cf466..c97b2b4f 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -10,20 +10,29 @@ weight=2
 <![end-metadata]-->
 
 
-## Extending services in Compose
+## Extending services and Compose files
+
+Compose supports two ways to sharing common configuration and
+extend a service with that shared configuration.
+
+1. Extending individual services with [the `extends` field](#extending-services)
+2. Extending entire compositions by
+   [exnteding compose files](#extending-compose-files)
+
+### Extending services
 
 Docker Compose's `extends` keyword enables sharing of common configurations
 among different files, or even different projects entirely. Extending services
-is useful if you have several applications that reuse commonly-defined services.
-Using `extends` you can define a service in one place and refer to it from
-anywhere.
+is useful if you have several services that reuse a common set of configuration
+options. Using `extends` you can define a common set of service options in one
+place and refer to it from anywhere.
 
-Alternatively, you can deploy the same application to multiple environments with
-a slightly different set of services in each case (or with changes to the
-configuration of some services). Moreover, you can do so without copy-pasting
-the configuration around.
+> **Note:** `links` and `volumes_from` are never shared between services using
+> `extends`. See
+> [Adding and overriding configuration](#adding-and-overriding-configuration)
+> for more information.
 
-### Understand the extends configuration
+#### Understand the extends configuration
 
 When defining any service in `docker-compose.yml`, you can declare that you are
 extending another service like this:
@@ -77,183 +86,46 @@ You can also write other services and link your `web` service to them:
     db:
       image: postgres
 
-For full details on how to use `extends`, refer to the [reference](#reference).
+#### Example use case
 
-### Example use case
+Extending an individual service is useful when you have multiple services that
+have a common configuration.  In this example we have a composition that with
+a web application and a queue worker. Both services use the same codebase and
+share many configuration options.
 
-In this example, you’ll repurpose the example app from the [quick start
-guide](/). (If you're not familiar with Compose, it's recommended that
-you go through the quick start first.) This example assumes you want to use
-Compose both to develop an application locally and then deploy it to a
-production environment.
+In a **common.yml** we'll define the common configuration:
 
-The local and production environments are similar, but there are some
-differences. In development, you mount the application code as a volume so that
-it can pick up changes; in production, the code should be immutable from the
-outside. This ensures it’s not accidentally changed. The development environment
-uses a local Redis container, but in production another team manages the Redis
-service, which is listening at `redis-production.example.com`.
+    app:
+      build: .
+      environment:
+        CONFIG_FILE_PATH: /code/config
+        API_KEY: xxxyyy
+      cpu_shares: 5
 
-To configure with `extends` for this sample, you must:
-
-1.  Define the web application as a Docker image in `Dockerfile` and a Compose
-    service in `common.yml`.
-
-2.  Define the development environment in the standard Compose file,
-    `docker-compose.yml`.
-
-    - Use `extends` to pull in the web service.
-    - Configure a volume to enable code reloading.
-    - Create an additional Redis service for the application to use locally.
-
-3.  Define the production environment in a third Compose file, `production.yml`.
-
-    - Use `extends` to pull in the web service.
-    - Configure the web service to talk to the external, production Redis service.
-
-#### Define the web app
-
-Defining the web application requires the following:
-
-1.  Create an `app.py` file.
-
-    This file contains a simple Python application that uses Flask to serve HTTP
-    and increments a counter in Redis:
-
-        from flask import Flask
-        from redis import Redis
-        import os
-
-        app = Flask(__name__)
-        redis = Redis(host=os.environ['REDIS_HOST'], port=6379)
-
-        @app.route('/')
-        def hello():
-           redis.incr('hits')
-           return 'Hello World! I have been seen %s times.\n' % redis.get('hits')
-
-        if __name__ == "__main__":
-           app.run(host="0.0.0.0", debug=True)
-
-    This code uses a `REDIS_HOST` environment variable to determine where to
-    find Redis.
-
-2.  Define the Python dependencies in a `requirements.txt` file:
-
-        flask
-        redis
-
-3.  Create a `Dockerfile` to build an image containing the app:
-
-        FROM python:2.7
-        ADD . /code
-        WORKDIR /code
-        RUN pip install -r requirements.txt
-        CMD python app.py
-
-4.  Create a Compose configuration file called `common.yml`:
-
-    This configuration defines how to run the app.
-
-        web:
-          build: .
-          ports:
-            - "5000:5000"
-
-    Typically, you would have dropped this configuration into
-    `docker-compose.yml` file, but in order to pull it into multiple files with
-    `extends`, it needs to be in a separate file.
-
-#### Define the development environment
-
-1.  Create a `docker-compose.yml` file.
-
-    The `extends` option pulls in the `web` service from the `common.yml` file
-    you created in the previous section.
-
-        web:
-          extends:
-            file: common.yml
-            service: web
-          volumes:
-            - .:/code
-          links:
-            - redis
-          environment:
-            - REDIS_HOST=redis
-        redis:
-          image: redis
-
-    The new addition defines a `web` service that:
-
-    - Fetches the base configuration for `web` out of `common.yml`.
-    - Adds `volumes` and `links` configuration to the base (`common.yml`)
-    configuration.
-    - Sets the `REDIS_HOST` environment variable to point to the linked redis
-    container. This environment uses a stock `redis` image from the Docker Hub.
-
-2.  Run `docker-compose up`.
-
-    Compose creates, links, and starts a web and redis container linked together.
-    It mounts your application code inside the web container.
-
-3.  Verify that the code is mounted by changing the message in
-    `app.py`&mdash;say, from `Hello world!` to `Hello from Compose!`.
-
-    Don't forget to refresh your browser to see the change!
-
-#### Define the production environment
-
-You are almost done. Now, define your production environment:
-
-1.  Create a `production.yml` file.
-
-    As with `docker-compose.yml`, the `extends` option pulls in the `web` service
-    from `common.yml`.
-
-        web:
-          extends:
-            file: common.yml
-            service: web
-          environment:
-            - REDIS_HOST=redis-production.example.com
-
-2.  Run `docker-compose -f production.yml up`.
-
-    Compose creates *just* a web container and configures the Redis connection via
-    the `REDIS_HOST` environment variable. This variable points to the production
-    Redis instance.
-
-    > **Note**: If you try to load up the webapp in your browser you'll get an
-    > error&mdash;`redis-production.example.com` isn't actually a Redis server.
-
-You've now done a basic `extends` configuration. As your application develops,
-you can make any necessary changes to the web service in `common.yml`. Compose
-picks up both the development and production environments when you next run
-`docker-compose`. You don't have to do any copy-and-paste, and you don't have to
-manually keep both environments in sync.
+In a **docker-compose.yml** we'll define the concrete services which use the
+common configuration:
 
 
-### Reference
+    webapp:
+      extends:
+        file: common.yml
+        service: app
+      command: /code/run_web_app
+      ports:
+        - 8080:8080
+      links:
+        - queue
+        - db
 
-You can use `extends` on any service together with other configuration keys. It
-expects a dictionary that contains a `service` key and optionally a `file` key.
-The `extends` key can also take a string, whose value is the name of a `service` defined in the same file.
+    queue_worker:
+      extends:
+        file: common.yml
+        service: app
+    command: /code/run_worker
+    links:
+      - queue
 
-The `file` key specifies the location of a Compose configuration file defining
-the extension. The `file` value can be an absolute or relative path. If you
-specify a relative path, Docker Compose treats it as relative to the location
-of the current file. If you don't specify a `file`, Compose looks in the
-current configuration file.
-
-The `service` key specifies the name of the service to extend, for example `web`
-or `database`.
-
-You can extend a service that itself extends another. You can extend
-indefinitely. Compose does not support circular references and `docker-compose`
-returns an error if it encounters them.
-
-#### Adding and overriding configuration
+#### Adding  and overriding configuration
 
 Compose copies configurations from the original service over to the local one,
 **except** for `links` and `volumes_from`. These exceptions exist to avoid
@@ -282,6 +154,8 @@ listed below.**
 In the case of `build` and `image`, using one in the local service causes
 Compose to discard the other, if it was defined in the original service.
 
+Example of image replacing build:
+
     # original service
     build: .
 
@@ -291,6 +165,9 @@ Compose to discard the other, if it was defined in the original service.
     # result
     image: redis
 
+
+Example of build replacing image:
+
     # original service
     image: redis
 
@@ -356,6 +233,13 @@ locally-defined bindings taking precedence:
       - /local-dir/bar:/bar
       - /local-dir/baz/:baz
 
+
+### Extending Compose files
+
+> **Note:** This feature is new in `docker-compose` 1.5
+
+
+
 ## Compose documentation
 
 - [User guide](/)

From 1c4c7ccface1e71e462b1ff3d840c0d0804d230d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 29 Oct 2015 15:21:06 -0400
Subject: [PATCH 0489/1265] Support a volume to the docs directory and add
 --watch, so docs can be refreshed.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index 021e8f6e..b9ef0548 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -13,8 +13,8 @@ DOCKER_ENVS := \
 	-e TIMEOUT
 # note: we _cannot_ add "-e DOCKER_BUILDTAGS" here because even if it's unset in the shell, that would shadow the "ENV DOCKER_BUILDTAGS" set in our Dockerfile, which is very important for our official builds
 
-# to allow `make DOCSDIR=docs docs-shell` (to create a bind mount in docs)
-DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR)/$(DOCSDIR):/$(DOCSDIR))
+# to allow `make DOCSDIR=1 docs-shell` (to create a bind mount in docs)
+DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR):/docs/content/compose)
 
 # to allow `make DOCSPORT=9000 docs`
 DOCSPORT := 8000
@@ -37,7 +37,7 @@ GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
 default: docs
 
 docs: docs-build
-	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)
+	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP) --watch
 
 docs-draft: docs-build
 	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --buildDrafts="true" --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)

From c5cf5cfad45afb66f6b47fd6b7a0937e1e82f7f3 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 21 Oct 2015 17:17:38 -0400
Subject: [PATCH 0490/1265] Changes to production.md for working with multiple
 Compose files.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/production.md | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/docs/production.md b/docs/production.md
index 0b0e46c3..39f0e1fe 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -12,11 +12,9 @@ weight=1
 
 ## Using Compose in production
 
-While **Compose is not yet considered production-ready**, if you'd like to experiment and learn more about using it in production deployments, this guide
-can help.
-The project is actively working towards becoming
-production-ready; to learn more about the progress being made, check out the <a href="https://github.com/docker/compose/blob/master/ROADMAP.md">roadmap</a> for details
-on how it's coming along and what still needs to be done.
+> Compose is still primarily aimed at development and testing environments.
+> Compose may be used for smaller production deployments, but is probably
+> not yet suitable for larger deployments.
 
 When deploying to production, you'll almost certainly want to make changes to
 your app configuration that are more appropriate to a live environment. These
@@ -30,22 +28,16 @@ changes may include:
 - Specifying a restart policy (e.g., `restart: always`) to avoid downtime
 - Adding extra services (e.g., a log aggregator)
 
-For this reason, you'll probably want to define a separate Compose file, say
-`production.yml`, which specifies production-appropriate configuration.
+For this reason, you'll probably want to define an additional Compose file, say
+`production.yml`, which specifies production-appropriate
+configuration. This configuration file only needs to include the changes you'd
+like to make from the original Compose file.  The additional Compose file
+can be applied over the original `docker-compose.yml` to create a new configuration.
 
-> **Note:** The [extends](extends.md) keyword is useful for maintaining multiple
-> Compose files which re-use common services without having to manually copy and
-> paste.
+Once you've got a second configuration file, tell Compose to use it with the
+`-f` option:
 
-Once you've got an alternate configuration file, make Compose use it
-by setting the `COMPOSE_FILE` environment variable:
-
-    $ export COMPOSE_FILE=production.yml
-    $ docker-compose up -d
-
-> **Note:** You can also use the file for a one-off command without setting
-> an environment variable. You do this by passing the `-f` flag, e.g.,
-> `docker-compose -f production.yml up -d`.
+    $ docker-compose -f docker-compose.yml -f production.yml up -d
 
 ### Deploying changes
 

From eab265befaa6c48d44ad2b9314ccc97ad6630f7b Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 9 Oct 2015 12:56:59 -0400
Subject: [PATCH 0491/1265] Document using multiple Compose files use cases.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/compose-file.md |  18 ++--
 docs/extends.md      | 208 ++++++++++++++++++++++++++++++++++---------
 docs/production.md   |   3 +
 3 files changed, 176 insertions(+), 53 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 00b04d58..4f8fc9e0 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -169,21 +169,21 @@ Extend another service, in the current file or another, optionally overriding
 configuration.
 
 You can use `extends` on any service together with other configuration keys.
-The value must be a dictionary with the key: `service` and may optionally have
-the `file` key.
+The `extends` value must be a dictionary defined with a required `service`
+and an optional `file` key.
 
     extends:
       file: common.yml
       service: webapp
 
-The `file` key specifies the location of a Compose configuration file defining
-the service which is being extended. The `file` value can be an absolute or
-relative path. If you specify a relative path, Docker Compose treats it as
-relative to the location of the current file. If you don't specify a `file`,
-Compose looks in the current configuration file.
+The `service` the name of the service being extended, for example
+`web` or `database`. The `file` is the location of a Compose configuration
+file defining that service.
 
-The `service` key specifies the name of the service to extend, for example `web`
-or `database`.
+If you omit the `file` Compose looks for the service configuration in the
+current file. The `file` value can be an absolute or relative path. If you
+specify a relative path, Compose treats it as relative to the location of the
+current file.
 
 You can extend a service that itself extends another. You can extend
 indefinitely. Compose does not support circular references and `docker-compose`
diff --git a/docs/extends.md b/docs/extends.md
index c97b2b4f..58def22d 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -10,16 +10,15 @@ weight=2
 <![end-metadata]-->
 
 
-## Extending services and Compose files
+# Extending services and Compose files
 
-Compose supports two ways to sharing common configuration and
-extend a service with that shared configuration.
+Compose supports two methods of sharing common configuration:
 
 1. Extending individual services with [the `extends` field](#extending-services)
 2. Extending entire compositions by
-   [exnteding compose files](#extending-compose-files)
+   [using multiple compose files](#multiple-compose-files)
 
-### Extending services
+## Extending services
 
 Docker Compose's `extends` keyword enables sharing of common configurations
 among different files, or even different projects entirely. Extending services
@@ -30,9 +29,9 @@ place and refer to it from anywhere.
 > **Note:** `links` and `volumes_from` are never shared between services using
 > `extends`. See
 > [Adding and overriding configuration](#adding-and-overriding-configuration)
-> for more information.
+ > for more information.
 
-#### Understand the extends configuration
+### Understand the extends configuration
 
 When defining any service in `docker-compose.yml`, you can declare that you are
 extending another service like this:
@@ -54,8 +53,8 @@ looks like this:
         - "/data"
 
 In this case, you'll get exactly the same result as if you wrote
-`docker-compose.yml` with that `build`, `ports` and `volumes` configuration
-defined directly under `web`.
+`docker-compose.yml` with the same `build`, `ports` and `volumes` configuration
+values defined directly under `web`.
 
 You can go further and define (or re-define) configuration locally in
 `docker-compose.yml`:
@@ -86,14 +85,14 @@ You can also write other services and link your `web` service to them:
     db:
       image: postgres
 
-#### Example use case
+### Example use case
 
 Extending an individual service is useful when you have multiple services that
-have a common configuration.  In this example we have a composition that with
-a web application and a queue worker. Both services use the same codebase and
-share many configuration options.
+have a common configuration.  The example below is a composition with
+two services: a web application and a queue worker. Both services use the same
+codebase and share many configuration options.
 
-In a **common.yml** we'll define the common configuration:
+In a **common.yml** we define the common configuration:
 
     app:
       build: .
@@ -102,10 +101,9 @@ In a **common.yml** we'll define the common configuration:
         API_KEY: xxxyyy
       cpu_shares: 5
 
-In a **docker-compose.yml** we'll define the concrete services which use the
+In a **docker-compose.yml** we define the concrete services which use the
 common configuration:
 
-
     webapp:
       extends:
         file: common.yml
@@ -121,11 +119,11 @@ common configuration:
       extends:
         file: common.yml
         service: app
-    command: /code/run_worker
-    links:
-      - queue
+      command: /code/run_worker
+      links:
+        - queue
 
-#### Adding  and overriding configuration
+### Adding and overriding configuration
 
 Compose copies configurations from the original service over to the local one,
 **except** for `links` and `volumes_from`. These exceptions exist to avoid
@@ -134,13 +132,11 @@ locally. This ensures dependencies between services are clearly visible when
 reading the current file. Defining these locally also ensures changes to the
 referenced file don't result in breakage.
 
-If a configuration option is defined in both the original service and the local
-service, the local value either *override*s or *extend*s the definition of the
-original service. This works differently for other configuration options.
+If a configuration option is defined in both the original service the local
+service, the local value *replaces* or *extends* the original value.
 
 For single-value options like `image`, `command` or `mem_limit`, the new value
-replaces the old value. **This is the default behaviour - all exceptions are
-listed below.**
+replaces the old value.
 
     # original service
     command: python app.py
@@ -195,8 +191,8 @@ For the **multi-value options** `ports`, `expose`, `external_links`, `dns` and
       - "4000"
       - "5000"
 
-In the case of `environment` and `labels`, Compose "merges" entries together
-with locally-defined values taking precedence:
+In the case of `environment`, `labels`, `volumes` and `devices`, Compose
+"merges" entries together with locally-defined values taking precedence:
 
     # original service
     environment:
@@ -214,30 +210,154 @@ with locally-defined values taking precedence:
       - BAR=local
       - BAZ=local
 
-Finally, for `volumes` and `devices`, Compose "merges" entries together with
-locally-defined bindings taking precedence:
 
-    # original service
-    volumes:
-      - /original-dir/foo:/foo
-      - /original-dir/bar:/bar
+## Multiple Compose files
 
-    # local service
-    volumes:
-      - /local-dir/bar:/bar
-      - /local-dir/baz/:baz
+Using multiple Compose files enables you to customize a composition for
+different environments or different workflows.
 
-    # result
-    volumes:
-      - /original-dir/foo:/foo
-      - /local-dir/bar:/bar
-      - /local-dir/baz/:baz
+### Understanding multiple Compose files
+
+By default, Compose reads two files, a `docker-compose.yml` and an optional
+`docker-compose.override.yml` file. By convention, the `docker-compose.yml`
+contains your base configuration. The override file, as its name implies, can
+contain configuration overrides for existing services or entirely new
+services.
+
+If a service is defined in both files, Compose merges the configurations using
+the same rules as the `extends` field (see [Adding and overriding
+configuration](#adding-and-overriding-configuration)), with one exception.  If a
+service contains `links` or `volumes_from` those fields are copied over and
+replace any values in the original service, in the same way single-valued fields
+are copied.
+
+To use multiple override files, or an override file with a different name, you
+can use the `-f` option to specify the list of files. Compose merges files in
+the order they're specified on the command line. See the [`docker-compose`
+command reference](./reference/docker-compose.md) for more information about
+using `-f`.
+
+When you use multiple configuration files, you must make sure all paths in the
+files are relative to the base Compose file (the first Compose file specified
+with `-f`). This is required because override files need not be valid
+Compose files. Override files can contain small fragments of configuration.
+Tracking which fragment of a service is relative to which path is difficult and
+confusing, so to keep paths easier to understand, all paths must be defined
+relative to the base file.
+
+### Example use case
+
+In this section are two common use cases for multiple compose files: changing a
+composition for different environments, and running administrative tasks
+against a composition.
+
+#### Different environments
+
+A common use case for multiple files is changing a development composition
+for a production-like environment (which may be production, staging or CI).
+To support these differences, you can split your Compose configuration into
+a few different files:
+
+Start with a base file that defines the canonical configuration for the
+services.
+
+**docker-compose.yml**
+
+    web:
+      image: example/my_web_app:latest
+      links:
+        - db
+        - cache
+
+    db:
+      image: postgres:latest
+
+    cache:
+      image: redis:latest
+
+In this example the development configuration exposes some ports to the
+host, mounts our code as a volume, and builds the web image.
+
+**docker-compose.override.yml**
 
 
-### Extending Compose files
+    web:
+      build: .
+      volumes:
+        - '.:/code'
+      ports:
+        - 8883:80
+      environment:
+        DEBUG: 'true'
 
-> **Note:** This feature is new in `docker-compose` 1.5
+    db:
+      command: '-d'
+      ports:
+        - 5432:5432
 
+    cache:
+      ports:
+        - 6379:6379
+
+When you run `docker-compose up` it reads the overrides automatically.
+
+Now, it would be nice to use this composition in a production environment. So,
+create another override file (which might be stored in a different git
+repo or managed by a different team).
+
+**docker-compose.prod.yml**
+
+    web:
+      ports:
+        - 80:80
+      environment:
+        PRODUCTION: 'true'
+
+    cache:
+      environment:
+        TTL: '500'
+
+To deploy with this production Compose file you can run
+
+    docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
+
+This deploys all three services using the configuration in
+`docker-compose.yml` and `docker-compose.prod.yml` (but not the
+dev configuration in `docker-compose.override.yml`).
+
+
+See [production](production.md) for more information about Compose in
+production.
+
+#### Administrative tasks
+
+Another common use case is running adhoc or administrative tasks against one
+or more services in a composition. This example demonstrates running a
+database backup.
+
+Start with a **docker-compose.yml**.
+
+    web:
+      image: example/my_web_app:latest
+      links:
+        - db
+
+    db:
+      image: postgres:latest
+
+In a **docker-compose.admin.yml** add a new service to run the database
+export or backup.
+
+    dbadmin:
+      build: database_admin/
+      links:
+        - db
+
+To start a normal environment run `docker-compose up -d`. To run a database
+backup, include the `docker-compose.admin.yml` as well.
+
+    docker-compose -f docker-compose.yml -f docker-compose.admin.yml \
+        run dbadmin db-backup
 
 
 ## Compose documentation
diff --git a/docs/production.md b/docs/production.md
index 39f0e1fe..0a5e77b5 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -39,6 +39,9 @@ Once you've got a second configuration file, tell Compose to use it with the
 
     $ docker-compose -f docker-compose.yml -f production.yml up -d
 
+See [Using multiple compose files](extends.md#different-environments) for a more
+complete example.
+
 ### Deploying changes
 
 When you make changes to your app code, you'll need to rebuild your image and

From 8bdde9a7313fbaf5221dff20b314aa0fed0dd66a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 2 Nov 2015 15:14:42 -0500
Subject: [PATCH 0492/1265] Replace composition with Compose app.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/extends.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/extends.md b/docs/extends.md
index 58def22d..e4d09af9 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -15,8 +15,8 @@ weight=2
 Compose supports two methods of sharing common configuration:
 
 1. Extending individual services with [the `extends` field](#extending-services)
-2. Extending entire compositions by
-   [using multiple compose files](#multiple-compose-files)
+2. Extending entire Compose file by
+   [using multiple Compose files](#multiple-compose-files)
 
 ## Extending services
 
@@ -88,7 +88,7 @@ You can also write other services and link your `web` service to them:
 ### Example use case
 
 Extending an individual service is useful when you have multiple services that
-have a common configuration.  The example below is a composition with
+have a common configuration.  The example below is a Compose app with
 two services: a web application and a queue worker. Both services use the same
 codebase and share many configuration options.
 
@@ -213,8 +213,8 @@ In the case of `environment`, `labels`, `volumes` and `devices`, Compose
 
 ## Multiple Compose files
 
-Using multiple Compose files enables you to customize a composition for
-different environments or different workflows.
+Using multiple Compose files enables you to customize a Compose application
+for different environments or different workflows.
 
 ### Understanding multiple Compose files
 
@@ -248,12 +248,12 @@ relative to the base file.
 ### Example use case
 
 In this section are two common use cases for multiple compose files: changing a
-composition for different environments, and running administrative tasks
-against a composition.
+Compose app for different environments, and running administrative tasks
+against a Compose app.
 
 #### Different environments
 
-A common use case for multiple files is changing a development composition
+A common use case for multiple files is changing a development Compose app
 for a production-like environment (which may be production, staging or CI).
 To support these differences, you can split your Compose configuration into
 a few different files:
@@ -301,7 +301,7 @@ host, mounts our code as a volume, and builds the web image.
 
 When you run `docker-compose up` it reads the overrides automatically.
 
-Now, it would be nice to use this composition in a production environment. So,
+Now, it would be nice to use this Compose app in a production environment. So,
 create another override file (which might be stored in a different git
 repo or managed by a different team).
 
@@ -332,7 +332,7 @@ production.
 #### Administrative tasks
 
 Another common use case is running adhoc or administrative tasks against one
-or more services in a composition. This example demonstrates running a
+or more services in a Compose app. This example demonstrates running a
 database backup.
 
 Start with a **docker-compose.yml**.

From e503e085ac98e6e744020f5068be40412f443f67 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 3 Nov 2015 11:52:44 -0500
Subject: [PATCH 0493/1265] Re-order extends docs.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/extends.md | 391 ++++++++++++++++++++++++------------------------
 1 file changed, 197 insertions(+), 194 deletions(-)

diff --git a/docs/extends.md b/docs/extends.md
index e4d09af9..b21b6d76 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -14,201 +14,9 @@ weight=2
 
 Compose supports two methods of sharing common configuration:
 
-1. Extending individual services with [the `extends` field](#extending-services)
-2. Extending entire Compose file by
+1. Extending an entire Compose file by
    [using multiple Compose files](#multiple-compose-files)
-
-## Extending services
-
-Docker Compose's `extends` keyword enables sharing of common configurations
-among different files, or even different projects entirely. Extending services
-is useful if you have several services that reuse a common set of configuration
-options. Using `extends` you can define a common set of service options in one
-place and refer to it from anywhere.
-
-> **Note:** `links` and `volumes_from` are never shared between services using
-> `extends`. See
-> [Adding and overriding configuration](#adding-and-overriding-configuration)
- > for more information.
-
-### Understand the extends configuration
-
-When defining any service in `docker-compose.yml`, you can declare that you are
-extending another service like this:
-
-    web:
-      extends:
-        file: common-services.yml
-        service: webapp
-
-This instructs Compose to re-use the configuration for the `webapp` service
-defined in the `common-services.yml` file. Suppose that `common-services.yml`
-looks like this:
-
-    webapp:
-      build: .
-      ports:
-        - "8000:8000"
-      volumes:
-        - "/data"
-
-In this case, you'll get exactly the same result as if you wrote
-`docker-compose.yml` with the same `build`, `ports` and `volumes` configuration
-values defined directly under `web`.
-
-You can go further and define (or re-define) configuration locally in
-`docker-compose.yml`:
-
-    web:
-      extends:
-        file: common-services.yml
-        service: webapp
-      environment:
-        - DEBUG=1
-      cpu_shares: 5
-
-    important_web:
-      extends: web
-      cpu_shares: 10
-
-You can also write other services and link your `web` service to them:
-
-    web:
-      extends:
-        file: common-services.yml
-        service: webapp
-      environment:
-        - DEBUG=1
-      cpu_shares: 5
-      links:
-        - db
-    db:
-      image: postgres
-
-### Example use case
-
-Extending an individual service is useful when you have multiple services that
-have a common configuration.  The example below is a Compose app with
-two services: a web application and a queue worker. Both services use the same
-codebase and share many configuration options.
-
-In a **common.yml** we define the common configuration:
-
-    app:
-      build: .
-      environment:
-        CONFIG_FILE_PATH: /code/config
-        API_KEY: xxxyyy
-      cpu_shares: 5
-
-In a **docker-compose.yml** we define the concrete services which use the
-common configuration:
-
-    webapp:
-      extends:
-        file: common.yml
-        service: app
-      command: /code/run_web_app
-      ports:
-        - 8080:8080
-      links:
-        - queue
-        - db
-
-    queue_worker:
-      extends:
-        file: common.yml
-        service: app
-      command: /code/run_worker
-      links:
-        - queue
-
-### Adding and overriding configuration
-
-Compose copies configurations from the original service over to the local one,
-**except** for `links` and `volumes_from`. These exceptions exist to avoid
-implicit dependencies&mdash;you always define `links` and `volumes_from`
-locally. This ensures dependencies between services are clearly visible when
-reading the current file. Defining these locally also ensures changes to the
-referenced file don't result in breakage.
-
-If a configuration option is defined in both the original service the local
-service, the local value *replaces* or *extends* the original value.
-
-For single-value options like `image`, `command` or `mem_limit`, the new value
-replaces the old value.
-
-    # original service
-    command: python app.py
-
-    # local service
-    command: python otherapp.py
-
-    # result
-    command: python otherapp.py
-
-In the case of `build` and `image`, using one in the local service causes
-Compose to discard the other, if it was defined in the original service.
-
-Example of image replacing build:
-
-    # original service
-    build: .
-
-    # local service
-    image: redis
-
-    # result
-    image: redis
-
-
-Example of build replacing image:
-
-    # original service
-    image: redis
-
-    # local service
-    build: .
-
-    # result
-    build: .
-
-For the **multi-value options** `ports`, `expose`, `external_links`, `dns` and
-`dns_search`, Compose concatenates both sets of values:
-
-    # original service
-    expose:
-      - "3000"
-
-    # local service
-    expose:
-      - "4000"
-      - "5000"
-
-    # result
-    expose:
-      - "3000"
-      - "4000"
-      - "5000"
-
-In the case of `environment`, `labels`, `volumes` and `devices`, Compose
-"merges" entries together with locally-defined values taking precedence:
-
-    # original service
-    environment:
-      - FOO=original
-      - BAR=original
-
-    # local service
-    environment:
-      - BAR=local
-      - BAZ=local
-
-    # result
-    environment:
-      - FOO=original
-      - BAR=local
-      - BAZ=local
+2. Extending individual services with [the `extends` field](#extending-services)
 
 
 ## Multiple Compose files
@@ -360,6 +168,201 @@ backup, include the `docker-compose.admin.yml` as well.
         run dbadmin db-backup
 
 
+## Extending services
+
+Docker Compose's `extends` keyword enables sharing of common configurations
+among different files, or even different projects entirely. Extending services
+is useful if you have several services that reuse a common set of configuration
+options. Using `extends` you can define a common set of service options in one
+place and refer to it from anywhere.
+
+> **Note:** `links` and `volumes_from` are never shared between services using
+> `extends`. See
+> [Adding and overriding configuration](#adding-and-overriding-configuration)
+ > for more information.
+
+### Understand the extends configuration
+
+When defining any service in `docker-compose.yml`, you can declare that you are
+extending another service like this:
+
+    web:
+      extends:
+        file: common-services.yml
+        service: webapp
+
+This instructs Compose to re-use the configuration for the `webapp` service
+defined in the `common-services.yml` file. Suppose that `common-services.yml`
+looks like this:
+
+    webapp:
+      build: .
+      ports:
+        - "8000:8000"
+      volumes:
+        - "/data"
+
+In this case, you'll get exactly the same result as if you wrote
+`docker-compose.yml` with the same `build`, `ports` and `volumes` configuration
+values defined directly under `web`.
+
+You can go further and define (or re-define) configuration locally in
+`docker-compose.yml`:
+
+    web:
+      extends:
+        file: common-services.yml
+        service: webapp
+      environment:
+        - DEBUG=1
+      cpu_shares: 5
+
+    important_web:
+      extends: web
+      cpu_shares: 10
+
+You can also write other services and link your `web` service to them:
+
+    web:
+      extends:
+        file: common-services.yml
+        service: webapp
+      environment:
+        - DEBUG=1
+      cpu_shares: 5
+      links:
+        - db
+    db:
+      image: postgres
+
+### Example use case
+
+Extending an individual service is useful when you have multiple services that
+have a common configuration.  The example below is a Compose app with
+two services: a web application and a queue worker. Both services use the same
+codebase and share many configuration options.
+
+In a **common.yml** we define the common configuration:
+
+    app:
+      build: .
+      environment:
+        CONFIG_FILE_PATH: /code/config
+        API_KEY: xxxyyy
+      cpu_shares: 5
+
+In a **docker-compose.yml** we define the concrete services which use the
+common configuration:
+
+    webapp:
+      extends:
+        file: common.yml
+        service: app
+      command: /code/run_web_app
+      ports:
+        - 8080:8080
+      links:
+        - queue
+        - db
+
+    queue_worker:
+      extends:
+        file: common.yml
+        service: app
+      command: /code/run_worker
+      links:
+        - queue
+
+## Adding and overriding configuration
+
+Compose copies configurations from the original service over to the local one,
+**except** for `links` and `volumes_from`. These exceptions exist to avoid
+implicit dependencies&mdash;you always define `links` and `volumes_from`
+locally. This ensures dependencies between services are clearly visible when
+reading the current file. Defining these locally also ensures changes to the
+referenced file don't result in breakage.
+
+If a configuration option is defined in both the original service the local
+service, the local value *replaces* or *extends* the original value.
+
+For single-value options like `image`, `command` or `mem_limit`, the new value
+replaces the old value.
+
+    # original service
+    command: python app.py
+
+    # local service
+    command: python otherapp.py
+
+    # result
+    command: python otherapp.py
+
+In the case of `build` and `image`, using one in the local service causes
+Compose to discard the other, if it was defined in the original service.
+
+Example of image replacing build:
+
+    # original service
+    build: .
+
+    # local service
+    image: redis
+
+    # result
+    image: redis
+
+
+Example of build replacing image:
+
+    # original service
+    image: redis
+
+    # local service
+    build: .
+
+    # result
+    build: .
+
+For the **multi-value options** `ports`, `expose`, `external_links`, `dns` and
+`dns_search`, Compose concatenates both sets of values:
+
+    # original service
+    expose:
+      - "3000"
+
+    # local service
+    expose:
+      - "4000"
+      - "5000"
+
+    # result
+    expose:
+      - "3000"
+      - "4000"
+      - "5000"
+
+In the case of `environment`, `labels`, `volumes` and `devices`, Compose
+"merges" entries together with locally-defined values taking precedence:
+
+    # original service
+    environment:
+      - FOO=original
+      - BAR=original
+
+    # local service
+    environment:
+      - BAR=local
+      - BAZ=local
+
+    # result
+    environment:
+      - FOO=original
+      - BAR=local
+      - BAZ=local
+
+
+
+
 ## Compose documentation
 
 - [User guide](/)

From 385b4280a1f6d2b36dccb43a0f99858693ff673f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 4 Nov 2015 15:33:37 -0500
Subject: [PATCH 0494/1265] Fix jenkins CI by using an older docker version to
 match the host.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b28a438d..acf9b6ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*
 
-RUN curl https://get.docker.com/builds/Linux/x86_64/docker-latest \
+RUN curl https://get.docker.com/builds/Linux/x86_64/docker-1.8.3 \
         -o /usr/local/bin/docker && \
     chmod +x /usr/local/bin/docker
 

From 6b002fb9225907f1c9b48523879b1263b607bdeb Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 3 Nov 2015 11:30:34 -0500
Subject: [PATCH 0495/1265] Cherry-pick release notes froim 1.5.0

And bump version to 1.6.0dev

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 CHANGELOG.md        | 101 ++++++++++++++++++++++++++++++++++++++++++++
 compose/__init__.py |   2 +-
 docs/install.md     |   2 +-
 3 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 598f5e57..dde42542 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,107 @@
 Change log
 ==========
 
+1.5.0 (2015-11-03)
+------------------
+
+**Breaking changes:**
+
+With the introduction of variable substitution support in the Compose file, any
+Compose file that uses an environment variable (`$VAR` or `${VAR}`) in the `command:`
+or `entrypoint:` field will break.
+
+Previously these values were interpolated inside the container, with a value
+from the container environment.  In Compose 1.5.0, the values will be
+interpolated on the host, with a value from the host environment.
+
+To migrate a Compose file to 1.5.0, escape the variables with an extra `$`
+(ex: `$$VAR` or `$${VAR}`).  See
+https://github.com/docker/compose/blob/8cc8e61/docs/compose-file.md#variable-substitution
+
+Major features:
+
+-   Compose is now available for Windows.
+
+-   Environment variables can be used in the Compose file. See
+    https://github.com/docker/compose/blob/8cc8e61/docs/compose-file.md#variable-substitution
+
+-   Multiple compose files can be specified, allowing you to override
+    settings in the default Compose file. See
+    https://github.com/docker/compose/blob/8cc8e61/docs/reference/docker-compose.md
+    for more details.
+
+-   Compose now produces better error messages when a file contains
+    invalid configuration.
+
+-   `up` now waits for all services to exit before shutting down,
+    rather than shutting down as soon as one container exits.
+
+-   Experimental support for the new docker networking system can be
+    enabled with the `--x-networking` flag. Read more here:
+    https://github.com/docker/docker/blob/8fee1c20/docs/userguide/dockernetworks.md
+
+New features:
+
+-   You can now optionally pass a mode to `volumes_from`, e.g.
+    `volumes_from: ["servicename:ro"]`.
+
+-   Since Docker now lets you create volumes with names, you can refer to those
+    volumes by name in `docker-compose.yml`. For example,
+    `volumes: ["mydatavolume:/data"]` will mount the volume named
+    `mydatavolume` at the path `/data` inside the container.
+
+    If the first component of an entry in `volumes` starts with a `.`, `/` or
+    `~`, it is treated as a path and expansion of relative paths is performed as
+    necessary. Otherwise, it is treated as a volume name and passed straight
+    through to Docker.
+
+    Read more on named volumes and volume drivers here:
+    https://github.com/docker/docker/blob/244d9c33/docs/userguide/dockervolumes.md
+
+-   `docker-compose build --pull` instructs Compose to pull the base image for
+    each Dockerfile before building.
+
+-   `docker-compose pull --ignore-pull-failures` instructs Compose to continue
+    if it fails to pull a single service's image, rather than aborting.
+
+-   You can now specify an IPC namespace in `docker-compose.yml` with the `ipc`
+    option.
+
+-   Containers created by `docker-compose run` can now be named with the
+    `--name` flag.
+
+-   If you install Compose with pip or use it as a library, it now works with
+    Python 3.
+
+-   `image` now supports image digests (in addition to ids and tags), e.g.
+    `image: "busybox@sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d"`
+
+-   `ports` now supports ranges of ports, e.g.
+
+        ports:
+          - "3000-3005"
+          - "9000-9001:8000-8001"
+
+-   `docker-compose run` now supports a `-p|--publish` parameter, much like
+    `docker run -p`, for publishing specific ports to the host.
+
+-   `docker-compose pause` and `docker-compose unpause` have been implemented,
+    analogous to `docker pause` and `docker unpause`.
+
+-   When using `extends` to copy configuration from another service in the same
+    Compose file, you can omit the `file` option.
+
+-   Compose can be installed and run as a Docker image. This is an experimental
+    feature.
+
+Bug fixes:
+
+-   All values for the `log_driver` option which are supported by the Docker
+    daemon are now supported by Compose.
+
+-   `docker-compose build` can now be run successfully against a Swarm cluster.
+
+
 1.4.2 (2015-09-22)
 ------------------
 
diff --git a/compose/__init__.py b/compose/__init__.py
index e3ace983..7c16c97b 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '1.5.0dev'
+__version__ = '1.6.0dev'
diff --git a/docs/install.md b/docs/install.md
index e19bda0f..c5304409 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
 7. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.4.2
+        docker-compose version: 1.5.0
 
 
 ## Alternative install options

From d18ad4c81221e13346b8840a35a3defb71d86378 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 3 Nov 2015 16:58:30 -0500
Subject: [PATCH 0496/1265] Fix rebase-bump-commit script when used with a
 final release.

Previously it would find commits for RC releases, which broke the rebase.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/release/rebase-bump-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/release/rebase-bump-commit b/script/release/rebase-bump-commit
index 14ad22a9..23877bb5 100755
--- a/script/release/rebase-bump-commit
+++ b/script/release/rebase-bump-commit
@@ -22,7 +22,7 @@ VERSION="$(git config "branch.${BRANCH}.release")" || usage
 
 
 COMMIT_MSG="Bump $VERSION"
-sha="$(git log --grep "$COMMIT_MSG" --format="%H")"
+sha="$(git log --grep "$COMMIT_MSG\$" --format="%H")"
 if [ -z "$sha" ]; then
     >&2 echo "No commit with message \"$COMMIT_MSG\""
     exit 2

From 0227b3adbdec8595d013ce70364dff08a691ef4e Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 5 Nov 2015 10:26:54 -0500
Subject: [PATCH 0497/1265] Upgrade pyyaml to 3.11

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index daaaa950..60327d72 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-PyYAML==3.10
+PyYAML==3.11
 docker-py==1.5.0
 dockerpty==0.3.4
 docopt==0.6.1

From ce322047a052d96cf9a6f1dd65df66385b215e50 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 28 Oct 2015 13:16:19 -0400
Subject: [PATCH 0498/1265] Move config hash tests to service_test.py

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/integration/service_test.py | 37 +++++++++++++++++++++++++++++++
 tests/integration/state_test.py   | 36 ------------------------------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index f083908b..804f5219 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -14,6 +14,7 @@ from .. import mock
 from .testcases import DockerClientTestCase
 from .testcases import pull_busybox
 from compose import __version__
+from compose.const import LABEL_CONFIG_HASH
 from compose.const import LABEL_CONTAINER_NUMBER
 from compose.const import LABEL_ONE_OFF
 from compose.const import LABEL_PROJECT
@@ -23,6 +24,7 @@ from compose.container import Container
 from compose.service import build_extra_hosts
 from compose.service import ConfigError
 from compose.service import ConvergencePlan
+from compose.service import ConvergenceStrategy
 from compose.service import Net
 from compose.service import Service
 from compose.service import VolumeFromSpec
@@ -930,3 +932,38 @@ class ServiceTest(DockerClientTestCase):
 
         self.assertEqual(set(service.containers(stopped=True)), set([original, duplicate]))
         self.assertEqual(set(service.duplicate_containers()), set([duplicate]))
+
+
+def converge(service,
+             strategy=ConvergenceStrategy.changed,
+             do_build=True):
+    """Create a converge plan from a strategy and execute the plan."""
+    plan = service.convergence_plan(strategy)
+    return service.execute_convergence_plan(plan, do_build=do_build, timeout=1)
+
+
+class ConfigHashTest(DockerClientTestCase):
+    def test_no_config_hash_when_one_off(self):
+        web = self.create_service('web')
+        container = web.create_container(one_off=True)
+        self.assertNotIn(LABEL_CONFIG_HASH, container.labels)
+
+    def test_no_config_hash_when_overriding_options(self):
+        web = self.create_service('web')
+        container = web.create_container(environment={'FOO': '1'})
+        self.assertNotIn(LABEL_CONFIG_HASH, container.labels)
+
+    def test_config_hash_with_custom_labels(self):
+        web = self.create_service('web', labels={'foo': '1'})
+        container = converge(web)[0]
+        self.assertIn(LABEL_CONFIG_HASH, container.labels)
+        self.assertIn('foo', container.labels)
+
+    def test_config_hash_sticks_around(self):
+        web = self.create_service('web', command=["top"])
+        container = converge(web)[0]
+        self.assertIn(LABEL_CONFIG_HASH, container.labels)
+
+        web = self.create_service('web', command=["top", "-d", "1"])
+        container = converge(web)[0]
+        self.assertIn(LABEL_CONFIG_HASH, container.labels)
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index 3230aefc..cb904572 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -10,7 +10,6 @@ import tempfile
 
 from .testcases import DockerClientTestCase
 from compose.config import config
-from compose.const import LABEL_CONFIG_HASH
 from compose.project import Project
 from compose.service import ConvergenceStrategy
 
@@ -180,14 +179,6 @@ class ProjectWithDependenciesTest(ProjectTestCase):
         self.assertEqual(len(containers), 2)
 
 
-def converge(service,
-             strategy=ConvergenceStrategy.changed,
-             do_build=True):
-    """Create a converge plan from a strategy and execute the plan."""
-    plan = service.convergence_plan(strategy)
-    return service.execute_convergence_plan(plan, do_build=do_build, timeout=1)
-
-
 class ServiceStateTest(DockerClientTestCase):
     """Test cases for Service.convergence_plan."""
 
@@ -278,30 +269,3 @@ class ServiceStateTest(DockerClientTestCase):
             self.assertEqual(('recreate', [container]), web.convergence_plan())
         finally:
             shutil.rmtree(context)
-
-
-class ConfigHashTest(DockerClientTestCase):
-    def test_no_config_hash_when_one_off(self):
-        web = self.create_service('web')
-        container = web.create_container(one_off=True)
-        self.assertNotIn(LABEL_CONFIG_HASH, container.labels)
-
-    def test_no_config_hash_when_overriding_options(self):
-        web = self.create_service('web')
-        container = web.create_container(environment={'FOO': '1'})
-        self.assertNotIn(LABEL_CONFIG_HASH, container.labels)
-
-    def test_config_hash_with_custom_labels(self):
-        web = self.create_service('web', labels={'foo': '1'})
-        container = converge(web)[0]
-        self.assertIn(LABEL_CONFIG_HASH, container.labels)
-        self.assertIn('foo', container.labels)
-
-    def test_config_hash_sticks_around(self):
-        web = self.create_service('web', command=["top"])
-        container = converge(web)[0]
-        self.assertIn(LABEL_CONFIG_HASH, container.labels)
-
-        web = self.create_service('web', command=["top", "-d", "1"])
-        container = converge(web)[0]
-        self.assertIn(LABEL_CONFIG_HASH, container.labels)

From 8ff960afd13b71bbe84fb7bef2120cc8f958de93 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 3 Nov 2015 20:00:54 -0500
Subject: [PATCH 0499/1265] Fix service recreate when image changes to build.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py               | 13 ++++---
 tests/integration/state_test.py  | 65 ++++++++++++++++++--------------
 tests/unit/config/config_test.py |  2 +
 3 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index e121ee95..e5a4cc4a 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -414,6 +414,7 @@ class Service(object):
             return [
                 self.recreate_container(
                     container,
+                    do_build=do_build,
                     timeout=timeout,
                     attach_logs=should_attach_logs
                 )
@@ -435,10 +436,12 @@ class Service(object):
         else:
             raise Exception("Invalid action: {}".format(action))
 
-    def recreate_container(self,
-                           container,
-                           timeout=DEFAULT_TIMEOUT,
-                           attach_logs=False):
+    def recreate_container(
+            self,
+            container,
+            do_build=False,
+            timeout=DEFAULT_TIMEOUT,
+            attach_logs=False):
         """Recreate a container.
 
         The original container is renamed to a temporary name so that data
@@ -450,7 +453,7 @@ class Service(object):
         container.stop(timeout=timeout)
         container.rename_to_tmp_name()
         new_container = self.create_container(
-            do_build=False,
+            do_build=do_build,
             previous_container=container,
             number=container.labels.get(LABEL_CONTAINER_NUMBER),
             quiet=True,
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index cb904572..7830ba32 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -4,9 +4,7 @@ by `docker-compose up`.
 """
 from __future__ import unicode_literals
 
-import os
-import shutil
-import tempfile
+import py
 
 from .testcases import DockerClientTestCase
 from compose.config import config
@@ -232,40 +230,49 @@ class ServiceStateTest(DockerClientTestCase):
 
         image_id = self.client.images(name='busybox')[0]['Id']
         self.client.tag(image_id, repository=repo, tag=tag)
+        self.addCleanup(self.client.remove_image, image)
 
-        try:
-            web = self.create_service('web', image=image)
-            container = web.create_container()
+        web = self.create_service('web', image=image)
+        container = web.create_container()
 
-            # update the image
-            c = self.client.create_container(image, ['touch', '/hello.txt'])
-            self.client.commit(c, repository=repo, tag=tag)
-            self.client.remove_container(c)
+        # update the image
+        c = self.client.create_container(image, ['touch', '/hello.txt'])
+        self.client.commit(c, repository=repo, tag=tag)
+        self.client.remove_container(c)
 
-            web = self.create_service('web', image=image)
-            self.assertEqual(('recreate', [container]), web.convergence_plan())
-
-        finally:
-            self.client.remove_image(image)
+        web = self.create_service('web', image=image)
+        self.assertEqual(('recreate', [container]), web.convergence_plan())
 
     def test_trigger_recreate_with_build(self):
-        context = tempfile.mkdtemp()
+        context = py.test.ensuretemp('test_trigger_recreate_with_build')
+        self.addCleanup(context.remove)
+
         base_image = "FROM busybox\nLABEL com.docker.compose.test_image=true\n"
+        dockerfile = context.join('Dockerfile')
+        dockerfile.write(base_image)
 
-        try:
-            dockerfile = os.path.join(context, 'Dockerfile')
+        web = self.create_service('web', build=str(context))
+        container = web.create_container()
 
-            with open(dockerfile, 'w') as f:
-                f.write(base_image)
+        dockerfile.write(base_image + 'CMD echo hello world\n')
+        web.build()
 
-            web = self.create_service('web', build=context)
-            container = web.create_container()
+        web = self.create_service('web', build=str(context))
+        self.assertEqual(('recreate', [container]), web.convergence_plan())
 
-            with open(dockerfile, 'w') as f:
-                f.write(base_image + 'CMD echo hello world\n')
-            web.build()
+    def test_image_changed_to_build(self):
+        context = py.test.ensuretemp('test_image_changed_to_build')
+        self.addCleanup(context.remove)
+        context.join('Dockerfile').write("""
+            FROM busybox
+            LABEL com.docker.compose.test_image=true
+        """)
 
-            web = self.create_service('web', build=context)
-            self.assertEqual(('recreate', [container]), web.convergence_plan())
-        finally:
-            shutil.rmtree(context)
+        web = self.create_service('web', image='busybox')
+        container = web.create_container()
+
+        web = self.create_service('web', build=str(context))
+        plan = web.convergence_plan()
+        self.assertEqual(('recreate', [container]), plan)
+        containers = web.execute_convergence_plan(plan)
+        self.assertEqual(len(containers), 1)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 7246b661..69b23585 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -177,6 +177,7 @@ class ConfigTest(unittest.TestCase):
         details = config.ConfigDetails('.', [base_file, override_file])
 
         tmpdir = py.test.ensuretemp('config_test')
+        self.addCleanup(tmpdir.remove)
         tmpdir.join('common.yml').write("""
             base:
               labels: ['label=one']
@@ -412,6 +413,7 @@ class ConfigTest(unittest.TestCase):
 
     def test_load_yaml_with_yaml_error(self):
         tmpdir = py.test.ensuretemp('invalid_yaml_test')
+        self.addCleanup(tmpdir.remove)
         invalid_yaml_file = tmpdir.join('docker-compose.yml')
         invalid_yaml_file.write("""
             web:

From 26c7dd37126cca09b149d3de7f134d5c8a766fdd Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 4 Nov 2015 15:54:59 -0500
Subject: [PATCH 0500/1265] Handle non-utf8 unicode without raising an error.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py |  2 +-
 compose/utils.py         |  2 +-
 tests/unit/utils_test.py | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 5bc534fe..ff3ae780 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -457,7 +457,7 @@ def parse_environment(environment):
 
 def split_env(env):
     if isinstance(env, six.binary_type):
-        env = env.decode('utf-8')
+        env = env.decode('utf-8', 'replace')
     if '=' in env:
         return env.split('=', 1)
     else:
diff --git a/compose/utils.py b/compose/utils.py
index c8fddc5f..08f6034f 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -95,7 +95,7 @@ def stream_as_text(stream):
     """
     for data in stream:
         if not isinstance(data, six.text_type):
-            data = data.decode('utf-8')
+            data = data.decode('utf-8', 'replace')
         yield data
 
 
diff --git a/tests/unit/utils_test.py b/tests/unit/utils_test.py
index b272c734..e3d0bc00 100644
--- a/tests/unit/utils_test.py
+++ b/tests/unit/utils_test.py
@@ -1,3 +1,6 @@
+# encoding: utf-8
+from __future__ import unicode_literals
+
 from .. import unittest
 from compose import utils
 
@@ -14,3 +17,16 @@ class JsonSplitterTestCase(unittest.TestCase):
             utils.json_splitter(data),
             ({'foo': 'bar'}, '{"next": "obj"}')
         )
+
+
+class StreamAsTextTestCase(unittest.TestCase):
+
+    def test_stream_with_non_utf_unicode_character(self):
+        stream = [b'\xed\xf3\xf3']
+        output, = utils.stream_as_text(stream)
+        assert output == '���'
+
+    def test_stream_with_utf_character(self):
+        stream = ['ěĝ'.encode('utf-8')]
+        output, = utils.stream_as_text(stream)
+        assert output == 'ěĝ'

From d32bb8efeea1e265d54f7cd7415db202d854f1f2 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 5 Nov 2015 15:33:42 -0500
Subject: [PATCH 0501/1265] Fix #1549 - flush after each line of logs.

Includes some refactoring of log_printer_test to support checking for flush(), and so that each test calls the unit-under-test directly, instead of through a helper function.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/log_printer.py         |  1 +
 tests/unit/cli/log_printer_test.py | 82 +++++++++++++++---------------
 2 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 66920726..864657a4 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -26,6 +26,7 @@ class LogPrinter(object):
         generators = list(self._make_log_generators(self.monochrome, prefix_width))
         for line in Multiplexer(generators).loop():
             self.output.write(line)
+            self.output.flush()
 
     def _make_log_generators(self, monochrome, prefix_width):
         def no_color(text):
diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py
index 575fcaf7..5b04226c 100644
--- a/tests/unit/cli/log_printer_test.py
+++ b/tests/unit/cli/log_printer_test.py
@@ -1,13 +1,13 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import mock
+import pytest
 import six
 
 from compose.cli.log_printer import LogPrinter
 from compose.cli.log_printer import wait_on_exit
 from compose.container import Container
-from tests import unittest
+from tests import mock
 
 
 def build_mock_container(reader):
@@ -22,40 +22,52 @@ def build_mock_container(reader):
     )
 
 
-class LogPrinterTest(unittest.TestCase):
-    def get_default_output(self, monochrome=False):
-        def reader(*args, **kwargs):
-            yield b"hello\nworld"
-        container = build_mock_container(reader)
-        output = run_log_printer([container], monochrome=monochrome)
-        return output
+@pytest.fixture
+def output_stream():
+    output = six.StringIO()
+    output.flush = mock.Mock()
+    return output
 
-    def test_single_container(self):
-        output = self.get_default_output()
 
-        self.assertIn('hello', output)
-        self.assertIn('world', output)
+@pytest.fixture
+def mock_container():
+    def reader(*args, **kwargs):
+        yield b"hello\nworld"
+    return build_mock_container(reader)
 
-    def test_monochrome(self):
-        output = self.get_default_output(monochrome=True)
-        self.assertNotIn('\033[', output)
 
-    def test_polychrome(self):
-        output = self.get_default_output()
-        self.assertIn('\033[', output)
+class TestLogPrinter(object):
 
-    def test_unicode(self):
+    def test_single_container(self, output_stream, mock_container):
+        LogPrinter([mock_container], output=output_stream).run()
+
+        output = output_stream.getvalue()
+        assert 'hello' in output
+        assert 'world' in output
+        # Call count is 2 lines + "container exited line"
+        assert output_stream.flush.call_count == 3
+
+    def test_monochrome(self, output_stream, mock_container):
+        LogPrinter([mock_container], output=output_stream, monochrome=True).run()
+        assert '\033[' not in output_stream.getvalue()
+
+    def test_polychrome(self, output_stream, mock_container):
+        LogPrinter([mock_container], output=output_stream).run()
+        assert '\033[' in output_stream.getvalue()
+
+    def test_unicode(self, output_stream):
         glyph = u'\u2022'
 
         def reader(*args, **kwargs):
             yield glyph.encode('utf-8') + b'\n'
 
         container = build_mock_container(reader)
-        output = run_log_printer([container])
+        LogPrinter([container], output=output_stream).run()
+        output = output_stream.getvalue()
         if six.PY2:
             output = output.decode('utf-8')
 
-        self.assertIn(glyph, output)
+        assert glyph in output
 
     def test_wait_on_exit(self):
         exit_status = 3
@@ -65,24 +77,12 @@ class LogPrinterTest(unittest.TestCase):
             wait=mock.Mock(return_value=exit_status))
 
         expected = '{} exited with code {}\n'.format(mock_container.name, exit_status)
-        self.assertEqual(expected, wait_on_exit(mock_container))
+        assert expected == wait_on_exit(mock_container)
 
-    def test_generator_with_no_logs(self):
-        mock_container = mock.Mock(
-            spec=Container,
-            has_api_logs=False,
-            log_driver='none',
-            name_without_project='web_1',
-            wait=mock.Mock(return_value=0))
+    def test_generator_with_no_logs(self, mock_container, output_stream):
+        mock_container.has_api_logs = False
+        mock_container.log_driver = 'none'
+        LogPrinter([mock_container], output=output_stream).run()
 
-        output = run_log_printer([mock_container])
-        self.assertIn(
-            "WARNING: no logs are available with the 'none' log driver\n",
-            output
-        )
-
-
-def run_log_printer(containers, monochrome=False):
-    output = six.StringIO()
-    LogPrinter(containers, output=output, monochrome=monochrome).run()
-    return output.getvalue()
+        output = output_stream.getvalue()
+        assert "WARNING: no logs are available with the 'none' log driver\n" in output

From 3456002aef26fd025819349f29e46d0062f9040a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 5 Nov 2015 17:50:32 -0500
Subject: [PATCH 0502/1265] Don't set the hostname to the service name with
 networking.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py           |  3 ---
 tests/acceptance/cli_test.py |  1 -
 tests/unit/service_test.py   | 10 ----------
 3 files changed, 14 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index e5a4cc4a..c17d4f91 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -599,9 +599,6 @@ class Service(object):
             container_options['hostname'] = parts[0]
             container_options['domainname'] = parts[2]
 
-        if 'hostname' not in container_options and self.use_networking:
-            container_options['hostname'] = self.name
-
         if 'ports' in container_options or 'expose' in self.options:
             ports = []
             all_ports = container_options.get('ports', []) + self.options.get('expose', [])
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 41e9718b..fc68f9d8 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -205,7 +205,6 @@ class CLITestCase(DockerClientTestCase):
             containers = service.containers()
             self.assertEqual(len(containers), 1)
             self.assertIn(containers[0].id, network['Containers'])
-            self.assertEqual(containers[0].get('Config.Hostname'), service.name)
 
         web_container = self.project.get_service('web').containers()[0]
         self.assertFalse(web_container.get('HostConfig.Links'))
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 8c5c888f..bc0db6fb 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -213,16 +213,6 @@ class ServiceTest(unittest.TestCase):
         opts = service._get_container_create_options({'image': 'foo'}, 1)
         self.assertIsNone(opts.get('hostname'))
 
-    def test_hostname_defaults_to_service_name_when_using_networking(self):
-        service = Service(
-            'foo',
-            image='foo',
-            use_networking=True,
-            client=self.mock_client,
-        )
-        opts = service._get_container_create_options({'image': 'foo'}, 1)
-        self.assertEqual(opts['hostname'], 'foo')
-
     def test_get_container_create_options_with_name_option(self):
         service = Service(
             'foo',

From 0e19c92e82c75f821c231367b5cda88eefdf1427 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 4 Nov 2015 16:37:44 -0500
Subject: [PATCH 0503/1265] Make working_dir consistent in the config package.

- make it a positional arg, since it's required
- make it the first argument for all functions that require it
- remove an unnecessary one-line function that was only called in one place

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         | 33 ++++++++++++--------------------
 tests/unit/config/config_test.py |  2 +-
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 5bc534fe..141fa89d 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -252,7 +252,7 @@ class ServiceLoader(object):
         if not self.already_seen:
             validate_against_service_schema(service_dict, self.service_name)
 
-        return process_container_options(service_dict, working_dir=self.working_dir)
+        return process_container_options(self.working_dir, service_dict)
 
     def validate_and_construct_extends(self):
         extends = self.service_dict['extends']
@@ -321,7 +321,7 @@ def resolve_environment(working_dir, service_dict):
 
     env = {}
     if 'env_file' in service_dict:
-        for env_file in get_env_files(service_dict, working_dir=working_dir):
+        for env_file in get_env_files(working_dir, service_dict):
             env.update(env_vars_from_file(env_file))
 
     env.update(parse_environment(service_dict.get('environment')))
@@ -345,14 +345,14 @@ def validate_extended_service_dict(service_dict, filename, service):
                 "%s services with 'net: container' cannot be extended" % error_prefix)
 
 
-def process_container_options(service_dict, working_dir=None):
-    service_dict = service_dict.copy()
+def process_container_options(working_dir, service_dict):
+    service_dict = dict(service_dict)
 
     if 'volumes' in service_dict and service_dict.get('volume_driver') is None:
-        service_dict['volumes'] = resolve_volume_paths(service_dict, working_dir=working_dir)
+        service_dict['volumes'] = resolve_volume_paths(working_dir, service_dict)
 
     if 'build' in service_dict:
-        service_dict['build'] = resolve_build_path(service_dict['build'], working_dir=working_dir)
+        service_dict['build'] = expand_path(working_dir, service_dict['build'])
 
     if 'labels' in service_dict:
         service_dict['labels'] = parse_labels(service_dict['labels'])
@@ -428,7 +428,7 @@ def merge_environment(base, override):
     return env
 
 
-def get_env_files(options, working_dir=None):
+def get_env_files(working_dir, options):
     if 'env_file' not in options:
         return {}
 
@@ -488,17 +488,14 @@ def env_vars_from_file(filename):
     return env
 
 
-def resolve_volume_paths(service_dict, working_dir=None):
-    if working_dir is None:
-        raise Exception("No working_dir passed to resolve_volume_paths()")
-
+def resolve_volume_paths(working_dir, service_dict):
     return [
-        resolve_volume_path(v, working_dir, service_dict['name'])
-        for v in service_dict['volumes']
+        resolve_volume_path(working_dir, volume, service_dict['name'])
+        for volume in service_dict['volumes']
     ]
 
 
-def resolve_volume_path(volume, working_dir, service_name):
+def resolve_volume_path(working_dir, volume, service_name):
     container_path, host_path = split_path_mapping(volume)
 
     if host_path is not None:
@@ -510,12 +507,6 @@ def resolve_volume_path(volume, working_dir, service_name):
         return container_path
 
 
-def resolve_build_path(build_path, working_dir=None):
-    if working_dir is None:
-        raise Exception("No working_dir passed to resolve_build_path")
-    return expand_path(working_dir, build_path)
-
-
 def validate_paths(service_dict):
     if 'build' in service_dict:
         build_path = service_dict['build']
@@ -582,7 +573,7 @@ def parse_labels(labels):
         return dict(split_label(e) for e in labels)
 
     if isinstance(labels, dict):
-        return labels
+        return dict(labels)
 
 
 def split_label(label):
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 69b23585..e0d2e870 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -577,7 +577,7 @@ class VolumeConfigTest(unittest.TestCase):
 
     def test_volume_path_with_non_ascii_directory(self):
         volume = u'/Füü/data:/data'
-        container_path = config.resolve_volume_path(volume, ".", "test")
+        container_path = config.resolve_volume_path(".", volume, "test")
         self.assertEqual(container_path, volume)
 
 

From ec22d98377eb5c12ba3bf5fac0eb4bff379e3242 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 4 Nov 2015 16:46:19 -0500
Subject: [PATCH 0504/1265] Use VolumeSpec instead of re-parsing the volume
 string.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py         | 19 +++++++++++--------
 tests/unit/service_test.py |  4 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index e5a4cc4a..16e3fd00 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -911,14 +911,15 @@ def merge_volume_bindings(volumes_option, previous_container):
     """Return a list of volume bindings for a container. Container data volumes
     are replaced by those from the previous container.
     """
+    volumes = [parse_volume_spec(volume) for volume in volumes_option or []]
     volume_bindings = dict(
-        build_volume_binding(parse_volume_spec(volume))
-        for volume in volumes_option or []
-        if ':' in volume)
+        build_volume_binding(volume)
+        for volume in volumes
+        if volume.external)
 
     if previous_container:
         volume_bindings.update(
-            get_container_data_volumes(previous_container, volumes_option))
+            get_container_data_volumes(previous_container, volumes))
 
     return list(volume_bindings.values())
 
@@ -929,12 +930,14 @@ def get_container_data_volumes(container, volumes_option):
     """
     volumes = []
 
-    volumes_option = volumes_option or []
     container_volumes = container.get('Volumes') or {}
-    image_volumes = container.image_config['ContainerConfig'].get('Volumes') or {}
+    image_volumes = [
+        parse_volume_spec(volume)
+        for volume in
+        container.image_config['ContainerConfig'].get('Volumes') or {}
+    ]
 
-    for volume in set(volumes_option + list(image_volumes)):
-        volume = parse_volume_spec(volume)
+    for volume in set(volumes_option + image_volumes):
         # No need to preserve host volumes
         if volume.external:
             continue
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 8c5c888f..ed02bb4c 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -593,11 +593,11 @@ class ServiceVolumesTest(unittest.TestCase):
         self.assertEqual(binding, ('/inside', '/outside:/inside:rw'))
 
     def test_get_container_data_volumes(self):
-        options = [
+        options = [parse_volume_spec(v) for v in [
             '/host/volume:/host/volume:ro',
             '/new/volume',
             '/existing/volume',
-        ]
+        ]]
 
         self.mock_client.inspect_image.return_value = {
             'ContainerConfig': {

From 7c2a16234f333102dfc21c0597f58c030b4a222e Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 6 Nov 2015 12:29:52 -0500
Subject: [PATCH 0505/1265] Recreate dependents when a dependency is created
 (not just when it's recreated).

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/project.py              |  2 +-
 tests/integration/state_test.py | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/compose/project.py b/compose/project.py
index 1e01eaf6..f0478203 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -322,7 +322,7 @@ class Project(object):
                 name
                 for name in service.get_dependency_names()
                 if name in plans
-                and plans[name].action == 'recreate'
+                and plans[name].action in ('recreate', 'create')
             ]
 
             if updated_dependencies and strategy.allows_recreate:
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index 7830ba32..1fecce87 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -176,6 +176,19 @@ class ProjectWithDependenciesTest(ProjectTestCase):
         containers = self.run_up(next_cfg)
         self.assertEqual(len(containers), 2)
 
+    def test_service_recreated_when_dependency_created(self):
+        containers = self.run_up(self.cfg, service_names=['web'], start_deps=False)
+        self.assertEqual(len(containers), 1)
+
+        containers = self.run_up(self.cfg)
+        self.assertEqual(len(containers), 3)
+
+        web, = [c for c in containers if c.service == 'web']
+        nginx, = [c for c in containers if c.service == 'nginx']
+
+        self.assertEqual(web.links(), ['composetest_db_1', 'db', 'db_1'])
+        self.assertEqual(nginx.links(), ['composetest_web_1', 'web', 'web_1'])
+
 
 class ServiceStateTest(DockerClientTestCase):
     """Test cases for Service.convergence_plan."""

From 1bfb71032650b9a8b4184316af906df382807d9d Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 9 Nov 2015 17:24:21 +0000
Subject: [PATCH 0506/1265] Fix parallel output

We were outputting an extra line, which in *some* cases, on *some*
terminals, was causing the output of parallel actions to get messed up.

In particular, it would happen when the terminal had just been cleared
or hadn't yet filled up with a screen's worth of text.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/utils.py b/compose/utils.py
index c8fddc5f..14cca61b 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -164,7 +164,7 @@ def write_out_msg(stream, lines, msg_index, msg, status="done"):
         stream.write("%c[%dA" % (27, diff))
         # erase
         stream.write("%c[2K\r" % 27)
-        stream.write("{} {} ... {}\n".format(msg, obj_index, status))
+        stream.write("{} {} ... {}\r".format(msg, obj_index, status))
         # move back down
         stream.write("%c[%dB" % (27, diff))
     else:

From a1e140f5a3376812d3d13b011ac93760dfd4f1c2 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 9 Nov 2015 13:07:26 -0800
Subject: [PATCH 0507/1265] Update service config_dict computation to include
 volumes_from mode

Ensure config_hash is updated when volumes_from mode is changed, and
service is recreated on next up as a result.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/service.py         | 4 +++-
 tests/unit/service_test.py | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index e5a4cc4a..8d40ab10 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -502,7 +502,9 @@ class Service(object):
             'image_id': self.image()['Id'],
             'links': self.get_link_names(),
             'net': self.net.id,
-            'volumes_from': self.get_volumes_from_names(),
+            'volumes_from': [
+                (v.source.name, v.mode) for v in self.volumes_from if isinstance(v.source, Service)
+            ],
         }
 
     def get_dependency_names(self):
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 8c5c888f..bd771225 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -410,7 +410,7 @@ class ServiceTest(unittest.TestCase):
             'options': {'image': 'example.com/foo'},
             'links': [('one', 'one')],
             'net': 'other',
-            'volumes_from': ['two'],
+            'volumes_from': [('two', 'rw')],
         }
         self.assertEqual(config_dict, expected)
 

From 3474bb6cf5c1961deb20cd186cd2a2dbf3224f0c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 6 Nov 2015 14:30:27 -0500
Subject: [PATCH 0508/1265] Cleanup workaround in testcase.py

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/integration/testcases.py | 35 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 686a2b69..60e67b5b 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -42,34 +42,23 @@ class DockerClientTestCase(unittest.TestCase):
         if 'command' not in kwargs:
             kwargs['command'] = ["top"]
 
-        links = kwargs.get('links', None)
-        volumes_from = kwargs.get('volumes_from', None)
-        net = kwargs.get('net', None)
+        workaround_options = {}
+        for option in ['links', 'volumes_from', 'net']:
+            if option in kwargs:
+                workaround_options[option] = kwargs.pop(option, None)
 
-        workaround_options = ['links', 'volumes_from', 'net']
-        for key in workaround_options:
-            try:
-                del kwargs[key]
-            except KeyError:
-                pass
-
-        options = ServiceLoader(working_dir='.', filename=None, service_name=name, service_dict=kwargs).make_service_dict()
+        options = ServiceLoader(
+            working_dir='.',
+            filename=None,
+            service_name=name,
+            service_dict=kwargs
+        ).make_service_dict()
+        options.update(workaround_options)
 
         labels = options.setdefault('labels', {})
         labels['com.docker.compose.test-name'] = self.id()
 
-        if links:
-            options['links'] = links
-        if volumes_from:
-            options['volumes_from'] = volumes_from
-        if net:
-            options['net'] = net
-
-        return Service(
-            project='composetest',
-            client=self.client,
-            **options
-        )
+        return Service(project='composetest', client=self.client, **options)
 
     def check_build(self, *args, **kwargs):
         kwargs.setdefault('rm', True)

From 45724fc667ff54f2ae26e00c27f76d43556b9239 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 6 Nov 2015 13:56:25 -0500
Subject: [PATCH 0509/1265] Only create the default network if at least one
 service needs it.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/project.py                |  7 +++++--
 tests/integration/project_test.py | 16 ++++++++++++++++
 tests/unit/project_test.py        | 28 ++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index f0478203..1f10934c 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -300,7 +300,7 @@ class Project(object):
 
         plans = self._get_convergence_plans(services, strategy)
 
-        if self.use_networking:
+        if self.use_networking and self.uses_default_network():
             self.ensure_network_exists()
 
         return [
@@ -383,7 +383,10 @@ class Project(object):
     def remove_network(self):
         network = self.get_network()
         if network:
-            self.client.remove_network(network['id'])
+            self.client.remove_network(network['Id'])
+
+    def uses_default_network(self):
+        return any(service.net.mode == self.name for service in self.services)
 
     def _inject_deps(self, acc, service):
         dep_names = service.get_dependency_names()
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 95052387..2ce31900 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -7,6 +7,7 @@ from compose.const import LABEL_PROJECT
 from compose.container import Container
 from compose.project import Project
 from compose.service import ConvergenceStrategy
+from compose.service import Net
 from compose.service import VolumeFromSpec
 
 
@@ -111,6 +112,7 @@ class ProjectTest(DockerClientTestCase):
         network_name = 'network_does_exist'
         project = Project(network_name, [], client)
         client.create_network(network_name)
+        self.addCleanup(client.remove_network, network_name)
         assert project.get_network()['Name'] == network_name
 
     def test_net_from_service(self):
@@ -398,6 +400,20 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(project.get_service('data').containers(stopped=True)), 1)
         self.assertEqual(len(project.get_service('console').containers()), 0)
 
+    def test_project_up_with_custom_network(self):
+        self.require_api_version('1.21')
+        client = docker_client(version='1.21')
+        network_name = 'composetest-custom'
+
+        client.create_network(network_name)
+        self.addCleanup(client.remove_network, network_name)
+
+        web = self.create_service('web', net=Net(network_name))
+        project = Project('composetest', [web], client, use_networking=True)
+        project.up()
+
+        assert project.get_network() is None
+
     def test_unscale_after_restart(self):
         web = self.create_service('web')
         project = Project('composetest', [web], self.client)
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index fc189fbb..b38f5c78 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -7,6 +7,8 @@ from .. import unittest
 from compose.const import LABEL_SERVICE
 from compose.container import Container
 from compose.project import Project
+from compose.service import ContainerNet
+from compose.service import Net
 from compose.service import Service
 
 
@@ -263,6 +265,32 @@ class ProjectTest(unittest.TestCase):
         service = project.get_service('test')
         self.assertEqual(service.net.mode, 'container:' + container_name)
 
+    def test_uses_default_network_true(self):
+        web = Service('web', project='test', image="alpine", net=Net('test'))
+        db = Service('web', project='test', image="alpine", net=Net('other'))
+        project = Project('test', [web, db], None)
+        assert project.uses_default_network()
+
+    def test_uses_default_network_custom_name(self):
+        web = Service('web', project='test', image="alpine", net=Net('other'))
+        project = Project('test', [web], None)
+        assert not project.uses_default_network()
+
+    def test_uses_default_network_host(self):
+        web = Service('web', project='test', image="alpine", net=Net('host'))
+        project = Project('test', [web], None)
+        assert not project.uses_default_network()
+
+    def test_uses_default_network_container(self):
+        container = mock.Mock(id='test')
+        web = Service(
+            'web',
+            project='test',
+            image="alpine",
+            net=ContainerNet(container))
+        project = Project('test', [web], None)
+        assert not project.uses_default_network()
+
     def test_container_without_name(self):
         self.mock_client.containers.return_value = [
             {'Image': 'busybox:latest', 'Id': '1', 'Name': '1'},

From c5c36d8b006d9694c34b06e434e08bb17b025250 Mon Sep 17 00:00:00 2001
From: Adrian Budau <budau.adi@gmail.com>
Date: Tue, 27 Oct 2015 02:00:51 -0700
Subject: [PATCH 0510/1265] Added --force-rm to compose build.

It's a flag passed to docker build that removes the intermediate
containers left behind on fail builds.

Signed-off-by: Adrian Budau <budau.adi@gmail.com>
---
 compose/cli/main.py                           |  4 ++-
 compose/project.py                            |  4 +--
 compose/service.py                            |  3 +-
 contrib/completion/bash/docker-compose        |  2 +-
 contrib/completion/zsh/_docker-compose        |  1 +
 docs/reference/build.md                       |  1 +
 tests/acceptance/cli_test.py                  | 28 +++++++++++++++++++
 .../simple-failing-dockerfile/Dockerfile      |  7 +++++
 .../docker-compose.yml                        |  2 ++
 tests/unit/service_test.py                    |  1 +
 10 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 tests/fixtures/simple-failing-dockerfile/Dockerfile
 create mode 100644 tests/fixtures/simple-failing-dockerfile/docker-compose.yml

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 11aeac38..b1aa9951 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -180,12 +180,14 @@ class TopLevelCommand(DocoptCommand):
         Usage: build [options] [SERVICE...]
 
         Options:
+            --force-rm  Always remove intermediate containers.
             --no-cache  Do not use cache when building the image.
             --pull      Always attempt to pull a newer version of the image.
         """
+        force_rm = bool(options.get('--force-rm', False))
         no_cache = bool(options.get('--no-cache', False))
         pull = bool(options.get('--pull', False))
-        project.build(service_names=options['SERVICE'], no_cache=no_cache, pull=pull)
+        project.build(service_names=options['SERVICE'], no_cache=no_cache, pull=pull, force_rm=force_rm)
 
     def help(self, project, options):
         """
diff --git a/compose/project.py b/compose/project.py
index f0478203..d2ba86b1 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -278,10 +278,10 @@ class Project(object):
         for service in self.get_services(service_names):
             service.restart(**options)
 
-    def build(self, service_names=None, no_cache=False, pull=False):
+    def build(self, service_names=None, no_cache=False, pull=False, force_rm=False):
         for service in self.get_services(service_names):
             if service.can_be_built():
-                service.build(no_cache, pull)
+                service.build(no_cache, pull, force_rm)
             else:
                 log.info('%s uses an image, skipping' % service.name)
 
diff --git a/compose/service.py b/compose/service.py
index f2861954..2055a6fe 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -701,7 +701,7 @@ class Service(object):
             cgroup_parent=cgroup_parent
         )
 
-    def build(self, no_cache=False, pull=False):
+    def build(self, no_cache=False, pull=False, force_rm=False):
         log.info('Building %s' % self.name)
 
         path = self.options['build']
@@ -715,6 +715,7 @@ class Service(object):
             tag=self.image_name,
             stream=True,
             rm=True,
+            forcerm=force_rm,
             pull=pull,
             nocache=no_cache,
             dockerfile=self.options.get('dockerfile', None),
diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index e25a43a1..f6f7ad40 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -93,7 +93,7 @@ __docker_compose_services_stopped() {
 _docker_compose_build() {
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--help --no-cache --pull" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help --force-rm --no-cache --pull" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_from_build
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index d79b25d1..08d5150d 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -192,6 +192,7 @@ __docker-compose_subcommand() {
         (build)
             _arguments \
                 $opts_help \
+                '--force-rm[Always remove intermediate containers.]' \
                 '--no-cache[Do not use cache when building the image]' \
                 '--pull[Always attempt to pull a newer version of the image.]' \
                 '*:services:__docker-compose_services_from_build' && ret=0
diff --git a/docs/reference/build.md b/docs/reference/build.md
index c427199f..84aefc25 100644
--- a/docs/reference/build.md
+++ b/docs/reference/build.md
@@ -15,6 +15,7 @@ parent = "smn_compose_cli"
 Usage: build [options] [SERVICE...]
 
 Options:
+--force-rm  Always remove intermediate containers.
 --no-cache  Do not use cache when building the image.
 --pull      Always attempt to pull a newer version of the image.
 ```
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index fc68f9d8..88a43d7f 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -9,6 +9,7 @@ from operator import attrgetter
 from .. import mock
 from compose.cli.command import get_project
 from compose.cli.docker_client import docker_client
+from compose.container import Container
 from tests.integration.testcases import DockerClientTestCase
 
 
@@ -145,6 +146,33 @@ class CLITestCase(DockerClientTestCase):
         assert BUILD_CACHE_TEXT not in result.stdout
         assert BUILD_PULL_TEXT in result.stdout
 
+    def test_build_failed(self):
+        self.base_dir = 'tests/fixtures/simple-failing-dockerfile'
+        self.dispatch(['build', 'simple'], returncode=1)
+
+        labels = ["com.docker.compose.test_failing_image=true"]
+        containers = [
+            Container.from_ps(self.project.client, c)
+            for c in self.project.client.containers(
+                all=True,
+                filters={"label": labels})
+        ]
+        assert len(containers) == 1
+
+    def test_build_failed_forcerm(self):
+        self.base_dir = 'tests/fixtures/simple-failing-dockerfile'
+        self.dispatch(['build', '--force-rm', 'simple'], returncode=1)
+
+        labels = ["com.docker.compose.test_failing_image=true"]
+
+        containers = [
+            Container.from_ps(self.project.client, c)
+            for c in self.project.client.containers(
+                all=True,
+                filters={"label": labels})
+        ]
+        assert not containers
+
     def test_up_detached(self):
         self.dispatch(['up', '-d'])
         service = self.project.get_service('simple')
diff --git a/tests/fixtures/simple-failing-dockerfile/Dockerfile b/tests/fixtures/simple-failing-dockerfile/Dockerfile
new file mode 100644
index 00000000..c2d06b16
--- /dev/null
+++ b/tests/fixtures/simple-failing-dockerfile/Dockerfile
@@ -0,0 +1,7 @@
+FROM busybox:latest
+LABEL com.docker.compose.test_image=true
+LABEL com.docker.compose.test_failing_image=true
+# With the following label the container wil be cleaned up automatically
+# Must be kept in sync with LABEL_PROJECT from compose/const.py
+LABEL com.docker.compose.project=composetest
+RUN exit 1
diff --git a/tests/fixtures/simple-failing-dockerfile/docker-compose.yml b/tests/fixtures/simple-failing-dockerfile/docker-compose.yml
new file mode 100644
index 00000000..b0357541
--- /dev/null
+++ b/tests/fixtures/simple-failing-dockerfile/docker-compose.yml
@@ -0,0 +1,2 @@
+simple:
+  build: .
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 50ce5da5..cacdcc77 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -356,6 +356,7 @@ class ServiceTest(unittest.TestCase):
             stream=True,
             path='.',
             pull=False,
+            forcerm=False,
             nocache=False,
             rm=True,
         )

From 133d213e78c060ad0e1448fb52086c120ffdd15d Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 10 Nov 2015 10:11:20 -0800
Subject: [PATCH 0511/1265] Use exit code 1 when encountering a ReadTimeout

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 11aeac38..95db45ce 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -80,6 +80,7 @@ def main():
             "If you encounter this issue regularly because of slow network conditions, consider setting "
             "COMPOSE_HTTP_TIMEOUT to a higher value (current value: %s)." % HTTP_TIMEOUT
         )
+        sys.exit(1)
 
 
 def setup_logging():

From 338bbb5063d882bb751cae3a25651bcf6e61b679 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 10 Nov 2015 13:11:59 -0500
Subject: [PATCH 0512/1265] Re-order flags in bash completion

and remove unnecessary variables from build command.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py                    | 9 +++++----
 contrib/completion/bash/docker-compose | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index b1aa9951..a4b774a9 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -184,10 +184,11 @@ class TopLevelCommand(DocoptCommand):
             --no-cache  Do not use cache when building the image.
             --pull      Always attempt to pull a newer version of the image.
         """
-        force_rm = bool(options.get('--force-rm', False))
-        no_cache = bool(options.get('--no-cache', False))
-        pull = bool(options.get('--pull', False))
-        project.build(service_names=options['SERVICE'], no_cache=no_cache, pull=pull, force_rm=force_rm)
+        project.build(
+            service_names=options['SERVICE'],
+            no_cache=bool(options.get('--no-cache', False)),
+            pull=bool(options.get('--pull', False)),
+            force_rm=bool(options.get('--force-rm', False)))
 
     def help(self, project, options):
         """
diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index f6f7ad40..b4f4387f 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -93,7 +93,7 @@ __docker_compose_services_stopped() {
 _docker_compose_build() {
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--help --force-rm --no-cache --pull" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--force-rm --help --no-cache --pull" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_from_build

From a8ac6e6f93be89ba82f60e7136a2ccd8fdec4798 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 4 Nov 2015 18:00:24 -0500
Subject: [PATCH 0513/1265] Add a warning when the host volume config is being
 ignored.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py                | 27 +++++++++++++++++++++++----
 tests/integration/service_test.py | 27 +++++++++++++++++++++++++++
 tests/unit/service_test.py        | 12 ++++++------
 3 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 2055a6fe..32f19323 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -918,8 +918,10 @@ def merge_volume_bindings(volumes_option, previous_container):
         if volume.external)
 
     if previous_container:
+        data_volumes = get_container_data_volumes(previous_container, volumes)
+        warn_on_masked_volume(volumes, data_volumes, previous_container.service)
         volume_bindings.update(
-            get_container_data_volumes(previous_container, volumes))
+            build_volume_binding(volume) for volume in data_volumes)
 
     return list(volume_bindings.values())
 
@@ -929,7 +931,6 @@ def get_container_data_volumes(container, volumes_option):
     a mapping of volume bindings for those volumes.
     """
     volumes = []
-
     container_volumes = container.get('Volumes') or {}
     image_volumes = [
         parse_volume_spec(volume)
@@ -949,9 +950,27 @@ def get_container_data_volumes(container, volumes_option):
 
         # Copy existing volume from old container
         volume = volume._replace(external=volume_path)
-        volumes.append(build_volume_binding(volume))
+        volumes.append(volume)
 
-    return dict(volumes)
+    return volumes
+
+
+def warn_on_masked_volume(volumes_option, container_volumes, service):
+    container_volumes = dict(
+        (volume.internal, volume.external)
+        for volume in container_volumes)
+
+    for volume in volumes_option:
+        if container_volumes.get(volume.internal) != volume.external:
+            log.warn((
+                "Service \"{service}\" is using volume \"{volume}\" from the "
+                "previous container. Host mapping \"{host_path}\" has no effect. "
+                "Remove the existing containers (with `docker-compose rm {service}`) "
+                "to use the host volume mapping."
+            ).format(
+                service=service,
+                volume=volume.internal,
+                host_path=volume.external))
 
 
 def build_volume_binding(volume_spec):
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 804f5219..88214e83 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -369,6 +369,33 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(list(new_container.get('Volumes')), ['/data'])
         self.assertEqual(new_container.get('Volumes')['/data'], volume_path)
 
+    def test_execute_convergence_plan_when_image_volume_masks_config(self):
+        service = Service(
+            project='composetest',
+            name='db',
+            client=self.client,
+            build='tests/fixtures/dockerfile-with-volume',
+        )
+
+        old_container = create_and_start_container(service)
+        self.assertEqual(list(old_container.get('Volumes').keys()), ['/data'])
+        volume_path = old_container.get('Volumes')['/data']
+
+        service.options['volumes'] = ['/tmp:/data']
+
+        with mock.patch('compose.service.log') as mock_log:
+            new_container, = service.execute_convergence_plan(
+                ConvergencePlan('recreate', [old_container]))
+
+        mock_log.warn.assert_called_once_with(mock.ANY)
+        _, args, kwargs = mock_log.warn.mock_calls[0]
+        self.assertIn(
+            "Service \"db\" is using volume \"/data\" from the previous container",
+            args[0])
+
+        self.assertEqual(list(new_container.get('Volumes')), ['/data'])
+        self.assertEqual(new_container.get('Volumes')['/data'], volume_path)
+
     def test_start_container_passes_through_options(self):
         db = self.create_service('db')
         create_and_start_container(db, environment={'FOO': 'BAR'})
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index cacdcc77..b69e0996 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -607,13 +607,13 @@ class ServiceVolumesTest(unittest.TestCase):
             },
         }, has_been_inspected=True)
 
-        expected = {
-            '/existing/volume': '/var/lib/docker/aaaaaaaa:/existing/volume:rw',
-            '/mnt/image/data': '/var/lib/docker/cccccccc:/mnt/image/data:rw',
-        }
+        expected = [
+            parse_volume_spec('/var/lib/docker/aaaaaaaa:/existing/volume:rw'),
+            parse_volume_spec('/var/lib/docker/cccccccc:/mnt/image/data:rw'),
+        ]
 
-        binds = get_container_data_volumes(container, options)
-        self.assertEqual(binds, expected)
+        volumes = get_container_data_volumes(container, options)
+        self.assertEqual(sorted(volumes), sorted(expected))
 
     def test_merge_volume_bindings(self):
         options = [

From 22d90d21800bd5bf5c695f09cd3c98928781db9e Mon Sep 17 00:00:00 2001
From: Kevin Greene <kevin@spantree.net>
Date: Mon, 26 Oct 2015 17:39:50 -0400
Subject: [PATCH 0514/1265] Added ulimits functionality to docker compose

Signed-off-by: Kevin Greene <kevin@spantree.net>
---
 compose/config/config.py          | 12 +++++++
 compose/config/fields_schema.json | 19 ++++++++++
 compose/service.py                | 19 ++++++++++
 docs/compose-file.md              | 11 ++++++
 tests/integration/service_test.py | 31 ++++++++++++++++
 tests/unit/config/config_test.py  | 60 +++++++++++++++++++++++++++++++
 6 files changed, 152 insertions(+)

diff --git a/compose/config/config.py b/compose/config/config.py
index 434589d3..7931608d 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -345,6 +345,15 @@ def validate_extended_service_dict(service_dict, filename, service):
                 "%s services with 'net: container' cannot be extended" % error_prefix)
 
 
+def validate_ulimits(ulimit_config):
+    for limit_name, soft_hard_values in six.iteritems(ulimit_config):
+        if isinstance(soft_hard_values, dict):
+            if not soft_hard_values['soft'] <= soft_hard_values['hard']:
+                raise ConfigurationError(
+                    "ulimit_config \"{}\" cannot contain a 'soft' value higher "
+                    "than 'hard' value".format(ulimit_config))
+
+
 def process_container_options(working_dir, service_dict):
     service_dict = dict(service_dict)
 
@@ -357,6 +366,9 @@ def process_container_options(working_dir, service_dict):
     if 'labels' in service_dict:
         service_dict['labels'] = parse_labels(service_dict['labels'])
 
+    if 'ulimits' in service_dict:
+        validate_ulimits(service_dict['ulimits'])
+
     return service_dict
 
 
diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index e254e353..f22b513a 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -116,6 +116,25 @@
         "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "stdin_open": {"type": "boolean"},
         "tty": {"type": "boolean"},
+        "ulimits": {
+          "type": "object",
+          "patternProperties": {
+            "^[a-z]+$": {
+              "oneOf": [
+                {"type": "integer"},
+                {
+                  "type":"object",
+                  "properties": {
+                    "hard": {"type": "integer"},
+                    "soft": {"type": "integer"}
+                  },
+                  "required": ["soft", "hard"],
+                  "additionalProperties": false
+                }
+              ]
+            }
+          }
+        },
         "user": {"type": "string"},
         "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "volume_driver": {"type": "string"},
diff --git a/compose/service.py b/compose/service.py
index 2055a6fe..9e0066b7 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -676,6 +676,7 @@ class Service(object):
 
         devices = options.get('devices', None)
         cgroup_parent = options.get('cgroup_parent', None)
+        ulimits = build_ulimits(options.get('ulimits', None))
 
         return self.client.create_host_config(
             links=self._get_links(link_to_self=one_off),
@@ -692,6 +693,7 @@ class Service(object):
             cap_drop=cap_drop,
             mem_limit=options.get('mem_limit'),
             memswap_limit=options.get('memswap_limit'),
+            ulimits=ulimits,
             log_config=log_config,
             extra_hosts=extra_hosts,
             read_only=read_only,
@@ -1073,6 +1075,23 @@ def parse_restart_spec(restart_config):
 
     return {'Name': name, 'MaximumRetryCount': int(max_retry_count)}
 
+# Ulimits
+
+
+def build_ulimits(ulimit_config):
+    if not ulimit_config:
+        return None
+    ulimits = []
+    for limit_name, soft_hard_values in six.iteritems(ulimit_config):
+        if isinstance(soft_hard_values, six.integer_types):
+            ulimits.append({'name': limit_name, 'soft': soft_hard_values, 'hard': soft_hard_values})
+        elif isinstance(soft_hard_values, dict):
+            ulimit_dict = {'name': limit_name}
+            ulimit_dict.update(soft_hard_values)
+            ulimits.append(ulimit_dict)
+
+    return ulimits
+
 
 # Extra hosts
 
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 4f8fc9e0..3b36fa2b 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -333,6 +333,17 @@ Override the default labeling scheme for each container.
         - label:user:USER
         - label:role:ROLE
 
+### ulimits
+
+Override the default ulimits for a container. You can either use a number
+to set the hard and soft limits, or specify them in a dictionary.
+
+      ulimits:
+        nproc: 65535
+        nofile:
+          soft: 20000
+          hard: 40000
+
 ### volumes, volume\_driver
 
 Mount paths as volumes, optionally specifying a path on the host machine
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 804f5219..2f3be89a 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -22,6 +22,7 @@ from compose.const import LABEL_SERVICE
 from compose.const import LABEL_VERSION
 from compose.container import Container
 from compose.service import build_extra_hosts
+from compose.service import build_ulimits
 from compose.service import ConfigError
 from compose.service import ConvergencePlan
 from compose.service import ConvergenceStrategy
@@ -164,6 +165,36 @@ class ServiceTest(DockerClientTestCase):
             {'www.example.com': '192.168.0.17',
              'api.example.com': '192.168.0.18'})
 
+    def sort_dicts_by_name(self, dictionary_list):
+        return sorted(dictionary_list, key=lambda k: k['name'])
+
+    def test_build_ulimits_with_invalid_options(self):
+        self.assertRaises(ConfigError, lambda: build_ulimits({'nofile': {'soft': 10000, 'hard': 10}}))
+
+    def test_build_ulimits_with_integers(self):
+        self.assertEqual(build_ulimits(
+            {'nofile': {'soft': 10000, 'hard': 20000}}),
+            [{'name': 'nofile', 'soft': 10000, 'hard': 20000}])
+        self.assertEqual(self.sort_dicts_by_name(build_ulimits(
+            {'nofile': {'soft': 10000, 'hard': 20000}, 'nproc': {'soft': 65535, 'hard': 65535}})),
+            self.sort_dicts_by_name([{'name': 'nofile', 'soft': 10000, 'hard': 20000},
+                                     {'name': 'nproc', 'soft': 65535, 'hard': 65535}]))
+
+    def test_build_ulimits_with_dicts(self):
+        self.assertEqual(build_ulimits(
+            {'nofile': 20000}),
+            [{'name': 'nofile', 'soft': 20000, 'hard': 20000}])
+        self.assertEqual(self.sort_dicts_by_name(build_ulimits(
+            {'nofile': 20000, 'nproc': 65535})),
+            self.sort_dicts_by_name([{'name': 'nofile', 'soft': 20000, 'hard': 20000},
+                                     {'name': 'nproc', 'soft': 65535, 'hard': 65535}]))
+
+    def test_build_ulimits_with_integers_and_dicts(self):
+        self.assertEqual(self.sort_dicts_by_name(build_ulimits(
+            {'nproc': 65535, 'nofile': {'soft': 10000, 'hard': 20000}})),
+            self.sort_dicts_by_name([{'name': 'nofile', 'soft': 10000, 'hard': 20000},
+                                     {'name': 'nproc', 'soft': 65535, 'hard': 65535}]))
+
     def test_create_container_with_extra_hosts_list(self):
         extra_hosts = ['somehost:162.242.195.82', 'otherhost:50.31.209.229']
         service = self.create_service('db', extra_hosts=extra_hosts)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index e0d2e870..f27329ba 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -349,6 +349,66 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_config_ulimits_invalid_keys_validation_error(self):
+        expected_error_msg = "Service 'web' configuration key 'ulimits' contains unsupported option: 'not_soft_or_hard'"
+
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            config.load(
+                build_config_details(
+                    {'web': {
+                        'image': 'busybox',
+                        'ulimits': {
+                            'nofile': {
+                                "not_soft_or_hard": 100,
+                                "soft": 10000,
+                                "hard": 20000,
+                            }
+                        }
+                    }},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+
+    def test_config_ulimits_required_keys_validation_error(self):
+        expected_error_msg = "Service 'web' configuration key 'ulimits' u?'hard' is a required property"
+
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            config.load(
+                build_config_details(
+                    {'web': {
+                        'image': 'busybox',
+                        'ulimits': {
+                            'nofile': {
+                                "soft": 10000,
+                            }
+                        }
+                    }},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+
+    def test_config_ulimits_soft_greater_than_hard_error(self):
+        expected_error_msg = "cannot contain a 'soft' value higher than 'hard' value"
+
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            config.load(
+                build_config_details(
+                    {'web': {
+                        'image': 'busybox',
+                        'ulimits': {
+                            'nofile': {
+                                "soft": 10000,
+                                "hard": 1000
+                            }
+                        }
+                    }},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+
     def test_valid_config_which_allows_two_type_definitions(self):
         expose_values = [["8000"], [8000]]
         for expose in expose_values:

From 7365a398b327ecee9de01da5deab83275a87d779 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 10 Nov 2015 13:37:07 -0500
Subject: [PATCH 0515/1265] Update doc wording for ulimits.

and move tests to the correct module

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/compose-file.md              |  5 ++--
 tests/integration/service_test.py | 31 -----------------------
 tests/unit/service_test.py        | 42 +++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 3b36fa2b..51d1f5e1 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -335,8 +335,9 @@ Override the default labeling scheme for each container.
 
 ### ulimits
 
-Override the default ulimits for a container. You can either use a number
-to set the hard and soft limits, or specify them in a dictionary.
+Override the default ulimits for a container. You can either specify a single
+limit as an integer or soft/hard limits as a mapping.
+
 
       ulimits:
         nproc: 65535
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 2f3be89a..804f5219 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -22,7 +22,6 @@ from compose.const import LABEL_SERVICE
 from compose.const import LABEL_VERSION
 from compose.container import Container
 from compose.service import build_extra_hosts
-from compose.service import build_ulimits
 from compose.service import ConfigError
 from compose.service import ConvergencePlan
 from compose.service import ConvergenceStrategy
@@ -165,36 +164,6 @@ class ServiceTest(DockerClientTestCase):
             {'www.example.com': '192.168.0.17',
              'api.example.com': '192.168.0.18'})
 
-    def sort_dicts_by_name(self, dictionary_list):
-        return sorted(dictionary_list, key=lambda k: k['name'])
-
-    def test_build_ulimits_with_invalid_options(self):
-        self.assertRaises(ConfigError, lambda: build_ulimits({'nofile': {'soft': 10000, 'hard': 10}}))
-
-    def test_build_ulimits_with_integers(self):
-        self.assertEqual(build_ulimits(
-            {'nofile': {'soft': 10000, 'hard': 20000}}),
-            [{'name': 'nofile', 'soft': 10000, 'hard': 20000}])
-        self.assertEqual(self.sort_dicts_by_name(build_ulimits(
-            {'nofile': {'soft': 10000, 'hard': 20000}, 'nproc': {'soft': 65535, 'hard': 65535}})),
-            self.sort_dicts_by_name([{'name': 'nofile', 'soft': 10000, 'hard': 20000},
-                                     {'name': 'nproc', 'soft': 65535, 'hard': 65535}]))
-
-    def test_build_ulimits_with_dicts(self):
-        self.assertEqual(build_ulimits(
-            {'nofile': 20000}),
-            [{'name': 'nofile', 'soft': 20000, 'hard': 20000}])
-        self.assertEqual(self.sort_dicts_by_name(build_ulimits(
-            {'nofile': 20000, 'nproc': 65535})),
-            self.sort_dicts_by_name([{'name': 'nofile', 'soft': 20000, 'hard': 20000},
-                                     {'name': 'nproc', 'soft': 65535, 'hard': 65535}]))
-
-    def test_build_ulimits_with_integers_and_dicts(self):
-        self.assertEqual(self.sort_dicts_by_name(build_ulimits(
-            {'nproc': 65535, 'nofile': {'soft': 10000, 'hard': 20000}})),
-            self.sort_dicts_by_name([{'name': 'nofile', 'soft': 10000, 'hard': 20000},
-                                     {'name': 'nproc', 'soft': 65535, 'hard': 65535}]))
-
     def test_create_container_with_extra_hosts_list(self):
         extra_hosts = ['somehost:162.242.195.82', 'otherhost:50.31.209.229']
         service = self.create_service('db', extra_hosts=extra_hosts)
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index cacdcc77..52128d46 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -12,6 +12,7 @@ from compose.const import LABEL_ONE_OFF
 from compose.const import LABEL_PROJECT
 from compose.const import LABEL_SERVICE
 from compose.container import Container
+from compose.service import build_ulimits
 from compose.service import build_volume_binding
 from compose.service import ConfigError
 from compose.service import ContainerNet
@@ -497,6 +498,47 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(service._get_links(link_to_self=True), [])
 
 
+def sort_by_name(dictionary_list):
+    return sorted(dictionary_list, key=lambda k: k['name'])
+
+
+class BuildUlimitsTestCase(unittest.TestCase):
+
+    def test_build_ulimits_with_dict(self):
+        ulimits = build_ulimits(
+            {
+                'nofile': {'soft': 10000, 'hard': 20000},
+                'nproc': {'soft': 65535, 'hard': 65535}
+            }
+        )
+        expected = [
+            {'name': 'nofile', 'soft': 10000, 'hard': 20000},
+            {'name': 'nproc', 'soft': 65535, 'hard': 65535}
+        ]
+        assert sort_by_name(ulimits) == sort_by_name(expected)
+
+    def test_build_ulimits_with_ints(self):
+        ulimits = build_ulimits({'nofile': 20000, 'nproc': 65535})
+        expected = [
+            {'name': 'nofile', 'soft': 20000, 'hard': 20000},
+            {'name': 'nproc', 'soft': 65535, 'hard': 65535}
+        ]
+        assert sort_by_name(ulimits) == sort_by_name(expected)
+
+    def test_build_ulimits_with_integers_and_dicts(self):
+        ulimits = build_ulimits(
+            {
+                'nproc': 65535,
+                'nofile': {'soft': 10000, 'hard': 20000}
+            }
+        )
+        expected = [
+            {'name': 'nofile', 'soft': 10000, 'hard': 20000},
+            {'name': 'nproc', 'soft': 65535, 'hard': 65535}
+        ]
+        assert sort_by_name(ulimits) == sort_by_name(expected)
+
+
 class NetTestCase(unittest.TestCase):
 
     def test_net(self):

From 98ad5a05e4fb342ba4deed92754da51ca98973b3 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 6 Nov 2015 16:38:38 -0500
Subject: [PATCH 0516/1265] Validate additional files before merging them.

Consolidates all the top level config handling into `process_config_file` which
is now used for both files and merge sources.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py              |  2 +-
 compose/config/__init__.py       |  1 -
 compose/config/config.py         | 56 +++++++++++++++++---------------
 compose/config/validation.py     | 10 +-----
 tests/unit/config/config_test.py | 13 ++++++++
 5 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 08c1aee0..806926d8 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -13,12 +13,12 @@ from requests.exceptions import ReadTimeout
 
 from .. import __version__
 from .. import legacy
+from ..config import ConfigurationError
 from ..config import parse_environment
 from ..const import DEFAULT_TIMEOUT
 from ..const import HTTP_TIMEOUT
 from ..const import IS_WINDOWS_PLATFORM
 from ..progress_stream import StreamOutputError
-from ..project import ConfigurationError
 from ..project import NoSuchService
 from ..service import BuildError
 from ..service import ConvergenceStrategy
diff --git a/compose/config/__init__.py b/compose/config/__init__.py
index de6f10c9..ec607e08 100644
--- a/compose/config/__init__.py
+++ b/compose/config/__init__.py
@@ -1,5 +1,4 @@
 # flake8: noqa
-from .config import ConfigDetails
 from .config import ConfigurationError
 from .config import DOCKER_CONFIG_KEYS
 from .config import find
diff --git a/compose/config/config.py b/compose/config/config.py
index 7931608d..feef0387 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -13,7 +13,6 @@ from .errors import ConfigurationError
 from .interpolation import interpolate_environment_variables
 from .validation import validate_against_fields_schema
 from .validation import validate_against_service_schema
-from .validation import validate_extended_service_exists
 from .validation import validate_extends_file_path
 from .validation import validate_top_level_object
 
@@ -99,6 +98,10 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
     :type  config: :class:`dict`
     """
 
+    @classmethod
+    def from_filename(cls, filename):
+        return cls(filename, load_yaml(filename))
+
 
 def find(base_dir, filenames):
     if filenames == ['-']:
@@ -114,7 +117,7 @@ def find(base_dir, filenames):
     log.debug("Using configuration files: {}".format(",".join(filenames)))
     return ConfigDetails(
         os.path.dirname(filenames[0]),
-        [ConfigFile(f, load_yaml(f)) for f in filenames])
+        [ConfigFile.from_filename(f) for f in filenames])
 
 
 def get_default_config_files(base_dir):
@@ -183,12 +186,10 @@ def load(config_details):
         validate_paths(service_dict)
         return service_dict
 
-    def load_file(filename, config):
-        processed_config = interpolate_environment_variables(config)
-        validate_against_fields_schema(processed_config)
+    def build_services(filename, config):
         return [
             build_service(filename, name, service_config)
-            for name, service_config in processed_config.items()
+            for name, service_config in config.items()
         ]
 
     def merge_services(base, override):
@@ -200,16 +201,27 @@ def load(config_details):
             for name in all_service_names
         }
 
-    config_file = config_details.config_files[0]
-    validate_top_level_object(config_file.config)
+    config_file = process_config_file(config_details.config_files[0])
     for next_file in config_details.config_files[1:]:
-        validate_top_level_object(next_file.config)
+        next_file = process_config_file(next_file)
 
-        config_file = ConfigFile(
-            config_file.filename,
-            merge_services(config_file.config, next_file.config))
+        config = merge_services(config_file.config, next_file.config)
+        config_file = config_file._replace(config=config)
 
-    return load_file(config_file.filename, config_file.config)
+    return build_services(config_file.filename, config_file.config)
+
+
+def process_config_file(config_file, service_name=None):
+    validate_top_level_object(config_file.config)
+    processed_config = interpolate_environment_variables(config_file.config)
+    validate_against_fields_schema(processed_config)
+
+    if service_name and service_name not in processed_config:
+        raise ConfigurationError(
+            "Cannot extend service '{}' in {}: Service not found".format(
+                service_name, config_file.filename))
+
+    return config_file._replace(config=processed_config)
 
 
 class ServiceLoader(object):
@@ -259,22 +271,13 @@ class ServiceLoader(object):
         if not isinstance(extends, dict):
             extends = {'service': extends}
 
-        validate_extends_file_path(self.service_name, extends, self.filename)
         config_path = self.get_extended_config_path(extends)
         service_name = extends['service']
 
-        config = load_yaml(config_path)
-        validate_top_level_object(config)
-        full_extended_config = interpolate_environment_variables(config)
-
-        validate_extended_service_exists(
-            service_name,
-            full_extended_config,
-            config_path
-        )
-        validate_against_fields_schema(full_extended_config)
-
-        service_config = full_extended_config[service_name]
+        extended_file = process_config_file(
+            ConfigFile.from_filename(config_path),
+            service_name=service_name)
+        service_config = extended_file.config[service_name]
         return config_path, service_config, service_name
 
     def resolve_extends(self, extended_config_path, service_config, service_name):
@@ -304,6 +307,7 @@ class ServiceLoader(object):
         need to obtain a full path too or we are extending from a service
         defined in our own file.
         """
+        validate_extends_file_path(self.service_name, extends_options, self.filename)
         if 'file' in extends_options:
             return expand_path(self.working_dir, extends_options['file'])
         return self.filename
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 542081d5..3bd40410 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -96,14 +96,6 @@ def validate_extends_file_path(service_name, extends_options, filename):
         )
 
 
-def validate_extended_service_exists(extended_service_name, full_extended_config, extended_config_path):
-    if extended_service_name not in full_extended_config:
-        msg = (
-            "Cannot extend service '%s' in %s: Service not found"
-        ) % (extended_service_name, extended_config_path)
-        raise ConfigurationError(msg)
-
-
 def get_unsupported_config_msg(service_name, error_key):
     msg = "Unsupported config option for '{}' service: '{}'".format(service_name, error_key)
     if error_key in DOCKER_CONFIG_HINTS:
@@ -264,7 +256,7 @@ def process_errors(errors, service_name=None):
                             msg))
                 else:
                     root_msgs.append(
-                        "Service '{}' doesn\'t have any configuration options. "
+                        "Service \"{}\" doesn't have any configuration options. "
                         "All top level keys in your docker-compose.yml must map "
                         "to a dictionary of configuration options.'".format(service_name))
             elif error.validator == 'required':
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index f27329ba..ab34f4dc 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -195,6 +195,19 @@ class ConfigTest(unittest.TestCase):
         ]
         self.assertEqual(service_sort(service_dicts), service_sort(expected))
 
+    def test_load_with_multiple_files_and_invalid_override(self):
+        base_file = config.ConfigFile(
+            'base.yaml',
+            {'web': {'image': 'example/web'}})
+        override_file = config.ConfigFile(
+            'override.yaml',
+            {'bogus': 'thing'})
+        details = config.ConfigDetails('.', [base_file, override_file])
+
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(details)
+        assert 'Service "bogus" doesn\'t have any configuration' in exc.exconly()
+
     def test_config_valid_service_names(self):
         for valid_name in ['_', '-', '.__.', '_what-up.', 'what_.up----', 'whatup']:
             config.load(

From a92d86308f7bc3e571f06df4990e609ec370bfc5 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 6 Nov 2015 17:18:47 -0500
Subject: [PATCH 0517/1265] Rename ServiceLoader to ServiceExtendsResolver

ServiceLoader has evolved to be not really all that related to "loading" a
service. It's responsibility is more to do with handling the `extends`
field, which is only part of loading.  The class and its primary method
(make_service_dict()) were renamed to better reflect their responsibility.

As part of that change process_container_options() was removed from
make_service_dict() and renamed to process_service().  It contains logic for
handling the non-extends options.

This change allows us to remove the hacks from testcase.py and only call
the functions we need to format a service dict correctly for integration tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py          | 27 ++++++++++++---------------
 tests/integration/service_test.py | 25 ++++++++++++++++++++++---
 tests/integration/testcases.py    | 21 +++++++--------------
 tests/unit/config/config_test.py  |  7 ++++---
 4 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index feef0387..7846ea7b 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -177,12 +177,12 @@ def load(config_details):
     """
 
     def build_service(filename, service_name, service_dict):
-        loader = ServiceLoader(
+        resolver = ServiceExtendsResolver(
             config_details.working_dir,
             filename,
             service_name,
             service_dict)
-        service_dict = loader.make_service_dict()
+        service_dict = process_service(config_details.working_dir, resolver.run())
         validate_paths(service_dict)
         return service_dict
 
@@ -224,7 +224,7 @@ def process_config_file(config_file, service_name=None):
     return config_file._replace(config=processed_config)
 
 
-class ServiceLoader(object):
+class ServiceExtendsResolver(object):
     def __init__(
         self,
         working_dir,
@@ -234,7 +234,7 @@ class ServiceLoader(object):
         already_seen=None
     ):
         if working_dir is None:
-            raise ValueError("No working_dir passed to ServiceLoader()")
+            raise ValueError("No working_dir passed to ServiceExtendsResolver()")
 
         self.working_dir = os.path.abspath(working_dir)
 
@@ -251,7 +251,7 @@ class ServiceLoader(object):
         if self.signature(name) in self.already_seen:
             raise CircularReference(self.already_seen + [self.signature(name)])
 
-    def make_service_dict(self):
+    def run(self):
         service_dict = dict(self.service_dict)
         env = resolve_environment(self.working_dir, self.service_dict)
         if env:
@@ -264,7 +264,7 @@ class ServiceLoader(object):
         if not self.already_seen:
             validate_against_service_schema(service_dict, self.service_name)
 
-        return process_container_options(self.working_dir, service_dict)
+        return service_dict
 
     def validate_and_construct_extends(self):
         extends = self.service_dict['extends']
@@ -281,19 +281,16 @@ class ServiceLoader(object):
         return config_path, service_config, service_name
 
     def resolve_extends(self, extended_config_path, service_config, service_name):
-        other_working_dir = os.path.dirname(extended_config_path)
-        other_already_seen = self.already_seen + [self.signature(self.service_name)]
-
-        other_loader = ServiceLoader(
-            other_working_dir,
+        resolver = ServiceExtendsResolver(
+            os.path.dirname(extended_config_path),
             extended_config_path,
             self.service_name,
             service_config,
-            already_seen=other_already_seen,
+            already_seen=self.already_seen + [self.signature(self.service_name)],
         )
 
-        other_loader.detect_cycle(service_name)
-        other_service_dict = other_loader.make_service_dict()
+        resolver.detect_cycle(service_name)
+        other_service_dict = process_service(resolver.working_dir, resolver.run())
         validate_extended_service_dict(
             other_service_dict,
             extended_config_path,
@@ -358,7 +355,7 @@ def validate_ulimits(ulimit_config):
                     "than 'hard' value".format(ulimit_config))
 
 
-def process_container_options(working_dir, service_dict):
+def process_service(working_dir, service_dict):
     service_dict = dict(service_dict)
 
     if 'volumes' in service_dict and service_dict.get('volume_driver') is None:
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 804f5219..d4474dcc 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -815,7 +815,13 @@ class ServiceTest(DockerClientTestCase):
             environment=['ONE=1', 'TWO=2', 'THREE=3'],
             env_file=['tests/fixtures/env/one.env', 'tests/fixtures/env/two.env'])
         env = create_and_start_container(service).environment
-        for k, v in {'ONE': '1', 'TWO': '2', 'THREE': '3', 'FOO': 'baz', 'DOO': 'dah'}.items():
+        for k, v in {
+            'ONE': '1',
+            'TWO': '2',
+            'THREE': '3',
+            'FOO': 'baz',
+            'DOO': 'dah'
+        }.items():
             self.assertEqual(env[k], v)
 
     @mock.patch.dict(os.environ)
@@ -823,9 +829,22 @@ class ServiceTest(DockerClientTestCase):
         os.environ['FILE_DEF'] = 'E1'
         os.environ['FILE_DEF_EMPTY'] = 'E2'
         os.environ['ENV_DEF'] = 'E3'
-        service = self.create_service('web', environment={'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': None, 'NO_DEF': None})
+        service = self.create_service(
+            'web',
+            environment={
+                'FILE_DEF': 'F1',
+                'FILE_DEF_EMPTY': '',
+                'ENV_DEF': None,
+                'NO_DEF': None
+            }
+        )
         env = create_and_start_container(service).environment
-        for k, v in {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''}.items():
+        for k, v in {
+            'FILE_DEF': 'F1',
+            'FILE_DEF_EMPTY': '',
+            'ENV_DEF': 'E3',
+            'NO_DEF': ''
+        }.items():
             self.assertEqual(env[k], v)
 
     def test_with_high_enough_api_version_we_get_default_network_mode(self):
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 60e67b5b..5ee6a421 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -7,7 +7,8 @@ from pytest import skip
 
 from .. import unittest
 from compose.cli.docker_client import docker_client
-from compose.config.config import ServiceLoader
+from compose.config.config import process_service
+from compose.config.config import resolve_environment
 from compose.const import LABEL_PROJECT
 from compose.progress_stream import stream_output
 from compose.service import Service
@@ -42,23 +43,15 @@ class DockerClientTestCase(unittest.TestCase):
         if 'command' not in kwargs:
             kwargs['command'] = ["top"]
 
-        workaround_options = {}
-        for option in ['links', 'volumes_from', 'net']:
-            if option in kwargs:
-                workaround_options[option] = kwargs.pop(option, None)
-
-        options = ServiceLoader(
-            working_dir='.',
-            filename=None,
-            service_name=name,
-            service_dict=kwargs
-        ).make_service_dict()
-        options.update(workaround_options)
+        # TODO: remove this once #2299 is fixed
+        kwargs['name'] = name
 
+        options = process_service('.', kwargs)
+        options['environment'] = resolve_environment('.', kwargs)
         labels = options.setdefault('labels', {})
         labels['com.docker.compose.test-name'] = self.id()
 
-        return Service(project='composetest', client=self.client, **options)
+        return Service(client=self.client, project='composetest', **options)
 
     def check_build(self, *args, **kwargs):
         kwargs.setdefault('rm', True)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index ab34f4dc..2835a431 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -18,13 +18,14 @@ from tests import unittest
 
 def make_service_dict(name, service_dict, working_dir, filename=None):
     """
-    Test helper function to construct a ServiceLoader
+    Test helper function to construct a ServiceExtendsResolver
     """
-    return config.ServiceLoader(
+    resolver = config.ServiceExtendsResolver(
         working_dir=working_dir,
         filename=filename,
         service_name=name,
-        service_dict=service_dict).make_service_dict()
+        service_dict=service_dict)
+    return config.process_service(working_dir, resolver.run())
 
 
 def service_sort(services):

From 5e97b806d51e72f282046231af417b4d647cf64f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 9 Nov 2015 14:24:44 -0500
Subject: [PATCH 0518/1265] Fix a bug in ExtendsResolver where the service name
 of the extended service was wrong.

This bug can be seen by the change to the test case. When the extended service
uses a different name, the error was reported incorrectly.

By fixing this bug we can simplify self.signature and self.detect_cycles to
always use self.service_name.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py            | 20 +++++++++++---------
 tests/fixtures/extends/circle-1.yml |  2 +-
 tests/fixtures/extends/circle-2.yml |  2 +-
 tests/unit/config/config_test.py    | 23 ++++++++++++-----------
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 7846ea7b..1ddb2abe 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -247,11 +247,17 @@ class ServiceExtendsResolver(object):
         self.service_name = service_name
         self.service_dict['name'] = service_name
 
-    def detect_cycle(self, name):
-        if self.signature(name) in self.already_seen:
-            raise CircularReference(self.already_seen + [self.signature(name)])
+    @property
+    def signature(self):
+        return self.filename, self.service_name
+
+    def detect_cycle(self):
+        if self.signature in self.already_seen:
+            raise CircularReference(self.already_seen + [self.signature])
 
     def run(self):
+        self.detect_cycle()
+
         service_dict = dict(self.service_dict)
         env = resolve_environment(self.working_dir, self.service_dict)
         if env:
@@ -284,12 +290,11 @@ class ServiceExtendsResolver(object):
         resolver = ServiceExtendsResolver(
             os.path.dirname(extended_config_path),
             extended_config_path,
-            self.service_name,
+            service_name,
             service_config,
-            already_seen=self.already_seen + [self.signature(self.service_name)],
+            already_seen=self.already_seen + [self.signature],
         )
 
-        resolver.detect_cycle(service_name)
         other_service_dict = process_service(resolver.working_dir, resolver.run())
         validate_extended_service_dict(
             other_service_dict,
@@ -309,9 +314,6 @@ class ServiceExtendsResolver(object):
             return expand_path(self.working_dir, extends_options['file'])
         return self.filename
 
-    def signature(self, name):
-        return self.filename, name
-
 
 def resolve_environment(working_dir, service_dict):
     """Unpack any environment variables from an env_file, if set.
diff --git a/tests/fixtures/extends/circle-1.yml b/tests/fixtures/extends/circle-1.yml
index a034e961..d88ea61d 100644
--- a/tests/fixtures/extends/circle-1.yml
+++ b/tests/fixtures/extends/circle-1.yml
@@ -5,7 +5,7 @@ bar:
 web:
   extends:
     file: circle-2.yml
-    service: web
+    service: other
 baz:
   image: busybox
 quux:
diff --git a/tests/fixtures/extends/circle-2.yml b/tests/fixtures/extends/circle-2.yml
index fa6ddefc..de05bc8d 100644
--- a/tests/fixtures/extends/circle-2.yml
+++ b/tests/fixtures/extends/circle-2.yml
@@ -2,7 +2,7 @@ foo:
   image: busybox
 bar:
   image: busybox
-web:
+other:
   extends:
     file: circle-1.yml
     service: web
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 2835a431..71783168 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1080,18 +1080,19 @@ class ExtendsTest(unittest.TestCase):
         ]))
 
     def test_circular(self):
-        try:
+        with pytest.raises(config.CircularReference) as exc:
             load_from_filename('tests/fixtures/extends/circle-1.yml')
-            raise Exception("Expected config.CircularReference to be raised")
-        except config.CircularReference as e:
-            self.assertEqual(
-                [(os.path.basename(filename), service_name) for (filename, service_name) in e.trail],
-                [
-                    ('circle-1.yml', 'web'),
-                    ('circle-2.yml', 'web'),
-                    ('circle-1.yml', 'web'),
-                ],
-            )
+
+        path = [
+            (os.path.basename(filename), service_name)
+            for (filename, service_name) in exc.value.trail
+        ]
+        expected = [
+            ('circle-1.yml', 'web'),
+            ('circle-2.yml', 'other'),
+            ('circle-1.yml', 'web'),
+        ]
+        self.assertEqual(path, expected)
 
     def test_extends_validation_empty_dictionary(self):
         with self.assertRaisesRegexp(ConfigurationError, 'service'):

From 1f7faadc7712f5bf734e6254d2a8d6f1427f5029 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 6 Nov 2015 11:57:27 -0500
Subject: [PATCH 0519/1265] Remove name from config schema.

Refactors config validation of a service to use a ServiceConfig data object.
Instead of passing around a bunch of related scalars, we can use the
ServiceConfig object as a parameter to most of the service validation functions.

This allows for a fix to the config schema, where the name is a field in the
schema, but not actually in the configuration. My passing the name around as
part of the ServiceConfig object, we don't need to add it to the config options.
Fixes #2299

validate_against_service_schema() is moved from a conditional branch in
ServiceExtendsResolver() to happen as one of the last steps after all
configuration is merged. This schema only contains constraints which only need
to be true at the very end of merging.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py           | 101 +++++++++++++++--------------
 compose/config/fields_schema.json  |   1 -
 compose/config/service_schema.json |   6 --
 compose/config/validation.py       |   2 +-
 tests/integration/testcases.py     |   9 ++-
 tests/unit/config/config_test.py   |  10 +--
 6 files changed, 62 insertions(+), 67 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 1ddb2abe..21788551 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -103,6 +103,20 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
         return cls(filename, load_yaml(filename))
 
 
+class ServiceConfig(namedtuple('_ServiceConfig', 'working_dir filename name config')):
+
+    @classmethod
+    def with_abs_paths(cls, working_dir, filename, name, config):
+        if not working_dir:
+            raise ValueError("No working_dir for ServiceConfig.")
+
+        return cls(
+            os.path.abspath(working_dir),
+            os.path.abspath(filename) if filename else filename,
+            name,
+            config)
+
+
 def find(base_dir, filenames):
     if filenames == ['-']:
         return ConfigDetails(
@@ -177,19 +191,22 @@ def load(config_details):
     """
 
     def build_service(filename, service_name, service_dict):
-        resolver = ServiceExtendsResolver(
+        service_config = ServiceConfig.with_abs_paths(
             config_details.working_dir,
             filename,
             service_name,
             service_dict)
-        service_dict = process_service(config_details.working_dir, resolver.run())
+        resolver = ServiceExtendsResolver(service_config)
+        service_dict = process_service(resolver.run())
+        validate_against_service_schema(service_dict, service_config.name)
         validate_paths(service_dict)
+        service_dict['name'] = service_config.name
         return service_dict
 
-    def build_services(filename, config):
+    def build_services(config_file):
         return [
-            build_service(filename, name, service_config)
-            for name, service_config in config.items()
+            build_service(config_file.filename, name, service_dict)
+            for name, service_dict in config_file.config.items()
         ]
 
     def merge_services(base, override):
@@ -208,7 +225,7 @@ def load(config_details):
         config = merge_services(config_file.config, next_file.config)
         config_file = config_file._replace(config=config)
 
-    return build_services(config_file.filename, config_file.config)
+    return build_services(config_file)
 
 
 def process_config_file(config_file, service_name=None):
@@ -225,31 +242,14 @@ def process_config_file(config_file, service_name=None):
 
 
 class ServiceExtendsResolver(object):
-    def __init__(
-        self,
-        working_dir,
-        filename,
-        service_name,
-        service_dict,
-        already_seen=None
-    ):
-        if working_dir is None:
-            raise ValueError("No working_dir passed to ServiceExtendsResolver()")
-
-        self.working_dir = os.path.abspath(working_dir)
-
-        if filename:
-            self.filename = os.path.abspath(filename)
-        else:
-            self.filename = filename
+    def __init__(self, service_config, already_seen=None):
+        self.service_config = service_config
+        self.working_dir = service_config.working_dir
         self.already_seen = already_seen or []
-        self.service_dict = service_dict.copy()
-        self.service_name = service_name
-        self.service_dict['name'] = service_name
 
     @property
     def signature(self):
-        return self.filename, self.service_name
+        return self.service_config.filename, self.service_config.name
 
     def detect_cycle(self):
         if self.signature in self.already_seen:
@@ -258,8 +258,8 @@ class ServiceExtendsResolver(object):
     def run(self):
         self.detect_cycle()
 
-        service_dict = dict(self.service_dict)
-        env = resolve_environment(self.working_dir, self.service_dict)
+        service_dict = dict(self.service_config.config)
+        env = resolve_environment(self.working_dir, self.service_config.config)
         if env:
             service_dict['environment'] = env
             service_dict.pop('env_file', None)
@@ -267,13 +267,10 @@ class ServiceExtendsResolver(object):
         if 'extends' in service_dict:
             service_dict = self.resolve_extends(*self.validate_and_construct_extends())
 
-        if not self.already_seen:
-            validate_against_service_schema(service_dict, self.service_name)
-
-        return service_dict
+        return self.service_config._replace(config=service_dict)
 
     def validate_and_construct_extends(self):
-        extends = self.service_dict['extends']
+        extends = self.service_config.config['extends']
         if not isinstance(extends, dict):
             extends = {'service': extends}
 
@@ -286,33 +283,38 @@ class ServiceExtendsResolver(object):
         service_config = extended_file.config[service_name]
         return config_path, service_config, service_name
 
-    def resolve_extends(self, extended_config_path, service_config, service_name):
+    def resolve_extends(self, extended_config_path, service_dict, service_name):
         resolver = ServiceExtendsResolver(
-            os.path.dirname(extended_config_path),
-            extended_config_path,
-            service_name,
-            service_config,
-            already_seen=self.already_seen + [self.signature],
-        )
+            ServiceConfig.with_abs_paths(
+                os.path.dirname(extended_config_path),
+                extended_config_path,
+                service_name,
+                service_dict),
+            already_seen=self.already_seen + [self.signature])
 
-        other_service_dict = process_service(resolver.working_dir, resolver.run())
+        service_config = resolver.run()
+        other_service_dict = process_service(service_config)
         validate_extended_service_dict(
             other_service_dict,
             extended_config_path,
             service_name,
         )
 
-        return merge_service_dicts(other_service_dict, self.service_dict)
+        return merge_service_dicts(other_service_dict, self.service_config.config)
 
     def get_extended_config_path(self, extends_options):
         """Service we are extending either has a value for 'file' set, which we
         need to obtain a full path too or we are extending from a service
         defined in our own file.
         """
-        validate_extends_file_path(self.service_name, extends_options, self.filename)
+        filename = self.service_config.filename
+        validate_extends_file_path(
+            self.service_config.name,
+            extends_options,
+            filename)
         if 'file' in extends_options:
             return expand_path(self.working_dir, extends_options['file'])
-        return self.filename
+        return filename
 
 
 def resolve_environment(working_dir, service_dict):
@@ -357,8 +359,9 @@ def validate_ulimits(ulimit_config):
                     "than 'hard' value".format(ulimit_config))
 
 
-def process_service(working_dir, service_dict):
-    service_dict = dict(service_dict)
+def process_service(service_config):
+    working_dir = service_config.working_dir
+    service_dict = dict(service_config.config)
 
     if 'volumes' in service_dict and service_dict.get('volume_driver') is None:
         service_dict['volumes'] = resolve_volume_paths(working_dir, service_dict)
@@ -505,12 +508,12 @@ def env_vars_from_file(filename):
 
 def resolve_volume_paths(working_dir, service_dict):
     return [
-        resolve_volume_path(working_dir, volume, service_dict['name'])
+        resolve_volume_path(working_dir, volume)
         for volume in service_dict['volumes']
     ]
 
 
-def resolve_volume_path(working_dir, volume, service_name):
+def resolve_volume_path(working_dir, volume):
     container_path, host_path = split_path_mapping(volume)
 
     if host_path is not None:
diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index f22b513a..7723f2fb 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -89,7 +89,6 @@
         "mac_address": {"type": "string"},
         "mem_limit": {"type": ["number", "string"]},
         "memswap_limit": {"type": ["number", "string"]},
-        "name": {"type": "string"},
         "net": {"type": "string"},
         "pid": {"type": ["string", "null"]},
 
diff --git a/compose/config/service_schema.json b/compose/config/service_schema.json
index 5cb5d6d0..221c5d8d 100644
--- a/compose/config/service_schema.json
+++ b/compose/config/service_schema.json
@@ -3,12 +3,6 @@
 
   "type": "object",
 
-  "properties": {
-      "name": {"type": "string"}
-  },
-
-  "required": ["name"],
-
   "allOf": [
     {"$ref": "fields_schema.json#/definitions/service"},
     {"$ref": "#/definitions/service_constraints"}
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 3bd40410..d3bcb35c 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -195,7 +195,7 @@ def process_errors(errors, service_name=None):
 
     for error in errors:
         # handle root level errors
-        if len(error.path) == 0 and not error.instance.get('name'):
+        if len(error.path) == 0 and not service_name:
             if error.validator == 'type':
                 msg = "Top level object needs to be a dictionary. Check your .yml file that you have defined a service at the top level."
                 root_msgs.append(msg)
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 5ee6a421..d63f0591 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -9,6 +9,7 @@ from .. import unittest
 from compose.cli.docker_client import docker_client
 from compose.config.config import process_service
 from compose.config.config import resolve_environment
+from compose.config.config import ServiceConfig
 from compose.const import LABEL_PROJECT
 from compose.progress_stream import stream_output
 from compose.service import Service
@@ -43,15 +44,13 @@ class DockerClientTestCase(unittest.TestCase):
         if 'command' not in kwargs:
             kwargs['command'] = ["top"]
 
-        # TODO: remove this once #2299 is fixed
-        kwargs['name'] = name
-
-        options = process_service('.', kwargs)
+        service_config = ServiceConfig('.', None, name, kwargs)
+        options = process_service(service_config)
         options['environment'] = resolve_environment('.', kwargs)
         labels = options.setdefault('labels', {})
         labels['com.docker.compose.test-name'] = self.id()
 
-        return Service(client=self.client, project='composetest', **options)
+        return Service(name, client=self.client, project='composetest', **options)
 
     def check_build(self, *args, **kwargs):
         kwargs.setdefault('rm', True)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 71783168..022ec7c7 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -20,12 +20,12 @@ def make_service_dict(name, service_dict, working_dir, filename=None):
     """
     Test helper function to construct a ServiceExtendsResolver
     """
-    resolver = config.ServiceExtendsResolver(
+    resolver = config.ServiceExtendsResolver(config.ServiceConfig(
         working_dir=working_dir,
         filename=filename,
-        service_name=name,
-        service_dict=service_dict)
-    return config.process_service(working_dir, resolver.run())
+        name=name,
+        config=service_dict))
+    return config.process_service(resolver.run())
 
 
 def service_sort(services):
@@ -651,7 +651,7 @@ class VolumeConfigTest(unittest.TestCase):
 
     def test_volume_path_with_non_ascii_directory(self):
         volume = u'/Füü/data:/data'
-        container_path = config.resolve_volume_path(".", volume, "test")
+        container_path = config.resolve_volume_path(".", volume)
         self.assertEqual(container_path, volume)
 
 

From 19b2c41c7ee7887468d04ceb1fc90f05b232432a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 9 Nov 2015 15:39:55 -0500
Subject: [PATCH 0520/1265] Add a test for invalid field 'name', and fix an
 existing test for invalid service names.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/unit/config/config_test.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 022ec7c7..add7a5a4 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -77,8 +77,8 @@ class ConfigTest(unittest.TestCase):
             )
 
     def test_config_invalid_service_names(self):
-        with self.assertRaises(ConfigurationError):
-            for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
+        for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
+            with pytest.raises(ConfigurationError):
                 config.load(
                     build_config_details(
                         {invalid_name: {'image': 'busybox'}},
@@ -87,6 +87,16 @@ class ConfigTest(unittest.TestCase):
                     )
                 )
 
+    def test_load_with_invalid_field_name(self):
+        config_details = build_config_details(
+            {'web': {'image': 'busybox', 'name': 'bogus'}},
+            'working_dir',
+            'filename.yml')
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(config_details)
+        error_msg = "Unsupported config option for 'web' service: 'name'"
+        assert error_msg in exc.exconly()
+
     def test_config_integer_service_name_raise_validation_error(self):
         expected_error_msg = "Service name: 1 needs to be a string, eg '1'"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):

From b8b4c84573ec7d20524b7d2715d956fcc9f897a8 Mon Sep 17 00:00:00 2001
From: Yves Peter <ypdraw@gmail.com>
Date: Wed, 4 Nov 2015 23:40:57 +0100
Subject: [PATCH 0521/1265] Fixes #1490 progress_stream would print a lot of
 new lines on "docker-compose pull" if there's no tty.

Signed-off-by: Yves Peter <ypdraw@gmail.com>
---
 compose/progress_stream.py         | 23 +++++++++++++---------
 tests/unit/progress_stream_test.py | 31 ++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index ac8e4b41..c729a6df 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -14,8 +14,14 @@ def stream_output(output, stream):
 
     for event in utils.json_stream(output):
         all_events.append(event)
+        is_progress_event = 'progress' in event or 'progressDetail' in event
 
-        if 'progress' in event or 'progressDetail' in event:
+        if not is_progress_event:
+            print_output_event(event, stream, is_terminal)
+            stream.flush()
+
+        # if it's a progress event and we have a terminal, then display the progress bars
+        elif is_terminal:
             image_id = event.get('id')
             if not image_id:
                 continue
@@ -27,17 +33,16 @@ def stream_output(output, stream):
                 stream.write("\n")
                 diff = 0
 
-            if is_terminal:
-                # move cursor up `diff` rows
-                stream.write("%c[%dA" % (27, diff))
+            # move cursor up `diff` rows
+            stream.write("%c[%dA" % (27, diff))
 
-        print_output_event(event, stream, is_terminal)
+            print_output_event(event, stream, is_terminal)
 
-        if 'id' in event and is_terminal:
-            # move cursor back down
-            stream.write("%c[%dB" % (27, diff))
+            if 'id' in event:
+                # move cursor back down
+                stream.write("%c[%dB" % (27, diff))
 
-        stream.flush()
+            stream.flush()
 
     return all_events
 
diff --git a/tests/unit/progress_stream_test.py b/tests/unit/progress_stream_test.py
index d8f7ec83..b01be11a 100644
--- a/tests/unit/progress_stream_test.py
+++ b/tests/unit/progress_stream_test.py
@@ -34,3 +34,34 @@ class ProgressStreamTestCase(unittest.TestCase):
         ]
         events = progress_stream.stream_output(output, StringIO())
         self.assertEqual(len(events), 1)
+
+    def test_stream_output_progress_event_tty(self):
+        events = [
+            b'{"status": "Already exists", "progressDetail": {}, "id": "8d05e3af52b0"}'
+        ]
+
+        class TTYStringIO(StringIO):
+            def isatty(self):
+                return True
+
+        output = TTYStringIO()
+        events = progress_stream.stream_output(events, output)
+        self.assertTrue(len(output.getvalue()) > 0)
+
+    def test_stream_output_progress_event_no_tty(self):
+        events = [
+            b'{"status": "Already exists", "progressDetail": {}, "id": "8d05e3af52b0"}'
+        ]
+        output = StringIO()
+
+        events = progress_stream.stream_output(events, output)
+        self.assertEqual(len(output.getvalue()), 0)
+
+    def test_stream_output_no_progress_event_no_tty(self):
+        events = [
+            b'{"status": "Pulling from library/xy", "id": "latest"}'
+        ]
+        output = StringIO()
+
+        events = progress_stream.stream_output(events, output)
+        self.assertTrue(len(output.getvalue()) > 0)

From c573fcc70a297dbc8d971ad13a81bbaa88262dec Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 11 Nov 2015 11:21:24 -0800
Subject: [PATCH 0522/1265] Reorganize conditional branches to improve
 readability

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/progress_stream.py | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index c729a6df..a6c8e0a2 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -19,30 +19,33 @@ def stream_output(output, stream):
         if not is_progress_event:
             print_output_event(event, stream, is_terminal)
             stream.flush()
+            continue
+
+        if not is_terminal:
+            continue
 
         # if it's a progress event and we have a terminal, then display the progress bars
-        elif is_terminal:
-            image_id = event.get('id')
-            if not image_id:
-                continue
+        image_id = event.get('id')
+        if not image_id:
+            continue
 
-            if image_id in lines:
-                diff = len(lines) - lines[image_id]
-            else:
-                lines[image_id] = len(lines)
-                stream.write("\n")
-                diff = 0
+        if image_id in lines:
+            diff = len(lines) - lines[image_id]
+        else:
+            lines[image_id] = len(lines)
+            stream.write("\n")
+            diff = 0
 
-            # move cursor up `diff` rows
-            stream.write("%c[%dA" % (27, diff))
+        # move cursor up `diff` rows
+        stream.write("%c[%dA" % (27, diff))
 
-            print_output_event(event, stream, is_terminal)
+        print_output_event(event, stream, is_terminal)
 
-            if 'id' in event:
-                # move cursor back down
-                stream.write("%c[%dB" % (27, diff))
+        if 'id' in event:
+            # move cursor back down
+            stream.write("%c[%dB" % (27, diff))
 
-            stream.flush()
+        stream.flush()
 
     return all_events
 

From 513dfda218a96f89de69788db9fb39f007656356 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 11 Nov 2015 12:45:02 -0800
Subject: [PATCH 0523/1265] Allow dashes in environment variable names

See http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html
Environment variable names used by the utilities in the Shell and
Utilities volume of POSIX.1-2008 consist solely of uppercase letters,
digits, and the <underscore> ( '_' ) from the characters defined in
Portable Character Set and do not begin with a digit. Other characters may
be permitted by an implementation; applications shall tolerate the
presence of such names.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/fields_schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index f22b513a..454020a8 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -40,7 +40,7 @@
             {
               "type": "object",
               "patternProperties": {
-                "^[^-]+$": {
+                ".+": {
                   "type": ["string", "number", "boolean", "null"],
                   "format": "environment"
                 }

From d6b44905f25d8d03a5057c942bc9a955da40be23 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 11 Nov 2015 12:52:30 -0800
Subject: [PATCH 0524/1265] Add test for environment variable dashes support

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/unit/config/config_test.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 71783168..3adc02c8 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -470,20 +470,18 @@ class ConfigTest(unittest.TestCase):
         self.assertTrue(mock_logging.warn.called)
         self.assertTrue(expected_warning_msg in mock_logging.warn.call_args[0][0])
 
-    def test_config_invalid_environment_dict_key_raises_validation_error(self):
-        expected_error_msg = "Service 'web' configuration key 'environment' contains unsupported option: '---'"
-
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
-            config.load(
-                build_config_details(
-                    {'web': {
-                        'image': 'busybox',
-                        'environment': {'---': 'nope'}
-                    }},
-                    'working_dir',
-                    'filename.yml'
-                )
+    def test_config_valid_environment_dict_key_contains_dashes(self):
+        services = config.load(
+            build_config_details(
+                {'web': {
+                    'image': 'busybox',
+                    'environment': {'SPRING_JPA_HIBERNATE_DDL-AUTO': 'none'}
+                }},
+                'working_dir',
+                'filename.yml'
             )
+        )
+        self.assertEqual(services[0]['environment']['SPRING_JPA_HIBERNATE_DDL-AUTO'], 'none')
 
     def test_load_yaml_with_yaml_error(self):
         tmpdir = py.test.ensuretemp('invalid_yaml_test')

From f7d808769405e52e4c84acdcf15875614cb71993 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 12 Nov 2015 12:40:36 -0500
Subject: [PATCH 0525/1265] Add ids to config schemas

Also enforce a max complexity for functions and add some new tests for config.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/fields_schema.json  |  6 ++++--
 compose/config/service_schema.json | 11 ++++-------
 compose/config/validation.py       |  5 ++++-
 tests/unit/config/config_test.py   | 24 ++++++++++++++++--------
 tox.ini                            |  2 ++
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 7723f2fb..a174ba87 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -2,15 +2,18 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
 
   "type": "object",
+  "id": "fields_schema.json",
 
   "patternProperties": {
     "^[a-zA-Z0-9._-]+$": {
       "$ref": "#/definitions/service"
     }
   },
+  "additionalProperties": false,
 
   "definitions": {
     "service": {
+      "id": "#/definitions/service",
       "type": "object",
 
       "properties": {
@@ -167,6 +170,5 @@
       ]
     }
 
-  },
-  "additionalProperties": false
+  }
 }
diff --git a/compose/config/service_schema.json b/compose/config/service_schema.json
index 221c5d8d..05774efd 100644
--- a/compose/config/service_schema.json
+++ b/compose/config/service_schema.json
@@ -1,15 +1,17 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "service_schema.json",
 
   "type": "object",
 
   "allOf": [
     {"$ref": "fields_schema.json#/definitions/service"},
-    {"$ref": "#/definitions/service_constraints"}
+    {"$ref": "#/definitions/constraints"}
   ],
 
   "definitions": {
-    "service_constraints": {
+    "constraints": {
+      "id": "#/definitions/constraints",
       "anyOf": [
         {
           "required": ["build"],
@@ -21,13 +23,8 @@
             {"required": ["build"]},
             {"required": ["dockerfile"]}
           ]}
-        },
-        {
-          "required": ["extends"],
-          "not": {"required": ["build", "image"]}
         }
       ]
     }
   }
-
 }
diff --git a/compose/config/validation.py b/compose/config/validation.py
index d3bcb35c..962d41e2 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -307,7 +307,10 @@ def _validate_against_schema(config, schema_filename, format_checker=[], service
         schema = json.load(schema_fh)
 
     resolver = RefResolver(resolver_full_path, schema)
-    validation_output = Draft4Validator(schema, resolver=resolver, format_checker=FormatChecker(format_checker))
+    validation_output = Draft4Validator(
+        schema,
+        resolver=resolver,
+        format_checker=FormatChecker(format_checker))
 
     errors = [error for error in sorted(validation_output.iter_errors(config), key=str)]
     if errors:
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index add7a5a4..03e338cb 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -78,14 +78,12 @@ class ConfigTest(unittest.TestCase):
 
     def test_config_invalid_service_names(self):
         for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
-            with pytest.raises(ConfigurationError):
-                config.load(
-                    build_config_details(
-                        {invalid_name: {'image': 'busybox'}},
-                        'working_dir',
-                        'filename.yml'
-                    )
-                )
+            with pytest.raises(ConfigurationError) as exc:
+                config.load(build_config_details(
+                    {invalid_name: {'image': 'busybox'}},
+                    'working_dir',
+                    'filename.yml'))
+            assert 'Invalid service name \'%s\'' % invalid_name in exc.exconly()
 
     def test_load_with_invalid_field_name(self):
         config_details = build_config_details(
@@ -97,6 +95,16 @@ class ConfigTest(unittest.TestCase):
         error_msg = "Unsupported config option for 'web' service: 'name'"
         assert error_msg in exc.exconly()
 
+    def test_load_invalid_service_definition(self):
+        config_details = build_config_details(
+            {'web': 'wrong'},
+            'working_dir',
+            'filename.yml')
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(config_details)
+        error_msg = "Service \"web\" doesn\'t have any configuration options"
+        assert error_msg in exc.exconly()
+
     def test_config_integer_service_name_raise_validation_error(self):
         expected_error_msg = "Service name: 1 needs to be a string, eg '1'"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
diff --git a/tox.ini b/tox.ini
index f05c5ed2..d1098a55 100644
--- a/tox.ini
+++ b/tox.ini
@@ -43,4 +43,6 @@ directory = coverage-html
 [flake8]
 # Allow really long lines for now
 max-line-length = 140
+# Set this high for now
+max-complexity = 20
 exclude = compose/packages

From fa96484d2835b8711e560d0c22626c67b99b2407 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 12 Nov 2015 12:43:29 -0500
Subject: [PATCH 0526/1265] Refactor process_errors into smaller functions

So that it passed new max-complexity requirement

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/validation.py     | 316 +++++++++++++++----------------
 tests/unit/config/config_test.py |   2 +-
 2 files changed, 149 insertions(+), 169 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 962d41e2..2928238c 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -109,189 +109,169 @@ def anglicize_validator(validator):
     return 'a ' + validator
 
 
-def process_errors(errors, service_name=None):
+def handle_error_for_schema_with_id(error, service_name):
+    schema_id = error.schema['id']
+
+    if schema_id == 'fields_schema.json' and error.validator == 'additionalProperties':
+        return "Invalid service name '{}' - only {} characters are allowed".format(
+            # The service_name is the key to the json object
+            list(error.instance)[0],
+            VALID_NAME_CHARS)
+
+    if schema_id == '#/definitions/constraints':
+        if 'image' in error.instance and 'build' in error.instance:
+            return (
+                "Service '{}' has both an image and build path specified. "
+                "A service can either be built to image or use an existing "
+                "image, not both.".format(service_name))
+        if 'image' not in error.instance and 'build' not in error.instance:
+            return (
+                "Service '{}' has neither an image nor a build path "
+                "specified. Exactly one must be provided.".format(service_name))
+        if 'image' in error.instance and 'dockerfile' in error.instance:
+            return (
+                "Service '{}' has both an image and alternate Dockerfile. "
+                "A service can either be built to image or use an existing "
+                "image, not both.".format(service_name))
+
+    if schema_id == '#/definitions/service':
+        if error.validator == 'additionalProperties':
+            invalid_config_key = parse_key_from_error_msg(error)
+            return get_unsupported_config_msg(service_name, invalid_config_key)
+
+
+def handle_generic_service_error(error, service_name):
+    config_key = " ".join("'%s'" % k for k in error.path)
+    msg_format = None
+    error_msg = error.message
+
+    if error.validator == 'oneOf':
+        msg_format = "Service '{}' configuration key {} {}"
+        error_msg = _parse_oneof_validator(error)
+
+    elif error.validator == 'type':
+        msg_format = ("Service '{}' configuration key {} contains an invalid "
+                      "type, it should be {}")
+        error_msg = _parse_valid_types_from_validator(error.validator_value)
+
+    # TODO: no test case for this branch, there are no config options
+    # which exercise this branch
+    elif error.validator == 'required':
+        msg_format = "Service '{}' configuration key '{}' is invalid, {}"
+
+    elif error.validator == 'dependencies':
+        msg_format = "Service '{}' configuration key '{}' is invalid: {}"
+        config_key = list(error.validator_value.keys())[0]
+        required_keys = ",".join(error.validator_value[config_key])
+        error_msg = "when defining '{}' you must set '{}' as well".format(
+            config_key,
+            required_keys)
+
+    elif error.path:
+        msg_format = "Service '{}' configuration key {} value {}"
+
+    if msg_format:
+        return msg_format.format(service_name, config_key, error_msg)
+
+    return error.message
+
+
+def parse_key_from_error_msg(error):
+    return error.message.split("'")[1]
+
+
+def _parse_valid_types_from_validator(validator):
+    """A validator value can be either an array of valid types or a string of
+    a valid type. Parse the valid types and prefix with the correct article.
     """
-    jsonschema gives us an error tree full of information to explain what has
+    if not isinstance(validator, list):
+        return anglicize_validator(validator)
+
+    if len(validator) == 1:
+        return anglicize_validator(validator[0])
+
+    return "{}, or {}".format(
+        ", ".join([anglicize_validator(validator[0])] + validator[1:-1]),
+        anglicize_validator(validator[-1]))
+
+
+def _parse_oneof_validator(error):
+    """oneOf has multiple schemas, so we need to reason about which schema, sub
+    schema or constraint the validation is failing on.
+    Inspecting the context value of a ValidationError gives us information about
+    which sub schema failed and which kind of error it is.
+    """
+    types = []
+    for context in error.context:
+
+        if context.validator == 'required':
+            return context.message
+
+        if context.validator == 'additionalProperties':
+            invalid_config_key = parse_key_from_error_msg(context)
+            return "contains unsupported option: '{}'".format(invalid_config_key)
+
+        if context.path:
+            invalid_config_key = " ".join(
+                "'{}' ".format(fragment) for fragment in context.path
+                if isinstance(fragment, six.string_types)
+            )
+            return "{}contains {}, which is an invalid type, it should be {}".format(
+                invalid_config_key,
+                context.instance,
+                _parse_valid_types_from_validator(context.validator_value))
+
+        if context.validator == 'uniqueItems':
+            return "contains non unique items, please remove duplicates from {}".format(
+                context.instance)
+
+        if context.validator == 'type':
+            types.append(context.validator_value)
+
+    valid_types = _parse_valid_types_from_validator(types)
+    return "contains an invalid type, it should be {}".format(valid_types)
+
+
+def process_errors(errors, service_name=None):
+    """jsonschema gives us an error tree full of information to explain what has
     gone wrong. Process each error and pull out relevant information and re-write
     helpful error messages that are relevant.
     """
-    def _parse_key_from_error_msg(error):
-        return error.message.split("'")[1]
+    def format_error_message(error, service_name):
+        if not service_name and error.path:
+            # field_schema errors will have service name on the path
+            service_name = error.path.popleft()
 
-    def _clean_error_message(message):
-        return message.replace("u'", "'")
+        if 'id' in error.schema:
+            error_msg = handle_error_for_schema_with_id(error, service_name)
+            if error_msg:
+                return error_msg
 
-    def _parse_valid_types_from_validator(validator):
-        """
-        A validator value can be either an array of valid types or a string of
-        a valid type. Parse the valid types and prefix with the correct article.
-        """
-        if isinstance(validator, list):
-            if len(validator) >= 2:
-                first_type = anglicize_validator(validator[0])
-                last_type = anglicize_validator(validator[-1])
-                types_from_validator = ", ".join([first_type] + validator[1:-1])
+        return handle_generic_service_error(error, service_name)
 
-                msg = "{} or {}".format(
-                    types_from_validator,
-                    last_type
-                )
-            else:
-                msg = "{}".format(anglicize_validator(validator[0]))
-        else:
-            msg = "{}".format(anglicize_validator(validator))
-
-        return msg
-
-    def _parse_oneof_validator(error):
-        """
-        oneOf has multiple schemas, so we need to reason about which schema, sub
-        schema or constraint the validation is failing on.
-        Inspecting the context value of a ValidationError gives us information about
-        which sub schema failed and which kind of error it is.
-        """
-        required = [context for context in error.context if context.validator == 'required']
-        if required:
-            return required[0].message
-
-        additionalProperties = [context for context in error.context if context.validator == 'additionalProperties']
-        if additionalProperties:
-            invalid_config_key = _parse_key_from_error_msg(additionalProperties[0])
-            return "contains unsupported option: '{}'".format(invalid_config_key)
-
-        constraint = [context for context in error.context if len(context.path) > 0]
-        if constraint:
-            valid_types = _parse_valid_types_from_validator(constraint[0].validator_value)
-            invalid_config_key = "".join(
-                "'{}' ".format(fragment) for fragment in constraint[0].path
-                if isinstance(fragment, six.string_types)
-            )
-            msg = "{}contains {}, which is an invalid type, it should be {}".format(
-                invalid_config_key,
-                constraint[0].instance,
-                valid_types
-            )
-            return msg
-
-        uniqueness = [context for context in error.context if context.validator == 'uniqueItems']
-        if uniqueness:
-            msg = "contains non unique items, please remove duplicates from {}".format(
-                uniqueness[0].instance
-            )
-            return msg
-
-        types = [context.validator_value for context in error.context if context.validator == 'type']
-        valid_types = _parse_valid_types_from_validator(types)
-
-        msg = "contains an invalid type, it should be {}".format(valid_types)
-
-        return msg
-
-    root_msgs = []
-    invalid_keys = []
-    required = []
-    type_errors = []
-    other_errors = []
-
-    for error in errors:
-        # handle root level errors
-        if len(error.path) == 0 and not service_name:
-            if error.validator == 'type':
-                msg = "Top level object needs to be a dictionary. Check your .yml file that you have defined a service at the top level."
-                root_msgs.append(msg)
-            elif error.validator == 'additionalProperties':
-                invalid_service_name = _parse_key_from_error_msg(error)
-                msg = "Invalid service name '{}' - only {} characters are allowed".format(invalid_service_name, VALID_NAME_CHARS)
-                root_msgs.append(msg)
-            else:
-                root_msgs.append(_clean_error_message(error.message))
-
-        else:
-            if not service_name:
-                # field_schema errors will have service name on the path
-                service_name = error.path[0]
-                error.path.popleft()
-            else:
-                # service_schema errors have the service name passed in, as that
-                # is not available on error.path or necessarily error.instance
-                service_name = service_name
-
-            if error.validator == 'additionalProperties':
-                invalid_config_key = _parse_key_from_error_msg(error)
-                invalid_keys.append(get_unsupported_config_msg(service_name, invalid_config_key))
-            elif error.validator == 'anyOf':
-                if 'image' in error.instance and 'build' in error.instance:
-                    required.append(
-                        "Service '{}' has both an image and build path specified. "
-                        "A service can either be built to image or use an existing "
-                        "image, not both.".format(service_name))
-                elif 'image' not in error.instance and 'build' not in error.instance:
-                    required.append(
-                        "Service '{}' has neither an image nor a build path "
-                        "specified. Exactly one must be provided.".format(service_name))
-                elif 'image' in error.instance and 'dockerfile' in error.instance:
-                    required.append(
-                        "Service '{}' has both an image and alternate Dockerfile. "
-                        "A service can either be built to image or use an existing "
-                        "image, not both.".format(service_name))
-                else:
-                    required.append(_clean_error_message(error.message))
-            elif error.validator == 'oneOf':
-                config_key = error.path[0]
-                msg = _parse_oneof_validator(error)
-
-                type_errors.append("Service '{}' configuration key '{}' {}".format(
-                    service_name, config_key, msg)
-                )
-            elif error.validator == 'type':
-                msg = _parse_valid_types_from_validator(error.validator_value)
-
-                if len(error.path) > 0:
-                    config_key = " ".join(["'%s'" % k for k in error.path])
-                    type_errors.append(
-                        "Service '{}' configuration key {} contains an invalid "
-                        "type, it should be {}".format(
-                            service_name,
-                            config_key,
-                            msg))
-                else:
-                    root_msgs.append(
-                        "Service \"{}\" doesn't have any configuration options. "
-                        "All top level keys in your docker-compose.yml must map "
-                        "to a dictionary of configuration options.'".format(service_name))
-            elif error.validator == 'required':
-                config_key = error.path[0]
-                required.append(
-                    "Service '{}' option '{}' is invalid, {}".format(
-                        service_name,
-                        config_key,
-                        _clean_error_message(error.message)))
-            elif error.validator == 'dependencies':
-                dependency_key = list(error.validator_value.keys())[0]
-                required_keys = ",".join(error.validator_value[dependency_key])
-                required.append("Invalid '{}' configuration for '{}' service: when defining '{}' you must set '{}' as well".format(
-                    dependency_key, service_name, dependency_key, required_keys))
-            else:
-                config_key = " ".join(["'%s'" % k for k in error.path])
-                err_msg = "Service '{}' configuration key {} value {}".format(service_name, config_key, error.message)
-                other_errors.append(err_msg)
-
-    return "\n".join(root_msgs + invalid_keys + required + type_errors + other_errors)
+    return '\n'.join(format_error_message(error, service_name) for error in errors)
 
 
 def validate_against_fields_schema(config):
-    schema_filename = "fields_schema.json"
-    format_checkers = ["ports", "environment"]
-    return _validate_against_schema(config, schema_filename, format_checkers)
+    return _validate_against_schema(
+        config,
+        "fields_schema.json",
+        ["ports", "environment"])
 
 
 def validate_against_service_schema(config, service_name):
-    schema_filename = "service_schema.json"
-    format_checkers = ["ports"]
-    return _validate_against_schema(config, schema_filename, format_checkers, service_name)
+    return _validate_against_schema(
+        config,
+        "service_schema.json",
+        ["ports"],
+        service_name)
 
 
-def _validate_against_schema(config, schema_filename, format_checker=[], service_name=None):
+def _validate_against_schema(
+        config,
+        schema_filename,
+        format_checker=(),
+        service_name=None):
     config_source_dir = os.path.dirname(os.path.abspath(__file__))
 
     if sys.platform == "win32":
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 03e338cb..9abc58e4 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -867,7 +867,7 @@ class MemoryOptionsTest(unittest.TestCase):
         a mem_limit
         """
         expected_error_msg = (
-            "Invalid 'memswap_limit' configuration for 'foo' service: when "
+            "Service 'foo' configuration key 'memswap_limit' is invalid: when "
             "defining 'memswap_limit' you must set 'mem_limit' as well"
         )
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):

From 589755d03448b04dff441895949116d647b64bc1 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 9 Nov 2015 20:01:20 -0500
Subject: [PATCH 0527/1265] Inclide the filename in validation errors.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         |   4 +-
 compose/config/interpolation.py  |   7 ---
 compose/config/validation.py     |  60 ++++++++++++------
 tests/unit/config/config_test.py | 104 +++++++++++++++----------------
 4 files changed, 95 insertions(+), 80 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 21788551..2c1fdeb9 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -229,9 +229,9 @@ def load(config_details):
 
 
 def process_config_file(config_file, service_name=None):
-    validate_top_level_object(config_file.config)
+    validate_top_level_object(config_file)
     processed_config = interpolate_environment_variables(config_file.config)
-    validate_against_fields_schema(processed_config)
+    validate_against_fields_schema(processed_config, config_file.filename)
 
     if service_name and service_name not in processed_config:
         raise ConfigurationError(
diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index f8e1da61..ba7e35c1 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -18,13 +18,6 @@ def interpolate_environment_variables(config):
 
 
 def process_service(service_name, service_dict, mapping):
-    if not isinstance(service_dict, dict):
-        raise ConfigurationError(
-            'Service "%s" doesn\'t have any configuration options. '
-            'All top level keys in your docker-compose.yml must map '
-            'to a dictionary of configuration options.' % service_name
-        )
-
     return dict(
         (key, interpolate_value(service_name, key, val, mapping))
         for (key, val) in service_dict.items()
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 2928238c..38866b0f 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -66,21 +66,38 @@ def format_boolean_in_environment(instance):
     return True
 
 
-def validate_service_names(config):
-    for service_name in config.keys():
+def validate_top_level_service_objects(config_file):
+    """Perform some high level validation of the service name and value.
+
+    This validation must happen before interpolation, which must happen
+    before the rest of validation, which is why it's separate from the
+    rest of the service validation.
+    """
+    for service_name, service_dict in config_file.config.items():
         if not isinstance(service_name, six.string_types):
             raise ConfigurationError(
-                "Service name: {} needs to be a string, eg '{}'".format(
+                "In file '{}' service name: {} needs to be a string, eg '{}'".format(
+                    config_file.filename,
                     service_name,
                     service_name))
 
+        if not isinstance(service_dict, dict):
+            raise ConfigurationError(
+                "In file '{}' service '{}' doesn\'t have any configuration options. "
+                "All top level keys in your docker-compose.yml must map "
+                "to a dictionary of configuration options.".format(
+                    config_file.filename,
+                    service_name))
 
-def validate_top_level_object(config):
-    if not isinstance(config, dict):
+
+def validate_top_level_object(config_file):
+    if not isinstance(config_file.config, dict):
         raise ConfigurationError(
-            "Top level object needs to be a dictionary. Check your .yml file "
-            "that you have defined a service at the top level.")
-    validate_service_names(config)
+            "Top level object in '{}' needs to be an object not '{}'. Check "
+            "that you have defined a service at the top level.".format(
+                config_file.filename,
+                type(config_file.config)))
+    validate_top_level_service_objects(config_file)
 
 
 def validate_extends_file_path(service_name, extends_options, filename):
@@ -252,26 +269,28 @@ def process_errors(errors, service_name=None):
     return '\n'.join(format_error_message(error, service_name) for error in errors)
 
 
-def validate_against_fields_schema(config):
-    return _validate_against_schema(
+def validate_against_fields_schema(config, filename):
+    _validate_against_schema(
         config,
         "fields_schema.json",
-        ["ports", "environment"])
+        format_checker=["ports", "environment"],
+        filename=filename)
 
 
 def validate_against_service_schema(config, service_name):
-    return _validate_against_schema(
+    _validate_against_schema(
         config,
         "service_schema.json",
-        ["ports"],
-        service_name)
+        format_checker=["ports"],
+        service_name=service_name)
 
 
 def _validate_against_schema(
         config,
         schema_filename,
         format_checker=(),
-        service_name=None):
+        service_name=None,
+        filename=None):
     config_source_dir = os.path.dirname(os.path.abspath(__file__))
 
     if sys.platform == "win32":
@@ -293,6 +312,11 @@ def _validate_against_schema(
         format_checker=FormatChecker(format_checker))
 
     errors = [error for error in sorted(validation_output.iter_errors(config), key=str)]
-    if errors:
-        error_msg = process_errors(errors, service_name)
-        raise ConfigurationError("Validation failed, reason(s):\n{}".format(error_msg))
+    if not errors:
+        return
+
+    error_msg = process_errors(errors, service_name)
+    file_msg = " in file '{}'".format(filename) if filename else ''
+    raise ConfigurationError("Validation failed{}, reason(s):\n{}".format(
+        file_msg,
+        error_msg))
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 9abc58e4..84ed4943 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -94,6 +94,7 @@ class ConfigTest(unittest.TestCase):
             config.load(config_details)
         error_msg = "Unsupported config option for 'web' service: 'name'"
         assert error_msg in exc.exconly()
+        assert "Validation failed in file 'filename.yml'" in exc.exconly()
 
     def test_load_invalid_service_definition(self):
         config_details = build_config_details(
@@ -102,11 +103,12 @@ class ConfigTest(unittest.TestCase):
             'filename.yml')
         with pytest.raises(ConfigurationError) as exc:
             config.load(config_details)
-        error_msg = "Service \"web\" doesn\'t have any configuration options"
+        error_msg = "service 'web' doesn't have any configuration options"
         assert error_msg in exc.exconly()
 
     def test_config_integer_service_name_raise_validation_error(self):
-        expected_error_msg = "Service name: 1 needs to be a string, eg '1'"
+        expected_error_msg = ("In file 'filename.yml' service name: 1 needs to "
+                              "be a string, eg '1'")
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 build_config_details(
@@ -156,25 +158,26 @@ class ConfigTest(unittest.TestCase):
 
     def test_load_with_multiple_files_and_empty_override(self):
         base_file = config.ConfigFile(
-            'base.yaml',
+            'base.yml',
             {'web': {'image': 'example/web'}})
-        override_file = config.ConfigFile('override.yaml', None)
+        override_file = config.ConfigFile('override.yml', None)
         details = config.ConfigDetails('.', [base_file, override_file])
 
         with pytest.raises(ConfigurationError) as exc:
             config.load(details)
-        assert 'Top level object needs to be a dictionary' in exc.exconly()
+        error_msg = "Top level object in 'override.yml' needs to be an object"
+        assert error_msg in exc.exconly()
 
     def test_load_with_multiple_files_and_empty_base(self):
-        base_file = config.ConfigFile('base.yaml', None)
+        base_file = config.ConfigFile('base.yml', None)
         override_file = config.ConfigFile(
-            'override.yaml',
+            'override.yml',
             {'web': {'image': 'example/web'}})
         details = config.ConfigDetails('.', [base_file, override_file])
 
         with pytest.raises(ConfigurationError) as exc:
             config.load(details)
-        assert 'Top level object needs to be a dictionary' in exc.exconly()
+        assert "Top level object in 'base.yml' needs to be an object" in exc.exconly()
 
     def test_load_with_multiple_files_and_extends_in_override_file(self):
         base_file = config.ConfigFile(
@@ -225,17 +228,17 @@ class ConfigTest(unittest.TestCase):
 
         with pytest.raises(ConfigurationError) as exc:
             config.load(details)
-        assert 'Service "bogus" doesn\'t have any configuration' in exc.exconly()
+        assert "service 'bogus' doesn't have any configuration" in exc.exconly()
+        assert "In file 'override.yaml'" in exc.exconly()
 
     def test_config_valid_service_names(self):
         for valid_name in ['_', '-', '.__.', '_what-up.', 'what_.up----', 'whatup']:
-            config.load(
+            services = config.load(
                 build_config_details(
                     {valid_name: {'image': 'busybox'}},
                     'tests/fixtures/extends',
-                    'common.yml'
-                )
-            )
+                    'common.yml'))
+            assert services[0]['name'] == valid_name
 
     def test_config_invalid_ports_format_validation(self):
         expected_error_msg = "Service 'web' configuration key 'ports' contains an invalid type"
@@ -300,7 +303,8 @@ class ConfigTest(unittest.TestCase):
             )
 
     def test_invalid_config_not_a_dictionary(self):
-        expected_error_msg = "Top level object needs to be a dictionary."
+        expected_error_msg = ("Top level object in 'filename.yml' needs to be "
+                              "an object.")
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
                 build_config_details(
@@ -382,12 +386,13 @@ class ConfigTest(unittest.TestCase):
             )
 
     def test_config_ulimits_invalid_keys_validation_error(self):
-        expected_error_msg = "Service 'web' configuration key 'ulimits' contains unsupported option: 'not_soft_or_hard'"
+        expected = ("Service 'web' configuration key 'ulimits' 'nofile' contains "
+                    "unsupported option: 'not_soft_or_hard'")
 
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
-            config.load(
-                build_config_details(
-                    {'web': {
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(build_config_details(
+                {
+                    'web': {
                         'image': 'busybox',
                         'ulimits': {
                             'nofile': {
@@ -396,50 +401,43 @@ class ConfigTest(unittest.TestCase):
                                 "hard": 20000,
                             }
                         }
-                    }},
-                    'working_dir',
-                    'filename.yml'
-                )
-            )
+                    }
+                },
+                'working_dir',
+                'filename.yml'))
+        assert expected in exc.exconly()
 
     def test_config_ulimits_required_keys_validation_error(self):
-        expected_error_msg = "Service 'web' configuration key 'ulimits' u?'hard' is a required property"
 
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
-            config.load(
-                build_config_details(
-                    {'web': {
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(build_config_details(
+                {
+                    'web': {
                         'image': 'busybox',
-                        'ulimits': {
-                            'nofile': {
-                                "soft": 10000,
-                            }
-                        }
-                    }},
-                    'working_dir',
-                    'filename.yml'
-                )
-            )
+                        'ulimits': {'nofile': {"soft": 10000}}
+                    }
+                },
+                'working_dir',
+                'filename.yml'))
+        assert "Service 'web' configuration key 'ulimits' 'nofile'" in exc.exconly()
+        assert "'hard' is a required property" in exc.exconly()
 
     def test_config_ulimits_soft_greater_than_hard_error(self):
-        expected_error_msg = "cannot contain a 'soft' value higher than 'hard' value"
+        expected = "cannot contain a 'soft' value higher than 'hard' value"
 
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
-            config.load(
-                build_config_details(
-                    {'web': {
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(build_config_details(
+                {
+                    'web': {
                         'image': 'busybox',
                         'ulimits': {
-                            'nofile': {
-                                "soft": 10000,
-                                "hard": 1000
-                            }
+                            'nofile': {"soft": 10000, "hard": 1000}
                         }
-                    }},
-                    'working_dir',
-                    'filename.yml'
-                )
-            )
+                    }
+                },
+                'working_dir',
+                'filename.yml'))
+        assert expected in exc.exconly()
 
     def test_valid_config_which_allows_two_type_definitions(self):
         expose_values = [["8000"], [8000]]

From 9c305ac10f6c6900e432602ccefa5e0bdd83f9e1 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 12 Nov 2015 13:26:13 -0500
Subject: [PATCH 0528/1265] Remove name field from the list of ALLOWED_KEYS

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 2c1fdeb9..20126620 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -65,7 +65,6 @@ ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
     'dockerfile',
     'expose',
     'external_links',
-    'name',
 ]
 
 

From ea4230e7a2f53a116c22dce20632cb5355cf4c07 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 10 Nov 2015 18:52:21 -0500
Subject: [PATCH 0529/1265] Handle both SIGINT and SIGTERM for docker-compose
 up.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py          | 21 +++++++----
 tests/acceptance/cli_test.py | 70 +++++++++++++++++++++++++++++-------
 tests/unit/cli/main_test.py  |  8 ++---
 3 files changed, 76 insertions(+), 23 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 806926d8..7b1e0aa3 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -658,17 +658,24 @@ def build_log_printer(containers, service_names, monochrome):
 
 def attach_to_logs(project, log_printer, service_names, timeout):
     print("Attaching to", list_containers(log_printer.containers))
-    try:
-        log_printer.run()
-    finally:
-        def handler(signal, frame):
-            project.kill(service_names=service_names)
-            sys.exit(0)
-        signal.signal(signal.SIGINT, handler)
 
+    def force_shutdown(signal, frame):
+        project.kill(service_names=service_names)
+        sys.exit(2)
+
+    def shutdown(signal, frame):
+        set_signal_handler(force_shutdown)
         print("Gracefully stopping... (press Ctrl+C again to force)")
         project.stop(service_names=service_names, timeout=timeout)
 
+    set_signal_handler(shutdown)
+    log_printer.run()
+
+
+def set_signal_handler(handler):
+    signal.signal(signal.SIGINT, handler)
+    signal.signal(signal.SIGTERM, handler)
+
 
 def list_containers(containers):
     return ", ".join(c.name for c in containers)
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 88a43d7f..57f2039e 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -2,7 +2,9 @@ from __future__ import absolute_import
 
 import os
 import shlex
+import signal
 import subprocess
+import time
 from collections import namedtuple
 from operator import attrgetter
 
@@ -20,6 +22,45 @@ BUILD_CACHE_TEXT = 'Using cache'
 BUILD_PULL_TEXT = 'Status: Image is up to date for busybox:latest'
 
 
+def start_process(base_dir, options):
+    proc = subprocess.Popen(
+        ['docker-compose'] + options,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        cwd=base_dir)
+    print("Running process: %s" % proc.pid)
+    return proc
+
+
+def wait_on_process(proc, returncode=0):
+    stdout, stderr = proc.communicate()
+    if proc.returncode != returncode:
+        print(stderr)
+        assert proc.returncode == returncode
+    return ProcessResult(stdout.decode('utf-8'), stderr.decode('utf-8'))
+
+
+def wait_on_condition(condition, delay=0.1, timeout=5):
+    start_time = time.time()
+    while not condition():
+        if time.time() - start_time > timeout:
+            raise AssertionError("Timeout: %s" % condition)
+        time.sleep(delay)
+
+
+class ContainerCountCondition(object):
+
+    def __init__(self, project, expected):
+        self.project = project
+        self.expected = expected
+
+    def __call__(self):
+        return len(self.project.containers()) == self.expected
+
+    def __str__(self):
+        return "waiting for counter count == %s" % self.expected
+
+
 class CLITestCase(DockerClientTestCase):
 
     def setUp(self):
@@ -42,17 +83,8 @@ class CLITestCase(DockerClientTestCase):
 
     def dispatch(self, options, project_options=None, returncode=0):
         project_options = project_options or []
-        proc = subprocess.Popen(
-            ['docker-compose'] + project_options + options,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            cwd=self.base_dir)
-        print("Running process: %s" % proc.pid)
-        stdout, stderr = proc.communicate()
-        if proc.returncode != returncode:
-            print(stderr)
-            assert proc.returncode == returncode
-        return ProcessResult(stdout.decode('utf-8'), stderr.decode('utf-8'))
+        proc = start_process(self.base_dir, project_options + options)
+        return wait_on_process(proc, returncode=returncode)
 
     def test_help(self):
         old_base_dir = self.base_dir
@@ -291,7 +323,7 @@ class CLITestCase(DockerClientTestCase):
             returncode=1)
 
     def test_up_with_timeout(self):
-        self.dispatch(['up', '-d', '-t', '1'], None)
+        self.dispatch(['up', '-d', '-t', '1'])
         service = self.project.get_service('simple')
         another = self.project.get_service('another')
         self.assertEqual(len(service.containers()), 1)
@@ -303,6 +335,20 @@ class CLITestCase(DockerClientTestCase):
         self.assertFalse(config['AttachStdout'])
         self.assertFalse(config['AttachStdin'])
 
+    def test_up_handles_sigint(self):
+        proc = start_process(self.base_dir, ['up', '-t', '2'])
+        wait_on_condition(ContainerCountCondition(self.project, 2))
+
+        os.kill(proc.pid, signal.SIGINT)
+        wait_on_condition(ContainerCountCondition(self.project, 0))
+
+    def test_up_handles_sigterm(self):
+        proc = start_process(self.base_dir, ['up', '-t', '2'])
+        wait_on_condition(ContainerCountCondition(self.project, 2))
+
+        os.kill(proc.pid, signal.SIGTERM)
+        wait_on_condition(ContainerCountCondition(self.project, 0))
+
     def test_run_service_without_links(self):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['run', 'console', '/bin/true'])
diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py
index ee837fcd..db37ac1a 100644
--- a/tests/unit/cli/main_test.py
+++ b/tests/unit/cli/main_test.py
@@ -57,11 +57,11 @@ class CLIMainTestCase(unittest.TestCase):
         with mock.patch('compose.cli.main.signal', autospec=True) as mock_signal:
             attach_to_logs(project, log_printer, service_names, timeout)
 
-        mock_signal.signal.assert_called_once_with(mock_signal.SIGINT, mock.ANY)
+        assert mock_signal.signal.mock_calls == [
+            mock.call(mock_signal.SIGINT, mock.ANY),
+            mock.call(mock_signal.SIGTERM, mock.ANY),
+        ]
         log_printer.run.assert_called_once_with()
-        project.stop.assert_called_once_with(
-            service_names=service_names,
-            timeout=timeout)
 
 
 class SetupConsoleHandlerTestCase(unittest.TestCase):

From 6236bb0019de51fe482e2ba6be8a99de471a6861 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 10 Nov 2015 19:43:05 -0500
Subject: [PATCH 0530/1265] Handle both SIGINT and SIGTERM for docker-compose
 run.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py          | 99 ++++++++++++++++++++----------------
 tests/acceptance/cli_test.py | 47 +++++++++++++++++
 2 files changed, 102 insertions(+), 44 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 7b1e0aa3..9fef8d04 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -368,7 +368,6 @@ class TopLevelCommand(DocoptCommand):
                                   allocates a TTY.
         """
         service = project.get_service(options['SERVICE'])
-
         detach = options['-d']
 
         if IS_WINDOWS_PLATFORM and not detach:
@@ -380,22 +379,6 @@ class TopLevelCommand(DocoptCommand):
         if options['--allow-insecure-ssl']:
             log.warn(INSECURE_SSL_WARNING)
 
-        if not options['--no-deps']:
-            deps = service.get_linked_service_names()
-
-            if len(deps) > 0:
-                project.up(
-                    service_names=deps,
-                    start_deps=True,
-                    strategy=ConvergenceStrategy.never,
-                )
-            elif project.use_networking:
-                project.ensure_network_exists()
-
-        tty = True
-        if detach or options['-T'] or not sys.stdin.isatty():
-            tty = False
-
         if options['COMMAND']:
             command = [options['COMMAND']] + options['ARGS']
         else:
@@ -403,7 +386,7 @@ class TopLevelCommand(DocoptCommand):
 
         container_options = {
             'command': command,
-            'tty': tty,
+            'tty': not (detach or options['-T'] or not sys.stdin.isatty()),
             'stdin_open': not detach,
             'detach': detach,
         }
@@ -435,31 +418,7 @@ class TopLevelCommand(DocoptCommand):
         if options['--name']:
             container_options['name'] = options['--name']
 
-        try:
-            container = service.create_container(
-                quiet=True,
-                one_off=True,
-                **container_options
-            )
-        except APIError as e:
-            legacy.check_for_legacy_containers(
-                project.client,
-                project.name,
-                [service.name],
-                allow_one_off=False,
-            )
-
-            raise e
-
-        if detach:
-            container.start()
-            print(container.name)
-        else:
-            dockerpty.start(project.client, container.id, interactive=not options['-T'])
-            exit_code = container.wait()
-            if options['--rm']:
-                project.client.remove_container(container.id)
-            sys.exit(exit_code)
+        run_one_off_container(container_options, project, service, options)
 
     def scale(self, project, options):
         """
@@ -647,6 +606,58 @@ def convergence_strategy_from_opts(options):
     return ConvergenceStrategy.changed
 
 
+def run_one_off_container(container_options, project, service, options):
+    if not options['--no-deps']:
+        deps = service.get_linked_service_names()
+        if deps:
+            project.up(
+                service_names=deps,
+                start_deps=True,
+                strategy=ConvergenceStrategy.never)
+
+    if project.use_networking:
+        project.ensure_network_exists()
+
+    try:
+        container = service.create_container(
+            quiet=True,
+            one_off=True,
+            **container_options)
+    except APIError:
+        legacy.check_for_legacy_containers(
+            project.client,
+            project.name,
+            [service.name],
+            allow_one_off=False)
+        raise
+
+    if options['-d']:
+        container.start()
+        print(container.name)
+        return
+
+    def remove_container(force=False):
+        if options['--rm']:
+            project.client.remove_container(container.id, force=True)
+
+    def force_shutdown(signal, frame):
+        project.client.kill(container.id)
+        remove_container(force=True)
+        sys.exit(2)
+
+    def shutdown(signal, frame):
+        set_signal_handler(force_shutdown)
+        project.client.stop(container.id)
+        remove_container()
+        sys.exit(1)
+
+    set_signal_handler(shutdown)
+    dockerpty.start(project.client, container.id, interactive=not options['-T'])
+    exit_code = container.wait()
+    remove_container()
+    sys.exit(exit_code)
+
+
 def build_log_printer(containers, service_names, monochrome):
     if service_names:
         containers = [
@@ -657,7 +668,6 @@ def build_log_printer(containers, service_names, monochrome):
 
 
 def attach_to_logs(project, log_printer, service_names, timeout):
-    print("Attaching to", list_containers(log_printer.containers))
 
     def force_shutdown(signal, frame):
         project.kill(service_names=service_names)
@@ -668,6 +678,7 @@ def attach_to_logs(project, log_printer, service_names, timeout):
         print("Gracefully stopping... (press Ctrl+C again to force)")
         project.stop(service_names=service_names, timeout=timeout)
 
+    print("Attaching to", list_containers(log_printer.containers))
     set_signal_handler(shutdown)
     log_printer.run()
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 57f2039e..b88ed280 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -8,6 +8,8 @@ import time
 from collections import namedtuple
 from operator import attrgetter
 
+from docker import errors
+
 from .. import mock
 from compose.cli.command import get_project
 from compose.cli.docker_client import docker_client
@@ -61,6 +63,25 @@ class ContainerCountCondition(object):
         return "waiting for counter count == %s" % self.expected
 
 
+class ContainerStateCondition(object):
+
+    def __init__(self, client, name, running):
+        self.client = client
+        self.name = name
+        self.running = running
+
+    # State.Running == true
+    def __call__(self):
+        try:
+            container = self.client.inspect_container(self.name)
+            return container['State']['Running'] == self.running
+        except errors.APIError:
+            return False
+
+    def __str__(self):
+        return "waiting for container to have state %s" % self.expected
+
+
 class CLITestCase(DockerClientTestCase):
 
     def setUp(self):
@@ -554,6 +575,32 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(networks), 1)
         self.assertEqual(container.human_readable_command, u'true')
 
+    def test_run_handles_sigint(self):
+        proc = start_process(self.base_dir, ['run', '-T', 'simple', 'top'])
+        wait_on_condition(ContainerStateCondition(
+            self.project.client,
+            'simplecomposefile_simple_run_1',
+            running=True))
+
+        os.kill(proc.pid, signal.SIGINT)
+        wait_on_condition(ContainerStateCondition(
+            self.project.client,
+            'simplecomposefile_simple_run_1',
+            running=False))
+
+    def test_run_handles_sigterm(self):
+        proc = start_process(self.base_dir, ['run', '-T', 'simple', 'top'])
+        wait_on_condition(ContainerStateCondition(
+            self.project.client,
+            'simplecomposefile_simple_run_1',
+            running=True))
+
+        os.kill(proc.pid, signal.SIGTERM)
+        wait_on_condition(ContainerStateCondition(
+            self.project.client,
+            'simplecomposefile_simple_run_1',
+            running=False))
+
     def test_rm(self):
         service = self.project.get_service('simple')
         service.create_container()

From c99f2f8efd2927b01c1acdb990a83df8206a96f8 Mon Sep 17 00:00:00 2001
From: Stefan Scherer <scherer_stefan@icloud.com>
Date: Fri, 13 Nov 2015 08:33:51 +0100
Subject: [PATCH 0531/1265] Use uname to build target name for different
 platforms

Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
---
 script/build-linux-inner | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/build-linux-inner b/script/build-linux-inner
index 01137ff2..47d5eb2e 100755
--- a/script/build-linux-inner
+++ b/script/build-linux-inner
@@ -2,7 +2,7 @@
 
 set -ex
 
-TARGET=dist/docker-compose-Linux-x86_64
+TARGET=dist/docker-compose-$(uname -s)-$(uname -m)
 VENV=/code/.tox/py27
 
 mkdir -p `pwd`/dist

From e1308a8329de0ce12e4405677a1911a5db3bd33b Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 13 Nov 2015 10:49:17 -0500
Subject: [PATCH 0532/1265] Fix extra warnings on masked volumes.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py         |  5 ++++-
 tests/unit/service_test.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/compose/service.py b/compose/service.py
index 3b05264b..148da4db 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -963,7 +963,10 @@ def warn_on_masked_volume(volumes_option, container_volumes, service):
         for volume in container_volumes)
 
     for volume in volumes_option:
-        if container_volumes.get(volume.internal) != volume.external:
+        if (
+            volume.internal in container_volumes and
+            container_volumes.get(volume.internal) != volume.external
+        ):
             log.warn((
                 "Service \"{service}\" is using volume \"{volume}\" from the "
                 "previous container. Host mapping \"{host_path}\" has no effect. "
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 0cff9899..808c391c 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -26,6 +26,8 @@ from compose.service import parse_volume_spec
 from compose.service import Service
 from compose.service import ServiceNet
 from compose.service import VolumeFromSpec
+from compose.service import VolumeSpec
+from compose.service import warn_on_masked_volume
 
 
 class ServiceTest(unittest.TestCase):
@@ -750,6 +752,39 @@ class ServiceVolumesTest(unittest.TestCase):
             ['/mnt/sda1/host/path:/data:rw'],
         )
 
+    def test_warn_on_masked_volume_no_warning_when_no_container_volumes(self):
+        volumes_option = [VolumeSpec('/home/user', '/path', 'rw')]
+        container_volumes = []
+        service = 'service_name'
+
+        with mock.patch('compose.service.log') as mock_log:
+            warn_on_masked_volume(volumes_option, container_volumes, service)
+
+        assert not mock_log.warn.called
+
+    def test_warn_on_masked_volume_when_masked(self):
+        volumes_option = [VolumeSpec('/home/user', '/path', 'rw')]
+        container_volumes = [
+            VolumeSpec('/var/lib/docker/path', '/path', 'rw'),
+            VolumeSpec('/var/lib/docker/path', '/other', 'rw'),
+        ]
+        service = 'service_name'
+
+        with mock.patch('compose.service.log') as mock_log:
+            warn_on_masked_volume(volumes_option, container_volumes, service)
+
+        mock_log.warn.called_once_with(mock.ANY)
+
+    def test_warn_on_masked_no_warning_with_same_path(self):
+        volumes_option = [VolumeSpec('/home/user', '/path', 'rw')]
+        container_volumes = [VolumeSpec('/home/user', '/path', 'rw')]
+        service = 'service_name'
+
+        with mock.patch('compose.service.log') as mock_log:
+            warn_on_masked_volume(volumes_option, container_volumes, service)
+
+        assert not mock_log.warn.called
+
     def test_create_with_special_volume_mode(self):
         self.mock_client.inspect_image.return_value = {'Id': 'imageid'}
 

From 61f91ebff7c2158c4d2d51abc88c0e35e84cf256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Seguin?= <stephseguin93@gmail.com>
Date: Sat, 14 Nov 2015 12:19:57 +0100
Subject: [PATCH 0533/1265] Fix restart with stopped containers. Fixes #1814
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
---
 compose/service.py           | 2 +-
 tests/acceptance/cli_test.py | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/compose/service.py b/compose/service.py
index 3b05264b..4f449d15 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -185,7 +185,7 @@ class Service(object):
             c.kill(**options)
 
     def restart(self, **options):
-        for c in self.containers():
+        for c in self.containers(stopped=True):
             log.info("Restarting %s" % c.name)
             c.restart(**options)
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 88a43d7f..34a2d166 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -597,6 +597,15 @@ class CLITestCase(DockerClientTestCase):
             started_at,
         )
 
+    def test_restart_stopped_container(self):
+        service = self.project.get_service('simple')
+        container = service.create_container()
+        container.start()
+        container.kill()
+        self.assertEqual(len(service.containers(stopped=True)), 1)
+        self.dispatch(['restart', '-t', '1'], None)
+        self.assertEqual(len(service.containers(stopped=False)), 1)
+
     def test_scale(self):
         project = self.project
 

From 265828f4ebc383c18b251b153805ea084eaccf4d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 16 Nov 2015 12:55:35 -0500
Subject: [PATCH 0534/1265] Fix texttable dep. 0.8.2 was removed from pypi.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 60327d72..659cb57f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,5 +6,5 @@ enum34==1.0.4
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3
-texttable==0.8.2
+texttable==0.8.4
 websocket-client==0.32.0

From d4b98452012d930121231f3b7be9c2c1db8b8208 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 12 Nov 2015 17:29:58 -0500
Subject: [PATCH 0535/1265] Add the git sha to version output

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 .gitignore                  |  1 +
 Dockerfile.run              |  2 +-
 MANIFEST.in                 |  1 +
 compose/cli/command.py      |  4 ++--
 compose/cli/utils.py        | 39 +++++++++++++++++++++++++++----------
 docker-compose.spec         | 24 ++++++++++++++++++-----
 script/build-image          |  1 +
 script/build-linux          |  1 +
 script/build-linux-inner    |  1 +
 script/build-osx            |  1 +
 script/build-windows.ps1    |  2 ++
 script/release/push-release |  1 +
 script/write-git-sha        |  7 +++++++
 13 files changed, 67 insertions(+), 18 deletions(-)
 create mode 100755 script/write-git-sha

diff --git a/.gitignore b/.gitignore
index 83a08a0e..da728279 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /docs/_site
 /venv
 README.rst
+compose/GITSHA
diff --git a/Dockerfile.run b/Dockerfile.run
index 9f3745fe..792077ad 100644
--- a/Dockerfile.run
+++ b/Dockerfile.run
@@ -8,6 +8,6 @@ COPY    requirements.txt /code/requirements.txt
 RUN     pip install -r /code/requirements.txt
 
 ADD     dist/docker-compose-release.tar.gz /code/docker-compose
-RUN     pip install /code/docker-compose/docker-compose-*
+RUN     pip install --no-deps /code/docker-compose/docker-compose-*
 
 ENTRYPOINT ["/usr/bin/docker-compose"]
diff --git a/MANIFEST.in b/MANIFEST.in
index 0342e35b..8c6f932b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,6 +7,7 @@ include *.md
 exclude README.md
 include README.rst
 include compose/config/*.json
+include compose/GITSHA
 recursive-include contrib/completion *
 recursive-include tests *
 global-exclude *.pyc
diff --git a/compose/cli/command.py b/compose/cli/command.py
index 525217ee..6094b530 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -12,12 +12,12 @@ from requests.exceptions import SSLError
 
 from . import errors
 from . import verbose_proxy
-from .. import __version__
 from .. import config
 from ..project import Project
 from ..service import ConfigError
 from .docker_client import docker_client
 from .utils import call_silently
+from .utils import get_version_info
 from .utils import is_mac
 from .utils import is_ubuntu
 
@@ -71,7 +71,7 @@ def get_client(verbose=False, version=None):
     client = docker_client(version=version)
     if verbose:
         version_info = six.iteritems(client.version())
-        log.info("Compose version %s", __version__)
+        log.info(get_version_info('full'))
         log.info("Docker base_url: %s", client.base_url)
         log.info("Docker version: %s",
                  ", ".join("%s=%s" % item for item in version_info))
diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index 07510e2f..dd859edc 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -7,10 +7,10 @@ import platform
 import ssl
 import subprocess
 
-from docker import version as docker_py_version
+import docker
 from six.moves import input
 
-from .. import __version__
+import compose
 
 
 def yesno(prompt, default=None):
@@ -57,13 +57,32 @@ def is_ubuntu():
 
 
 def get_version_info(scope):
-    versioninfo = 'docker-compose version: %s' % __version__
+    versioninfo = 'docker-compose version {}, build {}'.format(
+        compose.__version__,
+        get_build_version())
+
     if scope == 'compose':
         return versioninfo
-    elif scope == 'full':
-        return versioninfo + '\n' \
-            + "docker-py version: %s\n" % docker_py_version \
-            + "%s version: %s\n" % (platform.python_implementation(), platform.python_version()) \
-            + "OpenSSL version: %s" % ssl.OPENSSL_VERSION
-    else:
-        raise RuntimeError('passed unallowed value to `cli.utils.get_version_info`')
+    if scope == 'full':
+        return (
+            "{}\n"
+            "docker-py version: {}\n"
+            "{} version: {}\n"
+            "OpenSSL version: {}"
+        ).format(
+            versioninfo,
+            docker.version,
+            platform.python_implementation(),
+            platform.python_version(),
+            ssl.OPENSSL_VERSION)
+
+    raise ValueError("{} is not a valid version scope".format(scope))
+
+
+def get_build_version():
+    filename = os.path.join(os.path.dirname(compose.__file__), 'GITSHA')
+    if not os.path.exists(filename):
+        return 'unknown'
+
+    with open(filename) as fh:
+        return fh.read().strip()
diff --git a/docker-compose.spec b/docker-compose.spec
index 678fc132..24d03e05 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -9,18 +9,32 @@ a = Analysis(['bin/docker-compose'],
              runtime_hooks=None,
              cipher=block_cipher)
 
-pyz = PYZ(a.pure,
-             cipher=block_cipher)
+pyz = PYZ(a.pure, cipher=block_cipher)
 
 exe = EXE(pyz,
           a.scripts,
           a.binaries,
           a.zipfiles,
           a.datas,
-          [('compose/config/fields_schema.json', 'compose/config/fields_schema.json', 'DATA')],
-          [('compose/config/service_schema.json', 'compose/config/service_schema.json', 'DATA')],
+          [
+            (
+                'compose/config/fields_schema.json',
+                'compose/config/fields_schema.json',
+                'DATA'
+            ),
+            (
+                'compose/config/service_schema.json',
+                'compose/config/service_schema.json',
+                'DATA'
+            ),
+            (
+                'compose/GITSHA',
+                'compose/GITSHA',
+                'DATA'
+            )
+          ],
           name='docker-compose',
           debug=False,
           strip=None,
           upx=True,
-          console=True )
+          console=True)
diff --git a/script/build-image b/script/build-image
index 3ac9729b..89733505 100755
--- a/script/build-image
+++ b/script/build-image
@@ -10,6 +10,7 @@ fi
 TAG=$1
 VERSION="$(python setup.py --version)"
 
+./script/write-git-sha
 python setup.py sdist
 cp dist/docker-compose-$VERSION.tar.gz dist/docker-compose-release.tar.gz
 docker build -t docker/compose:$TAG -f Dockerfile.run .
diff --git a/script/build-linux b/script/build-linux
index ade18bc5..47fb45e1 100755
--- a/script/build-linux
+++ b/script/build-linux
@@ -9,4 +9,5 @@ docker build -t "$TAG" . | tail -n 200
 docker run \
     --rm --entrypoint="script/build-linux-inner" \
     -v $(pwd)/dist:/code/dist \
+    -v $(pwd)/.git:/code/.git \
     "$TAG"
diff --git a/script/build-linux-inner b/script/build-linux-inner
index 01137ff2..50b16dd8 100755
--- a/script/build-linux-inner
+++ b/script/build-linux-inner
@@ -9,6 +9,7 @@ mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 
 $VENV/bin/pip install -q -r requirements-build.txt
+./script/write-git-sha
 su -c "$VENV/bin/pyinstaller docker-compose.spec" user
 mv dist/docker-compose $TARGET
 $TARGET version
diff --git a/script/build-osx b/script/build-osx
index 042964e4..168fd430 100755
--- a/script/build-osx
+++ b/script/build-osx
@@ -9,6 +9,7 @@ virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
 venv/bin/pip install -r requirements-build.txt
 venv/bin/pip install --no-deps .
+./script/write-git-sha
 venv/bin/pyinstaller docker-compose.spec
 mv dist/docker-compose dist/docker-compose-Darwin-x86_64
 dist/docker-compose-Darwin-x86_64 version
diff --git a/script/build-windows.ps1 b/script/build-windows.ps1
index 42a4a501..28011b1d 100644
--- a/script/build-windows.ps1
+++ b/script/build-windows.ps1
@@ -47,6 +47,8 @@ virtualenv .\venv
 .\venv\Scripts\pip install --no-deps .
 .\venv\Scripts\pip install --allow-external pyinstaller -r requirements-build.txt
 
+git rev-parse --short HEAD | out-file -encoding ASCII compose\GITSHA
+
 # Build binary
 # pyinstaller has lots of warnings, so we need to run with ErrorAction = Continue
 $ErrorActionPreference = "Continue"
diff --git a/script/release/push-release b/script/release/push-release
index ccdf2496..b754d40f 100755
--- a/script/release/push-release
+++ b/script/release/push-release
@@ -57,6 +57,7 @@ docker push docker/compose:$VERSION
 echo "Uploading sdist to pypi"
 pandoc -f markdown -t rst README.md -o README.rst
 sed -i -e 's/logo.png?raw=true/https:\/\/github.com\/docker\/compose\/raw\/master\/logo.png?raw=true/' README.rst
+./script/write-git-sha
 python setup.py sdist
 if [ "$(command -v twine 2> /dev/null)" ]; then
     twine upload ./dist/docker-compose-${VERSION}.tar.gz
diff --git a/script/write-git-sha b/script/write-git-sha
new file mode 100755
index 00000000..d16743c6
--- /dev/null
+++ b/script/write-git-sha
@@ -0,0 +1,7 @@
+#!/bin/bash
+#
+# Write the current commit sha to the file GITSHA. This file is included in
+# packaging so that `docker-compose version` can include the git sha.
+#
+set -e
+git rev-parse --short HEAD > compose/GITSHA

From efbfa9e38fb4565953d608e504e2bdc79737d408 Mon Sep 17 00:00:00 2001
From: Simon van der Veldt <simon.vanderveldt@gmail.com>
Date: Wed, 18 Nov 2015 21:38:58 +0100
Subject: [PATCH 0536/1265] run.sh script: Also pass DOCKER_TLS_VERIFY and
 DOCKER_CERT_PATH env vars to compose container

Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com>
---
 script/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/run.sh b/script/run.sh
index cf46c143..342188e8 100755
--- a/script/run.sh
+++ b/script/run.sh
@@ -26,7 +26,7 @@ fi
 if [ -S "$DOCKER_HOST" ]; then
     DOCKER_ADDR="-v $DOCKER_HOST:$DOCKER_HOST -e DOCKER_HOST"
 else
-    DOCKER_ADDR="-e DOCKER_HOST"
+    DOCKER_ADDR="-e DOCKER_HOST -e DOCKER_TLS_VERIFY -e DOCKER_CERT_PATH"
 fi
 
 

From c78c32c2e819cdbf83f9e9ed2dc16ff9e62b78dc Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 16 Nov 2015 12:35:26 -0500
Subject: [PATCH 0537/1265] Fixes #2398 - the build progress stream can contain
 empty json objects.

Previously these empty objects would hit a bug in splitting objects causing it crash.
With this fix the empty objects are returned properly.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/utils.py         | 12 ++++++------
 tests/unit/utils_test.py | 28 ++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/compose/utils.py b/compose/utils.py
index 2c6c4584..a013035e 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -102,7 +102,7 @@ def stream_as_text(stream):
 def line_splitter(buffer, separator=u'\n'):
     index = buffer.find(six.text_type(separator))
     if index == -1:
-        return None, None
+        return None
     return buffer[:index + 1], buffer[index + 1:]
 
 
@@ -120,11 +120,11 @@ def split_buffer(stream, splitter=None, decoder=lambda a: a):
     for data in stream_as_text(stream):
         buffered += data
         while True:
-            item, rest = splitter(buffered)
-            if not item:
+            buffer_split = splitter(buffered)
+            if buffer_split is None:
                 break
 
-            buffered = rest
+            item, buffered = buffer_split
             yield item
 
     if buffered:
@@ -140,7 +140,7 @@ def json_splitter(buffer):
         rest = buffer[json.decoder.WHITESPACE.match(buffer, index).end():]
         return obj, rest
     except ValueError:
-        return None, None
+        return None
 
 
 def json_stream(stream):
@@ -148,7 +148,7 @@ def json_stream(stream):
     This handles streams which are inconsistently buffered (some entries may
     be newline delimited, and others are not).
     """
-    return split_buffer(stream_as_text(stream), json_splitter, json_decoder.decode)
+    return split_buffer(stream, json_splitter, json_decoder.decode)
 
 
 def write_out_msg(stream, lines, msg_index, msg, status="done"):
diff --git a/tests/unit/utils_test.py b/tests/unit/utils_test.py
index e3d0bc00..15999dde 100644
--- a/tests/unit/utils_test.py
+++ b/tests/unit/utils_test.py
@@ -1,25 +1,21 @@
 # encoding: utf-8
 from __future__ import unicode_literals
 
-from .. import unittest
 from compose import utils
 
 
-class JsonSplitterTestCase(unittest.TestCase):
+class TestJsonSplitter(object):
 
     def test_json_splitter_no_object(self):
         data = '{"foo": "bar'
-        self.assertEqual(utils.json_splitter(data), (None, None))
+        assert utils.json_splitter(data) is None
 
     def test_json_splitter_with_object(self):
         data = '{"foo": "bar"}\n  \n{"next": "obj"}'
-        self.assertEqual(
-            utils.json_splitter(data),
-            ({'foo': 'bar'}, '{"next": "obj"}')
-        )
+        assert utils.json_splitter(data) == ({'foo': 'bar'}, '{"next": "obj"}')
 
 
-class StreamAsTextTestCase(unittest.TestCase):
+class TestStreamAsText(object):
 
     def test_stream_with_non_utf_unicode_character(self):
         stream = [b'\xed\xf3\xf3']
@@ -30,3 +26,19 @@ class StreamAsTextTestCase(unittest.TestCase):
         stream = ['ěĝ'.encode('utf-8')]
         output, = utils.stream_as_text(stream)
         assert output == 'ěĝ'
+
+
+class TestJsonStream(object):
+
+    def test_with_falsy_entries(self):
+        stream = [
+            '{"one": "two"}\n{}\n',
+            "[1, 2, 3]\n[]\n",
+        ]
+        output = list(utils.json_stream(stream))
+        assert output == [
+            {'one': 'two'},
+            {},
+            [1, 2, 3],
+            [],
+        ]

From 1e8f76767f80ecb4b7aa546eeb787102aff311e4 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 18 Nov 2015 14:51:01 -0500
Subject: [PATCH 0538/1265] Fix env_file and environment when used with
 extends.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         | 22 +++++++--------
 tests/integration/testcases.py   |  3 +-
 tests/unit/config/config_test.py | 48 ++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 20126620..fa214767 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -257,16 +257,11 @@ class ServiceExtendsResolver(object):
     def run(self):
         self.detect_cycle()
 
-        service_dict = dict(self.service_config.config)
-        env = resolve_environment(self.working_dir, self.service_config.config)
-        if env:
-            service_dict['environment'] = env
-            service_dict.pop('env_file', None)
-
-        if 'extends' in service_dict:
+        if 'extends' in self.service_config.config:
             service_dict = self.resolve_extends(*self.validate_and_construct_extends())
+            return self.service_config._replace(config=service_dict)
 
-        return self.service_config._replace(config=service_dict)
+        return self.service_config
 
     def validate_and_construct_extends(self):
         extends = self.service_config.config['extends']
@@ -316,16 +311,15 @@ class ServiceExtendsResolver(object):
         return filename
 
 
-def resolve_environment(working_dir, service_dict):
+def resolve_environment(service_config):
     """Unpack any environment variables from an env_file, if set.
     Interpolate environment values if set.
     """
-    if 'environment' not in service_dict and 'env_file' not in service_dict:
-        return {}
+    service_dict = service_config.config
 
     env = {}
     if 'env_file' in service_dict:
-        for env_file in get_env_files(working_dir, service_dict):
+        for env_file in get_env_files(service_config.working_dir, service_dict):
             env.update(env_vars_from_file(env_file))
 
     env.update(parse_environment(service_dict.get('environment')))
@@ -362,6 +356,10 @@ def process_service(service_config):
     working_dir = service_config.working_dir
     service_dict = dict(service_config.config)
 
+    if 'environment' in service_dict or 'env_file' in service_dict:
+        service_dict['environment'] = resolve_environment(service_config)
+        service_dict.pop('env_file', None)
+
     if 'volumes' in service_dict and service_dict.get('volume_driver') is None:
         service_dict['volumes'] = resolve_volume_paths(working_dir, service_dict)
 
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index d63f0591..de2d1a70 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -46,7 +46,8 @@ class DockerClientTestCase(unittest.TestCase):
 
         service_config = ServiceConfig('.', None, name, kwargs)
         options = process_service(service_config)
-        options['environment'] = resolve_environment('.', kwargs)
+        options['environment'] = resolve_environment(
+            service_config._replace(config=options))
         labels = options.setdefault('labels', {})
         labels['com.docker.compose.test-name'] = self.id()
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 3038af80..c69e3430 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1317,6 +1317,54 @@ class ExtendsTest(unittest.TestCase):
             },
         ]))
 
+    def test_extends_with_environment_and_env_files(self):
+        tmpdir = py.test.ensuretemp('test_extends_with_environment')
+        self.addCleanup(tmpdir.remove)
+        commondir = tmpdir.mkdir('common')
+        commondir.join('base.yml').write("""
+            app:
+                image: 'example/app'
+                env_file:
+                    - 'envs'
+                environment:
+                    - SECRET
+        """)
+        tmpdir.join('docker-compose.yml').write("""
+            ext:
+                extends:
+                    file: common/base.yml
+                    service: app
+                env_file:
+                    - 'envs'
+                environment:
+                    - THING
+        """)
+        commondir.join('envs').write("""
+            COMMON_ENV_FILE=1
+        """)
+        tmpdir.join('envs').write("""
+            FROM_ENV_FILE=1
+        """)
+
+        expected = [
+            {
+                'name': 'ext',
+                'image': 'example/app',
+                'environment': {
+                    'SECRET': 'secret',
+                    'FROM_ENV_FILE': '1',
+                    'COMMON_ENV_FILE': '1',
+                    'THING': 'thing',
+                },
+            },
+        ]
+        with mock.patch.dict(os.environ):
+            os.environ['SECRET'] = 'secret'
+            os.environ['THING'] = 'thing'
+            config = load_from_filename(str(tmpdir.join('docker-compose.yml')))
+
+        assert config == expected
+
 
 @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class ExpandPathTest(unittest.TestCase):

From acf31181e8bff0481703c8f17f93c17ebec59506 Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Wed, 18 Nov 2015 20:17:23 +1000
Subject: [PATCH 0539/1265] Some small changes to clear up docs-validation
 complaints

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 docs/README.md    | 9 +++++++++
 docs/django.md    | 2 +-
 docs/extends.md   | 2 +-
 docs/install.md   | 2 +-
 docs/rails.md     | 2 +-
 docs/wordpress.md | 2 +-
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 8fbad30c..d8ab7c3e 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,3 +1,12 @@
+<!--[metadata]>
++++
+draft = true
+title = "Compose README"
+description = "Compose README"
+keywords = ["Docker, documentation, manual, guide, reference, api"]
++++
+<![end-metadata]-->
+
 # Contributing to the Docker Compose documentation
 
 The documentation in this directory is part of the [https://docs.docker.com](https://docs.docker.com) website.  Docker uses [the Hugo static generator](http://gohugo.io/overview/introduction/) to convert project Markdown files to a static HTML site.
diff --git a/docs/django.md b/docs/django.md
index d4d2bd1e..b503e574 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -171,7 +171,7 @@ In this section, you set up the database connection for Django.
 
 ## More Compose documentation
 
-- [User guide](../index.md)
+- [User guide](index.md)
 - [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/extends.md b/docs/extends.md
index b21b6d76..011a7350 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -365,7 +365,7 @@ In the case of `environment`, `labels`, `volumes` and `devices`, Compose
 
 ## Compose documentation
 
-- [User guide](/)
+- [User guide](index.md)
 - [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
 - [Get started with Django](django.md)
diff --git a/docs/install.md b/docs/install.md
index c5304409..5f956359 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -126,7 +126,7 @@ To uninstall Docker Compose if you installed using `pip`:
 
 ## Where to go next
 
-- [User guide](/)
+- [User guide](index.md)
 - [Getting Started](gettingstarted.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
diff --git a/docs/rails.md b/docs/rails.md
index 8e16af64..d3f1707c 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -133,7 +133,7 @@ That's it. Your app should now be running on port 3000 on your Docker daemon. If
 
 ## More Compose documentation
 
-- [User guide](/)
+- [User guide](index.md)
 - [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
 - [Get started with Django](django.md)
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 373ef4d0..15746a75 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -93,7 +93,7 @@ database containers. If you're using [Docker Machine](https://docs.docker.com/ma
 
 ## More Compose documentation
 
-- [User guide](/)
+- [User guide](index.md)
 - [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
 - [Get started with Django](django.md)

From 3fdf0f43bef4a881b65de871b26ec6feffd98059 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 19 Nov 2015 12:55:03 -0500
Subject: [PATCH 0540/1265] Add note about required pip version.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/install.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/install.md b/docs/install.md
index 5f956359..d394905d 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -70,6 +70,7 @@ to get started.
 
     $ pip install docker-compose
 
+> **Note:** pip version 6.0 or greater is required
 
 ### Install as a container
 

From 6224b6edd9b776fbeaf4526152e323c0538be8f2 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 19 Nov 2015 14:52:50 -0500
Subject: [PATCH 0541/1265] Fix use case link in readme.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5052db39..c9b4729a 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ see [the list of features](docs/index.md#features).
 
 Compose is great for development, testing, and staging environments, as well as
 CI workflows. You can learn more about each case in
-[Common Use Cases](#common-use-cases).
+[Common Use Cases](docs/index.md#common-use-cases).
 
 Using Compose is basically a three-step process.
 

From d1adbb9b259c4582b77ac90a96fe2d071fb408aa Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 12 Nov 2015 20:44:05 -0500
Subject: [PATCH 0542/1265] Refactor parallel_execute.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/container.py              |  39 ++++++++++
 compose/project.py                |  34 ++-------
 compose/service.py                |  45 ++++--------
 compose/utils.py                  | 117 +++++++++++++++---------------
 tests/integration/service_test.py |  27 ++++---
 tox.ini                           |   2 +-
 6 files changed, 137 insertions(+), 127 deletions(-)

diff --git a/compose/container.py b/compose/container.py
index 1ca48380..dde83bd3 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import operator
 from functools import reduce
 
 import six
@@ -8,6 +9,7 @@ import six
 from .const import LABEL_CONTAINER_NUMBER
 from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
+from compose.utils import parallel_execute
 
 
 class Container(object):
@@ -250,3 +252,40 @@ def get_container_name(container):
     # ps
     shortest_name = min(container['Names'], key=lambda n: len(n.split('/')))
     return shortest_name.split('/')[-1]
+
+
+def parallel_operation(containers, operation, options, message):
+    parallel_execute(
+        containers,
+        operator.methodcaller(operation, **options),
+        operator.attrgetter('name'),
+        message)
+
+
+def parallel_remove(containers, options):
+    stopped_containers = [c for c in containers if not c.is_running]
+    parallel_operation(stopped_containers, 'remove', options, 'Removing')
+
+
+def parallel_stop(containers, options):
+    parallel_operation(containers, 'stop', options, 'Stopping')
+
+
+def parallel_start(containers, options):
+    parallel_operation(containers, 'start', options, 'Starting')
+
+
+def parallel_pause(containers, options):
+    parallel_operation(containers, 'pause', options, 'Pausing')
+
+
+def parallel_unpause(containers, options):
+    parallel_operation(containers, 'unpause', options, 'Unpausing')
+
+
+def parallel_kill(containers, options):
+    parallel_operation(containers, 'kill', options, 'Killing')
+
+
+def parallel_restart(containers, options):
+    parallel_operation(containers, 'restart', options, 'Restarting')
diff --git a/compose/project.py b/compose/project.py
index 41af8626..dc6dd32f 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -7,6 +7,7 @@ from functools import reduce
 from docker.errors import APIError
 from docker.errors import NotFound
 
+from . import container
 from .config import ConfigurationError
 from .config import get_service_name_from_net
 from .const import DEFAULT_TIMEOUT
@@ -22,7 +23,6 @@ from .service import parse_volume_from_spec
 from .service import Service
 from .service import ServiceNet
 from .service import VolumeFromSpec
-from .utils import parallel_execute
 
 
 log = logging.getLogger(__name__)
@@ -241,42 +241,22 @@ class Project(object):
             service.start(**options)
 
     def stop(self, service_names=None, **options):
-        parallel_execute(
-            objects=self.containers(service_names),
-            obj_callable=lambda c: c.stop(**options),
-            msg_index=lambda c: c.name,
-            msg="Stopping"
-        )
+        container.parallel_stop(self.containers(service_names), options)
 
     def pause(self, service_names=None, **options):
-        for service in reversed(self.get_services(service_names)):
-            service.pause(**options)
+        container.parallel_pause(reversed(self.containers(service_names)), options)
 
     def unpause(self, service_names=None, **options):
-        for service in self.get_services(service_names):
-            service.unpause(**options)
+        container.parallel_unpause(self.containers(service_names), options)
 
     def kill(self, service_names=None, **options):
-        parallel_execute(
-            objects=self.containers(service_names),
-            obj_callable=lambda c: c.kill(**options),
-            msg_index=lambda c: c.name,
-            msg="Killing"
-        )
+        container.parallel_kill(self.containers(service_names), options)
 
     def remove_stopped(self, service_names=None, **options):
-        all_containers = self.containers(service_names, stopped=True)
-        stopped_containers = [c for c in all_containers if not c.is_running]
-        parallel_execute(
-            objects=stopped_containers,
-            obj_callable=lambda c: c.remove(**options),
-            msg_index=lambda c: c.name,
-            msg="Removing"
-        )
+        container.parallel_remove(self.containers(service_names, stopped=True), options)
 
     def restart(self, service_names=None, **options):
-        for service in self.get_services(service_names):
-            service.restart(**options)
+        container.parallel_restart(self.containers(service_names, stopped=True), options)
 
     def build(self, service_names=None, no_cache=False, pull=False, force_rm=False):
         for service in self.get_services(service_names):
diff --git a/compose/service.py b/compose/service.py
index b79fd900..ab6f6dd6 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -28,6 +28,9 @@ from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
 from .const import LABEL_VERSION
 from .container import Container
+from .container import parallel_remove
+from .container import parallel_start
+from .container import parallel_stop
 from .legacy import check_for_legacy_containers
 from .progress_stream import stream_output
 from .progress_stream import StreamOutputError
@@ -241,12 +244,7 @@ class Service(object):
                 else:
                     containers_to_start = stopped_containers
 
-                parallel_execute(
-                    objects=containers_to_start,
-                    obj_callable=lambda c: c.start(),
-                    msg_index=lambda c: c.name,
-                    msg="Starting"
-                )
+                parallel_start(containers_to_start, {})
 
                 num_running += len(containers_to_start)
 
@@ -259,35 +257,22 @@ class Service(object):
             ]
 
             parallel_execute(
-                objects=container_numbers,
-                obj_callable=lambda n: create_and_start(service=self, number=n),
-                msg_index=lambda n: n,
-                msg="Creating and starting"
+                container_numbers,
+                lambda n: create_and_start(service=self, number=n),
+                lambda n: n,
+                "Creating and starting"
             )
 
         if desired_num < num_running:
             num_to_stop = num_running - desired_num
-            sorted_running_containers = sorted(running_containers, key=attrgetter('number'))
-            containers_to_stop = sorted_running_containers[-num_to_stop:]
+            sorted_running_containers = sorted(
+                running_containers,
+                key=attrgetter('number'))
+            parallel_stop(
+                sorted_running_containers[-num_to_stop:],
+                dict(timeout=timeout))
 
-            parallel_execute(
-                objects=containers_to_stop,
-                obj_callable=lambda c: c.stop(timeout=timeout),
-                msg_index=lambda c: c.name,
-                msg="Stopping"
-            )
-
-        self.remove_stopped()
-
-    def remove_stopped(self, **options):
-        containers = [c for c in self.containers(stopped=True) if not c.is_running]
-
-        parallel_execute(
-            objects=containers,
-            obj_callable=lambda c: c.remove(**options),
-            msg_index=lambda c: c.name,
-            msg="Removing"
-        )
+        parallel_remove(self.containers(stopped=True), {})
 
     def create_container(self,
                          one_off=False,
diff --git a/compose/utils.py b/compose/utils.py
index a013035e..716f6633 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -17,58 +17,51 @@ log = logging.getLogger(__name__)
 json_decoder = json.JSONDecoder()
 
 
-def parallel_execute(objects, obj_callable, msg_index, msg):
-    """
-    For a given list of objects, call the callable passing in the first
+def perform_operation(func, arg, callback, index):
+    try:
+        callback((index, func(arg)))
+    except Exception as e:
+        callback((index, e))
+
+
+def parallel_execute(objects, func, index_func, msg):
+    """For a given list of objects, call the callable passing in the first
     object we give it.
     """
+    objects = list(objects)
     stream = get_output_stream(sys.stdout)
-    lines = []
+    writer = ParallelStreamWriter(stream, msg)
 
     for obj in objects:
-        write_out_msg(stream, lines, msg_index(obj), msg)
+        writer.initialize(index_func(obj))
 
     q = Queue()
 
-    def inner_execute_function(an_callable, parameter, msg_index):
-        error = None
-        try:
-            result = an_callable(parameter)
-        except APIError as e:
-            error = e.explanation
-            result = "error"
-        except Exception as e:
-            error = e
-            result = 'unexpected_exception'
-
-        q.put((msg_index, result, error))
-
-    for an_object in objects:
+    # TODO: limit the number of threads #1828
+    for obj in objects:
         t = Thread(
-            target=inner_execute_function,
-            args=(obj_callable, an_object, msg_index(an_object)),
-        )
+            target=perform_operation,
+            args=(func, obj, q.put, index_func(obj)))
         t.daemon = True
         t.start()
 
     done = 0
     errors = {}
-    total_to_execute = len(objects)
 
-    while done < total_to_execute:
+    while done < len(objects):
         try:
-            msg_index, result, error = q.get(timeout=1)
-
-            if result == 'unexpected_exception':
-                errors[msg_index] = result, error
-            if result == 'error':
-                errors[msg_index] = result, error
-                write_out_msg(stream, lines, msg_index, msg, status='error')
-            else:
-                write_out_msg(stream, lines, msg_index, msg)
-            done += 1
+            msg_index, result = q.get(timeout=1)
         except Empty:
-            pass
+            continue
+
+        if isinstance(result, APIError):
+            errors[msg_index] = "error", result.explanation
+            writer.write(msg_index, 'error')
+        elif isinstance(result, Exception):
+            errors[msg_index] = "unexpected_exception", result
+        else:
+            writer.write(msg_index, 'done')
+        done += 1
 
     if not errors:
         return
@@ -80,6 +73,36 @@ def parallel_execute(objects, obj_callable, msg_index, msg):
             raise error
 
 
+class ParallelStreamWriter(object):
+    """Write out messages for operations happening in parallel.
+
+    Each operation has it's own line, and ANSI code characters are used
+    to jump to the correct line, and write over the line.
+    """
+
+    def __init__(self, stream, msg):
+        self.stream = stream
+        self.msg = msg
+        self.lines = []
+
+    def initialize(self, obj_index):
+        self.lines.append(obj_index)
+        self.stream.write("{} {} ... \r\n".format(self.msg, obj_index))
+        self.stream.flush()
+
+    def write(self, obj_index, status):
+        position = self.lines.index(obj_index)
+        diff = len(self.lines) - position
+        # move up
+        self.stream.write("%c[%dA" % (27, diff))
+        # erase
+        self.stream.write("%c[2K\r" % 27)
+        self.stream.write("{} {} ... {}\r".format(self.msg, obj_index, status))
+        # move back down
+        self.stream.write("%c[%dB" % (27, diff))
+        self.stream.flush()
+
+
 def get_output_stream(stream):
     if six.PY3:
         return stream
@@ -151,30 +174,6 @@ def json_stream(stream):
     return split_buffer(stream, json_splitter, json_decoder.decode)
 
 
-def write_out_msg(stream, lines, msg_index, msg, status="done"):
-    """
-    Using special ANSI code characters we can write out the msg over the top of
-    a previous status message, if it exists.
-    """
-    obj_index = msg_index
-    if msg_index in lines:
-        position = lines.index(obj_index)
-        diff = len(lines) - position
-        # move up
-        stream.write("%c[%dA" % (27, diff))
-        # erase
-        stream.write("%c[2K\r" % 27)
-        stream.write("{} {} ... {}\r".format(msg, obj_index, status))
-        # move back down
-        stream.write("%c[%dB" % (27, diff))
-    else:
-        diff = 0
-        lines.append(obj_index)
-        stream.write("{} {} ... \r\n".format(msg, obj_index))
-
-    stream.flush()
-
-
 def json_hash(obj):
     dump = json.dumps(obj, sort_keys=True, separators=(',', ':'))
     h = hashlib.sha256()
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index aaa4f01e..34869ab8 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -36,6 +36,12 @@ def create_and_start_container(service, **override_options):
     return container
 
 
+def remove_stopped(service):
+    containers = [c for c in service.containers(stopped=True) if not c.is_running]
+    for container in containers:
+        container.remove()
+
+
 class ServiceTest(DockerClientTestCase):
     def test_containers(self):
         foo = self.create_service('foo')
@@ -94,14 +100,14 @@ class ServiceTest(DockerClientTestCase):
         create_and_start_container(service)
         self.assertEqual(len(service.containers()), 1)
 
-        service.remove_stopped()
+        remove_stopped(service)
         self.assertEqual(len(service.containers()), 1)
 
         service.kill()
         self.assertEqual(len(service.containers()), 0)
         self.assertEqual(len(service.containers(stopped=True)), 1)
 
-        service.remove_stopped()
+        remove_stopped(service)
         self.assertEqual(len(service.containers(stopped=True)), 0)
 
     def test_create_container_with_one_off(self):
@@ -659,9 +665,8 @@ class ServiceTest(DockerClientTestCase):
         self.assertIn('Creating', captured_output)
         self.assertIn('Starting', captured_output)
 
-    def test_scale_with_api_returns_errors(self):
-        """
-        Test that when scaling if the API returns an error, that error is handled
+    def test_scale_with_api_error(self):
+        """Test that when scaling if the API returns an error, that error is handled
         and the remaining threads continue.
         """
         service = self.create_service('web')
@@ -670,7 +675,10 @@ class ServiceTest(DockerClientTestCase):
 
         with mock.patch(
             'compose.container.Container.create',
-                side_effect=APIError(message="testing", response={}, explanation="Boom")):
+            side_effect=APIError(
+                message="testing",
+                response={},
+                explanation="Boom")):
 
             with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
                 service.scale(3)
@@ -679,9 +687,8 @@ class ServiceTest(DockerClientTestCase):
         self.assertTrue(service.containers()[0].is_running)
         self.assertIn("ERROR: for 2  Boom", mock_stdout.getvalue())
 
-    def test_scale_with_api_returns_unexpected_exception(self):
-        """
-        Test that when scaling if the API returns an error, that is not of type
+    def test_scale_with_unexpected_exception(self):
+        """Test that when scaling if the API returns an error, that is not of type
         APIError, that error is re-raised.
         """
         service = self.create_service('web')
@@ -903,7 +910,7 @@ class ServiceTest(DockerClientTestCase):
             self.assertIn(pair, labels)
 
         service.kill()
-        service.remove_stopped()
+        remove_stopped(service)
 
         labels_list = ["%s=%s" % pair for pair in labels_dict.items()]
 
diff --git a/tox.ini b/tox.ini
index d1098a55..9d45b0c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,5 +44,5 @@ directory = coverage-html
 # Allow really long lines for now
 max-line-length = 140
 # Set this high for now
-max-complexity = 20
+max-complexity = 12
 exclude = compose/packages

From 64447879d2f5a2fe5b8b50819b6620b759715a9d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 17 Nov 2015 12:21:47 -0500
Subject: [PATCH 0543/1265] Reduce complexity of merge_service_dicts

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py | 75 +++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 40 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 20126620..6c565433 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -1,5 +1,6 @@
 import codecs
 import logging
+import operator
 import os
 import sys
 from collections import namedtuple
@@ -389,56 +390,46 @@ def merge_service_dicts_from_files(base, override):
 
 
 def merge_service_dicts(base, override):
-    d = base.copy()
+    d = {}
 
-    if 'environment' in base or 'environment' in override:
-        d['environment'] = merge_environment(
-            base.get('environment'),
-            override.get('environment'),
-        )
+    def merge_field(field, merge_func, default=None):
+        if field in base or field in override:
+            d[field] = merge_func(
+                base.get(field, default),
+                override.get(field, default))
 
-    path_mapping_keys = ['volumes', 'devices']
+    merge_field('environment', merge_environment)
+    merge_field('labels', merge_labels)
+    merge_image_or_build(base, override, d)
 
-    for key in path_mapping_keys:
-        if key in base or key in override:
-            d[key] = merge_path_mappings(
-                base.get(key),
-                override.get(key),
-            )
+    for field in ['volumes', 'devices']:
+        merge_field(field, merge_path_mappings)
 
-    if 'labels' in base or 'labels' in override:
-        d['labels'] = merge_labels(
-            base.get('labels'),
-            override.get('labels'),
-        )
+    for field in ['ports', 'expose', 'external_links']:
+        merge_field(field, operator.add, default=[])
 
-    if 'image' in override and 'build' in d:
-        del d['build']
+    for field in ['dns', 'dns_search']:
+        merge_field(field, merge_list_or_string)
 
-    if 'build' in override and 'image' in d:
-        del d['image']
-
-    list_keys = ['ports', 'expose', 'external_links']
-
-    for key in list_keys:
-        if key in base or key in override:
-            d[key] = base.get(key, []) + override.get(key, [])
-
-    list_or_string_keys = ['dns', 'dns_search']
-
-    for key in list_or_string_keys:
-        if key in base or key in override:
-            d[key] = to_list(base.get(key)) + to_list(override.get(key))
-
-    already_merged_keys = ['environment', 'labels'] + path_mapping_keys + list_keys + list_or_string_keys
-
-    for k in set(ALLOWED_KEYS) - set(already_merged_keys):
-        if k in override:
-            d[k] = override[k]
+    already_merged_keys = set(d) | {'image', 'build'}
+    for field in set(ALLOWED_KEYS) - already_merged_keys:
+        if field in base or field in override:
+            d[field] = override.get(field, base.get(field))
 
     return d
 
 
+def merge_image_or_build(base, override, output):
+    if 'image' in override:
+        output['image'] = override['image']
+    elif 'build' in override:
+        output['build'] = override['build']
+    elif 'image' in base:
+        output['image'] = base['image']
+    elif 'build' in base:
+        output['build'] = base['build']
+
+
 def merge_environment(base, override):
     env = parse_environment(base)
     env.update(parse_environment(override))
@@ -604,6 +595,10 @@ def expand_path(working_dir, path):
     return os.path.abspath(os.path.join(working_dir, os.path.expanduser(path)))
 
 
+def merge_list_or_string(base, override):
+    return to_list(base) + to_list(override)
+
+
 def to_list(value):
     if value is None:
         return []

From 2351e11cc8410cee9472cda38b685204e6252084 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 20 Nov 2015 17:51:36 -0500
Subject: [PATCH 0544/1265] Make sure we always have the latest busybox image,
 so that build --pull tests don't flake.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/acceptance/cli_test.py   | 5 +++++
 tests/integration/testcases.py | 6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 7ca6e819..88ec4573 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -15,6 +15,7 @@ from compose.cli.command import get_project
 from compose.cli.docker_client import docker_client
 from compose.container import Container
 from tests.integration.testcases import DockerClientTestCase
+from tests.integration.testcases import pull_busybox
 
 
 ProcessResult = namedtuple('ProcessResult', 'stdout stderr')
@@ -184,6 +185,8 @@ class CLITestCase(DockerClientTestCase):
         assert BUILD_PULL_TEXT not in result.stdout
 
     def test_build_pull(self):
+        # Make sure we have the latest busybox already
+        pull_busybox(self.client)
         self.base_dir = 'tests/fixtures/simple-dockerfile'
         self.dispatch(['build', 'simple'], None)
 
@@ -192,6 +195,8 @@ class CLITestCase(DockerClientTestCase):
         assert BUILD_PULL_TEXT in result.stdout
 
     def test_build_no_cache_pull(self):
+        # Make sure we have the latest busybox already
+        pull_busybox(self.client)
         self.base_dir = 'tests/fixtures/simple-dockerfile'
         self.dispatch(['build', 'simple'])
 
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index d63f0591..9b7b1f82 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-from docker import errors
 from docker.utils import version_lt
 from pytest import skip
 
@@ -16,10 +15,7 @@ from compose.service import Service
 
 
 def pull_busybox(client):
-    try:
-        client.inspect_image('busybox:latest')
-    except errors.APIError:
-        client.pull('busybox:latest', stream=False)
+    client.pull('busybox:latest', stream=False)
 
 
 class DockerClientTestCase(unittest.TestCase):

From 13081d4516d6d6b8ebfebc045e78e9be6bd96b74 Mon Sep 17 00:00:00 2001
From: Brandon Burton <solarce+yousothirtsyongithub@gmail.com>
Date: Fri, 20 Nov 2015 16:02:37 -0800
Subject: [PATCH 0545/1265] Fixing matrix include so `os: linux` goes to trusty

Signed-off-by: Brandon Burton <brandon@inatree.org>
---
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3310e2ad..3bb365a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,16 +2,14 @@ sudo: required
 
 language: python
 
-services:
-  - docker
-
 matrix:
   include:
     - os: linux
+      services:
+      - docker
     - os: osx
       language: generic
 
-
 install: ./script/travis/install
 
 script:

From b4edf0c45481acb8d780de9ff73156fb7c581337 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 23 Nov 2015 11:34:48 -0500
Subject: [PATCH 0546/1265] Move parallel_execute to a new module.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/container.py |  39 -------------
 compose/parallel.py  | 135 +++++++++++++++++++++++++++++++++++++++++++
 compose/project.py   |  14 ++---
 compose/service.py   |   8 +--
 compose/utils.py     |  94 ------------------------------
 5 files changed, 146 insertions(+), 144 deletions(-)
 create mode 100644 compose/parallel.py

diff --git a/compose/container.py b/compose/container.py
index dde83bd3..1ca48380 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import operator
 from functools import reduce
 
 import six
@@ -9,7 +8,6 @@ import six
 from .const import LABEL_CONTAINER_NUMBER
 from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
-from compose.utils import parallel_execute
 
 
 class Container(object):
@@ -252,40 +250,3 @@ def get_container_name(container):
     # ps
     shortest_name = min(container['Names'], key=lambda n: len(n.split('/')))
     return shortest_name.split('/')[-1]
-
-
-def parallel_operation(containers, operation, options, message):
-    parallel_execute(
-        containers,
-        operator.methodcaller(operation, **options),
-        operator.attrgetter('name'),
-        message)
-
-
-def parallel_remove(containers, options):
-    stopped_containers = [c for c in containers if not c.is_running]
-    parallel_operation(stopped_containers, 'remove', options, 'Removing')
-
-
-def parallel_stop(containers, options):
-    parallel_operation(containers, 'stop', options, 'Stopping')
-
-
-def parallel_start(containers, options):
-    parallel_operation(containers, 'start', options, 'Starting')
-
-
-def parallel_pause(containers, options):
-    parallel_operation(containers, 'pause', options, 'Pausing')
-
-
-def parallel_unpause(containers, options):
-    parallel_operation(containers, 'unpause', options, 'Unpausing')
-
-
-def parallel_kill(containers, options):
-    parallel_operation(containers, 'kill', options, 'Killing')
-
-
-def parallel_restart(containers, options):
-    parallel_operation(containers, 'restart', options, 'Restarting')
diff --git a/compose/parallel.py b/compose/parallel.py
new file mode 100644
index 00000000..2735a397
--- /dev/null
+++ b/compose/parallel.py
@@ -0,0 +1,135 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import operator
+import sys
+from threading import Thread
+
+from docker.errors import APIError
+from six.moves.queue import Empty
+from six.moves.queue import Queue
+
+from compose.utils import get_output_stream
+
+
+def perform_operation(func, arg, callback, index):
+    try:
+        callback((index, func(arg)))
+    except Exception as e:
+        callback((index, e))
+
+
+def parallel_execute(objects, func, index_func, msg):
+    """For a given list of objects, call the callable passing in the first
+    object we give it.
+    """
+    objects = list(objects)
+    stream = get_output_stream(sys.stdout)
+    writer = ParallelStreamWriter(stream, msg)
+
+    for obj in objects:
+        writer.initialize(index_func(obj))
+
+    q = Queue()
+
+    # TODO: limit the number of threads #1828
+    for obj in objects:
+        t = Thread(
+            target=perform_operation,
+            args=(func, obj, q.put, index_func(obj)))
+        t.daemon = True
+        t.start()
+
+    done = 0
+    errors = {}
+
+    while done < len(objects):
+        try:
+            msg_index, result = q.get(timeout=1)
+        except Empty:
+            continue
+
+        if isinstance(result, APIError):
+            errors[msg_index] = "error", result.explanation
+            writer.write(msg_index, 'error')
+        elif isinstance(result, Exception):
+            errors[msg_index] = "unexpected_exception", result
+        else:
+            writer.write(msg_index, 'done')
+        done += 1
+
+    if not errors:
+        return
+
+    stream.write("\n")
+    for msg_index, (result, error) in errors.items():
+        stream.write("ERROR: for {}  {} \n".format(msg_index, error))
+        if result == 'unexpected_exception':
+            raise error
+
+
+class ParallelStreamWriter(object):
+    """Write out messages for operations happening in parallel.
+
+    Each operation has it's own line, and ANSI code characters are used
+    to jump to the correct line, and write over the line.
+    """
+
+    def __init__(self, stream, msg):
+        self.stream = stream
+        self.msg = msg
+        self.lines = []
+
+    def initialize(self, obj_index):
+        self.lines.append(obj_index)
+        self.stream.write("{} {} ... \r\n".format(self.msg, obj_index))
+        self.stream.flush()
+
+    def write(self, obj_index, status):
+        position = self.lines.index(obj_index)
+        diff = len(self.lines) - position
+        # move up
+        self.stream.write("%c[%dA" % (27, diff))
+        # erase
+        self.stream.write("%c[2K\r" % 27)
+        self.stream.write("{} {} ... {}\r".format(self.msg, obj_index, status))
+        # move back down
+        self.stream.write("%c[%dB" % (27, diff))
+        self.stream.flush()
+
+
+def parallel_operation(containers, operation, options, message):
+    parallel_execute(
+        containers,
+        operator.methodcaller(operation, **options),
+        operator.attrgetter('name'),
+        message)
+
+
+def parallel_remove(containers, options):
+    stopped_containers = [c for c in containers if not c.is_running]
+    parallel_operation(stopped_containers, 'remove', options, 'Removing')
+
+
+def parallel_stop(containers, options):
+    parallel_operation(containers, 'stop', options, 'Stopping')
+
+
+def parallel_start(containers, options):
+    parallel_operation(containers, 'start', options, 'Starting')
+
+
+def parallel_pause(containers, options):
+    parallel_operation(containers, 'pause', options, 'Pausing')
+
+
+def parallel_unpause(containers, options):
+    parallel_operation(containers, 'unpause', options, 'Unpausing')
+
+
+def parallel_kill(containers, options):
+    parallel_operation(containers, 'kill', options, 'Killing')
+
+
+def parallel_restart(containers, options):
+    parallel_operation(containers, 'restart', options, 'Restarting')
diff --git a/compose/project.py b/compose/project.py
index dc6dd32f..e29a2eb5 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -7,7 +7,7 @@ from functools import reduce
 from docker.errors import APIError
 from docker.errors import NotFound
 
-from . import container
+from . import parallel
 from .config import ConfigurationError
 from .config import get_service_name_from_net
 from .const import DEFAULT_TIMEOUT
@@ -241,22 +241,22 @@ class Project(object):
             service.start(**options)
 
     def stop(self, service_names=None, **options):
-        container.parallel_stop(self.containers(service_names), options)
+        parallel.parallel_stop(self.containers(service_names), options)
 
     def pause(self, service_names=None, **options):
-        container.parallel_pause(reversed(self.containers(service_names)), options)
+        parallel.parallel_pause(reversed(self.containers(service_names)), options)
 
     def unpause(self, service_names=None, **options):
-        container.parallel_unpause(self.containers(service_names), options)
+        parallel.parallel_unpause(self.containers(service_names), options)
 
     def kill(self, service_names=None, **options):
-        container.parallel_kill(self.containers(service_names), options)
+        parallel.parallel_kill(self.containers(service_names), options)
 
     def remove_stopped(self, service_names=None, **options):
-        container.parallel_remove(self.containers(service_names, stopped=True), options)
+        parallel.parallel_remove(self.containers(service_names, stopped=True), options)
 
     def restart(self, service_names=None, **options):
-        container.parallel_restart(self.containers(service_names, stopped=True), options)
+        parallel.parallel_restart(self.containers(service_names, stopped=True), options)
 
     def build(self, service_names=None, no_cache=False, pull=False, force_rm=False):
         for service in self.get_services(service_names):
diff --git a/compose/service.py b/compose/service.py
index ab6f6dd6..dd2399ee 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -28,14 +28,14 @@ from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
 from .const import LABEL_VERSION
 from .container import Container
-from .container import parallel_remove
-from .container import parallel_start
-from .container import parallel_stop
 from .legacy import check_for_legacy_containers
+from .parallel import parallel_execute
+from .parallel import parallel_remove
+from .parallel import parallel_start
+from .parallel import parallel_stop
 from .progress_stream import stream_output
 from .progress_stream import StreamOutputError
 from .utils import json_hash
-from .utils import parallel_execute
 
 
 log = logging.getLogger(__name__)
diff --git a/compose/utils.py b/compose/utils.py
index 716f6633..362629bc 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -2,107 +2,13 @@ import codecs
 import hashlib
 import json
 import json.decoder
-import logging
-import sys
-from threading import Thread
 
 import six
-from docker.errors import APIError
-from six.moves.queue import Empty
-from six.moves.queue import Queue
 
 
-log = logging.getLogger(__name__)
-
 json_decoder = json.JSONDecoder()
 
 
-def perform_operation(func, arg, callback, index):
-    try:
-        callback((index, func(arg)))
-    except Exception as e:
-        callback((index, e))
-
-
-def parallel_execute(objects, func, index_func, msg):
-    """For a given list of objects, call the callable passing in the first
-    object we give it.
-    """
-    objects = list(objects)
-    stream = get_output_stream(sys.stdout)
-    writer = ParallelStreamWriter(stream, msg)
-
-    for obj in objects:
-        writer.initialize(index_func(obj))
-
-    q = Queue()
-
-    # TODO: limit the number of threads #1828
-    for obj in objects:
-        t = Thread(
-            target=perform_operation,
-            args=(func, obj, q.put, index_func(obj)))
-        t.daemon = True
-        t.start()
-
-    done = 0
-    errors = {}
-
-    while done < len(objects):
-        try:
-            msg_index, result = q.get(timeout=1)
-        except Empty:
-            continue
-
-        if isinstance(result, APIError):
-            errors[msg_index] = "error", result.explanation
-            writer.write(msg_index, 'error')
-        elif isinstance(result, Exception):
-            errors[msg_index] = "unexpected_exception", result
-        else:
-            writer.write(msg_index, 'done')
-        done += 1
-
-    if not errors:
-        return
-
-    stream.write("\n")
-    for msg_index, (result, error) in errors.items():
-        stream.write("ERROR: for {}  {} \n".format(msg_index, error))
-        if result == 'unexpected_exception':
-            raise error
-
-
-class ParallelStreamWriter(object):
-    """Write out messages for operations happening in parallel.
-
-    Each operation has it's own line, and ANSI code characters are used
-    to jump to the correct line, and write over the line.
-    """
-
-    def __init__(self, stream, msg):
-        self.stream = stream
-        self.msg = msg
-        self.lines = []
-
-    def initialize(self, obj_index):
-        self.lines.append(obj_index)
-        self.stream.write("{} {} ... \r\n".format(self.msg, obj_index))
-        self.stream.flush()
-
-    def write(self, obj_index, status):
-        position = self.lines.index(obj_index)
-        diff = len(self.lines) - position
-        # move up
-        self.stream.write("%c[%dA" % (27, diff))
-        # erase
-        self.stream.write("%c[2K\r" % 27)
-        self.stream.write("{} {} ... {}\r".format(self.msg, obj_index, status))
-        # move back down
-        self.stream.write("%c[%dB" % (27, diff))
-        self.stream.flush()
-
-
 def get_output_stream(stream):
     if six.PY3:
         return stream

From c9ca5e86b0e8e0e1c8cd2345da5a55739b430242 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 13 Nov 2015 17:39:02 -0500
Subject: [PATCH 0547/1265] Remove project name validation

project name is already normalized to a valid name before creating a service.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py         | 4 ----
 tests/unit/service_test.py | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index dd2399ee..9004260f 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -18,7 +18,6 @@ from docker.utils.ports import split_port
 from . import __version__
 from .config import DOCKER_CONFIG_KEYS
 from .config import merge_environment
-from .config.validation import VALID_NAME_CHARS
 from .const import DEFAULT_TIMEOUT
 from .const import IS_WINDOWS_PLATFORM
 from .const import LABEL_CONFIG_HASH
@@ -122,9 +121,6 @@ class Service(object):
         net=None,
         **options
     ):
-        if not re.match('^%s+$' % VALID_NAME_CHARS, project):
-            raise ConfigError('Invalid project name "%s" - only %s are allowed' % (project, VALID_NAME_CHARS))
-
         self.name = name
         self.client = client
         self.project = project
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 808c391c..78edf3bf 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -35,11 +35,6 @@ class ServiceTest(unittest.TestCase):
     def setUp(self):
         self.mock_client = mock.create_autospec(docker.Client)
 
-    def test_project_validation(self):
-        self.assertRaises(ConfigError, lambda: Service(name='foo', project='>', image='foo'))
-
-        Service(name='foo', project='bar.bar__', image='foo')
-
     def test_containers(self):
         service = Service('db', self.mock_client, 'myproject', image='foo')
         self.mock_client.containers.return_value = []

From 068edfa31345760d334b952d27e546077b077388 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 13 Nov 2015 18:20:09 -0500
Subject: [PATCH 0548/1265] Move parsing of volumes_from to the last step of
 config parsing.

Includes creating a new compose.config.types module for all the domain objects.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py          | 19 +++++++++++++++++++
 compose/config/types.py           | 28 ++++++++++++++++++++++++++++
 compose/project.py                | 18 ++++++------------
 compose/service.py                | 19 +------------------
 tests/integration/project_test.py |  2 +-
 tests/integration/service_test.py |  2 +-
 tests/unit/project_test.py        | 23 +++++++++++++----------
 tests/unit/service_test.py        |  1 +
 tests/unit/sort_service_test.py   |  7 ++++---
 9 files changed, 74 insertions(+), 45 deletions(-)
 create mode 100644 compose/config/types.py

diff --git a/compose/config/config.py b/compose/config/config.py
index 84b6748c..8ec352ec 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import codecs
 import logging
 import operator
@@ -12,6 +14,7 @@ from .errors import CircularReference
 from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
 from .interpolation import interpolate_environment_variables
+from .types import VolumeFromSpec
 from .validation import validate_against_fields_schema
 from .validation import validate_against_service_schema
 from .validation import validate_extends_file_path
@@ -198,8 +201,12 @@ def load(config_details):
             service_dict)
         resolver = ServiceExtendsResolver(service_config)
         service_dict = process_service(resolver.run())
+
+        # TODO: move to validate_service()
         validate_against_service_schema(service_dict, service_config.name)
         validate_paths(service_dict)
+
+        service_dict = finalize_service(service_config._replace(config=service_dict))
         service_dict['name'] = service_config.name
         return service_dict
 
@@ -353,6 +360,7 @@ def validate_ulimits(ulimit_config):
                     "than 'hard' value".format(ulimit_config))
 
 
+# TODO: rename to normalize_service
 def process_service(service_config):
     working_dir = service_config.working_dir
     service_dict = dict(service_config.config)
@@ -370,12 +378,23 @@ def process_service(service_config):
     if 'labels' in service_dict:
         service_dict['labels'] = parse_labels(service_dict['labels'])
 
+    # TODO: move to a validate_service()
     if 'ulimits' in service_dict:
         validate_ulimits(service_dict['ulimits'])
 
     return service_dict
 
 
+def finalize_service(service_config):
+    service_dict = dict(service_config.config)
+
+    if 'volumes_from' in service_dict:
+        service_dict['volumes_from'] = [
+            VolumeFromSpec.parse(vf) for vf in service_dict['volumes_from']]
+
+    return service_dict
+
+
 def merge_service_dicts_from_files(base, override):
     """When merging services from multiple files we need to merge the `extends`
     field. This is not handled by `merge_service_dicts()` which is used to
diff --git a/compose/config/types.py b/compose/config/types.py
new file mode 100644
index 00000000..73bfd418
--- /dev/null
+++ b/compose/config/types.py
@@ -0,0 +1,28 @@
+"""
+Types for objects parsed from the configuration.
+"""
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+from collections import namedtuple
+
+from compose.config.errors import ConfigurationError
+
+
+class VolumeFromSpec(namedtuple('_VolumeFromSpec', 'source mode')):
+
+    @classmethod
+    def parse(cls, volume_from_config):
+        parts = volume_from_config.split(':')
+        if len(parts) > 2:
+            raise ConfigurationError(
+                "volume_from {} has incorrect format, should be "
+                "service[:mode]".format(volume_from_config))
+
+        if len(parts) == 1:
+            source = parts[0]
+            mode = 'rw'
+        else:
+            source, mode = parts
+
+        return cls(source, mode)
diff --git a/compose/project.py b/compose/project.py
index e29a2eb5..5caa1ea3 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -19,10 +19,8 @@ from .legacy import check_for_legacy_containers
 from .service import ContainerNet
 from .service import ConvergenceStrategy
 from .service import Net
-from .service import parse_volume_from_spec
 from .service import Service
 from .service import ServiceNet
-from .service import VolumeFromSpec
 
 
 log = logging.getLogger(__name__)
@@ -38,10 +36,7 @@ def sort_service_dicts(services):
         return [link.split(':')[0] for link in links]
 
     def get_service_names_from_volumes_from(volumes_from):
-        return [
-            parse_volume_from_spec(volume_from).source
-            for volume_from in volumes_from
-        ]
+        return [volume_from.source for volume_from in volumes_from]
 
     def get_service_dependents(service_dict, services):
         name = service_dict['name']
@@ -192,16 +187,15 @@ class Project(object):
     def get_volumes_from(self, service_dict):
         volumes_from = []
         if 'volumes_from' in service_dict:
-            for volume_from_config in service_dict.get('volumes_from', []):
-                volume_from_spec = parse_volume_from_spec(volume_from_config)
+            for volume_from_spec in service_dict.get('volumes_from', []):
                 # Get service
                 try:
-                    service_name = self.get_service(volume_from_spec.source)
-                    volume_from_spec = VolumeFromSpec(service_name, volume_from_spec.mode)
+                    service = self.get_service(volume_from_spec.source)
+                    volume_from_spec = volume_from_spec._replace(source=service)
                 except NoSuchService:
                     try:
-                        container_name = Container.from_id(self.client, volume_from_spec.source)
-                        volume_from_spec = VolumeFromSpec(container_name, volume_from_spec.mode)
+                        container = Container.from_id(self.client, volume_from_spec.source)
+                        volume_from_spec = volume_from_spec._replace(source=container)
                     except APIError:
                         raise ConfigurationError(
                             'Service "%s" mounts volumes from "%s", which is '
diff --git a/compose/service.py b/compose/service.py
index 9004260f..be0502c2 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -70,6 +70,7 @@ class BuildError(Exception):
         self.reason = reason
 
 
+# TODO: remove
 class ConfigError(ValueError):
     pass
 
@@ -86,9 +87,6 @@ class NoSuchImageError(Exception):
 VolumeSpec = namedtuple('VolumeSpec', 'external internal mode')
 
 
-VolumeFromSpec = namedtuple('VolumeFromSpec', 'source mode')
-
-
 ServiceName = namedtuple('ServiceName', 'project service number')
 
 
@@ -1029,21 +1027,6 @@ def build_volume_from(volume_from_spec):
         return ["{}:{}".format(volume_from_spec.source.id, volume_from_spec.mode)]
 
 
-def parse_volume_from_spec(volume_from_config):
-    parts = volume_from_config.split(':')
-    if len(parts) > 2:
-        raise ConfigError("Volume %s has incorrect format, should be "
-                          "external:internal[:mode]" % volume_from_config)
-
-    if len(parts) == 1:
-        source = parts[0]
-        mode = 'rw'
-    else:
-        source, mode = parts
-
-    return VolumeFromSpec(source, mode)
-
-
 # Labels
 
 
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 2ce31900..d65d7ef0 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -3,12 +3,12 @@ from __future__ import unicode_literals
 from .testcases import DockerClientTestCase
 from compose.cli.docker_client import docker_client
 from compose.config import config
+from compose.config.types import VolumeFromSpec
 from compose.const import LABEL_PROJECT
 from compose.container import Container
 from compose.project import Project
 from compose.service import ConvergenceStrategy
 from compose.service import Net
-from compose.service import VolumeFromSpec
 
 
 def build_service_dicts(service_config):
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 34869ab8..34bf93fc 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -14,6 +14,7 @@ from .. import mock
 from .testcases import DockerClientTestCase
 from .testcases import pull_busybox
 from compose import __version__
+from compose.config.types import VolumeFromSpec
 from compose.const import LABEL_CONFIG_HASH
 from compose.const import LABEL_CONTAINER_NUMBER
 from compose.const import LABEL_ONE_OFF
@@ -27,7 +28,6 @@ from compose.service import ConvergencePlan
 from compose.service import ConvergenceStrategy
 from compose.service import Net
 from compose.service import Service
-from compose.service import VolumeFromSpec
 
 
 def create_and_start_container(service, **override_options):
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index b38f5c78..f8178ed8 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -4,6 +4,7 @@ import docker
 
 from .. import mock
 from .. import unittest
+from compose.config.types import VolumeFromSpec
 from compose.const import LABEL_SERVICE
 from compose.container import Container
 from compose.project import Project
@@ -43,7 +44,7 @@ class ProjectTest(unittest.TestCase):
             {
                 'name': 'db',
                 'image': 'busybox:latest',
-                'volumes_from': ['volume']
+                'volumes_from': [VolumeFromSpec('volume', 'ro')]
             },
             {
                 'name': 'volume',
@@ -167,7 +168,7 @@ class ProjectTest(unittest.TestCase):
             {
                 'name': 'test',
                 'image': 'busybox:latest',
-                'volumes_from': ['aaa']
+                'volumes_from': [VolumeFromSpec('aaa', 'rw')]
             }
         ], self.mock_client)
         self.assertEqual(project.get_service('test')._get_volumes_from(), [container_id + ":rw"])
@@ -190,17 +191,13 @@ class ProjectTest(unittest.TestCase):
             {
                 'name': 'test',
                 'image': 'busybox:latest',
-                'volumes_from': ['vol']
+                'volumes_from': [VolumeFromSpec('vol', 'rw')]
             }
         ], self.mock_client)
         self.assertEqual(project.get_service('test')._get_volumes_from(), [container_name + ":rw"])
 
-    @mock.patch.object(Service, 'containers')
-    def test_use_volumes_from_service_container(self, mock_return):
+    def test_use_volumes_from_service_container(self):
         container_ids = ['aabbccddee', '12345']
-        mock_return.return_value = [
-            mock.Mock(id=container_id, spec=Container)
-            for container_id in container_ids]
 
         project = Project.from_dicts('test', [
             {
@@ -210,10 +207,16 @@ class ProjectTest(unittest.TestCase):
             {
                 'name': 'test',
                 'image': 'busybox:latest',
-                'volumes_from': ['vol']
+                'volumes_from': [VolumeFromSpec('vol', 'rw')]
             }
         ], None)
-        self.assertEqual(project.get_service('test')._get_volumes_from(), [container_ids[0] + ':rw'])
+        with mock.patch.object(Service, 'containers') as mock_return:
+            mock_return.return_value = [
+                mock.Mock(id=container_id, spec=Container)
+                for container_id in container_ids]
+            self.assertEqual(
+                project.get_service('test')._get_volumes_from(),
+                [container_ids[0] + ':rw'])
 
     def test_net_unset(self):
         project = Project.from_dicts('test', [
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 78edf3bf..efcc58e2 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -6,6 +6,7 @@ import pytest
 
 from .. import mock
 from .. import unittest
+from compose.config.types import VolumeFromSpec
 from compose.const import IS_WINDOWS_PLATFORM
 from compose.const import LABEL_CONFIG_HASH
 from compose.const import LABEL_ONE_OFF
diff --git a/tests/unit/sort_service_test.py b/tests/unit/sort_service_test.py
index a7e522a1..ef088287 100644
--- a/tests/unit/sort_service_test.py
+++ b/tests/unit/sort_service_test.py
@@ -1,4 +1,5 @@
 from .. import unittest
+from compose.config.types import VolumeFromSpec
 from compose.project import DependencyError
 from compose.project import sort_service_dicts
 
@@ -73,7 +74,7 @@ class SortServiceTest(unittest.TestCase):
             },
             {
                 'name': 'parent',
-                'volumes_from': ['child']
+                'volumes_from': [VolumeFromSpec('child', 'rw')]
             },
             {
                 'links': ['parent'],
@@ -116,7 +117,7 @@ class SortServiceTest(unittest.TestCase):
             },
             {
                 'name': 'parent',
-                'volumes_from': ['child']
+                'volumes_from': [VolumeFromSpec('child', 'ro')]
             },
             {
                 'name': 'child'
@@ -141,7 +142,7 @@ class SortServiceTest(unittest.TestCase):
             },
             {
                 'name': 'two',
-                'volumes_from': ['one']
+                'volumes_from': [VolumeFromSpec('one', 'rw')]
             },
             {
                 'name': 'one'

From 12b82a20ff331f420c040dbb9cf1ea44fd74d7d5 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 13 Nov 2015 18:29:25 -0500
Subject: [PATCH 0549/1265] Move restart spec to the config.types module.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py          |  4 ++++
 compose/config/types.py           | 17 +++++++++++++++++
 compose/service.py                | 22 +---------------------
 tests/integration/service_test.py | 24 ++++++------------------
 tests/unit/cli_test.py            |  2 +-
 5 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 8ec352ec..9b03ea4f 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -14,6 +14,7 @@ from .errors import CircularReference
 from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
 from .interpolation import interpolate_environment_variables
+from .types import parse_restart_spec
 from .types import VolumeFromSpec
 from .validation import validate_against_fields_schema
 from .validation import validate_against_service_schema
@@ -392,6 +393,9 @@ def finalize_service(service_config):
         service_dict['volumes_from'] = [
             VolumeFromSpec.parse(vf) for vf in service_dict['volumes_from']]
 
+    if 'restart' in service_dict:
+        service_dict['restart'] = parse_restart_spec(service_dict['restart'])
+
     return service_dict
 
 
diff --git a/compose/config/types.py b/compose/config/types.py
index 73bfd418..0ab53c82 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -26,3 +26,20 @@ class VolumeFromSpec(namedtuple('_VolumeFromSpec', 'source mode')):
             source, mode = parts
 
         return cls(source, mode)
+
+
+def parse_restart_spec(restart_config):
+    if not restart_config:
+        return None
+    parts = restart_config.split(':')
+    if len(parts) > 2:
+        raise ConfigurationError(
+            "Restart %s has incorrect format, should be "
+            "mode[:max_retry]" % restart_config)
+    if len(parts) == 2:
+        name, max_retry_count = parts
+    else:
+        name, = parts
+        max_retry_count = 0
+
+    return {'Name': name, 'MaximumRetryCount': int(max_retry_count)}
diff --git a/compose/service.py b/compose/service.py
index be0502c2..33d9a7be 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -648,8 +648,6 @@ class Service(object):
         if isinstance(dns_search, six.string_types):
             dns_search = [dns_search]
 
-        restart = parse_restart_spec(options.get('restart', None))
-
         extra_hosts = build_extra_hosts(options.get('extra_hosts', None))
         read_only = options.get('read_only', None)
 
@@ -667,7 +665,7 @@ class Service(object):
             devices=devices,
             dns=dns,
             dns_search=dns_search,
-            restart_policy=restart,
+            restart_policy=options.get('restart'),
             cap_add=cap_add,
             cap_drop=cap_drop,
             mem_limit=options.get('mem_limit'),
@@ -1043,24 +1041,6 @@ def build_container_labels(label_options, service_labels, number, config_hash):
     return labels
 
 
-# Restart policy
-
-
-def parse_restart_spec(restart_config):
-    if not restart_config:
-        return None
-    parts = restart_config.split(':')
-    if len(parts) > 2:
-        raise ConfigError("Restart %s has incorrect format, should be "
-                          "mode[:max_retry]" % restart_config)
-    if len(parts) == 2:
-        name, max_retry_count = parts
-    else:
-        name, = parts
-        max_retry_count = 0
-
-    return {'Name': name, 'MaximumRetryCount': int(max_retry_count)}
-
 # Ulimits
 
 
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 34bf93fc..15d8ca07 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -786,23 +786,21 @@ class ServiceTest(DockerClientTestCase):
         container = create_and_start_container(service)
         self.assertIsNone(container.get('HostConfig.Dns'))
 
-    def test_dns_single_value(self):
-        service = self.create_service('web', dns='8.8.8.8')
-        container = create_and_start_container(service)
-        self.assertEqual(container.get('HostConfig.Dns'), ['8.8.8.8'])
-
     def test_dns_list(self):
         service = self.create_service('web', dns=['8.8.8.8', '9.9.9.9'])
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.Dns'), ['8.8.8.8', '9.9.9.9'])
 
     def test_restart_always_value(self):
-        service = self.create_service('web', restart='always')
+        service = self.create_service('web', restart={'Name': 'always'})
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.RestartPolicy.Name'), 'always')
 
     def test_restart_on_failure_value(self):
-        service = self.create_service('web', restart='on-failure:5')
+        service = self.create_service('web', restart={
+            'Name': 'on-failure',
+            'MaximumRetryCount': 5
+        })
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.RestartPolicy.Name'), 'on-failure')
         self.assertEqual(container.get('HostConfig.RestartPolicy.MaximumRetryCount'), 5)
@@ -817,17 +815,7 @@ class ServiceTest(DockerClientTestCase):
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.CapDrop'), ['SYS_ADMIN', 'NET_ADMIN'])
 
-    def test_dns_search_no_value(self):
-        service = self.create_service('web')
-        container = create_and_start_container(service)
-        self.assertIsNone(container.get('HostConfig.DnsSearch'))
-
-    def test_dns_search_single_value(self):
-        service = self.create_service('web', dns_search='example.com')
-        container = create_and_start_container(service)
-        self.assertEqual(container.get('HostConfig.DnsSearch'), ['example.com'])
-
-    def test_dns_search_list(self):
+    def test_dns_search(self):
         service = self.create_service('web', dns_search=['dc1.example.com', 'dc2.example.com'])
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.DnsSearch'), ['dc1.example.com', 'dc2.example.com'])
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 5b63d2e8..23dc4262 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -124,7 +124,7 @@ class CLITestCase(unittest.TestCase):
         mock_project.get_service.return_value = Service(
             'service',
             client=mock_client,
-            restart='always',
+            restart={'Name': 'always', 'MaximumRetryCount': 0},
             image='someimage')
         command.run(mock_project, {
             'SERVICE': 'service',

From efec2aae6c86b6577f30451d54ac7030dbf39b13 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 13 Nov 2015 18:58:24 -0500
Subject: [PATCH 0550/1265] Fixes #2008 - re-use list_or_dict schema for all
 the types

At the same time, moves extra_hosts validation to the config module.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py          |  4 ++++
 compose/config/fields_schema.json | 31 +++++++++++---------------
 compose/config/types.py           | 16 ++++++++++++++
 compose/config/validation.py      |  4 ++--
 compose/service.py                | 36 +++----------------------------
 tests/integration/service_test.py | 33 ----------------------------
 tests/unit/config/config_test.py  | 25 ++++++++++++++++++++-
 tests/unit/config/types_test.py   | 29 +++++++++++++++++++++++++
 8 files changed, 90 insertions(+), 88 deletions(-)
 create mode 100644 tests/unit/config/types_test.py

diff --git a/compose/config/config.py b/compose/config/config.py
index 9b03ea4f..55adcaf2 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -14,6 +14,7 @@ from .errors import CircularReference
 from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
 from .interpolation import interpolate_environment_variables
+from .types import parse_extra_hosts
 from .types import parse_restart_spec
 from .types import VolumeFromSpec
 from .validation import validate_against_fields_schema
@@ -379,6 +380,9 @@ def process_service(service_config):
     if 'labels' in service_dict:
         service_dict['labels'] = parse_labels(service_dict['labels'])
 
+    if 'extra_hosts' in service_dict:
+        service_dict['extra_hosts'] = parse_extra_hosts(service_dict['extra_hosts'])
+
     # TODO: move to a validate_service()
     if 'ulimits' in service_dict:
         validate_ulimits(service_dict['ulimits'])
diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index ca3b3a50..9cbcfd1b 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -37,22 +37,7 @@
         "domainname": {"type": "string"},
         "entrypoint": {"$ref": "#/definitions/string_or_list"},
         "env_file": {"$ref": "#/definitions/string_or_list"},
-
-        "environment": {
-          "oneOf": [
-            {
-              "type": "object",
-              "patternProperties": {
-                ".+": {
-                  "type": ["string", "number", "boolean", "null"],
-                  "format": "environment"
-                }
-              },
-              "additionalProperties": false
-            },
-            {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
-          ]
-        },
+        "environment": {"$ref": "#/definitions/list_or_dict"},
 
         "expose": {
           "type": "array",
@@ -165,10 +150,18 @@
 
     "list_or_dict": {
       "oneOf": [
-        {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        {"type": "object"}
+        {
+          "type": "object",
+          "patternProperties": {
+            ".+": {
+              "type": ["string", "number", "boolean", "null"],
+              "format": "bool-value-in-mapping"
+            }
+          },
+          "additionalProperties": false
+        },
+        {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
       ]
     }
-
   }
 }
diff --git a/compose/config/types.py b/compose/config/types.py
index 0ab53c82..b6add089 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -43,3 +43,19 @@ def parse_restart_spec(restart_config):
         max_retry_count = 0
 
     return {'Name': name, 'MaximumRetryCount': int(max_retry_count)}
+
+
+def parse_extra_hosts(extra_hosts_config):
+    if not extra_hosts_config:
+        return {}
+
+    if isinstance(extra_hosts_config, dict):
+        return dict(extra_hosts_config)
+
+    if isinstance(extra_hosts_config, list):
+        extra_hosts_dict = {}
+        for extra_hosts_line in extra_hosts_config:
+            # TODO: validate string contains ':' ?
+            host, ip = extra_hosts_line.split(':')
+            extra_hosts_dict[host.strip()] = ip.strip()
+        return extra_hosts_dict
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 38866b0f..38020366 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -49,7 +49,7 @@ def format_ports(instance):
     return True
 
 
-@FormatChecker.cls_checks(format="environment")
+@FormatChecker.cls_checks(format="bool-value-in-mapping")
 def format_boolean_in_environment(instance):
     """
     Check if there is a boolean in the environment and display a warning.
@@ -273,7 +273,7 @@ def validate_against_fields_schema(config, filename):
     _validate_against_schema(
         config,
         "fields_schema.json",
-        format_checker=["ports", "environment"],
+        format_checker=["ports", "bool-value-in-mapping"],
         filename=filename)
 
 
diff --git a/compose/service.py b/compose/service.py
index 33d9a7be..2bb0030f 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -640,6 +640,7 @@ class Service(object):
         pid = options.get('pid', None)
         security_opt = options.get('security_opt', None)
 
+        # TODO: these options are already normalized by config
         dns = options.get('dns', None)
         if isinstance(dns, six.string_types):
             dns = [dns]
@@ -648,9 +649,6 @@ class Service(object):
         if isinstance(dns_search, six.string_types):
             dns_search = [dns_search]
 
-        extra_hosts = build_extra_hosts(options.get('extra_hosts', None))
-        read_only = options.get('read_only', None)
-
         devices = options.get('devices', None)
         cgroup_parent = options.get('cgroup_parent', None)
         ulimits = build_ulimits(options.get('ulimits', None))
@@ -672,8 +670,8 @@ class Service(object):
             memswap_limit=options.get('memswap_limit'),
             ulimits=ulimits,
             log_config=log_config,
-            extra_hosts=extra_hosts,
-            read_only=read_only,
+            extra_hosts=options.get('extra_hosts'),
+            read_only=options.get('read_only'),
             pid_mode=pid,
             security_opt=security_opt,
             ipc_mode=options.get('ipc'),
@@ -1057,31 +1055,3 @@ def build_ulimits(ulimit_config):
             ulimits.append(ulimit_dict)
 
     return ulimits
-
-
-# Extra hosts
-
-
-def build_extra_hosts(extra_hosts_config):
-    if not extra_hosts_config:
-        return {}
-
-    if isinstance(extra_hosts_config, list):
-        extra_hosts_dict = {}
-        for extra_hosts_line in extra_hosts_config:
-            if not isinstance(extra_hosts_line, six.string_types):
-                raise ConfigError(
-                    "extra_hosts_config \"%s\" must be either a list of strings or a string->string mapping," %
-                    extra_hosts_config
-                )
-            host, ip = extra_hosts_line.split(':')
-            extra_hosts_dict.update({host.strip(): ip.strip()})
-        extra_hosts_config = extra_hosts_dict
-
-    if isinstance(extra_hosts_config, dict):
-        return extra_hosts_config
-
-    raise ConfigError(
-        "extra_hosts_config \"%s\" must be either a list of strings or a string->string mapping," %
-        extra_hosts_config
-    )
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 15d8ca07..27a29005 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -22,8 +22,6 @@ from compose.const import LABEL_PROJECT
 from compose.const import LABEL_SERVICE
 from compose.const import LABEL_VERSION
 from compose.container import Container
-from compose.service import build_extra_hosts
-from compose.service import ConfigError
 from compose.service import ConvergencePlan
 from compose.service import ConvergenceStrategy
 from compose.service import Net
@@ -139,37 +137,6 @@ class ServiceTest(DockerClientTestCase):
         container.start()
         self.assertEqual(container.get('HostConfig.CpuShares'), 73)
 
-    def test_build_extra_hosts(self):
-        # string
-        self.assertRaises(ConfigError, lambda: build_extra_hosts("www.example.com: 192.168.0.17"))
-
-        # list of strings
-        self.assertEqual(build_extra_hosts(
-            ["www.example.com:192.168.0.17"]),
-            {'www.example.com': '192.168.0.17'})
-        self.assertEqual(build_extra_hosts(
-            ["www.example.com: 192.168.0.17"]),
-            {'www.example.com': '192.168.0.17'})
-        self.assertEqual(build_extra_hosts(
-            ["www.example.com: 192.168.0.17",
-             "static.example.com:192.168.0.19",
-             "api.example.com: 192.168.0.18"]),
-            {'www.example.com': '192.168.0.17',
-             'static.example.com': '192.168.0.19',
-             'api.example.com': '192.168.0.18'})
-
-        # list of dictionaries
-        self.assertRaises(ConfigError, lambda: build_extra_hosts(
-            [{'www.example.com': '192.168.0.17'},
-             {'api.example.com': '192.168.0.18'}]))
-
-        # dictionaries
-        self.assertEqual(build_extra_hosts(
-            {'www.example.com': '192.168.0.17',
-             'api.example.com': '192.168.0.18'}),
-            {'www.example.com': '192.168.0.17',
-             'api.example.com': '192.168.0.18'})
-
     def test_create_container_with_extra_hosts_list(self):
         extra_hosts = ['somehost:162.242.195.82', 'otherhost:50.31.209.229']
         service = self.create_service('db', extra_hosts=extra_hosts)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index c69e3430..f923fb37 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -32,7 +32,7 @@ def service_sort(services):
     return sorted(services, key=itemgetter('name'))
 
 
-def build_config_details(contents, working_dir, filename):
+def build_config_details(contents, working_dir='working_dir', filename='filename.yml'):
     return config.ConfigDetails(
         working_dir,
         [config.ConfigFile(filename, contents)])
@@ -512,6 +512,29 @@ class ConfigTest(unittest.TestCase):
 
         assert 'line 3, column 32' in exc.exconly()
 
+    def test_validate_extra_hosts_invalid(self):
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(build_config_details({
+                'web': {
+                    'image': 'alpine',
+                    'extra_hosts': "www.example.com: 192.168.0.17",
+                }
+            }))
+        assert "'extra_hosts' contains an invalid type" in exc.exconly()
+
+    def test_validate_extra_hosts_invalid_list(self):
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(build_config_details({
+                'web': {
+                    'image': 'alpine',
+                    'extra_hosts': [
+                        {'www.example.com': '192.168.0.17'},
+                        {'api.example.com': '192.168.0.18'}
+                    ],
+                }
+            }))
+        assert "which is an invalid type" in exc.exconly()
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)
diff --git a/tests/unit/config/types_test.py b/tests/unit/config/types_test.py
new file mode 100644
index 00000000..25692ca3
--- /dev/null
+++ b/tests/unit/config/types_test.py
@@ -0,0 +1,29 @@
+from compose.config.types import parse_extra_hosts
+
+
+def test_parse_extra_hosts_list():
+    expected = {'www.example.com': '192.168.0.17'}
+    assert parse_extra_hosts(["www.example.com:192.168.0.17"]) == expected
+
+    expected = {'www.example.com': '192.168.0.17'}
+    assert parse_extra_hosts(["www.example.com: 192.168.0.17"]) == expected
+
+    assert parse_extra_hosts([
+        "www.example.com: 192.168.0.17",
+        "static.example.com:192.168.0.19",
+        "api.example.com: 192.168.0.18"
+    ]) == {
+        'www.example.com': '192.168.0.17',
+        'static.example.com': '192.168.0.19',
+        'api.example.com': '192.168.0.18'
+    }
+
+
+def test_parse_extra_hosts_dict():
+    assert parse_extra_hosts({
+        'www.example.com': '192.168.0.17',
+        'api.example.com': '192.168.0.18'
+    }) == {
+        'www.example.com': '192.168.0.17',
+        'api.example.com': '192.168.0.18'
+    }

From dac75b07dc16d9b6f08654301dd9ddd5d0b48393 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 13 Nov 2015 19:40:10 -0500
Subject: [PATCH 0551/1265] Move volume parsing to config.types module

This removes the last of the old service.ConfigError

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/command.py               | 17 ++----
 compose/config/config.py             |  5 ++
 compose/config/types.py              | 59 +++++++++++++++++++
 compose/service.py                   | 69 ++---------------------
 tests/acceptance/cli_test.py         |  2 +-
 tests/integration/project_test.py    | 11 ++--
 tests/integration/resilience_test.py |  6 +-
 tests/integration/service_test.py    | 43 ++++++--------
 tests/integration/testcases.py       | 11 ++--
 tests/unit/config/config_test.py     | 38 +++++++------
 tests/unit/config/types_test.py      | 37 ++++++++++++
 tests/unit/service_test.py           | 84 +++++++---------------------
 12 files changed, 186 insertions(+), 196 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 6094b530..157e0016 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -14,7 +14,6 @@ from . import errors
 from . import verbose_proxy
 from .. import config
 from ..project import Project
-from ..service import ConfigError
 from .docker_client import docker_client
 from .utils import call_silently
 from .utils import get_version_info
@@ -84,16 +83,12 @@ def get_project(base_dir, config_path=None, project_name=None, verbose=False,
     config_details = config.find(base_dir, config_path)
 
     api_version = '1.21' if use_networking else None
-    try:
-        return Project.from_dicts(
-            get_project_name(config_details.working_dir, project_name),
-            config.load(config_details),
-            get_client(verbose=verbose, version=api_version),
-            use_networking=use_networking,
-            network_driver=network_driver,
-        )
-    except ConfigError as e:
-        raise errors.UserError(six.text_type(e))
+    return Project.from_dicts(
+        get_project_name(config_details.working_dir, project_name),
+        config.load(config_details),
+        get_client(verbose=verbose, version=api_version),
+        use_networking=use_networking,
+        network_driver=network_driver)
 
 
 def get_project_name(working_dir, project_name=None):
diff --git a/compose/config/config.py b/compose/config/config.py
index 55adcaf2..5b1de5ef 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -17,6 +17,7 @@ from .interpolation import interpolate_environment_variables
 from .types import parse_extra_hosts
 from .types import parse_restart_spec
 from .types import VolumeFromSpec
+from .types import VolumeSpec
 from .validation import validate_against_fields_schema
 from .validation import validate_against_service_schema
 from .validation import validate_extends_file_path
@@ -397,6 +398,10 @@ def finalize_service(service_config):
         service_dict['volumes_from'] = [
             VolumeFromSpec.parse(vf) for vf in service_dict['volumes_from']]
 
+    if 'volumes' in service_dict:
+        service_dict['volumes'] = [
+            VolumeSpec.parse(v) for v in service_dict['volumes']]
+
     if 'restart' in service_dict:
         service_dict['restart'] = parse_restart_spec(service_dict['restart'])
 
diff --git a/compose/config/types.py b/compose/config/types.py
index b6add089..cec1f6cf 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -4,9 +4,11 @@ Types for objects parsed from the configuration.
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import os
 from collections import namedtuple
 
 from compose.config.errors import ConfigurationError
+from compose.const import IS_WINDOWS_PLATFORM
 
 
 class VolumeFromSpec(namedtuple('_VolumeFromSpec', 'source mode')):
@@ -59,3 +61,60 @@ def parse_extra_hosts(extra_hosts_config):
             host, ip = extra_hosts_line.split(':')
             extra_hosts_dict[host.strip()] = ip.strip()
         return extra_hosts_dict
+
+
+def normalize_paths_for_engine(external_path, internal_path):
+    """Windows paths, c:\my\path\shiny, need to be changed to be compatible with
+    the Engine. Volume paths are expected to be linux style /c/my/path/shiny/
+    """
+    if not IS_WINDOWS_PLATFORM:
+        return external_path, internal_path
+
+    if external_path:
+        drive, tail = os.path.splitdrive(external_path)
+
+        if drive:
+            external_path = '/' + drive.lower().rstrip(':') + tail
+
+        external_path = external_path.replace('\\', '/')
+
+    return external_path, internal_path.replace('\\', '/')
+
+
+class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
+
+    @classmethod
+    def parse(cls, volume_config):
+        """Parse a volume_config path and split it into external:internal[:mode]
+        parts to be returned as a valid VolumeSpec.
+        """
+        if IS_WINDOWS_PLATFORM:
+            # relative paths in windows expand to include the drive, eg C:\
+            # so we join the first 2 parts back together to count as one
+            drive, tail = os.path.splitdrive(volume_config)
+            parts = tail.split(":")
+
+            if drive:
+                parts[0] = drive + parts[0]
+        else:
+            parts = volume_config.split(':')
+
+        if len(parts) > 3:
+            raise ConfigurationError(
+                "Volume %s has incorrect format, should be "
+                "external:internal[:mode]" % volume_config)
+
+        if len(parts) == 1:
+            external, internal = normalize_paths_for_engine(
+                None,
+                os.path.normpath(parts[0]))
+        else:
+            external, internal = normalize_paths_for_engine(
+                os.path.normpath(parts[0]),
+                os.path.normpath(parts[1]))
+
+        mode = 'rw'
+        if len(parts) == 3:
+            mode = parts[2]
+
+        return cls(external, internal, mode)
diff --git a/compose/service.py b/compose/service.py
index 2bb0030f..6340d074 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -2,7 +2,6 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import logging
-import os
 import re
 import sys
 from collections import namedtuple
@@ -18,8 +17,8 @@ from docker.utils.ports import split_port
 from . import __version__
 from .config import DOCKER_CONFIG_KEYS
 from .config import merge_environment
+from .config.types import VolumeSpec
 from .const import DEFAULT_TIMEOUT
-from .const import IS_WINDOWS_PLATFORM
 from .const import LABEL_CONFIG_HASH
 from .const import LABEL_CONTAINER_NUMBER
 from .const import LABEL_ONE_OFF
@@ -70,11 +69,6 @@ class BuildError(Exception):
         self.reason = reason
 
 
-# TODO: remove
-class ConfigError(ValueError):
-    pass
-
-
 class NeedsBuildError(Exception):
     def __init__(self, service):
         self.service = service
@@ -84,9 +78,6 @@ class NoSuchImageError(Exception):
     pass
 
 
-VolumeSpec = namedtuple('VolumeSpec', 'external internal mode')
-
-
 ServiceName = namedtuple('ServiceName', 'project service number')
 
 
@@ -598,8 +589,7 @@ class Service(object):
 
         if 'volumes' in container_options:
             container_options['volumes'] = dict(
-                (parse_volume_spec(v).internal, {})
-                for v in container_options['volumes'])
+                (v.internal, {}) for v in container_options['volumes'])
 
         container_options['environment'] = merge_environment(
             self.options.get('environment'),
@@ -884,11 +874,10 @@ def parse_repository_tag(repo_path):
 # Volumes
 
 
-def merge_volume_bindings(volumes_option, previous_container):
+def merge_volume_bindings(volumes, previous_container):
     """Return a list of volume bindings for a container. Container data volumes
     are replaced by those from the previous container.
     """
-    volumes = [parse_volume_spec(volume) for volume in volumes_option or []]
     volume_bindings = dict(
         build_volume_binding(volume)
         for volume in volumes
@@ -910,7 +899,7 @@ def get_container_data_volumes(container, volumes_option):
     volumes = []
     container_volumes = container.get('Volumes') or {}
     image_volumes = [
-        parse_volume_spec(volume)
+        VolumeSpec.parse(volume)
         for volume in
         container.image_config['ContainerConfig'].get('Volumes') or {}
     ]
@@ -957,56 +946,6 @@ def build_volume_binding(volume_spec):
     return volume_spec.internal, "{}:{}:{}".format(*volume_spec)
 
 
-def normalize_paths_for_engine(external_path, internal_path):
-    """Windows paths, c:\my\path\shiny, need to be changed to be compatible with
-    the Engine. Volume paths are expected to be linux style /c/my/path/shiny/
-    """
-    if not IS_WINDOWS_PLATFORM:
-        return external_path, internal_path
-
-    if external_path:
-        drive, tail = os.path.splitdrive(external_path)
-
-        if drive:
-            external_path = '/' + drive.lower().rstrip(':') + tail
-
-        external_path = external_path.replace('\\', '/')
-
-    return external_path, internal_path.replace('\\', '/')
-
-
-def parse_volume_spec(volume_config):
-    """
-    Parse a volume_config path and split it into external:internal[:mode]
-    parts to be returned as a valid VolumeSpec.
-    """
-    if IS_WINDOWS_PLATFORM:
-        # relative paths in windows expand to include the drive, eg C:\
-        # so we join the first 2 parts back together to count as one
-        drive, tail = os.path.splitdrive(volume_config)
-        parts = tail.split(":")
-
-        if drive:
-            parts[0] = drive + parts[0]
-    else:
-        parts = volume_config.split(':')
-
-    if len(parts) > 3:
-        raise ConfigError("Volume %s has incorrect format, should be "
-                          "external:internal[:mode]" % volume_config)
-
-    if len(parts) == 1:
-        external, internal = normalize_paths_for_engine(None, os.path.normpath(parts[0]))
-    else:
-        external, internal = normalize_paths_for_engine(os.path.normpath(parts[0]), os.path.normpath(parts[1]))
-
-    mode = 'rw'
-    if len(parts) == 3:
-        mode = parts[2]
-
-    return VolumeSpec(external, internal, mode)
-
-
 def build_volume_from(volume_from_spec):
     """
     volume_from can be either a service or a container. We want to return the
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 7ca6e819..73a1d66c 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -37,7 +37,7 @@ def start_process(base_dir, options):
 def wait_on_process(proc, returncode=0):
     stdout, stderr = proc.communicate()
     if proc.returncode != returncode:
-        print(stderr)
+        print(stderr.decode('utf-8'))
         assert proc.returncode == returncode
     return ProcessResult(stdout.decode('utf-8'), stderr.decode('utf-8'))
 
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index d65d7ef0..443ff978 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -4,6 +4,7 @@ from .testcases import DockerClientTestCase
 from compose.cli.docker_client import docker_client
 from compose.config import config
 from compose.config.types import VolumeFromSpec
+from compose.config.types import VolumeSpec
 from compose.const import LABEL_PROJECT
 from compose.container import Container
 from compose.project import Project
@@ -214,7 +215,7 @@ class ProjectTest(DockerClientTestCase):
 
     def test_project_up(self):
         web = self.create_service('web')
-        db = self.create_service('db', volumes=['/var/db'])
+        db = self.create_service('db', volumes=[VolumeSpec.parse('/var/db')])
         project = Project('composetest', [web, db], self.client)
         project.start()
         self.assertEqual(len(project.containers()), 0)
@@ -238,7 +239,7 @@ class ProjectTest(DockerClientTestCase):
 
     def test_recreate_preserves_volumes(self):
         web = self.create_service('web')
-        db = self.create_service('db', volumes=['/etc'])
+        db = self.create_service('db', volumes=[VolumeSpec.parse('/etc')])
         project = Project('composetest', [web, db], self.client)
         project.start()
         self.assertEqual(len(project.containers()), 0)
@@ -257,7 +258,7 @@ class ProjectTest(DockerClientTestCase):
 
     def test_project_up_with_no_recreate_running(self):
         web = self.create_service('web')
-        db = self.create_service('db', volumes=['/var/db'])
+        db = self.create_service('db', volumes=[VolumeSpec.parse('/var/db')])
         project = Project('composetest', [web, db], self.client)
         project.start()
         self.assertEqual(len(project.containers()), 0)
@@ -277,7 +278,7 @@ class ProjectTest(DockerClientTestCase):
 
     def test_project_up_with_no_recreate_stopped(self):
         web = self.create_service('web')
-        db = self.create_service('db', volumes=['/var/db'])
+        db = self.create_service('db', volumes=[VolumeSpec.parse('/var/db')])
         project = Project('composetest', [web, db], self.client)
         project.start()
         self.assertEqual(len(project.containers()), 0)
@@ -316,7 +317,7 @@ class ProjectTest(DockerClientTestCase):
 
     def test_project_up_starts_links(self):
         console = self.create_service('console')
-        db = self.create_service('db', volumes=['/var/db'])
+        db = self.create_service('db', volumes=[VolumeSpec.parse('/var/db')])
         web = self.create_service('web', links=[(db, 'db')])
 
         project = Project('composetest', [web, db, console], self.client)
diff --git a/tests/integration/resilience_test.py b/tests/integration/resilience_test.py
index 53aedfec..7f75356d 100644
--- a/tests/integration/resilience_test.py
+++ b/tests/integration/resilience_test.py
@@ -3,13 +3,17 @@ from __future__ import unicode_literals
 
 from .. import mock
 from .testcases import DockerClientTestCase
+from compose.config.types import VolumeSpec
 from compose.project import Project
 from compose.service import ConvergenceStrategy
 
 
 class ResilienceTest(DockerClientTestCase):
     def setUp(self):
-        self.db = self.create_service('db', volumes=['/var/db'], command='top')
+        self.db = self.create_service(
+            'db',
+            volumes=[VolumeSpec.parse('/var/db')],
+            command='top')
         self.project = Project('composetest', [self.db], self.client)
 
         container = self.db.create_container()
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 27a29005..5dd3d2e6 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -15,6 +15,7 @@ from .testcases import DockerClientTestCase
 from .testcases import pull_busybox
 from compose import __version__
 from compose.config.types import VolumeFromSpec
+from compose.config.types import VolumeSpec
 from compose.const import LABEL_CONFIG_HASH
 from compose.const import LABEL_CONTAINER_NUMBER
 from compose.const import LABEL_ONE_OFF
@@ -120,7 +121,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(container.name, 'composetest_db_run_1')
 
     def test_create_container_with_unspecified_volume(self):
-        service = self.create_service('db', volumes=['/var/db'])
+        service = self.create_service('db', volumes=[VolumeSpec.parse('/var/db')])
         container = service.create_container()
         container.start()
         self.assertIn('/var/db', container.get('Volumes'))
@@ -182,7 +183,9 @@ class ServiceTest(DockerClientTestCase):
         host_path = '/tmp/host-path'
         container_path = '/container-path'
 
-        service = self.create_service('db', volumes=['%s:%s' % (host_path, container_path)])
+        service = self.create_service(
+            'db',
+            volumes=[VolumeSpec(host_path, container_path, 'rw')])
         container = service.create_container()
         container.start()
 
@@ -195,11 +198,10 @@ class ServiceTest(DockerClientTestCase):
                         msg=("Last component differs: %s, %s" % (actual_host_path, host_path)))
 
     def test_recreate_preserves_volume_with_trailing_slash(self):
-        """
-        When the Compose file specifies a trailing slash in the container path, make
+        """When the Compose file specifies a trailing slash in the container path, make
         sure we copy the volume over when recreating.
         """
-        service = self.create_service('data', volumes=['/data/'])
+        service = self.create_service('data', volumes=[VolumeSpec.parse('/data/')])
         old_container = create_and_start_container(service)
         volume_path = old_container.get('Volumes')['/data']
 
@@ -213,7 +215,7 @@ class ServiceTest(DockerClientTestCase):
         """
         host_path = '/tmp/data'
         container_path = '/data'
-        volumes = ['{}:{}/'.format(host_path, container_path)]
+        volumes = [VolumeSpec.parse('{}:{}/'.format(host_path, container_path))]
 
         tmp_container = self.client.create_container(
             'busybox', 'true',
@@ -267,7 +269,7 @@ class ServiceTest(DockerClientTestCase):
         service = self.create_service(
             'db',
             environment={'FOO': '1'},
-            volumes=['/etc'],
+            volumes=[VolumeSpec.parse('/etc')],
             entrypoint=['top'],
             command=['-d', '1']
         )
@@ -305,7 +307,7 @@ class ServiceTest(DockerClientTestCase):
         service = self.create_service(
             'db',
             environment={'FOO': '1'},
-            volumes=['/var/db'],
+            volumes=[VolumeSpec.parse('/var/db')],
             entrypoint=['top'],
             command=['-d', '1']
         )
@@ -343,10 +345,8 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(new_container.get('Volumes')['/data'], volume_path)
 
     def test_execute_convergence_plan_when_image_volume_masks_config(self):
-        service = Service(
-            project='composetest',
-            name='db',
-            client=self.client,
+        service = self.create_service(
+            'db',
             build='tests/fixtures/dockerfile-with-volume',
         )
 
@@ -354,7 +354,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(list(old_container.get('Volumes').keys()), ['/data'])
         volume_path = old_container.get('Volumes')['/data']
 
-        service.options['volumes'] = ['/tmp:/data']
+        service.options['volumes'] = [VolumeSpec.parse('/tmp:/data')]
 
         with mock.patch('compose.service.log') as mock_log:
             new_container, = service.execute_convergence_plan(
@@ -864,22 +864,11 @@ class ServiceTest(DockerClientTestCase):
         for pair in expected.items():
             self.assertIn(pair, labels)
 
-        service.kill()
-        remove_stopped(service)
-
-        labels_list = ["%s=%s" % pair for pair in labels_dict.items()]
-
-        service = self.create_service('web', labels=labels_list)
-        labels = create_and_start_container(service).labels.items()
-        for pair in expected.items():
-            self.assertIn(pair, labels)
-
     def test_empty_labels(self):
-        labels_list = ['foo', 'bar']
-
-        service = self.create_service('web', labels=labels_list)
+        labels_dict = {'foo': '', 'bar': ''}
+        service = self.create_service('web', labels=labels_dict)
         labels = create_and_start_container(service).labels.items()
-        for name in labels_list:
+        for name in labels_dict:
             self.assertIn((name, ''), labels)
 
     def test_custom_container_name(self):
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index de2d1a70..f5de50ee 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -7,9 +7,7 @@ from pytest import skip
 
 from .. import unittest
 from compose.cli.docker_client import docker_client
-from compose.config.config import process_service
 from compose.config.config import resolve_environment
-from compose.config.config import ServiceConfig
 from compose.const import LABEL_PROJECT
 from compose.progress_stream import stream_output
 from compose.service import Service
@@ -45,13 +43,12 @@ class DockerClientTestCase(unittest.TestCase):
             kwargs['command'] = ["top"]
 
         service_config = ServiceConfig('.', None, name, kwargs)
-        options = process_service(service_config)
-        options['environment'] = resolve_environment(
-            service_config._replace(config=options))
-        labels = options.setdefault('labels', {})
+        kwargs['environment'] = resolve_environment(service_config)
+
+        labels = dict(kwargs.setdefault('labels', {}))
         labels['com.docker.compose.test-name'] = self.id()
 
-        return Service(name, client=self.client, project='composetest', **options)
+        return Service(name, client=self.client, project='composetest', **kwargs)
 
     def check_build(self, *args, **kwargs):
         kwargs.setdefault('rm', True)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index f923fb37..b2a4cd68 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -11,6 +11,7 @@ import pytest
 
 from compose.config import config
 from compose.config.errors import ConfigurationError
+from compose.config.types import VolumeSpec
 from compose.const import IS_WINDOWS_PLATFORM
 from tests import mock
 from tests import unittest
@@ -147,7 +148,7 @@ class ConfigTest(unittest.TestCase):
                 'name': 'web',
                 'build': '/',
                 'links': ['db'],
-                'volumes': ['/home/user/project:/code'],
+                'volumes': [VolumeSpec.parse('/home/user/project:/code')],
             },
             {
                 'name': 'db',
@@ -211,7 +212,7 @@ class ConfigTest(unittest.TestCase):
             {
                 'name': 'web',
                 'image': 'example/web',
-                'volumes': ['/home/user/project:/code'],
+                'volumes': [VolumeSpec.parse('/home/user/project:/code')],
                 'labels': {'label': 'one'},
             },
         ]
@@ -626,14 +627,11 @@ class VolumeConfigTest(unittest.TestCase):
     @mock.patch.dict(os.environ)
     def test_volume_binding_with_environment_variable(self):
         os.environ['VOLUME_PATH'] = '/host/path'
-        d = config.load(
-            build_config_details(
-                {'foo': {'build': '.', 'volumes': ['${VOLUME_PATH}:/container/path']}},
-                '.',
-                None,
-            )
-        )[0]
-        self.assertEqual(d['volumes'], ['/host/path:/container/path'])
+        d = config.load(build_config_details(
+            {'foo': {'build': '.', 'volumes': ['${VOLUME_PATH}:/container/path']}},
+            '.',
+        ))[0]
+        self.assertEqual(d['volumes'], [VolumeSpec.parse('/host/path:/container/path')])
 
     @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='posix paths')
     @mock.patch.dict(os.environ)
@@ -1031,19 +1029,21 @@ class EnvTest(unittest.TestCase):
             build_config_details(
                 {'foo': {'build': '.', 'volumes': ['$HOSTENV:$CONTAINERENV']}},
                 "tests/fixtures/env",
-                None,
             )
         )[0]
-        self.assertEqual(set(service_dict['volumes']), set(['/tmp:/host/tmp']))
+        self.assertEqual(
+            set(service_dict['volumes']),
+            set([VolumeSpec.parse('/tmp:/host/tmp')]))
 
         service_dict = config.load(
             build_config_details(
                 {'foo': {'build': '.', 'volumes': ['/opt${HOSTENV}:/opt${CONTAINERENV}']}},
                 "tests/fixtures/env",
-                None,
             )
         )[0]
-        self.assertEqual(set(service_dict['volumes']), set(['/opt/tmp:/opt/host/tmp']))
+        self.assertEqual(
+            set(service_dict['volumes']),
+            set([VolumeSpec.parse('/opt/tmp:/opt/host/tmp')]))
 
 
 def load_from_filename(filename):
@@ -1290,8 +1290,14 @@ class ExtendsTest(unittest.TestCase):
         dicts = load_from_filename('tests/fixtures/volume-path/docker-compose.yml')
 
         paths = [
-            '%s:/foo' % os.path.abspath('tests/fixtures/volume-path/common/foo'),
-            '%s:/bar' % os.path.abspath('tests/fixtures/volume-path/bar'),
+            VolumeSpec(
+                os.path.abspath('tests/fixtures/volume-path/common/foo'),
+                '/foo',
+                'rw'),
+            VolumeSpec(
+                os.path.abspath('tests/fixtures/volume-path/bar'),
+                '/bar',
+                'rw')
         ]
 
         self.assertEqual(set(dicts[0]['volumes']), set(paths))
diff --git a/tests/unit/config/types_test.py b/tests/unit/config/types_test.py
index 25692ca3..4df66548 100644
--- a/tests/unit/config/types_test.py
+++ b/tests/unit/config/types_test.py
@@ -1,4 +1,9 @@
+import pytest
+
+from compose.config.errors import ConfigurationError
 from compose.config.types import parse_extra_hosts
+from compose.config.types import VolumeSpec
+from compose.const import IS_WINDOWS_PLATFORM
 
 
 def test_parse_extra_hosts_list():
@@ -27,3 +32,35 @@ def test_parse_extra_hosts_dict():
         'www.example.com': '192.168.0.17',
         'api.example.com': '192.168.0.18'
     }
+
+
+class TestVolumeSpec(object):
+
+    def test_parse_volume_spec_only_one_path(self):
+        spec = VolumeSpec.parse('/the/volume')
+        assert spec == (None, '/the/volume', 'rw')
+
+    def test_parse_volume_spec_internal_and_external(self):
+        spec = VolumeSpec.parse('external:interval')
+        assert spec == ('external', 'interval', 'rw')
+
+    def test_parse_volume_spec_with_mode(self):
+        spec = VolumeSpec.parse('external:interval:ro')
+        assert spec == ('external', 'interval', 'ro')
+
+        spec = VolumeSpec.parse('external:interval:z')
+        assert spec == ('external', 'interval', 'z')
+
+    def test_parse_volume_spec_too_many_parts(self):
+        with pytest.raises(ConfigurationError) as exc:
+            VolumeSpec.parse('one:two:three:four')
+        assert 'has incorrect format' in exc.exconly()
+
+    @pytest.mark.xfail((not IS_WINDOWS_PLATFORM), reason='does not have a drive')
+    def test_parse_volume_windows_absolute_path(self):
+        windows_path = "c:\\Users\\me\\Documents\\shiny\\config:\\opt\\shiny\\config:ro"
+        assert VolumeSpec.parse(windows_path) == (
+            "/c/Users/me/Documents/shiny/config",
+            "/opt/shiny/config",
+            "ro"
+        )
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index efcc58e2..a439f0da 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -2,12 +2,11 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import docker
-import pytest
 
 from .. import mock
 from .. import unittest
 from compose.config.types import VolumeFromSpec
-from compose.const import IS_WINDOWS_PLATFORM
+from compose.config.types import VolumeSpec
 from compose.const import LABEL_CONFIG_HASH
 from compose.const import LABEL_ONE_OFF
 from compose.const import LABEL_PROJECT
@@ -15,7 +14,6 @@ from compose.const import LABEL_SERVICE
 from compose.container import Container
 from compose.service import build_ulimits
 from compose.service import build_volume_binding
-from compose.service import ConfigError
 from compose.service import ContainerNet
 from compose.service import get_container_data_volumes
 from compose.service import merge_volume_bindings
@@ -23,7 +21,6 @@ from compose.service import NeedsBuildError
 from compose.service import Net
 from compose.service import NoSuchImageError
 from compose.service import parse_repository_tag
-from compose.service import parse_volume_spec
 from compose.service import Service
 from compose.service import ServiceNet
 from compose.service import VolumeFromSpec
@@ -585,46 +582,12 @@ class ServiceVolumesTest(unittest.TestCase):
     def setUp(self):
         self.mock_client = mock.create_autospec(docker.Client)
 
-    def test_parse_volume_spec_only_one_path(self):
-        spec = parse_volume_spec('/the/volume')
-        self.assertEqual(spec, (None, '/the/volume', 'rw'))
-
-    def test_parse_volume_spec_internal_and_external(self):
-        spec = parse_volume_spec('external:interval')
-        self.assertEqual(spec, ('external', 'interval', 'rw'))
-
-    def test_parse_volume_spec_with_mode(self):
-        spec = parse_volume_spec('external:interval:ro')
-        self.assertEqual(spec, ('external', 'interval', 'ro'))
-
-        spec = parse_volume_spec('external:interval:z')
-        self.assertEqual(spec, ('external', 'interval', 'z'))
-
-    def test_parse_volume_spec_too_many_parts(self):
-        with self.assertRaises(ConfigError):
-            parse_volume_spec('one:two:three:four')
-
-    @pytest.mark.xfail((not IS_WINDOWS_PLATFORM), reason='does not have a drive')
-    def test_parse_volume_windows_absolute_path(self):
-        windows_absolute_path = "c:\\Users\\me\\Documents\\shiny\\config:\\opt\\shiny\\config:ro"
-
-        spec = parse_volume_spec(windows_absolute_path)
-
-        self.assertEqual(
-            spec,
-            (
-                "/c/Users/me/Documents/shiny/config",
-                "/opt/shiny/config",
-                "ro"
-            )
-        )
-
     def test_build_volume_binding(self):
-        binding = build_volume_binding(parse_volume_spec('/outside:/inside'))
-        self.assertEqual(binding, ('/inside', '/outside:/inside:rw'))
+        binding = build_volume_binding(VolumeSpec.parse('/outside:/inside'))
+        assert binding == ('/inside', '/outside:/inside:rw')
 
     def test_get_container_data_volumes(self):
-        options = [parse_volume_spec(v) for v in [
+        options = [VolumeSpec.parse(v) for v in [
             '/host/volume:/host/volume:ro',
             '/new/volume',
             '/existing/volume',
@@ -648,19 +611,19 @@ class ServiceVolumesTest(unittest.TestCase):
         }, has_been_inspected=True)
 
         expected = [
-            parse_volume_spec('/var/lib/docker/aaaaaaaa:/existing/volume:rw'),
-            parse_volume_spec('/var/lib/docker/cccccccc:/mnt/image/data:rw'),
+            VolumeSpec.parse('/var/lib/docker/aaaaaaaa:/existing/volume:rw'),
+            VolumeSpec.parse('/var/lib/docker/cccccccc:/mnt/image/data:rw'),
         ]
 
         volumes = get_container_data_volumes(container, options)
-        self.assertEqual(sorted(volumes), sorted(expected))
+        assert sorted(volumes) == sorted(expected)
 
     def test_merge_volume_bindings(self):
         options = [
-            '/host/volume:/host/volume:ro',
-            '/host/rw/volume:/host/rw/volume',
-            '/new/volume',
-            '/existing/volume',
+            VolumeSpec.parse('/host/volume:/host/volume:ro'),
+            VolumeSpec.parse('/host/rw/volume:/host/rw/volume'),
+            VolumeSpec.parse('/new/volume'),
+            VolumeSpec.parse('/existing/volume'),
         ]
 
         self.mock_client.inspect_image.return_value = {
@@ -686,8 +649,8 @@ class ServiceVolumesTest(unittest.TestCase):
             'web',
             image='busybox',
             volumes=[
-                '/host/path:/data1',
-                '/host/path:/data2',
+                VolumeSpec.parse('/host/path:/data1'),
+                VolumeSpec.parse('/host/path:/data2'),
             ],
             client=self.mock_client,
         )
@@ -716,7 +679,7 @@ class ServiceVolumesTest(unittest.TestCase):
         service = Service(
             'web',
             image='busybox',
-            volumes=['/host/path:/data'],
+            volumes=[VolumeSpec.parse('/host/path:/data')],
             client=self.mock_client,
         )
 
@@ -784,22 +747,17 @@ class ServiceVolumesTest(unittest.TestCase):
     def test_create_with_special_volume_mode(self):
         self.mock_client.inspect_image.return_value = {'Id': 'imageid'}
 
-        create_calls = []
-
-        def create_container(*args, **kwargs):
-            create_calls.append((args, kwargs))
-            return {'Id': 'containerid'}
-
-        self.mock_client.create_container = create_container
-
-        volumes = ['/tmp:/foo:z']
+        self.mock_client.create_container.return_value = {'Id': 'containerid'}
 
+        volume = '/tmp:/foo:z'
         Service(
             'web',
             client=self.mock_client,
             image='busybox',
-            volumes=volumes,
+            volumes=[VolumeSpec.parse(volume)],
         ).create_container()
 
-        self.assertEqual(len(create_calls), 1)
-        self.assertEqual(self.mock_client.create_host_config.call_args[1]['binds'], volumes)
+        assert self.mock_client.create_container.call_count == 1
+        self.assertEqual(
+            self.mock_client.create_host_config.call_args[1]['binds'],
+            [volume])

From effa9834a5722d2f5f5738087f0207c1eca9fd0b Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 13 Nov 2015 19:49:14 -0500
Subject: [PATCH 0552/1265] Remove unnecessary intermediate variables in
 get_container_host_config.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py | 44 ++++++++++++--------------------------------
 1 file changed, 12 insertions(+), 32 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 6340d074..08d563e9 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -496,7 +496,7 @@ class Service(object):
         # TODO: Implement issue #652 here
         return build_container_name(self.project, self.name, number, one_off)
 
-    # TODO: this would benefit from github.com/docker/docker/pull/11943
+    # TODO: this would benefit from github.com/docker/docker/pull/14699
     # to remove the need to inspect every container
     def _next_container_number(self, one_off=False):
         containers = filter(None, [
@@ -618,54 +618,34 @@ class Service(object):
 
     def _get_container_host_config(self, override_options, one_off=False):
         options = dict(self.options, **override_options)
-        port_bindings = build_port_bindings(options.get('ports') or [])
 
-        privileged = options.get('privileged', False)
-        cap_add = options.get('cap_add', None)
-        cap_drop = options.get('cap_drop', None)
         log_config = LogConfig(
             type=options.get('log_driver', ""),
             config=options.get('log_opt', None)
         )
-        pid = options.get('pid', None)
-        security_opt = options.get('security_opt', None)
-
-        # TODO: these options are already normalized by config
-        dns = options.get('dns', None)
-        if isinstance(dns, six.string_types):
-            dns = [dns]
-
-        dns_search = options.get('dns_search', None)
-        if isinstance(dns_search, six.string_types):
-            dns_search = [dns_search]
-
-        devices = options.get('devices', None)
-        cgroup_parent = options.get('cgroup_parent', None)
-        ulimits = build_ulimits(options.get('ulimits', None))
-
         return self.client.create_host_config(
             links=self._get_links(link_to_self=one_off),
-            port_bindings=port_bindings,
+            port_bindings=build_port_bindings(options.get('ports') or []),
             binds=options.get('binds'),
             volumes_from=self._get_volumes_from(),
-            privileged=privileged,
+            privileged=options.get('privileged', False),
             network_mode=self.net.mode,
-            devices=devices,
-            dns=dns,
-            dns_search=dns_search,
+            devices=options.get('devices'),
+            dns=options.get('dns'),
+            dns_search=options.get('dns_search'),
             restart_policy=options.get('restart'),
-            cap_add=cap_add,
-            cap_drop=cap_drop,
+            cap_add=options.get('cap_add'),
+            cap_drop=options.get('cap_drop'),
             mem_limit=options.get('mem_limit'),
             memswap_limit=options.get('memswap_limit'),
-            ulimits=ulimits,
+            ulimits=build_ulimits(options.get('ulimits')),
             log_config=log_config,
             extra_hosts=options.get('extra_hosts'),
             read_only=options.get('read_only'),
-            pid_mode=pid,
-            security_opt=security_opt,
+            pid_mode=options.get('pid'),
+            security_opt=options.get('security_opt'),
             ipc_mode=options.get('ipc'),
-            cgroup_parent=cgroup_parent
+            cgroup_parent=options.get('cgroup_parent'),
         )
 
     def build(self, no_cache=False, pull=False, force_rm=False):

From 533f33271a9be73546673aa9aacd823ca8ea9c38 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 17 Nov 2015 13:35:28 -0500
Subject: [PATCH 0553/1265] Move service sorting to config package.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/__init__.py                    |  1 -
 compose/config/config.py                      | 17 ++----
 compose/config/errors.py                      |  4 ++
 compose/config/sort_services.py               | 55 +++++++++++++++++++
 compose/project.py                            | 51 +----------------
 tests/integration/testcases.py                |  1 +
 tests/unit/config/config_test.py              | 23 +++++++-
 .../sort_services_test.py}                    |  6 +-
 tests/unit/project_test.py                    | 23 --------
 tests/unit/service_test.py                    |  2 -
 10 files changed, 91 insertions(+), 92 deletions(-)
 create mode 100644 compose/config/sort_services.py
 rename tests/unit/{sort_service_test.py => config/sort_services_test.py} (98%)

diff --git a/compose/config/__init__.py b/compose/config/__init__.py
index ec607e08..6fe9ff9f 100644
--- a/compose/config/__init__.py
+++ b/compose/config/__init__.py
@@ -2,7 +2,6 @@
 from .config import ConfigurationError
 from .config import DOCKER_CONFIG_KEYS
 from .config import find
-from .config import get_service_name_from_net
 from .config import load
 from .config import merge_environment
 from .config import parse_environment
diff --git a/compose/config/config.py b/compose/config/config.py
index 5b1de5ef..9d438ca1 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -14,6 +14,8 @@ from .errors import CircularReference
 from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
 from .interpolation import interpolate_environment_variables
+from .sort_services import get_service_name_from_net
+from .sort_services import sort_service_dicts
 from .types import parse_extra_hosts
 from .types import parse_restart_spec
 from .types import VolumeFromSpec
@@ -214,10 +216,10 @@ def load(config_details):
         return service_dict
 
     def build_services(config_file):
-        return [
+        return sort_service_dicts([
             build_service(config_file.filename, name, service_dict)
             for name, service_dict in config_file.config.items()
-        ]
+        ])
 
     def merge_services(base, override):
         all_service_names = set(base) | set(override)
@@ -638,17 +640,6 @@ def to_list(value):
         return value
 
 
-def get_service_name_from_net(net_config):
-    if not net_config:
-        return
-
-    if not net_config.startswith('container:'):
-        return
-
-    _, net_name = net_config.split(':', 1)
-    return net_name
-
-
 def load_yaml(filename):
     try:
         with open(filename, 'r') as fh:
diff --git a/compose/config/errors.py b/compose/config/errors.py
index 037b7ec8..6d6a69df 100644
--- a/compose/config/errors.py
+++ b/compose/config/errors.py
@@ -6,6 +6,10 @@ class ConfigurationError(Exception):
         return self.msg
 
 
+class DependencyError(ConfigurationError):
+    pass
+
+
 class CircularReference(ConfigurationError):
     def __init__(self, trail):
         self.trail = trail
diff --git a/compose/config/sort_services.py b/compose/config/sort_services.py
new file mode 100644
index 00000000..5d9adab1
--- /dev/null
+++ b/compose/config/sort_services.py
@@ -0,0 +1,55 @@
+from compose.config.errors import DependencyError
+
+
+def get_service_name_from_net(net_config):
+    if not net_config:
+        return
+
+    if not net_config.startswith('container:'):
+        return
+
+    _, net_name = net_config.split(':', 1)
+    return net_name
+
+
+def sort_service_dicts(services):
+    # Topological sort (Cormen/Tarjan algorithm).
+    unmarked = services[:]
+    temporary_marked = set()
+    sorted_services = []
+
+    def get_service_names(links):
+        return [link.split(':')[0] for link in links]
+
+    def get_service_names_from_volumes_from(volumes_from):
+        return [volume_from.source for volume_from in volumes_from]
+
+    def get_service_dependents(service_dict, services):
+        name = service_dict['name']
+        return [
+            service for service in services
+            if (name in get_service_names(service.get('links', [])) or
+                name in get_service_names_from_volumes_from(service.get('volumes_from', [])) or
+                name == get_service_name_from_net(service.get('net')))
+        ]
+
+    def visit(n):
+        if n['name'] in temporary_marked:
+            if n['name'] in get_service_names(n.get('links', [])):
+                raise DependencyError('A service can not link to itself: %s' % n['name'])
+            if n['name'] in n.get('volumes_from', []):
+                raise DependencyError('A service can not mount itself as volume: %s' % n['name'])
+            else:
+                raise DependencyError('Circular import between %s' % ' and '.join(temporary_marked))
+        if n in unmarked:
+            temporary_marked.add(n['name'])
+            for m in get_service_dependents(n, services):
+                visit(m)
+            temporary_marked.remove(n['name'])
+            unmarked.remove(n)
+            sorted_services.insert(0, n)
+
+    while unmarked:
+        visit(unmarked[-1])
+
+    return sorted_services
diff --git a/compose/project.py b/compose/project.py
index 5caa1ea3..30e81693 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -9,7 +9,7 @@ from docker.errors import NotFound
 
 from . import parallel
 from .config import ConfigurationError
-from .config import get_service_name_from_net
+from .config.sort_services import get_service_name_from_net
 from .const import DEFAULT_TIMEOUT
 from .const import LABEL_ONE_OFF
 from .const import LABEL_PROJECT
@@ -26,49 +26,6 @@ from .service import ServiceNet
 log = logging.getLogger(__name__)
 
 
-def sort_service_dicts(services):
-    # Topological sort (Cormen/Tarjan algorithm).
-    unmarked = services[:]
-    temporary_marked = set()
-    sorted_services = []
-
-    def get_service_names(links):
-        return [link.split(':')[0] for link in links]
-
-    def get_service_names_from_volumes_from(volumes_from):
-        return [volume_from.source for volume_from in volumes_from]
-
-    def get_service_dependents(service_dict, services):
-        name = service_dict['name']
-        return [
-            service for service in services
-            if (name in get_service_names(service.get('links', [])) or
-                name in get_service_names_from_volumes_from(service.get('volumes_from', [])) or
-                name == get_service_name_from_net(service.get('net')))
-        ]
-
-    def visit(n):
-        if n['name'] in temporary_marked:
-            if n['name'] in get_service_names(n.get('links', [])):
-                raise DependencyError('A service can not link to itself: %s' % n['name'])
-            if n['name'] in n.get('volumes_from', []):
-                raise DependencyError('A service can not mount itself as volume: %s' % n['name'])
-            else:
-                raise DependencyError('Circular import between %s' % ' and '.join(temporary_marked))
-        if n in unmarked:
-            temporary_marked.add(n['name'])
-            for m in get_service_dependents(n, services):
-                visit(m)
-            temporary_marked.remove(n['name'])
-            unmarked.remove(n)
-            sorted_services.insert(0, n)
-
-    while unmarked:
-        visit(unmarked[-1])
-
-    return sorted_services
-
-
 class Project(object):
     """
     A collection of services.
@@ -96,7 +53,7 @@ class Project(object):
         if use_networking:
             remove_links(service_dicts)
 
-        for service_dict in sort_service_dicts(service_dicts):
+        for service_dict in service_dicts:
             links = project.get_links(service_dict)
             volumes_from = project.get_volumes_from(service_dict)
             net = project.get_net(service_dict)
@@ -404,7 +361,3 @@ class NoSuchService(Exception):
 
     def __str__(self):
         return self.msg
-
-
-class DependencyError(ConfigurationError):
-    pass
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index f5de50ee..a2218d6b 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -8,6 +8,7 @@ from pytest import skip
 from .. import unittest
 from compose.cli.docker_client import docker_client
 from compose.config.config import resolve_environment
+from compose.config.config import ServiceConfig
 from compose.const import LABEL_PROJECT
 from compose.progress_stream import stream_output
 from compose.service import Service
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index b2a4cd68..a5eeb64f 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -77,7 +77,7 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-    def test_config_invalid_service_names(self):
+    def test_load_config_invalid_service_names(self):
         for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
             with pytest.raises(ConfigurationError) as exc:
                 config.load(build_config_details(
@@ -232,6 +232,27 @@ class ConfigTest(unittest.TestCase):
         assert "service 'bogus' doesn't have any configuration" in exc.exconly()
         assert "In file 'override.yaml'" in exc.exconly()
 
+    def test_load_sorts_in_dependency_order(self):
+        config_details = build_config_details({
+            'web': {
+                'image': 'busybox:latest',
+                'links': ['db'],
+            },
+            'db': {
+                'image': 'busybox:latest',
+                'volumes_from': ['volume:ro']
+            },
+            'volume': {
+                'image': 'busybox:latest',
+                'volumes': ['/tmp'],
+            }
+        })
+        services = config.load(config_details)
+
+        assert services[0]['name'] == 'volume'
+        assert services[1]['name'] == 'db'
+        assert services[2]['name'] == 'web'
+
     def test_config_valid_service_names(self):
         for valid_name in ['_', '-', '.__.', '_what-up.', 'what_.up----', 'whatup']:
             services = config.load(
diff --git a/tests/unit/sort_service_test.py b/tests/unit/config/sort_services_test.py
similarity index 98%
rename from tests/unit/sort_service_test.py
rename to tests/unit/config/sort_services_test.py
index ef088287..8d0c3ae4 100644
--- a/tests/unit/sort_service_test.py
+++ b/tests/unit/config/sort_services_test.py
@@ -1,7 +1,7 @@
-from .. import unittest
+from compose.config.errors import DependencyError
+from compose.config.sort_services import sort_service_dicts
 from compose.config.types import VolumeFromSpec
-from compose.project import DependencyError
-from compose.project import sort_service_dicts
+from tests import unittest
 
 
 class SortServiceTest(unittest.TestCase):
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index f8178ed8..f4c6f8ca 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -34,29 +34,6 @@ class ProjectTest(unittest.TestCase):
         self.assertEqual(project.get_service('db').name, 'db')
         self.assertEqual(project.get_service('db').options['image'], 'busybox:latest')
 
-    def test_from_dict_sorts_in_dependency_order(self):
-        project = Project.from_dicts('composetest', [
-            {
-                'name': 'web',
-                'image': 'busybox:latest',
-                'links': ['db'],
-            },
-            {
-                'name': 'db',
-                'image': 'busybox:latest',
-                'volumes_from': [VolumeFromSpec('volume', 'ro')]
-            },
-            {
-                'name': 'volume',
-                'image': 'busybox:latest',
-                'volumes': ['/tmp'],
-            }
-        ], None)
-
-        self.assertEqual(project.services[0].name, 'volume')
-        self.assertEqual(project.services[1].name, 'db')
-        self.assertEqual(project.services[2].name, 'web')
-
     def test_from_config(self):
         dicts = [
             {
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index a439f0da..e87ce592 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -23,8 +23,6 @@ from compose.service import NoSuchImageError
 from compose.service import parse_repository_tag
 from compose.service import Service
 from compose.service import ServiceNet
-from compose.service import VolumeFromSpec
-from compose.service import VolumeSpec
 from compose.service import warn_on_masked_volume
 
 

From e40670207f358622e7e2b3f7b73f389dc2bbf63e Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 24 Nov 2015 10:40:36 -0500
Subject: [PATCH 0554/1265] Add missing assert and autospec.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/unit/service_test.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 808c391c..85d1479d 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -757,7 +757,7 @@ class ServiceVolumesTest(unittest.TestCase):
         container_volumes = []
         service = 'service_name'
 
-        with mock.patch('compose.service.log') as mock_log:
+        with mock.patch('compose.service.log', autospec=True) as mock_log:
             warn_on_masked_volume(volumes_option, container_volumes, service)
 
         assert not mock_log.warn.called
@@ -770,17 +770,17 @@ class ServiceVolumesTest(unittest.TestCase):
         ]
         service = 'service_name'
 
-        with mock.patch('compose.service.log') as mock_log:
+        with mock.patch('compose.service.log', autospec=True) as mock_log:
             warn_on_masked_volume(volumes_option, container_volumes, service)
 
-        mock_log.warn.called_once_with(mock.ANY)
+        mock_log.warn.assert_called_once_with(mock.ANY)
 
     def test_warn_on_masked_no_warning_with_same_path(self):
         volumes_option = [VolumeSpec('/home/user', '/path', 'rw')]
         container_volumes = [VolumeSpec('/home/user', '/path', 'rw')]
         service = 'service_name'
 
-        with mock.patch('compose.service.log') as mock_log:
+        with mock.patch('compose.service.log', autospec=True) as mock_log:
             warn_on_masked_volume(volumes_option, container_volumes, service)
 
         assert not mock_log.warn.called

From 6e89a5708fab417b54d8b5b498abe38e621afde9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 12 Nov 2015 13:23:04 -0500
Subject: [PATCH 0555/1265] cherry-pick release notes from 1.5.1

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 CHANGELOG.md    | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
 docs/install.md |  6 +++---
 script/run.sh   |  2 +-
 3 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dde42542..428e5a93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,59 @@
 Change log
 ==========
 
+1.5.1 (2015-11-12)
+------------------
+
+-   Add the `--force-rm` option to `build`.
+
+-   Add the `ulimit` option for services in the Compose file.
+
+-   Fixed a bug where `up` would error with "service needs to be built" if
+    a service changed from using `image` to using `build`.
+
+-   Fixed a bug that would cause incorrect output of parallel operations
+    on some terminals.
+
+-   Fixed a bug that prevented a container from being recreated when the
+    mode of a `volumes_from` was changed.
+
+-   Fixed a regression in 1.5.0 where non-utf-8 unicode characters would cause
+    `up` or `logs` to crash.
+
+-   Fixed a regression in 1.5.0 where Compose would use a success exit status
+    code when a command fails due to an HTTP timeout communicating with the
+    docker daemon.
+
+-   Fixed a regression in 1.5.0 where `name` was being accepted as a valid
+    service option which would override the actual name of the service.
+
+-   When using `--x-networking` Compose no longer sets the hostname to the
+    container name.
+
+-   When using `--x-networking` Compose will only create the default network
+    if at least one container is using the network.
+
+-   When printings logs during `up` or `logs`, flush the output buffer after
+    each line to prevent buffering issues from hideing logs.
+
+-   Recreate a container if one of its dependencies is being created.
+    Previously a container was only recreated if it's dependencies already
+    existed, but were being recreated as well.
+
+-   Add a warning when a `volume` in the Compose file is being ignored
+    and masked by a container volume from a previous container.
+
+-   Improve the output of `pull` when run without a tty.
+
+-   When using multiple Compose files, validate each before attempting to merge
+    them together. Previously invalid files would result in not helpful errors.
+
+-   Allow dashes in keys in the `environment` service option.
+
+-   Improve validation error messages by including the filename as part of the
+    error message.
+
+
 1.5.0 (2015-11-03)
 ------------------
 
diff --git a/docs/install.md b/docs/install.md
index d394905d..861954b4 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -39,7 +39,7 @@ which the release page specifies, in your terminal.
 
      The following is an example command illustrating the format:
 
-        curl -L https://github.com/docker/compose/releases/download/VERSION_NUM/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+        curl -L https://github.com/docker/compose/releases/download/1.5.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 
      If you have problems installing with `curl`, see
      [Alternative Install Options](#alternative-install-options).
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
 7. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.5.0
+        docker-compose version: 1.5.1
 
 
 ## Alternative install options
@@ -77,7 +77,7 @@ to get started.
 Compose can also be run inside a container, from a small bash script wrapper.
 To install compose as a container run:
 
-    $ curl -L https://github.com/docker/compose/releases/download/1.5.0/run.sh > /usr/local/bin/docker-compose
+    $ curl -L https://github.com/docker/compose/releases/download/1.5.1/run.sh > /usr/local/bin/docker-compose
     $ chmod +x /usr/local/bin/docker-compose
 
 ## Master builds
diff --git a/script/run.sh b/script/run.sh
index 342188e8..9563b2e9 100755
--- a/script/run.sh
+++ b/script/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.5.0"
+VERSION="1.5.1"
 IMAGE="docker/compose:$VERSION"
 
 

From e67bc2569ccc3c811d16cea284eca1f65a227c33 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 23 Nov 2015 13:24:57 -0500
Subject: [PATCH 0556/1265] Properly resolve environment from all sources.

Split env resolving into two phases. The first phase is to expand the paths
of env_files, which is done before merging extends. Once all files are merged
together, the final phase is to read the env_files and use them as the base
for environment variables.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         | 34 +++++-------
 tests/integration/testcases.py   |  5 +-
 tests/unit/config/config_test.py | 94 +++++++++++++++++---------------
 3 files changed, 64 insertions(+), 69 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 9d438ca1..36914331 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -324,16 +324,13 @@ class ServiceExtendsResolver(object):
         return filename
 
 
-def resolve_environment(service_config):
+def resolve_environment(service_dict):
     """Unpack any environment variables from an env_file, if set.
     Interpolate environment values if set.
     """
-    service_dict = service_config.config
-
     env = {}
-    if 'env_file' in service_dict:
-        for env_file in get_env_files(service_config.working_dir, service_dict):
-            env.update(env_vars_from_file(env_file))
+    for env_file in service_dict.get('env_file', []):
+        env.update(env_vars_from_file(env_file))
 
     env.update(parse_environment(service_dict.get('environment')))
     return dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
@@ -370,9 +367,11 @@ def process_service(service_config):
     working_dir = service_config.working_dir
     service_dict = dict(service_config.config)
 
-    if 'environment' in service_dict or 'env_file' in service_dict:
-        service_dict['environment'] = resolve_environment(service_config)
-        service_dict.pop('env_file', None)
+    if 'env_file' in service_dict:
+        service_dict['env_file'] = [
+            expand_path(working_dir, path)
+            for path in to_list(service_dict['env_file'])
+        ]
 
     if 'volumes' in service_dict and service_dict.get('volume_driver') is None:
         service_dict['volumes'] = resolve_volume_paths(working_dir, service_dict)
@@ -396,6 +395,10 @@ def process_service(service_config):
 def finalize_service(service_config):
     service_dict = dict(service_config.config)
 
+    if 'environment' in service_dict or 'env_file' in service_dict:
+        service_dict['environment'] = resolve_environment(service_dict)
+        service_dict.pop('env_file', None)
+
     if 'volumes_from' in service_dict:
         service_dict['volumes_from'] = [
             VolumeFromSpec.parse(vf) for vf in service_dict['volumes_from']]
@@ -440,7 +443,7 @@ def merge_service_dicts(base, override):
     for field in ['ports', 'expose', 'external_links']:
         merge_field(field, operator.add, default=[])
 
-    for field in ['dns', 'dns_search']:
+    for field in ['dns', 'dns_search', 'env_file']:
         merge_field(field, merge_list_or_string)
 
     already_merged_keys = set(d) | {'image', 'build'}
@@ -468,17 +471,6 @@ def merge_environment(base, override):
     return env
 
 
-def get_env_files(working_dir, options):
-    if 'env_file' not in options:
-        return {}
-
-    env_files = options.get('env_file', [])
-    if not isinstance(env_files, list):
-        env_files = [env_files]
-
-    return [expand_path(working_dir, path) for path in env_files]
-
-
 def parse_environment(environment):
     if not environment:
         return {}
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 334693f7..9ea68e39 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -7,7 +7,6 @@ from pytest import skip
 from .. import unittest
 from compose.cli.docker_client import docker_client
 from compose.config.config import resolve_environment
-from compose.config.config import ServiceConfig
 from compose.const import LABEL_PROJECT
 from compose.progress_stream import stream_output
 from compose.service import Service
@@ -39,9 +38,7 @@ class DockerClientTestCase(unittest.TestCase):
         if 'command' not in kwargs:
             kwargs['command'] = ["top"]
 
-        service_config = ServiceConfig('.', None, name, kwargs)
-        kwargs['environment'] = resolve_environment(service_config)
-
+        kwargs['environment'] = resolve_environment(kwargs)
         labels = dict(kwargs.setdefault('labels', {}))
         labels['com.docker.compose.test-name'] = self.id()
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index a5eeb64f..2cd26e8f 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -10,6 +10,7 @@ import py
 import pytest
 
 from compose.config import config
+from compose.config.config import resolve_environment
 from compose.config.errors import ConfigurationError
 from compose.config.types import VolumeSpec
 from compose.const import IS_WINDOWS_PLATFORM
@@ -973,65 +974,54 @@ class EnvTest(unittest.TestCase):
         os.environ['FILE_DEF_EMPTY'] = 'E2'
         os.environ['ENV_DEF'] = 'E3'
 
-        service_dict = make_service_dict(
-            'foo', {
-                'build': '.',
-                'environment': {
-                    'FILE_DEF': 'F1',
-                    'FILE_DEF_EMPTY': '',
-                    'ENV_DEF': None,
-                    'NO_DEF': None
-                },
+        service_dict = {
+            'build': '.',
+            'environment': {
+                'FILE_DEF': 'F1',
+                'FILE_DEF_EMPTY': '',
+                'ENV_DEF': None,
+                'NO_DEF': None
             },
-            'tests/'
-        )
-
+        }
         self.assertEqual(
-            service_dict['environment'],
+            resolve_environment(service_dict),
             {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''},
         )
 
-    def test_env_from_file(self):
-        service_dict = make_service_dict(
-            'foo',
-            {'build': '.', 'env_file': 'one.env'},
-            'tests/fixtures/env',
-        )
+    def test_resolve_environment_from_env_file(self):
         self.assertEqual(
-            service_dict['environment'],
+            resolve_environment({'env_file': ['tests/fixtures/env/one.env']}),
             {'ONE': '2', 'TWO': '1', 'THREE': '3', 'FOO': 'bar'},
         )
 
-    def test_env_from_multiple_files(self):
-        service_dict = make_service_dict(
-            'foo',
-            {'build': '.', 'env_file': ['one.env', 'two.env']},
-            'tests/fixtures/env',
-        )
+    def test_resolve_environment_with_multiple_env_files(self):
+        service_dict = {
+            'env_file': [
+                'tests/fixtures/env/one.env',
+                'tests/fixtures/env/two.env'
+            ]
+        }
         self.assertEqual(
-            service_dict['environment'],
+            resolve_environment(service_dict),
             {'ONE': '2', 'TWO': '1', 'THREE': '3', 'FOO': 'baz', 'DOO': 'dah'},
         )
 
-    def test_env_nonexistent_file(self):
-        options = {'env_file': 'nonexistent.env'}
-        self.assertRaises(
-            ConfigurationError,
-            lambda: make_service_dict('foo', options, 'tests/fixtures/env'),
-        )
+    def test_resolve_environment_nonexistent_file(self):
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(build_config_details(
+                {'foo': {'image': 'example', 'env_file': 'nonexistent.env'}},
+                working_dir='tests/fixtures/env'))
+
+            assert 'Couldn\'t find env file' in exc.exconly()
+            assert 'nonexistent.env' in exc.exconly()
 
     @mock.patch.dict(os.environ)
-    def test_resolve_environment_from_file(self):
+    def test_resolve_environment_from_env_file_with_empty_values(self):
         os.environ['FILE_DEF'] = 'E1'
         os.environ['FILE_DEF_EMPTY'] = 'E2'
         os.environ['ENV_DEF'] = 'E3'
-        service_dict = make_service_dict(
-            'foo',
-            {'build': '.', 'env_file': 'resolve.env'},
-            'tests/fixtures/env',
-        )
         self.assertEqual(
-            service_dict['environment'],
+            resolve_environment({'env_file': ['tests/fixtures/env/resolve.env']}),
             {
                 'FILE_DEF': u'bär',
                 'FILE_DEF_EMPTY': '',
@@ -1378,6 +1368,8 @@ class ExtendsTest(unittest.TestCase):
                     - 'envs'
                 environment:
                     - SECRET
+                    - TEST_ONE=common
+                    - TEST_TWO=common
         """)
         tmpdir.join('docker-compose.yml').write("""
             ext:
@@ -1388,12 +1380,20 @@ class ExtendsTest(unittest.TestCase):
                     - 'envs'
                 environment:
                     - THING
+                    - TEST_ONE=top
         """)
         commondir.join('envs').write("""
-            COMMON_ENV_FILE=1
+            COMMON_ENV_FILE
+            TEST_ONE=common-env-file
+            TEST_TWO=common-env-file
+            TEST_THREE=common-env-file
+            TEST_FOUR=common-env-file
         """)
         tmpdir.join('envs').write("""
-            FROM_ENV_FILE=1
+            TOP_ENV_FILE
+            TEST_ONE=top-env-file
+            TEST_TWO=top-env-file
+            TEST_THREE=top-env-file
         """)
 
         expected = [
@@ -1402,15 +1402,21 @@ class ExtendsTest(unittest.TestCase):
                 'image': 'example/app',
                 'environment': {
                     'SECRET': 'secret',
-                    'FROM_ENV_FILE': '1',
-                    'COMMON_ENV_FILE': '1',
+                    'TOP_ENV_FILE': 'secret',
+                    'COMMON_ENV_FILE': 'secret',
                     'THING': 'thing',
+                    'TEST_ONE': 'top',
+                    'TEST_TWO': 'common',
+                    'TEST_THREE': 'top-env-file',
+                    'TEST_FOUR': 'common-env-file',
                 },
             },
         ]
         with mock.patch.dict(os.environ):
             os.environ['SECRET'] = 'secret'
             os.environ['THING'] = 'thing'
+            os.environ['COMMON_ENV_FILE'] = 'secret'
+            os.environ['TOP_ENV_FILE'] = 'secret'
             config = load_from_filename(str(tmpdir.join('docker-compose.yml')))
 
         assert config == expected

From fd06d699f22fc9d473ac4201feba5847782688ec Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Thu, 26 Nov 2015 20:30:12 +1000
Subject: [PATCH 0557/1265] Use FROM docs/base:latest again

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 docs/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/Dockerfile b/docs/Dockerfile
index 0114f04e..83b65633 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -1,4 +1,4 @@
-FROM docs/base:hugo-github-linking
+FROM docs/base:latest
 MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)
 
 RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/engine
@@ -9,7 +9,8 @@ RUN svn checkout https://github.com/kitematic/kitematic/trunk/docs /docs/content
 RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content/tutorials
 RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content
 
+ENV PROJECT=compose
 # To get the git info for this repo
 COPY . /src
 
-COPY . /docs/content/compose/
+COPY . /docs/content/$PROJECT/

From b85bfce65e26a85150be2073576e3ebe840f3ee1 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 26 Nov 2015 15:06:30 +0000
Subject: [PATCH 0558/1265] Fix ports validation test

We were essentially only testing that *at least one* of the invalid
values fails the validation check, rather than that *all* of them fail.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/unit/config/config_test.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 2cd26e8f..7ddec8ab 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -264,9 +264,8 @@ class ConfigTest(unittest.TestCase):
             assert services[0]['name'] == valid_name
 
     def test_config_invalid_ports_format_validation(self):
-        expected_error_msg = "Service 'web' configuration key 'ports' contains an invalid type"
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
-            for invalid_ports in [{"1": "8000"}, False, 0, "8000", 8000, ["8000", "8000"]]:
+        for invalid_ports in [{"1": "8000"}, False, 0, "8000", 8000, ["8000", "8000"]]:
+            with pytest.raises(ConfigurationError):
                 config.load(
                     build_config_details(
                         {'web': {'image': 'busybox', 'ports': invalid_ports}},

From f7239f41efe039137da352e249ae0914d683524f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Eckerstr=C3=B6m?= <jonaseck@gmail.com>
Date: Wed, 29 Apr 2015 10:22:24 +0200
Subject: [PATCH 0559/1265] Added support for url buid paths
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Eckerström <jonaseck@gmail.com>
---
 compose/config/config.py         | 27 ++++++++++++++++++++++++---
 tests/unit/config/config_test.py | 14 ++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 36914331..242e7af9 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -76,6 +76,13 @@ ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
     'external_links',
 ]
 
+DOCKER_VALID_URL_PREFIXES = (
+    'http://',
+    'https://',
+    'git://',
+    'github.com/',
+    'git@',
+)
 
 SUPPORTED_FILENAMES = [
     'docker-compose.yml',
@@ -377,7 +384,7 @@ def process_service(service_config):
         service_dict['volumes'] = resolve_volume_paths(working_dir, service_dict)
 
     if 'build' in service_dict:
-        service_dict['build'] = expand_path(working_dir, service_dict['build'])
+        service_dict['build'] = resolve_build_path(working_dir, service_dict['build'])
 
     if 'labels' in service_dict:
         service_dict['labels'] = parse_labels(service_dict['labels'])
@@ -539,11 +546,25 @@ def resolve_volume_path(working_dir, volume):
         return container_path
 
 
+def resolve_build_path(working_dir, build_path):
+    if is_url(build_path):
+        return build_path
+    return expand_path(working_dir, build_path)
+
+
+def is_url(build_path):
+    return build_path.startswith(DOCKER_VALID_URL_PREFIXES)
+
+
 def validate_paths(service_dict):
     if 'build' in service_dict:
         build_path = service_dict['build']
-        if not os.path.exists(build_path) or not os.access(build_path, os.R_OK):
-            raise ConfigurationError("build path %s either does not exist or is not accessible." % build_path)
+        if (
+            not is_url(build_path) and
+            (not os.path.exists(build_path) or not os.access(build_path, os.R_OK))
+        ):
+            raise ConfigurationError(
+                "build path %s either does not exist or is not accessible." % build_path)
 
 
 def merge_path_mappings(base, override):
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 2cd26e8f..6de794ad 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1497,6 +1497,20 @@ class BuildPathTest(unittest.TestCase):
         service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml')
         self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])
 
+    def test_valid_url_path(self):
+        valid_urls = [
+            'git://github.com/docker/docker',
+            'git@github.com:docker/docker.git',
+            'git@bitbucket.org:atlassianlabs/atlassian-docker.git',
+            'https://github.com/docker/docker.git',
+            'http://github.com/docker/docker.git',
+        ]
+        for valid_url in valid_urls:
+            service_dict = config.load(build_config_details({
+                'validurl': {'build': valid_url},
+            }, '.', None))
+            assert service_dict[0]['build'] == valid_url
+
 
 class GetDefaultConfigFilesTestCase(unittest.TestCase):
 

From 2ab3cb212a3c4c0e3b6f3daf6792d3e8cb60782c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 19 Nov 2015 15:46:14 -0500
Subject: [PATCH 0560/1265] Add integration test and docs for build with a git
 url.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py          |  3 ++-
 docs/compose-file.md              | 11 +++++++----
 tests/integration/service_test.py |  7 +++++++
 tests/unit/config/config_test.py  | 16 +++++++++++++++-
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 242e7af9..c716393d 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -564,7 +564,8 @@ def validate_paths(service_dict):
             (not os.path.exists(build_path) or not os.access(build_path, os.R_OK))
         ):
             raise ConfigurationError(
-                "build path %s either does not exist or is not accessible." % build_path)
+                "build path %s either does not exist, is not accessible, "
+                "or is not a valid URL." % build_path)
 
 
 def merge_path_mappings(base, override):
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 51d1f5e1..800d2aa9 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -31,15 +31,18 @@ definition.
 
 ### build
 
-Path to a directory containing a Dockerfile. When the value supplied is a
-relative path, it is interpreted as relative to the location of the yml file
-itself. This directory is also the build context that is sent to the Docker daemon.
+Either a path to a directory containing a Dockerfile, or a url to a git repository.
+
+When the value supplied is a relative path, it is interpreted as relative to the
+location of the Compose file. This directory is also the build context that is
+sent to the Docker daemon.
 
 Compose will build and tag it with a generated name, and use that image thereafter.
 
     build: /path/to/build/dir
 
-Using `build` together with `image` is not allowed. Attempting to do so results in an error.
+Using `build` together with `image` is not allowed. Attempting to do so results in
+an error.
 
 ### cap_add, cap_drop
 
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 5dd3d2e6..b03baac5 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -507,6 +507,13 @@ class ServiceTest(DockerClientTestCase):
         self.create_service('web', build=text_type(base_dir)).build()
         self.assertEqual(len(self.client.images(name='composetest_web')), 1)
 
+    def test_build_with_git_url(self):
+        build_url = "https://github.com/dnephin/docker-build-from-url.git"
+        service = self.create_service('buildwithurl', build=build_url)
+        self.addCleanup(self.client.remove_image, service.image_name)
+        service.build()
+        assert service.image()
+
     def test_start_container_stays_unpriviliged(self):
         service = self.create_service('web')
         container = create_and_start_container(service).inspect()
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 6de794ad..e15ac350 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1497,13 +1497,14 @@ class BuildPathTest(unittest.TestCase):
         service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml')
         self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])
 
-    def test_valid_url_path(self):
+    def test_valid_url_in_build_path(self):
         valid_urls = [
             'git://github.com/docker/docker',
             'git@github.com:docker/docker.git',
             'git@bitbucket.org:atlassianlabs/atlassian-docker.git',
             'https://github.com/docker/docker.git',
             'http://github.com/docker/docker.git',
+            'github.com/docker/docker.git',
         ]
         for valid_url in valid_urls:
             service_dict = config.load(build_config_details({
@@ -1511,6 +1512,19 @@ class BuildPathTest(unittest.TestCase):
             }, '.', None))
             assert service_dict[0]['build'] == valid_url
 
+    def test_invalid_url_in_build_path(self):
+        invalid_urls = [
+            'example.com/bogus',
+            'ftp://example.com/',
+            '/path/does/not/exist',
+        ]
+        for invalid_url in invalid_urls:
+            with pytest.raises(ConfigurationError) as exc:
+                config.load(build_config_details({
+                    'invalidurl': {'build': invalid_url},
+                }, '.', None))
+            assert 'build path' in exc.exconly()
+
 
 class GetDefaultConfigFilesTestCase(unittest.TestCase):
 

From d52508e2b1b8e59900d492cff69169fe4fed7d1f Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 26 Nov 2015 18:52:14 +0000
Subject: [PATCH 0561/1265] Refactor ports section of fields schema

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/fields_schema.json | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 9cbcfd1b..3f1f10fa 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -83,16 +83,8 @@
         "ports": {
           "type": "array",
           "items": {
-            "oneOf": [
-              {
-                "type": "string",
-                "format": "ports"
-              },
-              {
-                "type": "number",
-                "format": "ports"
-              }
-            ]
+            "type": ["string", "number"],
+            "format": "ports"
           },
           "uniqueItems": true
         },

From 374b16843fedca5908d166226e4d1fc9f455acfc Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 26 Nov 2015 18:54:30 +0000
Subject: [PATCH 0562/1265] Fix ports validation message

- The `raises` kwarg to the `cls_check` decorator was being used
  incorrectly (it should be an exception class, not an object).

- We need to check for `error.cause` and get the message out of the
  exception object.

NB: The particular case where validation fails in the case of `ports` is
only when ranges don't match in length - no further validation is
currently performed client-side.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/validation.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 38020366..24a45e76 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -36,16 +36,12 @@ DOCKER_CONFIG_HINTS = {
 VALID_NAME_CHARS = '[a-zA-Z0-9\._\-]'
 
 
-@FormatChecker.cls_checks(
-    format="ports",
-    raises=ValidationError(
-        "Invalid port formatting, it should be "
-        "'[[remote_ip:]remote_port:]port[/protocol]'"))
+@FormatChecker.cls_checks(format="ports", raises=ValidationError)
 def format_ports(instance):
     try:
         split_port(instance)
-    except ValueError:
-        return False
+    except ValueError as e:
+        raise ValidationError(six.text_type(e))
     return True
 
 
@@ -184,6 +180,10 @@ def handle_generic_service_error(error, service_name):
             config_key,
             required_keys)
 
+    elif error.cause:
+        error_msg = six.text_type(error.cause)
+        msg_format = "Service '{}' configuration key {} is invalid: {}"
+
     elif error.path:
         msg_format = "Service '{}' configuration key {} value {}"
 

From 042c7048f26713d18da559941bc25f974d60883c Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 26 Nov 2015 19:17:13 +0000
Subject: [PATCH 0563/1265] Split out ports validation tests into type,
 uniqueness, format

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/unit/config/config_test.py | 86 ++++++++++++++++++++++++--------
 1 file changed, 64 insertions(+), 22 deletions(-)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 7ddec8ab..f85c52de 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -263,28 +263,6 @@ class ConfigTest(unittest.TestCase):
                     'common.yml'))
             assert services[0]['name'] == valid_name
 
-    def test_config_invalid_ports_format_validation(self):
-        for invalid_ports in [{"1": "8000"}, False, 0, "8000", 8000, ["8000", "8000"]]:
-            with pytest.raises(ConfigurationError):
-                config.load(
-                    build_config_details(
-                        {'web': {'image': 'busybox', 'ports': invalid_ports}},
-                        'working_dir',
-                        'filename.yml'
-                    )
-                )
-
-    def test_config_valid_ports_format_validation(self):
-        valid_ports = [["8000", "9000"], ["8000/8050"], ["8000"], [8000], ["49153-49154:3002-3003"]]
-        for ports in valid_ports:
-            config.load(
-                build_config_details(
-                    {'web': {'image': 'busybox', 'ports': ports}},
-                    'working_dir',
-                    'filename.yml'
-                )
-            )
-
     def test_config_hint(self):
         expected_error_msg = "(did you mean 'privileged'?)"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
@@ -558,6 +536,70 @@ class ConfigTest(unittest.TestCase):
         assert "which is an invalid type" in exc.exconly()
 
 
+class PortsTest(unittest.TestCase):
+    INVALID_PORTS_TYPES = [
+        {"1": "8000"},
+        False,
+        "8000",
+        8000,
+    ]
+
+    NON_UNIQUE_SINGLE_PORTS = [
+        ["8000", "8000"],
+    ]
+
+    INVALID_PORT_MAPPINGS = [
+        ["8000-8001:8000"],
+    ]
+
+    VALID_SINGLE_PORTS = [
+        ["8000"],
+        ["8000/tcp"],
+        ["8000", "9000"],
+        [8000],
+        [8000, 9000],
+    ]
+
+    VALID_PORT_MAPPINGS = [
+        ["8000:8050"],
+        ["49153-49154:3002-3003"],
+    ]
+
+    def test_config_invalid_ports_type_validation(self):
+        for invalid_ports in self.INVALID_PORTS_TYPES:
+            with pytest.raises(ConfigurationError) as exc:
+                self.check_config({'ports': invalid_ports})
+
+            assert "contains an invalid type" in exc.value.msg
+
+    def test_config_non_unique_ports_validation(self):
+        for invalid_ports in self.NON_UNIQUE_SINGLE_PORTS:
+            with pytest.raises(ConfigurationError) as exc:
+                self.check_config({'ports': invalid_ports})
+
+            assert "non-unique" in exc.value.msg
+
+    def test_config_invalid_ports_format_validation(self):
+        for invalid_ports in self.INVALID_PORT_MAPPINGS:
+            with pytest.raises(ConfigurationError) as exc:
+                self.check_config({'ports': invalid_ports})
+
+            assert "Port ranges don't match in length" in exc.value.msg
+
+    def test_config_valid_ports_format_validation(self):
+        for valid_ports in self.VALID_SINGLE_PORTS + self.VALID_PORT_MAPPINGS:
+            self.check_config({'ports': valid_ports})
+
+    def check_config(self, cfg):
+        config.load(
+            build_config_details(
+                {'web': dict(image='busybox', **cfg)},
+                'working_dir',
+                'filename.yml'
+            )
+        )
+
+
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)
     def test_config_file_with_environment_variable(self):

From ccf548b98c5eca779b753c14439d83832e1f6b54 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 26 Nov 2015 19:17:58 +0000
Subject: [PATCH 0564/1265] Validate the 'expose' option

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/fields_schema.json |  5 ++++-
 compose/config/validation.py      | 14 +++++++++++++-
 tests/unit/config/config_test.py  | 27 +++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 3f1f10fa..7d5220e3 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -41,7 +41,10 @@
 
         "expose": {
           "type": "array",
-          "items": {"type": ["string", "number"]},
+          "items": {
+            "type": ["string", "number"],
+            "format": "expose"
+          },
           "uniqueItems": true
         },
 
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 24a45e76..d16bdb9d 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -1,6 +1,7 @@
 import json
 import logging
 import os
+import re
 import sys
 
 import six
@@ -34,6 +35,7 @@ DOCKER_CONFIG_HINTS = {
 
 
 VALID_NAME_CHARS = '[a-zA-Z0-9\._\-]'
+VALID_EXPOSE_FORMAT = r'^\d+(\/[a-zA-Z]+)?$'
 
 
 @FormatChecker.cls_checks(format="ports", raises=ValidationError)
@@ -45,6 +47,16 @@ def format_ports(instance):
     return True
 
 
+@FormatChecker.cls_checks(format="expose", raises=ValidationError)
+def format_expose(instance):
+    if isinstance(instance, six.string_types):
+        if not re.match(VALID_EXPOSE_FORMAT, instance):
+            raise ValidationError(
+                "should be of the format 'PORT[/PROTOCOL]'")
+
+    return True
+
+
 @FormatChecker.cls_checks(format="bool-value-in-mapping")
 def format_boolean_in_environment(instance):
     """
@@ -273,7 +285,7 @@ def validate_against_fields_schema(config, filename):
     _validate_against_schema(
         config,
         "fields_schema.json",
-        format_checker=["ports", "bool-value-in-mapping"],
+        format_checker=["ports", "expose", "bool-value-in-mapping"],
         filename=filename)
 
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index f85c52de..6c445432 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -590,6 +590,33 @@ class PortsTest(unittest.TestCase):
         for valid_ports in self.VALID_SINGLE_PORTS + self.VALID_PORT_MAPPINGS:
             self.check_config({'ports': valid_ports})
 
+    def test_config_invalid_expose_type_validation(self):
+        for invalid_expose in self.INVALID_PORTS_TYPES:
+            with pytest.raises(ConfigurationError) as exc:
+                self.check_config({'expose': invalid_expose})
+
+            assert "contains an invalid type" in exc.value.msg
+
+    def test_config_non_unique_expose_validation(self):
+        for invalid_expose in self.NON_UNIQUE_SINGLE_PORTS:
+            with pytest.raises(ConfigurationError) as exc:
+                self.check_config({'expose': invalid_expose})
+
+            assert "non-unique" in exc.value.msg
+
+    def test_config_invalid_expose_format_validation(self):
+        # Valid port mappings ARE NOT valid 'expose' entries
+        for invalid_expose in self.INVALID_PORT_MAPPINGS + self.VALID_PORT_MAPPINGS:
+            with pytest.raises(ConfigurationError) as exc:
+                self.check_config({'expose': invalid_expose})
+
+            assert "should be of the format" in exc.value.msg
+
+    def test_config_valid_expose_format_validation(self):
+        # Valid single ports ARE valid 'expose' entries
+        for valid_expose in self.VALID_SINGLE_PORTS:
+            self.check_config({'expose': valid_expose})
+
     def check_config(self, cfg):
         config.load(
             build_config_details(

From 2f568984f73e7bade8d01127dd4e8cf7202eaaec Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 27 Nov 2015 11:52:25 -0500
Subject: [PATCH 0565/1265] Fixes #2368, removes the deprecated
 --allow-insecure-ssl flag.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py    | 17 -----------------
 tests/unit/cli_test.py |  4 ----
 2 files changed, 21 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 9fef8d04..2eba265b 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -41,11 +41,6 @@ if not IS_WINDOWS_PLATFORM:
 log = logging.getLogger(__name__)
 console_handler = logging.StreamHandler(sys.stderr)
 
-INSECURE_SSL_WARNING = """
---allow-insecure-ssl is deprecated and has no effect.
-It will be removed in a future version of Compose.
-"""
-
 
 def main():
     setup_logging()
@@ -303,11 +298,7 @@ class TopLevelCommand(DocoptCommand):
 
         Options:
             --ignore-pull-failures  Pull what it can and ignores images with pull failures.
-            --allow-insecure-ssl    Deprecated - no effect.
         """
-        if options['--allow-insecure-ssl']:
-            log.warn(INSECURE_SSL_WARNING)
-
         project.pull(
             service_names=options['SERVICE'],
             ignore_pull_failures=options.get('--ignore-pull-failures')
@@ -352,7 +343,6 @@ class TopLevelCommand(DocoptCommand):
         Usage: run [options] [-p PORT...] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]
 
         Options:
-            --allow-insecure-ssl  Deprecated - no effect.
             -d                    Detached mode: Run container in the background, print
                                   new container name.
             --name NAME           Assign a name to the container
@@ -376,9 +366,6 @@ class TopLevelCommand(DocoptCommand):
                 "Please pass the -d flag when using `docker-compose run`."
             )
 
-        if options['--allow-insecure-ssl']:
-            log.warn(INSECURE_SSL_WARNING)
-
         if options['COMMAND']:
             command = [options['COMMAND']] + options['ARGS']
         else:
@@ -514,7 +501,6 @@ class TopLevelCommand(DocoptCommand):
         Usage: up [options] [SERVICE...]
 
         Options:
-            --allow-insecure-ssl   Deprecated - no effect.
             -d                     Detached mode: Run containers in the background,
                                    print new container names.
             --no-color             Produce monochrome output.
@@ -528,9 +514,6 @@ class TopLevelCommand(DocoptCommand):
                                    when attached or when containers are already
                                    running. (default: 10)
         """
-        if options['--allow-insecure-ssl']:
-            log.warn(INSECURE_SSL_WARNING)
-
         monochrome = options['--no-color']
         start_deps = not options['--no-deps']
         service_names = options['SERVICE']
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 23dc4262..c962d007 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -102,7 +102,6 @@ class CLITestCase(unittest.TestCase):
             '-e': ['BAR=NEW', 'OTHER=bär'.encode('utf-8')],
             '--user': None,
             '--no-deps': None,
-            '--allow-insecure-ssl': None,
             '-d': True,
             '-T': None,
             '--entrypoint': None,
@@ -132,7 +131,6 @@ class CLITestCase(unittest.TestCase):
             '-e': [],
             '--user': None,
             '--no-deps': None,
-            '--allow-insecure-ssl': None,
             '-d': True,
             '-T': None,
             '--entrypoint': None,
@@ -161,7 +159,6 @@ class CLITestCase(unittest.TestCase):
             '-e': [],
             '--user': None,
             '--no-deps': None,
-            '--allow-insecure-ssl': None,
             '-d': True,
             '-T': None,
             '--entrypoint': None,
@@ -193,7 +190,6 @@ class CLITestCase(unittest.TestCase):
                 '-e': [],
                 '--user': None,
                 '--no-deps': None,
-                '--allow-insecure-ssl': None,
                 '-d': True,
                 '-T': None,
                 '--entrypoint': None,

From a21f9993b3acf20efafad70b02da81debfd37830 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 27 Nov 2015 12:02:13 -0500
Subject: [PATCH 0566/1265] Remove migrate-to-labels.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py                    |  47 +-----
 compose/legacy.py                      | 182 ---------------------
 compose/project.py                     |   8 -
 compose/service.py                     |  12 +-
 contrib/completion/bash/docker-compose |  10 --
 contrib/completion/zsh/_docker-compose |   5 -
 docs/install.md                        |   2 +-
 docs/reference/docker-compose.md       |   1 -
 tests/integration/legacy_test.py       | 218 -------------------------
 tests/unit/cli_test.py                 |   6 -
 10 files changed, 7 insertions(+), 484 deletions(-)
 delete mode 100644 compose/legacy.py
 delete mode 100644 tests/integration/legacy_test.py

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 9fef8d04..90b03017 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -12,7 +12,6 @@ from docker.errors import APIError
 from requests.exceptions import ReadTimeout
 
 from .. import __version__
-from .. import legacy
 from ..config import ConfigurationError
 from ..config import parse_environment
 from ..const import DEFAULT_TIMEOUT
@@ -55,7 +54,7 @@ def main():
     except KeyboardInterrupt:
         log.error("\nAborting.")
         sys.exit(1)
-    except (UserError, NoSuchService, ConfigurationError, legacy.LegacyError) as e:
+    except (UserError, NoSuchService, ConfigurationError) as e:
         log.error(e.msg)
         sys.exit(1)
     except NoSuchCommand as e:
@@ -147,9 +146,7 @@ class TopLevelCommand(DocoptCommand):
       stop               Stop services
       unpause            Unpause services
       up                 Create and start containers
-      migrate-to-labels  Recreate containers to add labels
       version            Show the Docker-Compose version information
-
     """
     base_dir = '.'
 
@@ -550,32 +547,6 @@ class TopLevelCommand(DocoptCommand):
             log_printer = build_log_printer(to_attach, service_names, monochrome)
             attach_to_logs(project, log_printer, service_names, timeout)
 
-    def migrate_to_labels(self, project, _options):
-        """
-        Recreate containers to add labels
-
-        If you're coming from Compose 1.2 or earlier, you'll need to remove or
-        migrate your existing containers after upgrading Compose. This is
-        because, as of version 1.3, Compose uses Docker labels to keep track
-        of containers, and so they need to be recreated with labels added.
-
-        If Compose detects containers that were created without labels, it
-        will refuse to run so that you don't end up with two sets of them. If
-        you want to keep using your existing containers (for example, because
-        they have data volumes you want to preserve) you can migrate them with
-        the following command:
-
-            docker-compose migrate-to-labels
-
-        Alternatively, if you're not worried about keeping them, you can
-        remove them - Compose will just create new ones.
-
-            docker rm -f myapp_web_1 myapp_db_1 ...
-
-        Usage: migrate-to-labels
-        """
-        legacy.migrate_project_to_labels(project)
-
     def version(self, project, options):
         """
         Show version informations
@@ -618,18 +589,10 @@ def run_one_off_container(container_options, project, service, options):
     if project.use_networking:
         project.ensure_network_exists()
 
-    try:
-        container = service.create_container(
-            quiet=True,
-            one_off=True,
-            **container_options)
-    except APIError:
-        legacy.check_for_legacy_containers(
-            project.client,
-            project.name,
-            [service.name],
-            allow_one_off=False)
-        raise
+    container = service.create_container(
+        quiet=True,
+        one_off=True,
+        **container_options)
 
     if options['-d']:
         container.start()
diff --git a/compose/legacy.py b/compose/legacy.py
deleted file mode 100644
index 54162417..00000000
--- a/compose/legacy.py
+++ /dev/null
@@ -1,182 +0,0 @@
-import logging
-import re
-
-from .const import LABEL_VERSION
-from .container import Container
-from .container import get_container_name
-
-
-log = logging.getLogger(__name__)
-
-
-# TODO: remove this section when migrate_project_to_labels is removed
-NAME_RE = re.compile(r'^([^_]+)_([^_]+)_(run_)?(\d+)$')
-
-ERROR_MESSAGE_FORMAT = """
-Compose found the following containers without labels:
-
-{names_list}
-
-As of Compose 1.3.0, containers are identified with labels instead of naming
-convention. If you want to continue using these containers, run:
-
-    $ docker-compose migrate-to-labels
-
-Alternatively, remove them:
-
-    $ docker rm -f {rm_args}
-"""
-
-ONE_OFF_ADDENDUM_FORMAT = """
-You should also remove your one-off containers:
-
-    $ docker rm -f {rm_args}
-"""
-
-ONE_OFF_ERROR_MESSAGE_FORMAT = """
-Compose found the following containers without labels:
-
-{names_list}
-
-As of Compose 1.3.0, containers are identified with labels instead of naming convention.
-
-Remove them before continuing:
-
-    $ docker rm -f {rm_args}
-"""
-
-
-def check_for_legacy_containers(
-        client,
-        project,
-        services,
-        allow_one_off=True):
-    """Check if there are containers named using the old naming convention
-    and warn the user that those containers may need to be migrated to
-    using labels, so that compose can find them.
-    """
-    containers = get_legacy_containers(client, project, services, one_off=False)
-
-    if containers:
-        one_off_containers = get_legacy_containers(client, project, services, one_off=True)
-
-        raise LegacyContainersError(
-            [c.name for c in containers],
-            [c.name for c in one_off_containers],
-        )
-
-    if not allow_one_off:
-        one_off_containers = get_legacy_containers(client, project, services, one_off=True)
-
-        if one_off_containers:
-            raise LegacyOneOffContainersError(
-                [c.name for c in one_off_containers],
-            )
-
-
-class LegacyError(Exception):
-    def __unicode__(self):
-        return self.msg
-
-    __str__ = __unicode__
-
-
-class LegacyContainersError(LegacyError):
-    def __init__(self, names, one_off_names):
-        self.names = names
-        self.one_off_names = one_off_names
-
-        self.msg = ERROR_MESSAGE_FORMAT.format(
-            names_list="\n".join("    {}".format(name) for name in names),
-            rm_args=" ".join(names),
-        )
-
-        if one_off_names:
-            self.msg += ONE_OFF_ADDENDUM_FORMAT.format(rm_args=" ".join(one_off_names))
-
-
-class LegacyOneOffContainersError(LegacyError):
-    def __init__(self, one_off_names):
-        self.one_off_names = one_off_names
-
-        self.msg = ONE_OFF_ERROR_MESSAGE_FORMAT.format(
-            names_list="\n".join("    {}".format(name) for name in one_off_names),
-            rm_args=" ".join(one_off_names),
-        )
-
-
-def add_labels(project, container):
-    project_name, service_name, one_off, number = NAME_RE.match(container.name).groups()
-    if project_name != project.name or service_name not in project.service_names:
-        return
-    service = project.get_service(service_name)
-    service.recreate_container(container)
-
-
-def migrate_project_to_labels(project):
-    log.info("Running migration to labels for project %s", project.name)
-
-    containers = get_legacy_containers(
-        project.client,
-        project.name,
-        project.service_names,
-        one_off=False,
-    )
-
-    for container in containers:
-        add_labels(project, container)
-
-
-def get_legacy_containers(
-        client,
-        project,
-        services,
-        one_off=False):
-
-    return list(_get_legacy_containers_iter(
-        client,
-        project,
-        services,
-        one_off=one_off,
-    ))
-
-
-def _get_legacy_containers_iter(
-        client,
-        project,
-        services,
-        one_off=False):
-
-    containers = client.containers(all=True)
-
-    for service in services:
-        for container in containers:
-            if LABEL_VERSION in (container.get('Labels') or {}):
-                continue
-
-            name = get_container_name(container)
-            if has_container(project, service, name, one_off=one_off):
-                yield Container.from_ps(client, container)
-
-
-def has_container(project, service, name, one_off=False):
-    if not name or not is_valid_name(name, one_off):
-        return False
-    container_project, container_service, _container_number = parse_name(name)
-    return container_project == project and container_service == service
-
-
-def is_valid_name(name, one_off=False):
-    match = NAME_RE.match(name)
-    if match is None:
-        return False
-    if one_off:
-        return match.group(3) == 'run_'
-    else:
-        return match.group(3) is None
-
-
-def parse_name(name):
-    match = NAME_RE.match(name)
-    (project, service_name, _, suffix) = match.groups()
-    return (project, service_name, int(suffix))
diff --git a/compose/project.py b/compose/project.py
index 30e81693..af40d820 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -15,7 +15,6 @@ from .const import LABEL_ONE_OFF
 from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
 from .container import Container
-from .legacy import check_for_legacy_containers
 from .service import ContainerNet
 from .service import ConvergenceStrategy
 from .service import Net
@@ -287,13 +286,6 @@ class Project(object):
         def matches_service_names(container):
             return container.labels.get(LABEL_SERVICE) in service_names
 
-        if not containers:
-            check_for_legacy_containers(
-                self.client,
-                self.name,
-                self.service_names,
-            )
-
         return [c for c in containers if matches_service_names(c)]
 
     def get_network(self):
diff --git a/compose/service.py b/compose/service.py
index 08d563e9..0b9a2aa3 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -26,7 +26,6 @@ from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
 from .const import LABEL_VERSION
 from .container import Container
-from .legacy import check_for_legacy_containers
 from .parallel import parallel_execute
 from .parallel import parallel_remove
 from .parallel import parallel_start
@@ -122,21 +121,12 @@ class Service(object):
     def containers(self, stopped=False, one_off=False, filters={}):
         filters.update({'label': self.labels(one_off=one_off)})
 
-        containers = list(filter(None, [
+        return list(filter(None, [
             Container.from_ps(self.client, container)
             for container in self.client.containers(
                 all=stopped,
                 filters=filters)]))
 
-        if not containers:
-            check_for_legacy_containers(
-                self.client,
-                self.project,
-                [self.name],
-            )
-
-        return containers
-
     def get_container(self, number=1):
         """Return a :class:`compose.container.Container` for this service. The
         container must be active, and match `number`.
diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index b4f4387f..c22e6abc 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -164,15 +164,6 @@ _docker_compose_logs() {
 }
 
 
-_docker_compose_migrate_to_labels() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-	esac
-}
-
-
 _docker_compose_pause() {
 	case "$cur" in
 		-*)
@@ -385,7 +376,6 @@ _docker_compose() {
 		help
 		kill
 		logs
-		migrate-to-labels
 		pause
 		port
 		ps
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 08d5150d..0b50b535 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -212,11 +212,6 @@ __docker-compose_subcommand() {
                 '--no-color[Produce monochrome output.]' \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
-        (migrate-to-labels)
-            _arguments -A '-*' \
-                $opts_help \
-                '(-):Recreate containers to add labels' && ret=0
-            ;;
         (pause)
             _arguments \
                 $opts_help \
diff --git a/docs/install.md b/docs/install.md
index 861954b4..cc15cec1 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -98,7 +98,7 @@ be recreated with labels added.
 If Compose detects containers that were created without labels, it will refuse
 to run so that you don't end up with two sets of them. If you want to keep using
 your existing containers (for example, because they have data volumes you want
-to preserve) you can migrate them with the following command:
+to preserve) you can use compose 1.5.x to migrate them with the following command:
 
     $ docker-compose migrate-to-labels
 
diff --git a/docs/reference/docker-compose.md b/docs/reference/docker-compose.md
index 8712072e..c19e4284 100644
--- a/docs/reference/docker-compose.md
+++ b/docs/reference/docker-compose.md
@@ -40,7 +40,6 @@ Commands:
   stop               Stop services
   unpause            Unpause services
   up                 Create and start containers
-  migrate-to-labels  Recreate containers to add labels
   version            Show the Docker-Compose version information
 ```
 
diff --git a/tests/integration/legacy_test.py b/tests/integration/legacy_test.py
deleted file mode 100644
index 3465d57f..00000000
--- a/tests/integration/legacy_test.py
+++ /dev/null
@@ -1,218 +0,0 @@
-import unittest
-
-from docker.errors import APIError
-
-from .. import mock
-from .testcases import DockerClientTestCase
-from compose import legacy
-from compose.project import Project
-
-
-class UtilitiesTestCase(unittest.TestCase):
-    def test_has_container(self):
-        self.assertTrue(
-            legacy.has_container("composetest", "web", "composetest_web_1", one_off=False),
-        )
-        self.assertFalse(
-            legacy.has_container("composetest", "web", "composetest_web_run_1", one_off=False),
-        )
-
-    def test_has_container_one_off(self):
-        self.assertFalse(
-            legacy.has_container("composetest", "web", "composetest_web_1", one_off=True),
-        )
-        self.assertTrue(
-            legacy.has_container("composetest", "web", "composetest_web_run_1", one_off=True),
-        )
-
-    def test_has_container_different_project(self):
-        self.assertFalse(
-            legacy.has_container("composetest", "web", "otherapp_web_1", one_off=False),
-        )
-        self.assertFalse(
-            legacy.has_container("composetest", "web", "otherapp_web_run_1", one_off=True),
-        )
-
-    def test_has_container_different_service(self):
-        self.assertFalse(
-            legacy.has_container("composetest", "web", "composetest_db_1", one_off=False),
-        )
-        self.assertFalse(
-            legacy.has_container("composetest", "web", "composetest_db_run_1", one_off=True),
-        )
-
-    def test_is_valid_name(self):
-        self.assertTrue(
-            legacy.is_valid_name("composetest_web_1", one_off=False),
-        )
-        self.assertFalse(
-            legacy.is_valid_name("composetest_web_run_1", one_off=False),
-        )
-
-    def test_is_valid_name_one_off(self):
-        self.assertFalse(
-            legacy.is_valid_name("composetest_web_1", one_off=True),
-        )
-        self.assertTrue(
-            legacy.is_valid_name("composetest_web_run_1", one_off=True),
-        )
-
-    def test_is_valid_name_invalid(self):
-        self.assertFalse(
-            legacy.is_valid_name("foo"),
-        )
-        self.assertFalse(
-            legacy.is_valid_name("composetest_web_lol_1", one_off=True),
-        )
-
-    def test_get_legacy_containers(self):
-        client = mock.Mock()
-        client.containers.return_value = [
-            {
-                "Id": "abc123",
-                "Image": "def456",
-                "Name": "composetest_web_1",
-                "Labels": None,
-            },
-            {
-                "Id": "ghi789",
-                "Image": "def456",
-                "Name": None,
-                "Labels": None,
-            },
-            {
-                "Id": "jkl012",
-                "Image": "def456",
-                "Labels": None,
-            },
-        ]
-
-        containers = legacy.get_legacy_containers(client, "composetest", ["web"])
-
-        self.assertEqual(len(containers), 1)
-        self.assertEqual(containers[0].id, 'abc123')
-
-
-class LegacyTestCase(DockerClientTestCase):
-
-    def setUp(self):
-        super(LegacyTestCase, self).setUp()
-        self.containers = []
-
-        db = self.create_service('db')
-        web = self.create_service('web', links=[(db, 'db')])
-        nginx = self.create_service('nginx', links=[(web, 'web')])
-
-        self.services = [db, web, nginx]
-        self.project = Project('composetest', self.services, self.client)
-
-        # Create a legacy container for each service
-        for service in self.services:
-            service.ensure_image_exists()
-            container = self.client.create_container(
-                name='{}_{}_1'.format(self.project.name, service.name),
-                **service.options
-            )
-            self.client.start(container)
-            self.containers.append(container)
-
-        # Create a single one-off legacy container
-        self.containers.append(self.client.create_container(
-            name='{}_{}_run_1'.format(self.project.name, db.name),
-            **self.services[0].options
-        ))
-
-    def tearDown(self):
-        super(LegacyTestCase, self).tearDown()
-        for container in self.containers:
-            try:
-                self.client.kill(container)
-            except APIError:
-                pass
-            try:
-                self.client.remove_container(container)
-            except APIError:
-                pass
-
-    def get_legacy_containers(self, **kwargs):
-        return legacy.get_legacy_containers(
-            self.client,
-            self.project.name,
-            [s.name for s in self.services],
-            **kwargs
-        )
-
-    def test_get_legacy_container_names(self):
-        self.assertEqual(len(self.get_legacy_containers()), len(self.services))
-
-    def test_get_legacy_container_names_one_off(self):
-        self.assertEqual(len(self.get_legacy_containers(one_off=True)), 1)
-
-    def test_migration_to_labels(self):
-        # Trying to get the container list raises an exception
-
-        with self.assertRaises(legacy.LegacyContainersError) as cm:
-            self.project.containers(stopped=True)
-
-        self.assertEqual(
-            set(cm.exception.names),
-            set(['composetest_db_1', 'composetest_web_1', 'composetest_nginx_1']),
-        )
-
-        self.assertEqual(
-            set(cm.exception.one_off_names),
-            set(['composetest_db_run_1']),
-        )
-
-        # Migrate the containers
-
-        legacy.migrate_project_to_labels(self.project)
-
-        # Getting the list no longer raises an exception
-
-        containers = self.project.containers(stopped=True)
-        self.assertEqual(len(containers), len(self.services))
-
-    def test_migration_one_off(self):
-        # We've already migrated
-
-        legacy.migrate_project_to_labels(self.project)
-
-        # Trying to create a one-off container results in a Docker API error
-
-        with self.assertRaises(APIError) as cm:
-            self.project.get_service('db').create_container(one_off=True)
-
-        # Checking for legacy one-off containers raises an exception
-
-        with self.assertRaises(legacy.LegacyOneOffContainersError) as cm:
-            legacy.check_for_legacy_containers(
-                self.client,
-                self.project.name,
-                ['db'],
-                allow_one_off=False,
-            )
-
-        self.assertEqual(
-            set(cm.exception.one_off_names),
-            set(['composetest_db_run_1']),
-        )
-
-        # Remove the old one-off container
-
-        c = self.client.inspect_container('composetest_db_run_1')
-        self.client.remove_container(c)
-
-        # Checking no longer raises an exception
-
-        legacy.check_for_legacy_containers(
-            self.client,
-            self.project.name,
-            ['db'],
-            allow_one_off=False,
-        )
-
-        # Creating a one-off container no longer results in an API error
-
-        self.project.get_service('db').create_container(one_off=True)
-        self.assertIsInstance(self.client.inspect_container('composetest_db_run_1'), dict)
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 23dc4262..2473a340 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -74,12 +74,6 @@ class CLITestCase(unittest.TestCase):
 
         self.assertIn('Usage: up', str(ctx.exception))
 
-    def test_command_help_dashes(self):
-        with self.assertRaises(SystemExit) as ctx:
-            TopLevelCommand().dispatch(['help', 'migrate-to-labels'], None)
-
-        self.assertIn('Usage: migrate-to-labels', str(ctx.exception))
-
     def test_command_help_nonexistent(self):
         with self.assertRaises(NoSuchCommand):
             TopLevelCommand().dispatch(['help', 'nonexistent'], None)

From 377f084dfe799d43798c9015081437f98228171d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 27 Nov 2015 13:54:00 -0500
Subject: [PATCH 0567/1265] Increase timeout in tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/acceptance/cli_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 282a5219..99b78d08 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -43,7 +43,7 @@ def wait_on_process(proc, returncode=0):
     return ProcessResult(stdout.decode('utf-8'), stderr.decode('utf-8'))
 
 
-def wait_on_condition(condition, delay=0.1, timeout=5):
+def wait_on_condition(condition, delay=0.1, timeout=20):
     start_time = time.time()
     while not condition():
         if time.time() - start_time > timeout:

From 3f39ffe72e471c3ca06c8ac6330e2858ba66795e Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 21 Oct 2015 20:13:43 -0400
Subject: [PATCH 0568/1265] FAQ document for Compose

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/faq.md                            | 139 +++++++++++++++++++++++++
 docs/index.md                          |   1 +
 script/travis/render-bintray-config.py |   4 +-
 3 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 docs/faq.md

diff --git a/docs/faq.md b/docs/faq.md
new file mode 100644
index 00000000..b36eb5ac
--- /dev/null
+++ b/docs/faq.md
@@ -0,0 +1,139 @@
+<!--[metadata]>
++++
+title = "Frequently Asked Questions"
+description = "Docker Compose FAQ"
+keywords = "documentation, docs,  docker, compose, faq"
+[menu.main]
+parent="smn_workw_compose"
+weight=9
++++
+<![end-metadata]-->
+
+# Frequently asked questions
+
+If you don’t see your question here, feel free to drop by `#docker-compose` on
+freenode IRC and ask the community.
+
+## Why do my services take 10 seconds to stop?
+
+Compose stop attempts to stop a container by sending a `SIGTERM`. It then waits
+for a [default timeout of 10 seconds](./reference/stop.md).  After the timeout,
+a `SIGKILL` is sent to the container to forcefully kill it.  If you
+are waiting for this timeout, it means that your containers aren't shutting down
+when they receive the `SIGTERM` signal.
+
+There has already been a lot written about this problem of
+[processes handling signals](https://medium.com/@gchudnov/trapping-signals-in-docker-containers-7a57fdda7d86)
+in containers.
+
+To fix this problem, try the following:
+
+* Make sure you're using the JSON form of `CMD` and `ENTRYPOINT`
+in your Dockerfile.
+
+  For example use `["program", "arg1", "arg2"]` not `"program arg1 arg2"`.
+  Using the string form causes Docker to run your process using `bash` which
+  doesn't handle signals properly. Compose always uses the JSON form, so don't
+  worry if you override the command or entrypoint in your Compose file.
+
+* If you are able, modify the application that you're running to
+add an explicit signal handler for `SIGTERM`.
+
+* If you can't modify the application, wrap the application in a lightweight init
+system (like [s6](http://skarnet.org/software/s6/)) or a signal proxy (like
+[dumb-init](https://github.com/Yelp/dumb-init) or
+[tini](https://github.com/krallin/tini)).  Either of these wrappers take care of
+handling `SIGTERM` properly.
+
+## How do I run multiple copies of a Compose file on the same host?
+
+Compose uses the project name to create unique identifiers for all of a
+project's  containers and other resources. To run multiple copies of a project,
+set a custom project name using the [`-p` command line
+option](./reference/docker-compose.md) or the [`COMPOSE_PROJECT_NAME`
+environment variable](./reference/overview.md#compose-project-name).
+
+## What's the difference between `up`, `run`, and `start`?
+
+Typically, you want `docker-compose up`. Use `up` to start or restart all the
+services defined in a `docker-compose.yml`. In the default "attached"
+mode, you'll see all the logs from all the containers. In "detached" mode (`-d`),
+Compose exits after starting the containers, but the containers continue to run
+in the background.
+
+The `docker-compose run` command is for running "one-off" or "adhoc" tasks. It
+requires the service name you want to run and only starts containers for services
+that the running service depends on. Use `run` to run tests or perform
+an administrative task such as removing or adding data to a data volume
+container. The `run` command acts like `docker run -ti` in that it opens an
+interactive terminal to the container and returns an exit status matching the
+exit status of the process in the container.
+
+The `docker-compose start` command is useful only to restart containers
+that were previously created, but were stopped. It never creates new
+containers.
+
+## Can I use json instead of yaml for my Compose file?
+
+Yes. [Yaml is a superset of json](http://stackoverflow.com/a/1729545/444646) so
+any JSON file should be valid Yaml.  To use a JSON file with Compose,
+specify the filename to use, for example:
+
+```bash
+docker-compose -f docker-compose.json up
+```
+
+## How do I get Compose to wait for my database to be ready before starting my application?
+
+Unfortunately, Compose won't do that for you but for a good reason.
+
+The problem of waiting for a database to be ready is really just a subset of a
+much larger problem of distributed systems. In production, your database could
+become unavailable or move hosts at any time.  The application needs to be
+resilient to these types of failures.
+
+To handle this, the application would attempt to re-establish a connection to
+the database after a failure. If the application retries the connection,
+it should eventually be able to connect to the database.
+
+To wait for the application to be in a good state, you can implement a
+healthcheck. A healthcheck makes a request to the application and checks
+the response for a success status code. If it is not successful it waits
+for a short period of time, and tries again. After some timeout value, the check
+stops trying and report a failure.
+
+If you need to run tests against your application, you can start by running a
+healthcheck. Once the healthcheck gets a successful response, you can start
+running your tests.
+
+
+## Should I include my code with `COPY`/`ADD` or a volume?
+
+You can add your code to the image using `COPY` or `ADD` directive in a
+`Dockerfile`.  This is useful if you need to relocate your code along with the
+Docker image, for example when you're sending code to another environment
+(production, CI, etc).
+
+You should use a `volume` if you want to make changes to your code and see them
+reflected immediately, for example when you're developing code and your server
+supports hot code reloading or live-reload.
+
+There may be cases where you'll want to use both. You can have the image
+include the code using a `COPY`, and use a `volume` in your Compose file to
+include the code from the host during development. The volume overrides
+the directory contents of the image.
+
+## Where can I find example compose files?
+
+There are [many examples of Compose files on
+github](https://github.com/search?q=in%3Apath+docker-compose.yml+extension%3Ayml&type=Code).
+
+
+## Compose documentation
+
+- [Installing Compose](install.md)
+- [Get started with Django](django.md)
+- [Get started with Rails](rails.md)
+- [Get started with WordPress](wordpress.md)
+- [Command line reference](./reference/index.md)
+- [Compose file reference](compose-file.md)
diff --git a/docs/index.md b/docs/index.md
index 279154ee..8b32a754 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -59,6 +59,7 @@ Compose has commands for managing the whole lifecycle of your application:
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
+- [Frequently asked questions](faq.md)
 - [Command line reference](./reference/index.md)
 - [Compose file reference](compose-file.md)
 
diff --git a/script/travis/render-bintray-config.py b/script/travis/render-bintray-config.py
index 6aa468d6..fc5d409a 100755
--- a/script/travis/render-bintray-config.py
+++ b/script/travis/render-bintray-config.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import print_function
+
 import datetime
 import os.path
 import sys
@@ -6,4 +8,4 @@ import sys
 os.environ['DATE'] = str(datetime.date.today())
 
 for line in sys.stdin:
-    print os.path.expandvars(line),
+    print(os.path.expandvars(line), end='')

From e760c42ae00b9e1cccf2aeff4a17a3f5a0bd8cbe Mon Sep 17 00:00:00 2001
From: jake-low <jakelow42@gmail.com>
Date: Wed, 2 Dec 2015 21:45:36 -0800
Subject: [PATCH 0569/1265] Stop warning about ".yaml" extension

".yaml" is the preferred extension according to http://www.yaml.org/faq.html

Signed-off-by: jake-low <jakelow42@gmail.com>
---
 compose/config/config.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index c716393d..853157ee 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -161,11 +161,6 @@ def get_default_config_files(base_dir):
         log.warn("Found multiple config files with supported names: %s", ", ".join(candidates))
         log.warn("Using %s\n", winner)
 
-    if winner == 'docker-compose.yaml':
-        log.warn("Please be aware that .yml is the expected extension "
-                 "in most cases, and using .yaml can cause compatibility "
-                 "issues in future.\n")
-
     if winner.startswith("fig."):
         log.warn("%s is deprecated and will not be supported in future. "
                  "Please rename your config file to docker-compose.yml\n" % winner)

From 7698da57ca9c8c17001a137dd128fca2881957ac Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 4 Dec 2015 16:50:50 +0100
Subject: [PATCH 0570/1265] update maintainers file for parsing

this updates the MAINTAINERS file to the new format,
so that it can be parsed and collected in the docker/opensource
repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 MAINTAINERS | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 00324232..820b2f82 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,4 +1,46 @@
-Aanand Prasad <aanand.prasad@gmail.com> (@aanand)
-Ben Firshman <ben@firshman.co.uk> (@bfirsh)
-Daniel Nephin <dnephin@gmail.com> (@dnephin)
-Mazz Mosley <mazz@houseofmnowster.com> (@mnowster)
+# Compose maintainers file
+#
+# This file describes who runs the docker/compose project and how.
+# This is a living document - if you see something out of date or missing, speak up!
+#
+# It is structured to be consumable by both humans and programs.
+# To extract its contents programmatically, use any TOML-compliant parser.
+#
+# This file is compiled into the MAINTAINERS file in docker/opensource.
+#
+[Org]
+	[Org."Core maintainers"]
+		people = [
+			"aanand",
+			"bfirsh",
+			"dnephin",
+			"mnowster",
+		]
+
+[people]
+
+# A reference list of all people associated with the project.
+# All other sections should refer to people by their canonical key
+# in the people section.
+
+	# ADD YOURSELF HERE IN ALPHABETICAL ORDER
+
+	[people.aanand]
+	Name = "Aanand Prasad"
+	Email = "aanand.prasad@gmail.com"
+	GitHub = "aanand"
+
+	[people.bfirsh]
+	Name = "Ben Firshman"
+	Email = "ben@firshman.co.uk"
+	GitHub = "bfirsh"
+
+	[people.dnephin]
+	Name = "Daniel Nephin"
+	Email = "dnephin@gmail.com"
+	GitHub = "dnephin"
+
+	[people.mnowster]
+	Name = "Mazz Mosley"
+	Email = "mazz@houseofmnowster.com"
+	GitHub = "mnowster"

From de4a18ea6c1b4addfeb3aad32204a01a90a2e776 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 2 Dec 2015 17:06:17 -0800
Subject: [PATCH 0571/1265] Cherry-pick release notes for 1.5.2

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 CHANGELOG.md    | 22 ++++++++++++++++++++++
 docs/install.md |  6 +++---
 script/run.sh   |  2 +-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 428e5a93..7b6e0dd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,28 @@
 Change log
 ==========
 
+1.5.2 (2015-12-03)
+------------------
+
+-   Fixed a bug which broke the use of `environment` and `env_file` with
+    `extends`, and caused environment keys without values to have a `None`
+    value, instead of a value from the host environment.
+
+-   Fixed a regression in 1.5.1 that caused a warning about volumes to be
+    raised incorrectly when containers were recreated.
+
+-   Fixed a bug which prevented building a `Dockerfile` that used `ADD <url>`
+
+-   Fixed a bug with `docker-compose restart` which prevented it from
+    starting stopped containers.
+
+-   Fixed handling of SIGTERM and SIGINT to properly stop containers
+
+-   Add support for using a url as the value of `build`
+
+-   Improved the validation of the `expose` option
+
+
 1.5.1 (2015-11-12)
 ------------------
 
diff --git a/docs/install.md b/docs/install.md
index 861954b4..980d285c 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -39,7 +39,7 @@ which the release page specifies, in your terminal.
 
      The following is an example command illustrating the format:
 
-        curl -L https://github.com/docker/compose/releases/download/1.5.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+        curl -L https://github.com/docker/compose/releases/download/1.5.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 
      If you have problems installing with `curl`, see
      [Alternative Install Options](#alternative-install-options).
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
 7. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.5.1
+        docker-compose version: 1.5.2
 
 
 ## Alternative install options
@@ -77,7 +77,7 @@ to get started.
 Compose can also be run inside a container, from a small bash script wrapper.
 To install compose as a container run:
 
-    $ curl -L https://github.com/docker/compose/releases/download/1.5.1/run.sh > /usr/local/bin/docker-compose
+    $ curl -L https://github.com/docker/compose/releases/download/1.5.2/run.sh > /usr/local/bin/docker-compose
     $ chmod +x /usr/local/bin/docker-compose
 
 ## Master builds
diff --git a/script/run.sh b/script/run.sh
index 9563b2e9..c5f7cc86 100755
--- a/script/run.sh
+++ b/script/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.5.1"
+VERSION="1.5.2"
 IMAGE="docker/compose:$VERSION"
 
 

From 2525752a05464d964b184a8a70d2b96674a69bbc Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Mon, 7 Dec 2015 09:10:19 +0100
Subject: [PATCH 0572/1265] Use more robust download URL for completions

Signed-off-by: Harald Albers <github@albersweb.de>
---
 docs/completion.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/completion.md b/docs/completion.md
index 3c2022d8..cac0d1a6 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -23,7 +23,7 @@ On a Mac, install with `brew install bash-completion`
 
 Place the completion script in `/etc/bash_completion.d/` (`/usr/local/etc/bash_completion.d/` on a Mac), using e.g.
 
-     curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose --version | awk 'NR==1{print $NF}')/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose
+     curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose version --short)/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose
 
 Completion will be available upon next login.
 
@@ -32,7 +32,7 @@ Completion will be available upon next login.
 Place the completion script in your `/path/to/zsh/completion`, using e.g. `~/.zsh/completion/`
 
     mkdir -p ~/.zsh/completion
-    curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose --version | awk 'NR==1{print $NF}')/contrib/completion/zsh/_docker-compose > ~/.zsh/completion/_docker-compose
+    curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose version --short)/contrib/completion/zsh/_docker-compose > ~/.zsh/completion/_docker-compose
 
 Include the directory in your `$fpath`, e.g. by adding in `~/.zshrc`
 

From f2c232bb1013f6734f9556a67766373d08473c5b Mon Sep 17 00:00:00 2001
From: Nick Jones <nick@nicksays.co.uk>
Date: Tue, 1 Dec 2015 16:20:36 +0000
Subject: [PATCH 0573/1265] Only allocate a tty if we detect one

Signed-off-by: Nick Jones <nick@nicksays.co.uk>
---
 script/run.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/script/run.sh b/script/run.sh
index 9563b2e9..6990799c 100755
--- a/script/run.sh
+++ b/script/run.sh
@@ -43,5 +43,11 @@ if [ -n "$HOME" ]; then
     VOLUMES="$VOLUMES -v $HOME:$HOME"
 fi
 
+# Only allocate tty if we detect one
+if [ -t 1 ]; then
+    DOCKER_RUN_OPTIONS="-ti"
+else
+    DOCKER_RUN_OPTIONS="-i"
+fi
 
-exec docker run --rm -ti $DOCKER_ADDR $COMPOSE_OPTIONS $VOLUMES -w $(pwd) $IMAGE $@
+exec docker run --rm $DOCKER_RUN_OPTIONS $DOCKER_ADDR $COMPOSE_OPTIONS $VOLUMES -w $(pwd) $IMAGE $@

From 437f3f8adbc3012e07b4629e8a668a7bb18e8ddd Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Sat, 10 Oct 2015 14:41:17 -0400
Subject: [PATCH 0574/1265] Add docker-compose config subcommand.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/command.py                        |  5 ++-
 compose/cli/main.py                           | 38 ++++++++++++++++
 tests/acceptance/cli_test.py                  | 44 +++++++++++++++----
 .../fixtures/invalid-composefile/invalid.yml  |  5 +++
 4 files changed, 82 insertions(+), 10 deletions(-)
 create mode 100644 tests/fixtures/invalid-composefile/invalid.yml

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 157e0016..59f6c4bc 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -46,7 +46,7 @@ def friendly_error_message():
 def project_from_options(base_dir, options):
     return get_project(
         base_dir,
-        get_config_path(options.get('--file')),
+        get_config_path_from_options(options),
         project_name=options.get('--project-name'),
         verbose=options.get('--verbose'),
         use_networking=options.get('--x-networking'),
@@ -54,7 +54,8 @@ def project_from_options(base_dir, options):
     )
 
 
-def get_config_path(file_option):
+def get_config_path_from_options(options):
+    file_option = options.get('--file')
     if file_option:
         return file_option
 
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 62db5183..f30ea334 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -8,10 +8,12 @@ import sys
 from inspect import getdoc
 from operator import attrgetter
 
+import yaml
 from docker.errors import APIError
 from requests.exceptions import ReadTimeout
 
 from .. import __version__
+from ..config import config
 from ..config import ConfigurationError
 from ..config import parse_environment
 from ..const import DEFAULT_TIMEOUT
@@ -23,6 +25,7 @@ from ..service import BuildError
 from ..service import ConvergenceStrategy
 from ..service import NeedsBuildError
 from .command import friendly_error_message
+from .command import get_config_path_from_options
 from .command import project_from_options
 from .docopt_command import DocoptCommand
 from .docopt_command import NoSuchCommand
@@ -126,6 +129,7 @@ class TopLevelCommand(DocoptCommand):
 
     Commands:
       build              Build or rebuild services
+      config             Validate and view the compose file
       help               Get help on a command
       kill               Kill containers
       logs               View output from containers
@@ -158,6 +162,10 @@ class TopLevelCommand(DocoptCommand):
             handler(None, command_options)
             return
 
+        if options['COMMAND'] == 'config':
+            handler(options, command_options)
+            return
+
         project = project_from_options(self.base_dir, options)
         with friendly_error_message():
             handler(project, command_options)
@@ -183,6 +191,36 @@ class TopLevelCommand(DocoptCommand):
             pull=bool(options.get('--pull', False)),
             force_rm=bool(options.get('--force-rm', False)))
 
+    def config(self, config_options, options):
+        """
+        Validate and view the compose file.
+
+        Usage: config [options]
+
+        Options:
+            -q, --quiet     Only validate the configuration, don't print
+                            anything.
+            --services      Print the service names, one per line.
+
+        """
+        config_path = get_config_path_from_options(config_options)
+        compose_config = config.load(config.find(self.base_dir, config_path))
+
+        if options['--quiet']:
+            return
+
+        if options['--services']:
+            print('\n'.join(service['name'] for service in compose_config))
+            return
+
+        compose_config = dict(
+            (service.pop('name'), service) for service in compose_config)
+        print(yaml.dump(
+            compose_config,
+            default_flow_style=False,
+            indent=2,
+            width=80))
+
     def help(self, project, options):
         """
         Get help on a command.
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 99b78d08..0d26ea1f 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -7,6 +7,7 @@ import subprocess
 import time
 from collections import namedtuple
 from operator import attrgetter
+from textwrap import dedent
 
 from docker import errors
 
@@ -90,10 +91,11 @@ class CLITestCase(DockerClientTestCase):
         self.base_dir = 'tests/fixtures/simple-composefile'
 
     def tearDown(self):
-        self.project.kill()
-        self.project.remove_stopped()
-        for container in self.project.containers(stopped=True, one_off=True):
-            container.remove(force=True)
+        if self.base_dir:
+            self.project.kill()
+            self.project.remove_stopped()
+            for container in self.project.containers(stopped=True, one_off=True):
+                container.remove(force=True)
         super(CLITestCase, self).tearDown()
 
     @property
@@ -109,13 +111,39 @@ class CLITestCase(DockerClientTestCase):
         return wait_on_process(proc, returncode=returncode)
 
     def test_help(self):
-        old_base_dir = self.base_dir
         self.base_dir = 'tests/fixtures/no-composefile'
         result = self.dispatch(['help', 'up'], returncode=1)
         assert 'Usage: up [options] [SERVICE...]' in result.stderr
-        # self.project.kill() fails during teardown
-        # unless there is a composefile.
-        self.base_dir = old_base_dir
+        # Prevent tearDown from trying to create a project
+        self.base_dir = None
+
+    def test_config_list_services(self):
+        result = self.dispatch(['config', '--services'])
+        assert set(result.stdout.rstrip().split('\n')) == {'simple', 'another'}
+
+    def test_config_quiet_with_error(self):
+        self.base_dir = None
+        result = self.dispatch([
+            '-f', 'tests/fixtures/invalid-composefile/invalid.yml',
+            'config', '-q'
+        ], returncode=1)
+        assert "'notaservice' doesn't have any configuration" in result.stderr
+
+    def test_config_quiet(self):
+        assert self.dispatch(['config', '-q']).stdout == ''
+
+    def test_config_default(self):
+        result = self.dispatch(['config'])
+        assert dedent("""
+            simple:
+              command: top
+              image: busybox:latest
+        """).lstrip() in result.stdout
+        assert dedent("""
+            another:
+              command: top
+              image: busybox:latest
+        """).lstrip() in result.stdout
 
     def test_ps(self):
         self.project.get_service('simple').create_container()
diff --git a/tests/fixtures/invalid-composefile/invalid.yml b/tests/fixtures/invalid-composefile/invalid.yml
new file mode 100644
index 00000000..0e74be44
--- /dev/null
+++ b/tests/fixtures/invalid-composefile/invalid.yml
@@ -0,0 +1,5 @@
+
+notaservice: oops
+
+web:
+    image: 'alpine:edge'

From a5b48a3dc2b7e4545959801e5a669e7b6dbc2b23 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Tue, 8 Dec 2015 10:23:55 -0800
Subject: [PATCH 0575/1265] Add bash completion for config subcommand

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index c22e6abc..497a8184 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -102,6 +102,11 @@ _docker_compose_build() {
 }
 
 
+_docker_compose_config() {
+	COMPREPLY=( $( compgen -W "--help --quiet -q --services" -- "$cur" ) )
+}
+
+
 _docker_compose_docker_compose() {
 	case "$prev" in
 		--file|-f)
@@ -373,6 +378,7 @@ _docker_compose() {
 
 	local commands=(
 		build
+		config
 		help
 		kill
 		logs

From 999d15b2256cf279afc310ec8ae843f073a21d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Seguin?= <stephseguin93@gmail.com>
Date: Tue, 8 Dec 2015 21:11:05 +0100
Subject: [PATCH 0576/1265] Remove unused functions in service
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
---
 compose/service.py                | 28 ------------------------
 tests/acceptance/cli_test.py      |  9 ++++++--
 tests/integration/service_test.py | 36 -------------------------------
 3 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 0b9a2aa3..0387b6e9 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -141,34 +141,6 @@ class Service(object):
         for c in self.containers(stopped=True):
             self.start_container_if_stopped(c, **options)
 
-    # TODO: remove these functions, project takes care of starting/stopping,
-    def stop(self, **options):
-        for c in self.containers():
-            log.info("Stopping %s" % c.name)
-            c.stop(**options)
-
-    def pause(self, **options):
-        for c in self.containers(filters={'status': 'running'}):
-            log.info("Pausing %s" % c.name)
-            c.pause(**options)
-
-    def unpause(self, **options):
-        for c in self.containers(filters={'status': 'paused'}):
-            log.info("Unpausing %s" % c.name)
-            c.unpause()
-
-    def kill(self, **options):
-        for c in self.containers():
-            log.info("Killing %s" % c.name)
-            c.kill(**options)
-
-    def restart(self, **options):
-        for c in self.containers(stopped=True):
-            log.info("Restarting %s" % c.name)
-            c.restart(**options)
-
-    # end TODO
-
     def scale(self, desired_num, timeout=DEFAULT_TIMEOUT):
         """
         Adjusts the number of containers to the specified number and ensures
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 0d26ea1f..66619629 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -52,6 +52,11 @@ def wait_on_condition(condition, delay=0.1, timeout=20):
         time.sleep(delay)
 
 
+def kill_service(service):
+    for container in service.containers():
+        container.kill()
+
+
 class ContainerCountCondition(object):
 
     def __init__(self, project, expected):
@@ -637,13 +642,13 @@ class CLITestCase(DockerClientTestCase):
     def test_rm(self):
         service = self.project.get_service('simple')
         service.create_container()
-        service.kill()
+        kill_service(service)
         self.assertEqual(len(service.containers(stopped=True)), 1)
         self.dispatch(['rm', '--force'], None)
         self.assertEqual(len(service.containers(stopped=True)), 0)
         service = self.project.get_service('simple')
         service.create_container()
-        service.kill()
+        kill_service(service)
         self.assertEqual(len(service.containers(stopped=True)), 1)
         self.dispatch(['rm', '-f'], None)
         self.assertEqual(len(service.containers(stopped=True)), 0)
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index b03baac5..5a809423 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -73,42 +73,6 @@ class ServiceTest(DockerClientTestCase):
         create_and_start_container(service)
         self.assertEqual(service.containers()[0].name, 'composetest_web_1')
 
-    def test_start_stop(self):
-        service = self.create_service('scalingtest')
-        self.assertEqual(len(service.containers(stopped=True)), 0)
-
-        service.create_container()
-        self.assertEqual(len(service.containers()), 0)
-        self.assertEqual(len(service.containers(stopped=True)), 1)
-
-        service.start()
-        self.assertEqual(len(service.containers()), 1)
-        self.assertEqual(len(service.containers(stopped=True)), 1)
-
-        service.stop(timeout=1)
-        self.assertEqual(len(service.containers()), 0)
-        self.assertEqual(len(service.containers(stopped=True)), 1)
-
-        service.stop(timeout=1)
-        self.assertEqual(len(service.containers()), 0)
-        self.assertEqual(len(service.containers(stopped=True)), 1)
-
-    def test_kill_remove(self):
-        service = self.create_service('scalingtest')
-
-        create_and_start_container(service)
-        self.assertEqual(len(service.containers()), 1)
-
-        remove_stopped(service)
-        self.assertEqual(len(service.containers()), 1)
-
-        service.kill()
-        self.assertEqual(len(service.containers()), 0)
-        self.assertEqual(len(service.containers(stopped=True)), 1)
-
-        remove_stopped(service)
-        self.assertEqual(len(service.containers(stopped=True)), 0)
-
     def test_create_container_with_one_off(self):
         db = self.create_service('db')
         container = db.create_container(one_off=True)

From 01bba5ea239fb747b9cd5ca34bf9c5f168f8a6d4 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Wed, 9 Dec 2015 08:55:59 +0100
Subject: [PATCH 0577/1265] Add zsh completion for config subcommand

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 0b50b535..67ca49bb 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -197,6 +197,12 @@ __docker-compose_subcommand() {
                 '--pull[Always attempt to pull a newer version of the image.]' \
                 '*:services:__docker-compose_services_from_build' && ret=0
             ;;
+        (config)
+            _arguments \
+                $opts_help \
+                '(--quiet -q)'{--quiet,-q}"[Only validate the configuration, don't print anything.]" \
+                '--services[Print the service names, one per line.]' && ret=0
+            ;;
         (help)
             _arguments ':subcommand:__docker-compose_commands' && ret=0
             ;;

From fa3528ea2558cc4b1efca9ba5ea061b57191ae30 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 9 Dec 2015 16:32:39 -0800
Subject: [PATCH 0578/1265] Fix dns and dns_search when used strings and
 without extends.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         |  4 ++++
 tests/unit/config/config_test.py | 21 +++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 853157ee..a2ccecc4 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -387,6 +387,10 @@ def process_service(service_config):
     if 'extra_hosts' in service_dict:
         service_dict['extra_hosts'] = parse_extra_hosts(service_dict['extra_hosts'])
 
+    for field in ['dns', 'dns_search']:
+        if field in service_dict:
+            service_dict[field] = to_list(service_dict[field])
+
     # TODO: move to a validate_service()
     if 'ulimits' in service_dict:
         validate_ulimits(service_dict['ulimits'])
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 20705d55..2185b792 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -535,6 +535,23 @@ class ConfigTest(unittest.TestCase):
             }))
         assert "which is an invalid type" in exc.exconly()
 
+    def test_normalize_dns_options(self):
+        actual = config.load(build_config_details({
+            'web': {
+                'image': 'alpine',
+                'dns': '8.8.8.8',
+                'dns_search': 'domain.local',
+            }
+        }))
+        assert actual == [
+            {
+                'name': 'web',
+                'image': 'alpine',
+                'dns': ['8.8.8.8'],
+                'dns_search': ['domain.local'],
+            }
+        ]
+
 
 class PortsTest(unittest.TestCase):
     INVALID_PORTS_TYPES = [
@@ -1080,8 +1097,8 @@ class EnvTest(unittest.TestCase):
                 {'foo': {'image': 'example', 'env_file': 'nonexistent.env'}},
                 working_dir='tests/fixtures/env'))
 
-            assert 'Couldn\'t find env file' in exc.exconly()
-            assert 'nonexistent.env' in exc.exconly()
+        assert 'Couldn\'t find env file' in exc.exconly()
+        assert 'nonexistent.env' in exc.exconly()
 
     @mock.patch.dict(os.environ)
     def test_resolve_environment_from_env_file_with_empty_values(self):

From 1d3aeaaae7085995ab2f2d6b482b3dd64794d8aa Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 9 Dec 2015 16:03:26 -0800
Subject: [PATCH 0579/1265] Ignore extra coverge files

These files are created because we run acceptance tests in a subprocess.
They have the process id in their name, so they wont be removed by the
normal coverage cleanup on each run.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 .gitignore   | 2 +-
 script/clean | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index da728279..4b318e23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 *.egg-info
 *.pyc
-/.coverage
+.coverage*
 /.tox
 /build
 /coverage-html
diff --git a/script/clean b/script/clean
index 08ba551a..35faf4db 100755
--- a/script/clean
+++ b/script/clean
@@ -2,5 +2,6 @@
 set -e
 
 find . -type f -name '*.pyc' -delete
+find . -name .coverage.* -delete
 find -name __pycache__ -delete
 rm -rf docs/_site build dist docker-compose.egg-info

From 6d709caaa50d094c4948355bfab24c97d8f2ed94 Mon Sep 17 00:00:00 2001
From: Dimitar Bonev <dimitar.bonev@gmail.com>
Date: Thu, 10 Dec 2015 22:56:45 +0200
Subject: [PATCH 0580/1265] Fixes incorrect network name shown in the log when
 no driver is specified

Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
---
 compose/project.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index af40d820..84413174 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -297,9 +297,13 @@ class Project(object):
     def ensure_network_exists(self):
         # TODO: recreate network if driver has changed?
         if self.get_network() is None:
+            driver_name = 'the default driver'
+            if self.network_driver:
+                driver_name = 'driver "{}"'.format(self.network_driver)
+
             log.info(
-                'Creating network "{}" with driver "{}"'
-                .format(self.name, self.network_driver)
+                'Creating network "{}" with {}'
+                .format(self.name, driver_name)
             )
             self.client.create_network(self.name, driver=self.network_driver)
 

From c8f266b637c1ec8c8a017d18d4f2bf4339055ae0 Mon Sep 17 00:00:00 2001
From: Jean Praloran <jean@sitehost.co.nz>
Date: Wed, 16 Dec 2015 08:19:28 +1300
Subject: [PATCH 0581/1265] add restarting status for human_readable_state

Signed-off-by: Jean Praloran <jeanpralo@gmail.com>
---
 compose/container.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/compose/container.py b/compose/container.py
index 1ca48380..8f96a944 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -115,6 +115,8 @@ class Container(object):
     def human_readable_state(self):
         if self.is_paused:
             return 'Paused'
+        if self.is_restarting:
+            return 'Restarting'
         if self.is_running:
             return 'Ghost' if self.get('State.Ghost') else 'Up'
         else:
@@ -134,6 +136,10 @@ class Container(object):
     def is_running(self):
         return self.get('State.Running')
 
+    @property
+    def is_restarting(self):
+        return self.get('State.Restarting')
+
     @property
     def is_paused(self):
         return self.get('State.Paused')

From bc843d67588c6305b82cd2eb7c057cfdef02a4eb Mon Sep 17 00:00:00 2001
From: Dimitar Bonev <dimitar.bonev@gmail.com>
Date: Tue, 15 Dec 2015 20:05:22 +0200
Subject: [PATCH 0582/1265] Start, restart, pause and unpause exit with
 non-zero if nothing to do

Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
---
 compose/cli/main.py          | 18 ++++++++++++++----
 compose/project.py           | 17 +++++++++++++----
 compose/service.py           |  4 +++-
 tests/acceptance/cli_test.py | 16 ++++++++++++++++
 4 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index f30ea334..781c5762 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -265,7 +265,8 @@ class TopLevelCommand(DocoptCommand):
 
         Usage: pause [SERVICE...]
         """
-        project.pause(service_names=options['SERVICE'])
+        containers = project.pause(service_names=options['SERVICE'])
+        exit_if(not containers, 'No containers to pause', 1)
 
     def port(self, project, options):
         """
@@ -476,7 +477,8 @@ class TopLevelCommand(DocoptCommand):
 
         Usage: start [SERVICE...]
         """
-        project.start(service_names=options['SERVICE'])
+        containers = project.start(service_names=options['SERVICE'])
+        exit_if(not containers, 'No containers to start', 1)
 
     def stop(self, project, options):
         """
@@ -504,7 +506,8 @@ class TopLevelCommand(DocoptCommand):
                                      (default: 10)
         """
         timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
-        project.restart(service_names=options['SERVICE'], timeout=timeout)
+        containers = project.restart(service_names=options['SERVICE'], timeout=timeout)
+        exit_if(not containers, 'No containers to restart', 1)
 
     def unpause(self, project, options):
         """
@@ -512,7 +515,8 @@ class TopLevelCommand(DocoptCommand):
 
         Usage: unpause [SERVICE...]
         """
-        project.unpause(service_names=options['SERVICE'])
+        containers = project.unpause(service_names=options['SERVICE'])
+        exit_if(not containers, 'No containers to unpause', 1)
 
     def up(self, project, options):
         """
@@ -674,3 +678,9 @@ def set_signal_handler(handler):
 
 def list_containers(containers):
     return ", ".join(c.name for c in containers)
+
+
+def exit_if(condition, message, exit_code):
+    if condition:
+        log.error(message)
+        raise SystemExit(exit_code)
diff --git a/compose/project.py b/compose/project.py
index 84413174..1cb1daa7 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -187,17 +187,24 @@ class Project(object):
                     net_name))
 
     def start(self, service_names=None, **options):
+        containers = []
         for service in self.get_services(service_names):
-            service.start(**options)
+            service_containers = service.start(**options)
+            containers.extend(service_containers)
+        return containers
 
     def stop(self, service_names=None, **options):
         parallel.parallel_stop(self.containers(service_names), options)
 
     def pause(self, service_names=None, **options):
-        parallel.parallel_pause(reversed(self.containers(service_names)), options)
+        containers = self.containers(service_names)
+        parallel.parallel_pause(reversed(containers), options)
+        return containers
 
     def unpause(self, service_names=None, **options):
-        parallel.parallel_unpause(self.containers(service_names), options)
+        containers = self.containers(service_names)
+        parallel.parallel_unpause(containers, options)
+        return containers
 
     def kill(self, service_names=None, **options):
         parallel.parallel_kill(self.containers(service_names), options)
@@ -206,7 +213,9 @@ class Project(object):
         parallel.parallel_remove(self.containers(service_names, stopped=True), options)
 
     def restart(self, service_names=None, **options):
-        parallel.parallel_restart(self.containers(service_names, stopped=True), options)
+        containers = self.containers(service_names, stopped=True)
+        parallel.parallel_restart(containers, options)
+        return containers
 
     def build(self, service_names=None, no_cache=False, pull=False, force_rm=False):
         for service in self.get_services(service_names):
diff --git a/compose/service.py b/compose/service.py
index 0387b6e9..e04ef271 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -138,8 +138,10 @@ class Service(object):
         raise ValueError("No container found for %s_%s" % (self.name, number))
 
     def start(self, **options):
-        for c in self.containers(stopped=True):
+        containers = self.containers(stopped=True)
+        for c in containers:
             self.start_container_if_stopped(c, **options)
+        return containers
 
     def scale(self, desired_num, timeout=DEFAULT_TIMEOUT):
         """
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 66619629..17b83fe3 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -664,6 +664,10 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(service.containers(stopped=True)), 1)
         self.assertFalse(service.containers(stopped=True)[0].is_running)
 
+    def test_start_no_containers(self):
+        result = self.dispatch(['start'], returncode=1)
+        assert 'No containers to start' in result.stderr
+
     def test_pause_unpause(self):
         self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
@@ -675,6 +679,14 @@ class CLITestCase(DockerClientTestCase):
         self.dispatch(['unpause'], None)
         self.assertFalse(service.containers()[0].is_paused)
 
+    def test_pause_no_containers(self):
+        result = self.dispatch(['pause'], returncode=1)
+        assert 'No containers to pause' in result.stderr
+
+    def test_unpause_no_containers(self):
+        result = self.dispatch(['unpause'], returncode=1)
+        assert 'No containers to unpause' in result.stderr
+
     def test_logs_invalid_service_name(self):
         self.dispatch(['logs', 'madeupname'], returncode=1)
 
@@ -737,6 +749,10 @@ class CLITestCase(DockerClientTestCase):
         self.dispatch(['restart', '-t', '1'], None)
         self.assertEqual(len(service.containers(stopped=False)), 1)
 
+    def test_restart_no_containers(self):
+        result = self.dispatch(['restart'], returncode=1)
+        assert 'No containers to restart' in result.stderr
+
     def test_scale(self):
         project = self.project
 

From a5420412646d5d8912949d2b114f364162fd2cd1 Mon Sep 17 00:00:00 2001
From: Dimitar Bonev <dimitar.bonev@gmail.com>
Date: Wed, 16 Dec 2015 21:25:30 +0200
Subject: [PATCH 0583/1265] Added support for cpu_quota flag

Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
---
 compose/config/config.py          | 1 +
 compose/config/fields_schema.json | 1 +
 compose/service.py                | 2 ++
 docs/compose-file.md              | 3 ++-
 tests/integration/service_test.py | 6 ++++++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index a2ccecc4..0c644833 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -31,6 +31,7 @@ DOCKER_CONFIG_KEYS = [
     'cap_drop',
     'cgroup_parent',
     'command',
+    'cpu_quota',
     'cpu_shares',
     'cpuset',
     'detach',
diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 7d5220e3..fdf56fd9 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -29,6 +29,7 @@
         },
         "container_name": {"type": "string"},
         "cpu_shares": {"type": ["number", "string"]},
+        "cpu_quota": {"type": ["number", "string"]},
         "cpuset": {"type": "string"},
         "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "dns": {"$ref": "#/definitions/string_or_list"},
diff --git a/compose/service.py b/compose/service.py
index e04ef271..3b54c2a7 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -59,6 +59,7 @@ DOCKER_START_KEYS = [
     'restart',
     'volumes_from',
     'security_opt',
+    'cpu_quota',
 ]
 
 
@@ -610,6 +611,7 @@ class Service(object):
             security_opt=options.get('security_opt'),
             ipc_mode=options.get('ipc'),
             cgroup_parent=options.get('cgroup_parent'),
+            cpu_quota=options.get('cpu_quota'),
         )
 
     def build(self, no_cache=False, pull=False, force_rm=False):
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 800d2aa9..c0f2efbe 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -385,12 +385,13 @@ specifying read-only access(``ro``) or read-write(``rw``).
      - container_name
      - service_name:rw
 
-### cpu\_shares, cpuset, domainname, entrypoint, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, stdin\_open, tty, user, working\_dir
+### cpu\_shares, cpu\_quota, cpuset, domainname, entrypoint, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, stdin\_open, tty, user, working\_dir
 
 Each of these is a single value, analogous to its
 [docker run](https://docs.docker.com/reference/run/) counterpart.
 
     cpu_shares: 73
+    cpu_quota: 50000
     cpuset: 0,1
 
     entrypoint: /code/entrypoint.sh
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 5a809423..59ba487a 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -102,6 +102,12 @@ class ServiceTest(DockerClientTestCase):
         container.start()
         self.assertEqual(container.get('HostConfig.CpuShares'), 73)
 
+    def test_create_container_with_cpu_quota(self):
+        service = self.create_service('db', cpu_quota=40000)
+        container = service.create_container()
+        container.start()
+        self.assertEqual(container.get('HostConfig.CpuQuota'), 40000)
+
     def test_create_container_with_extra_hosts_list(self):
         extra_hosts = ['somehost:162.242.195.82', 'otherhost:50.31.209.229']
         service = self.create_service('db', extra_hosts=extra_hosts)

From 2e9a49b4eb48d7611543bf5cb34130e8f5448dff Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 17 Dec 2015 17:50:45 +0000
Subject: [PATCH 0584/1265] Clarify behaviour of 'rm'

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py  | 5 +++++
 docs/reference/rm.md | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index f30ea334..8799880f 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -343,6 +343,11 @@ class TopLevelCommand(DocoptCommand):
         """
         Remove stopped service containers.
 
+        By default, volumes attached to containers will not be removed. You can see all
+        volumes with `docker volume ls`.
+
+        Any data which is not in a volume will be lost.
+
         Usage: rm [options] [SERVICE...]
 
         Options:
diff --git a/docs/reference/rm.md b/docs/reference/rm.md
index 2ed959e4..f8479224 100644
--- a/docs/reference/rm.md
+++ b/docs/reference/rm.md
@@ -20,3 +20,8 @@ Options:
 ```
 
 Removes stopped service containers.
+
+By default, volumes attached to containers will not be removed. You can see all
+volumes with `docker volume ls`.
+
+Any data which is not in a volume will be lost.

From 3c76d5a46770b68910223456226a5353ce2f51c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Seguin?= <stephseguin93@gmail.com>
Date: Mon, 14 Dec 2015 22:46:13 +0100
Subject: [PATCH 0585/1265] Add docker-compose create command. Closes #1125
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
---
 compose/cli/main.py               | 22 +++++++++++
 compose/project.py                | 19 +++++++--
 compose/service.py                | 20 ++++++----
 tests/acceptance/cli_test.py      | 46 ++++++++++++++++++++++
 tests/integration/project_test.py | 65 +++++++++++++++++++++++++++++++
 tests/integration/service_test.py | 18 +++++++++
 6 files changed, 179 insertions(+), 11 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index f30ea334..a98795e3 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -130,6 +130,7 @@ class TopLevelCommand(DocoptCommand):
     Commands:
       build              Build or rebuild services
       config             Validate and view the compose file
+      create             Create services
       help               Get help on a command
       kill               Kill containers
       logs               View output from containers
@@ -221,6 +222,27 @@ class TopLevelCommand(DocoptCommand):
             indent=2,
             width=80))
 
+    def create(self, project, options):
+        """
+        Creates containers for a service.
+
+        Usage: create [options] [SERVICE...]
+
+        Options:
+            --force-recreate       Recreate containers even if their configuration and
+                                   image haven't changed. Incompatible with --no-recreate.
+            --no-recreate          If containers already exist, don't recreate them.
+                                   Incompatible with --force-recreate.
+            --no-build             Don't build an image, even if it's missing
+        """
+        service_names = options['SERVICE']
+
+        project.create(
+            service_names=service_names,
+            strategy=convergence_strategy_from_opts(options),
+            do_build=not options['--no-build']
+        )
+
     def help(self, project, options):
         """
         Get help on a command.
diff --git a/compose/project.py b/compose/project.py
index 84413174..d4046856 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -123,6 +123,12 @@ class Project(object):
             [uniques.append(s) for s in services if s not in uniques]
             return uniques
 
+    def get_services_without_duplicate(self, service_names=None, include_deps=False):
+        services = self.get_services(service_names, include_deps)
+        for service in services:
+            service.remove_duplicate_containers()
+        return services
+
     def get_links(self, service_dict):
         links = []
         if 'links' in service_dict:
@@ -215,6 +221,14 @@ class Project(object):
             else:
                 log.info('%s uses an image, skipping' % service.name)
 
+    def create(self, service_names=None, strategy=ConvergenceStrategy.changed, do_build=True):
+        services = self.get_services_without_duplicate(service_names, include_deps=True)
+
+        plans = self._get_convergence_plans(services, strategy)
+
+        for service in services:
+            service.execute_convergence_plan(plans[service.name], do_build, detached=True, start=False)
+
     def up(self,
            service_names=None,
            start_deps=True,
@@ -223,10 +237,7 @@ class Project(object):
            timeout=DEFAULT_TIMEOUT,
            detached=False):
 
-        services = self.get_services(service_names, include_deps=start_deps)
-
-        for service in services:
-            service.remove_duplicate_containers()
+        services = self.get_services_without_duplicate(service_names, include_deps=start_deps)
 
         plans = self._get_convergence_plans(services, strategy)
 
diff --git a/compose/service.py b/compose/service.py
index 0387b6e9..791e57ae 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -328,7 +328,8 @@ class Service(object):
                                  plan,
                                  do_build=True,
                                  timeout=DEFAULT_TIMEOUT,
-                                 detached=False):
+                                 detached=False,
+                                 start=True):
         (action, containers) = plan
         should_attach_logs = not detached
 
@@ -338,7 +339,8 @@ class Service(object):
             if should_attach_logs:
                 container.attach_log_stream()
 
-            container.start()
+            if start:
+                container.start()
 
             return [container]
 
@@ -348,14 +350,16 @@ class Service(object):
                     container,
                     do_build=do_build,
                     timeout=timeout,
-                    attach_logs=should_attach_logs
+                    attach_logs=should_attach_logs,
+                    start_new_container=start
                 )
                 for container in containers
             ]
 
         elif action == 'start':
-            for container in containers:
-                self.start_container_if_stopped(container, attach_logs=should_attach_logs)
+            if start:
+                for container in containers:
+                    self.start_container_if_stopped(container, attach_logs=should_attach_logs)
 
             return containers
 
@@ -373,7 +377,8 @@ class Service(object):
             container,
             do_build=False,
             timeout=DEFAULT_TIMEOUT,
-            attach_logs=False):
+            attach_logs=False,
+            start_new_container=True):
         """Recreate a container.
 
         The original container is renamed to a temporary name so that data
@@ -392,7 +397,8 @@ class Service(object):
         )
         if attach_logs:
             new_container.attach_log_stream()
-        new_container.start()
+        if start_new_container:
+            new_container.start()
         container.remove()
         return new_container
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 66619629..032b507d 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -264,6 +264,52 @@ class CLITestCase(DockerClientTestCase):
         ]
         assert not containers
 
+    def test_create(self):
+        self.dispatch(['create'])
+        service = self.project.get_service('simple')
+        another = self.project.get_service('another')
+        self.assertEqual(len(service.containers()), 0)
+        self.assertEqual(len(another.containers()), 0)
+        self.assertEqual(len(service.containers(stopped=True)), 1)
+        self.assertEqual(len(another.containers(stopped=True)), 1)
+
+    def test_create_with_force_recreate(self):
+        self.dispatch(['create'], None)
+        service = self.project.get_service('simple')
+        self.assertEqual(len(service.containers()), 0)
+        self.assertEqual(len(service.containers(stopped=True)), 1)
+
+        old_ids = [c.id for c in service.containers(stopped=True)]
+
+        self.dispatch(['create', '--force-recreate'], None)
+        self.assertEqual(len(service.containers()), 0)
+        self.assertEqual(len(service.containers(stopped=True)), 1)
+
+        new_ids = [c.id for c in service.containers(stopped=True)]
+
+        self.assertNotEqual(old_ids, new_ids)
+
+    def test_create_with_no_recreate(self):
+        self.dispatch(['create'], None)
+        service = self.project.get_service('simple')
+        self.assertEqual(len(service.containers()), 0)
+        self.assertEqual(len(service.containers(stopped=True)), 1)
+
+        old_ids = [c.id for c in service.containers(stopped=True)]
+
+        self.dispatch(['create', '--no-recreate'], None)
+        self.assertEqual(len(service.containers()), 0)
+        self.assertEqual(len(service.containers(stopped=True)), 1)
+
+        new_ids = [c.id for c in service.containers(stopped=True)]
+
+        self.assertEqual(old_ids, new_ids)
+
+    def test_create_with_force_recreate_and_no_recreate(self):
+        self.dispatch(
+            ['create', '--force-recreate', '--no-recreate'],
+            returncode=1)
+
     def test_up_detached(self):
         self.dispatch(['up', '-d'])
         service = self.project.get_service('simple')
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 443ff978..229f653a 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -213,6 +213,71 @@ class ProjectTest(DockerClientTestCase):
         project.remove_stopped()
         self.assertEqual(len(project.containers(stopped=True)), 0)
 
+    def test_create(self):
+        web = self.create_service('web')
+        db = self.create_service('db', volumes=[VolumeSpec.parse('/var/db')])
+        project = Project('composetest', [web, db], self.client)
+
+        project.create(['db'])
+        self.assertEqual(len(project.containers()), 0)
+        self.assertEqual(len(project.containers(stopped=True)), 1)
+        self.assertEqual(len(db.containers()), 0)
+        self.assertEqual(len(db.containers(stopped=True)), 1)
+        self.assertEqual(len(web.containers(stopped=True)), 0)
+
+    def test_create_twice(self):
+        web = self.create_service('web')
+        db = self.create_service('db', volumes=[VolumeSpec.parse('/var/db')])
+        project = Project('composetest', [web, db], self.client)
+
+        project.create(['db', 'web'])
+        project.create(['db', 'web'])
+        self.assertEqual(len(project.containers()), 0)
+        self.assertEqual(len(project.containers(stopped=True)), 2)
+        self.assertEqual(len(db.containers()), 0)
+        self.assertEqual(len(db.containers(stopped=True)), 1)
+        self.assertEqual(len(web.containers()), 0)
+        self.assertEqual(len(web.containers(stopped=True)), 1)
+
+    def test_create_with_links(self):
+        db = self.create_service('db')
+        web = self.create_service('web', links=[(db, 'db')])
+        project = Project('composetest', [db, web], self.client)
+
+        project.create(['web'])
+        self.assertEqual(len(project.containers()), 0)
+        self.assertEqual(len(project.containers(stopped=True)), 2)
+        self.assertEqual(len(db.containers()), 0)
+        self.assertEqual(len(db.containers(stopped=True)), 1)
+        self.assertEqual(len(web.containers()), 0)
+        self.assertEqual(len(web.containers(stopped=True)), 1)
+
+    def test_create_strategy_always(self):
+        db = self.create_service('db')
+        project = Project('composetest', [db], self.client)
+        project.create(['db'])
+        old_id = project.containers(stopped=True)[0].id
+
+        project.create(['db'], strategy=ConvergenceStrategy.always)
+        self.assertEqual(len(project.containers()), 0)
+        self.assertEqual(len(project.containers(stopped=True)), 1)
+
+        db_container = project.containers(stopped=True)[0]
+        self.assertNotEqual(db_container.id, old_id)
+
+    def test_create_strategy_never(self):
+        db = self.create_service('db')
+        project = Project('composetest', [db], self.client)
+        project.create(['db'])
+        old_id = project.containers(stopped=True)[0].id
+
+        project.create(['db'], strategy=ConvergenceStrategy.never)
+        self.assertEqual(len(project.containers()), 0)
+        self.assertEqual(len(project.containers(stopped=True)), 1)
+
+        db_container = project.containers(stopped=True)[0]
+        self.assertEqual(db_container.id, old_id)
+
     def test_project_up(self):
         web = self.create_service('web')
         db = self.create_service('db', volumes=[VolumeSpec.parse('/var/db')])
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 5a809423..84ef696e 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -333,6 +333,24 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(list(new_container.get('Volumes')), ['/data'])
         self.assertEqual(new_container.get('Volumes')['/data'], volume_path)
 
+    def test_execute_convergence_plan_without_start(self):
+        service = self.create_service(
+            'db',
+            build='tests/fixtures/dockerfile-with-volume'
+        )
+
+        containers = service.execute_convergence_plan(ConvergencePlan('create', []), start=False)
+        self.assertEqual(len(service.containers()), 0)
+        self.assertEqual(len(service.containers(stopped=True)), 1)
+
+        containers = service.execute_convergence_plan(ConvergencePlan('recreate', containers), start=False)
+        self.assertEqual(len(service.containers()), 0)
+        self.assertEqual(len(service.containers(stopped=True)), 1)
+
+        service.execute_convergence_plan(ConvergencePlan('start', containers), start=False)
+        self.assertEqual(len(service.containers()), 0)
+        self.assertEqual(len(service.containers(stopped=True)), 1)
+
     def test_start_container_passes_through_options(self):
         db = self.create_service('db')
         create_and_start_container(db, environment={'FOO': 'BAR'})

From 5ed559fa0ef89c944734226278155050f994ece0 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Mon, 21 Dec 2015 01:52:54 +0100
Subject: [PATCH 0586/1265] Update links

Updates some links to their new locations, and
replaces some http:// with https:// links.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 CHANGELOG.md                             |  4 ++--
 CONTRIBUTING.md                          |  2 +-
 README.md                                |  2 +-
 compose/cli/errors.py                    |  4 ++--
 docs/compose-file.md                     | 10 +++++-----
 docs/django.md                           |  6 +++---
 docs/env.md                              |  2 +-
 docs/gettingstarted.md                   |  2 +-
 docs/index.md                            |  2 +-
 docs/install.md                          |  6 +++---
 docs/production.md                       |  4 ++--
 docs/rails.md                            |  4 ++--
 docs/wordpress.md                        |  8 ++++----
 experimental/compose_swarm_networking.md |  4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b6e0dd3..79aee75f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -301,8 +301,8 @@ Several new configuration keys have been added to `docker-compose.yml`:
 - `pid: host`, like `docker run --pid=host`, lets you reuse the same PID namespace as the host machine.
 - `cpuset`, like `docker run --cpuset-cpus`, lets you specify which CPUs to allow execution in.
 - `read_only`, like `docker run --read-only`, lets you mount a container's filesystem as read-only.
-- `security_opt`, like `docker run --security-opt`, lets you specify [security options](https://docs.docker.com/reference/run/#security-configuration).
-- `log_driver`, like `docker run --log-driver`, lets you specify a [log driver](https://docs.docker.com/reference/run/#logging-drivers-log-driver).
+- `security_opt`, like `docker run --security-opt`, lets you specify [security options](https://docs.docker.com/engine/reference/run/#security-configuration).
+- `log_driver`, like `docker run --log-driver`, lets you specify a [log driver](https://docs.docker.com/engine/reference/run/#logging-drivers-log-driver).
 
 Many bugs have been fixed, including the following:
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 62bf415c..66224752 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,7 +43,7 @@ To run the style checks at any time run `tox -e pre-commit`.
 
 ## Submitting a pull request
 
-See Docker's [basic contribution workflow](https://docs.docker.com/project/make-a-contribution/#the-basic-contribution-workflow) for a guide on how to submit a pull request for code or documentation.
+See Docker's [basic contribution workflow](https://docs.docker.com/opensource/workflow/make-a-contribution/#the-basic-contribution-workflow) for a guide on how to submit a pull request for code or documentation.
 
 ## Running the test suite
 
diff --git a/README.md b/README.md
index c9b4729a..b60a7eee 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ Compose has commands for managing the whole lifecycle of your application:
 Installation and documentation
 ------------------------------
 
-- Full documentation is available on [Docker's website](http://docs.docker.com/compose/).
+- Full documentation is available on [Docker's website](https://docs.docker.com/compose/).
 - If you have any questions, you can talk in real-time with other developers in the #docker-compose IRC channel on Freenode. [Click here to join using IRCCloud.](https://www.irccloud.com/invite?hostname=irc.freenode.net&channel=%23docker-compose)
 - Code repository for Compose is on [Github](https://github.com/docker/compose)
 - If you find any problems please fill out an [issue](https://github.com/docker/compose/issues/new)
diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index 244897f8..ca4413bd 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -27,7 +27,7 @@ class DockerNotFoundUbuntu(UserError):
         super(DockerNotFoundUbuntu, self).__init__("""
         Couldn't connect to Docker daemon. You might need to install Docker:
 
-        http://docs.docker.io/en/latest/installation/ubuntulinux/
+        https://docs.docker.com/engine/installation/ubuntulinux/
         """)
 
 
@@ -36,7 +36,7 @@ class DockerNotFoundGeneric(UserError):
         super(DockerNotFoundGeneric, self).__init__("""
         Couldn't connect to Docker daemon. You might need to install Docker:
 
-        http://docs.docker.io/en/latest/installation/
+        https://docs.docker.com/engine/installation/
         """)
 
 
diff --git a/docs/compose-file.md b/docs/compose-file.md
index c0f2efbe..2a6028b8 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -231,7 +231,7 @@ pull if it doesn't exist locally.
 
 ### labels
 
-Add metadata to containers using [Docker labels](http://docs.docker.com/userguide/labels-custom-metadata/). You can use either an array or a dictionary.
+Add metadata to containers using [Docker labels](https://docs.docker.com/engine/userguide/labels-custom-metadata/). You can use either an array or a dictionary.
 
 It's recommended that you use reverse-DNS notation to prevent your labels from conflicting with those used by other software.
 
@@ -269,7 +269,7 @@ reference](env.md) for details.
 ### log_driver
 
 Specify a logging driver for the service's containers, as with the ``--log-driver``
-option for docker run ([documented here](https://docs.docker.com/reference/logging/overview/)).
+option for docker run ([documented here](https://docs.docker.com/engine/reference/logging/overview/)).
 
 The default value is json-file.
 
@@ -371,8 +371,8 @@ a `volume_driver`.
 > Note: No path expansion will be done if you have also specified a
 > `volume_driver`.
 
-See [Docker Volumes](https://docs.docker.com/userguide/dockervolumes/) and
-[Volume Plugins](https://docs.docker.com/extend/plugins_volume/) for more
+See [Docker Volumes](https://docs.docker.com/engine/userguide/dockervolumes/) and
+[Volume Plugins](https://docs.docker.com/engine/extend/plugins_volume/) for more
 information.
 
 ### volumes_from
@@ -388,7 +388,7 @@ specifying read-only access(``ro``) or read-write(``rw``).
 ### cpu\_shares, cpu\_quota, cpuset, domainname, entrypoint, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, stdin\_open, tty, user, working\_dir
 
 Each of these is a single value, analogous to its
-[docker run](https://docs.docker.com/reference/run/) counterpart.
+[docker run](https://docs.docker.com/engine/reference/run/) counterpart.
 
     cpu_shares: 73
     cpu_quota: 50000
diff --git a/docs/django.md b/docs/django.md
index b503e574..2d4fdaf9 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -30,8 +30,8 @@ and a `docker-compose.yml` file.
     The Dockerfile defines an application's image content via one or more build
     commands that configure that image. Once built, you can run the image in a
     container.  For more information on `Dockerfiles`, see the [Docker user
-    guide](https://docs.docker.com/userguide/dockerimages/#building-an-image-from-a-dockerfile)
-    and the [Dockerfile reference](http://docs.docker.com/reference/builder/).
+    guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile)
+    and the [Dockerfile reference](https://docs.docker.com/engine/reference/builder/).
 
 3. Add the following content to the `Dockerfile`.
 
@@ -144,7 +144,7 @@ In this section, you set up the database connection for Django.
         }
 
     These settings are determined by the
-    [postgres](https://registry.hub.docker.com/_/postgres/) Docker image
+    [postgres](https://hub.docker.com/_/postgres/) Docker image
     specified in `docker-compose.yml`.
 
 3. Save and close the file.
diff --git a/docs/env.md b/docs/env.md
index d7b51ba2..c0e03a4e 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -35,7 +35,7 @@ Protocol (tcp or udp), e.g. `DB_PORT_5432_TCP_PROTO=tcp`
 <b><i>name</i>\_NAME</b><br>
 Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
 
-[Docker links]: http://docs.docker.com/userguide/dockerlinks/
+[Docker links]: https://docs.docker.com/engine/userguide/networking/default_network/dockerlinks/
 
 ## Related Information
 
diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md
index f685bf38..bb3d51e9 100644
--- a/docs/gettingstarted.md
+++ b/docs/gettingstarted.md
@@ -77,7 +77,7 @@ dependencies the Python application requires, including Python itself.
   * Install the Python dependencies.
   * Set the default command for the container to `python app.py`
 
-  For more information on how to write Dockerfiles, see the [Docker user guide](https://docs.docker.com/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](http://docs.docker.com/reference/builder/).
+  For more information on how to write Dockerfiles, see the [Docker user guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](http://docs.docker.com/reference/builder/).
 
 2. Build the image.
 
diff --git a/docs/index.md b/docs/index.md
index 8b32a754..36b93a39 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -183,4 +183,4 @@ individuals, we have a number of open channels for communication.
 
 * To contribute code or documentation changes: please submit a [pull request on Github](https://github.com/docker/compose/pulls).
 
-For more information and resources, please visit the [Getting Help project page](https://docs.docker.com/project/get-help/).
+For more information and resources, please visit the [Getting Help project page](https://docs.docker.com/opensource/get-help/).
diff --git a/docs/install.md b/docs/install.md
index 7c73baaa..417a48c1 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -20,11 +20,11 @@ To install Compose, do the following:
 
 1. Install Docker Engine version 1.7.1 or greater:
 
-     * <a href="https://docs.docker.com/installation/mac/" target="_blank">Mac OS X installation</a> (Toolbox installation includes both Engine and Compose)
+     * <a href="https://docs.docker.com/engine/installation/mac/" target="_blank">Mac OS X installation</a> (Toolbox installation includes both Engine and Compose)
 
-     * <a href="https://docs.docker.com/installation/ubuntulinux/" target="_blank">Ubuntu installation</a>
+     * <a href="https://docs.docker.com/engine/installation/ubuntulinux/" target="_blank">Ubuntu installation</a>
 
-     * <a href="https://docs.docker.com/installation/" target="_blank">other system installations</a>
+     * <a href="https://docs.docker.com/engine/installation/" target="_blank">other system installations</a>
 
 2. Mac OS X users are done installing. Others should continue to the next step.
 
diff --git a/docs/production.md b/docs/production.md
index 0a5e77b5..46e221bb 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -60,7 +60,7 @@ recreating any services which `web` depends on.
 You can use Compose to deploy an app to a remote Docker host by setting the
 `DOCKER_HOST`, `DOCKER_TLS_VERIFY`, and `DOCKER_CERT_PATH` environment variables
 appropriately. For tasks like this,
-[Docker Machine](https://docs.docker.com/machine) makes managing local and
+[Docker Machine](https://docs.docker.com/machine/) makes managing local and
 remote Docker hosts very easy, and is recommended even if you're not deploying
 remotely.
 
@@ -69,7 +69,7 @@ commands will work with no further configuration.
 
 ### Running Compose on a Swarm cluster
 
-[Docker Swarm](https://docs.docker.com/swarm), a Docker-native clustering
+[Docker Swarm](https://docs.docker.com/swarm/), a Docker-native clustering
 system, exposes the same API as a single Docker host, which means you can use
 Compose against a Swarm instance and run your apps across multiple hosts.
 
diff --git a/docs/rails.md b/docs/rails.md
index d3f1707c..e3daff25 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -30,7 +30,7 @@ Dockerfile consists of:
     RUN bundle install
     ADD . /myapp
 
-That'll put your application code inside an image that will build a container with Ruby, Bundler and all your dependencies inside it. For more information on how to write Dockerfiles, see the [Docker user guide](https://docs.docker.com/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](http://docs.docker.com/reference/builder/).
+That'll put your application code inside an image that will build a container with Ruby, Bundler and all your dependencies inside it. For more information on how to write Dockerfiles, see the [Docker user guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](https://docs.docker.com/engine/reference/builder/).
 
 Next, create a bootstrap `Gemfile` which just loads Rails. It'll be overwritten in a moment by `rails new`.
 
@@ -128,7 +128,7 @@ Finally, you need to create the database. In another terminal, run:
 
     $ docker-compose run web rake db:create
 
-That's it. Your app should now be running on port 3000 on your Docker daemon. If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` returns the Docker host IP address.
+That's it. Your app should now be running on port 3000 on your Docker daemon. If you're using [Docker Machine](https://docs.docker.com/machine/), then `docker-machine ip MACHINE_VM` returns the Docker host IP address.
 
 
 ## More Compose documentation
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 15746a75..84010491 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -28,9 +28,9 @@ to the name of your project.
 Next, inside that directory, create a `Dockerfile`, a file that defines what
 environment your app is going to run in. For more information on how to write
 Dockerfiles, see the
-[Docker user guide](https://docs.docker.com/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the
-[Dockerfile reference](http://docs.docker.com/reference/builder/). In this case,
-your Dockerfile should be:
+[Docker user guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the
+[Dockerfile reference](https://docs.docker.com/engine/reference/builder/). In
+this case, your Dockerfile should be:
 
     FROM orchardup/php5
     ADD . /code
@@ -89,7 +89,7 @@ configuration at the `db` container:
 
 With those four files in place, run `docker-compose up` inside your WordPress
 directory and it'll pull and build the needed images, and then start the web and
-database containers. If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.
+database containers. If you're using [Docker Machine](https://docs.docker.com/machine/), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.
 
 ## More Compose documentation
 
diff --git a/experimental/compose_swarm_networking.md b/experimental/compose_swarm_networking.md
index e3dcf6cc..b1fb25dc 100644
--- a/experimental/compose_swarm_networking.md
+++ b/experimental/compose_swarm_networking.md
@@ -15,9 +15,9 @@ Before you start, you’ll need to install the experimental build of Docker, and
         $ curl -L https://experimental.docker.com/builds/Darwin/x86_64/docker-latest > /usr/local/bin/docker
         $ chmod +x /usr/local/bin/docker
 
--   To install Machine, follow the instructions [here](http://docs.docker.com/machine/).
+-   To install Machine, follow the instructions [here](https://docs.docker.com/machine/install-machine/).
 
--   To install Compose, follow the instructions [here](http://docs.docker.com/compose/install/).
+-   To install Compose, follow the instructions [here](https://docs.docker.com/compose/install/).
 
 You’ll also need a [Docker Hub](https://hub.docker.com/account/signup/) account and a [Digital Ocean](https://www.digitalocean.com/) account.
 

From adde8058292076a564c6fce36f8fc75c2ac52381 Mon Sep 17 00:00:00 2001
From: Tomas Tomecek <ttomecek@redhat.com>
Date: Sat, 26 Dec 2015 11:03:58 +0100
Subject: [PATCH 0587/1265] allow running compose from git

with:

```
$ git clone docker/compose && cd compose
$ export PYTHONPATH="$PWD:$PYTHONPATH"
$ python -m compose --help
```

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
---
 compose/__main__.py | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 compose/__main__.py

diff --git a/compose/__main__.py b/compose/__main__.py
new file mode 100644
index 00000000..199ba2ae
--- /dev/null
+++ b/compose/__main__.py
@@ -0,0 +1,3 @@
+from compose.cli.main import main
+
+main()

From 39af6b653b1ca95463c699ad62f69c86adc79e95 Mon Sep 17 00:00:00 2001
From: Michael Gilliland <mjg.py3@gmail.com>
Date: Mon, 28 Dec 2015 16:35:05 -0500
Subject: [PATCH 0588/1265] Update `volumes_from` docs to state default

[Proof of read-write](https://github.com/docker/compose/blob/cfb1b37da22242dc67d5123772b3fa4518458504/compose/config/types.py#L26).

I found myself wondering what the default was a couple of times, and finally decided to change it :)

Signed-off-by: Michael Gilliland <gillilandmj@upmc.edu>
---
 docs/compose-file.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 2a6028b8..b3ef8938 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -378,7 +378,8 @@ information.
 ### volumes_from
 
 Mount all of the volumes from another service or container, optionally
-specifying read-only access(``ro``) or read-write(``rw``).
+specifying read-only access (``ro``) or read-write (``rw``). If no access level is specified,
+then read-write will be used.
 
     volumes_from:
      - service_name

From 778c213dfc9c65ac27d4f527018eb66d841d890e Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 28 Dec 2015 16:57:55 -0500
Subject: [PATCH 0589/1265] Fix signal handlers by moving shutdown logic out of
 handler.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py          | 45 +++++++++++++++---------------------
 compose/cli/signals.py       | 18 +++++++++++++++
 tests/acceptance/cli_test.py |  3 ++-
 tests/unit/cli/main_test.py  |  2 +-
 4 files changed, 40 insertions(+), 28 deletions(-)
 create mode 100644 compose/cli/signals.py

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 4a766133..e360dddd 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 
 import logging
 import re
-import signal
 import sys
 from inspect import getdoc
 from operator import attrgetter
@@ -12,6 +11,7 @@ import yaml
 from docker.errors import APIError
 from requests.exceptions import ReadTimeout
 
+from . import signals
 from .. import __version__
 from ..config import config
 from ..config import ConfigurationError
@@ -655,20 +655,19 @@ def run_one_off_container(container_options, project, service, options):
         if options['--rm']:
             project.client.remove_container(container.id, force=True)
 
-    def force_shutdown(signal, frame):
+    signals.set_signal_handler_to_shutdown()
+    try:
+        try:
+            dockerpty.start(project.client, container.id, interactive=not options['-T'])
+            exit_code = container.wait()
+        except signals.ShutdownException:
+            project.client.stop(container.id)
+            exit_code = 1
+    except signals.ShutdownException:
         project.client.kill(container.id)
         remove_container(force=True)
         sys.exit(2)
 
-    def shutdown(signal, frame):
-        set_signal_handler(force_shutdown)
-        project.client.stop(container.id)
-        remove_container()
-        sys.exit(1)
-
-    set_signal_handler(shutdown)
-    dockerpty.start(project.client, container.id, interactive=not options['-T'])
-    exit_code = container.wait()
     remove_container()
     sys.exit(exit_code)
 
@@ -683,25 +682,19 @@ def build_log_printer(containers, service_names, monochrome):
 
 
 def attach_to_logs(project, log_printer, service_names, timeout):
+    print("Attaching to", list_containers(log_printer.containers))
+    signals.set_signal_handler_to_shutdown()
 
-    def force_shutdown(signal, frame):
+    try:
+        try:
+            log_printer.run()
+        except signals.ShutdownException:
+            print("Gracefully stopping... (press Ctrl+C again to force)")
+            project.stop(service_names=service_names, timeout=timeout)
+    except signals.ShutdownException:
         project.kill(service_names=service_names)
         sys.exit(2)
 
-    def shutdown(signal, frame):
-        set_signal_handler(force_shutdown)
-        print("Gracefully stopping... (press Ctrl+C again to force)")
-        project.stop(service_names=service_names, timeout=timeout)
-
-    print("Attaching to", list_containers(log_printer.containers))
-    set_signal_handler(shutdown)
-    log_printer.run()
-
-
-def set_signal_handler(handler):
-    signal.signal(signal.SIGINT, handler)
-    signal.signal(signal.SIGTERM, handler)
-
 
 def list_containers(containers):
     return ", ".join(c.name for c in containers)
diff --git a/compose/cli/signals.py b/compose/cli/signals.py
new file mode 100644
index 00000000..38474ba4
--- /dev/null
+++ b/compose/cli/signals.py
@@ -0,0 +1,18 @@
+import signal
+
+
+class ShutdownException(Exception):
+    pass
+
+
+def shutdown(signal, frame):
+    raise ShutdownException()
+
+
+def set_signal_handler(handler):
+    signal.signal(signal.SIGINT, handler)
+    signal.signal(signal.SIGTERM, handler)
+
+
+def set_signal_handler_to_shutdown():
+    set_signal_handler(shutdown)
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index e6fa38a8..694f8583 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -86,7 +86,8 @@ class ContainerStateCondition(object):
             return False
 
     def __str__(self):
-        return "waiting for container to have state %s" % self.expected
+        state = 'running' if self.running else 'stopped'
+        return "waiting for container to be %s" % state
 
 
 class CLITestCase(DockerClientTestCase):
diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py
index db37ac1a..b63ac746 100644
--- a/tests/unit/cli/main_test.py
+++ b/tests/unit/cli/main_test.py
@@ -54,7 +54,7 @@ class CLIMainTestCase(unittest.TestCase):
         service_names = ['web', 'db']
         timeout = 12
 
-        with mock.patch('compose.cli.main.signal', autospec=True) as mock_signal:
+        with mock.patch('compose.cli.main.signals.signal', autospec=True) as mock_signal:
             attach_to_logs(project, log_printer, service_names, timeout)
 
         assert mock_signal.signal.mock_calls == [

From d4e913e42cf7141421d76407ce2ca22935bb1a25 Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Thu, 31 Dec 2015 19:04:38 -0800
Subject: [PATCH 0590/1265] Fixing TODO visible in docs

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/networking.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/networking.md b/docs/networking.md
index 718d56c7..91ac0b73 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -79,9 +79,11 @@ You can specify which one to use with the `--x-network-driver` flag:
 
     $ docker-compose --x-networking --x-network-driver=overlay up
 
+<!--[metadata]>
 ## Multi-host networking
 
 (TODO: talk about Swarm and the overlay driver)
+<![end-metadata]-->
 
 ## Custom container network modes
 

From 2acc29cf1c25be7078ebeaf70e9d45f8048198da Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 4 Jan 2016 15:35:57 -0500
Subject: [PATCH 0591/1265] Remove support for fig.yaml, FIG_FILE, and
 FIG_PROJECT_NAME.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/command.py                 | 15 ++-------------
 compose/config/config.py               |  6 ------
 contrib/completion/bash/docker-compose |  2 +-
 contrib/completion/zsh/_docker-compose |  2 +-
 tests/unit/cli_test.py                 |  7 -------
 tests/unit/config/config_test.py       |  2 --
 6 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 59f6c4bc..21d6ff0d 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -59,11 +59,7 @@ def get_config_path_from_options(options):
     if file_option:
         return file_option
 
-    if 'FIG_FILE' in os.environ:
-        log.warn('The FIG_FILE environment variable is deprecated.')
-        log.warn('Please use COMPOSE_FILE instead.')
-
-    config_file = os.environ.get('COMPOSE_FILE') or os.environ.get('FIG_FILE')
+    config_file = os.environ.get('COMPOSE_FILE')
     return [config_file] if config_file else None
 
 
@@ -96,14 +92,7 @@ def get_project_name(working_dir, project_name=None):
     def normalize_name(name):
         return re.sub(r'[^a-z0-9]', '', name.lower())
 
-    if 'FIG_PROJECT_NAME' in os.environ:
-        log.warn('The FIG_PROJECT_NAME environment variable is deprecated.')
-        log.warn('Please use COMPOSE_PROJECT_NAME instead.')
-
-    project_name = (
-        project_name or
-        os.environ.get('COMPOSE_PROJECT_NAME') or
-        os.environ.get('FIG_PROJECT_NAME'))
+    project_name = project_name or os.environ.get('COMPOSE_PROJECT_NAME')
     if project_name is not None:
         return normalize_name(project_name)
 
diff --git a/compose/config/config.py b/compose/config/config.py
index 0c644833..195665b5 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -88,8 +88,6 @@ DOCKER_VALID_URL_PREFIXES = (
 SUPPORTED_FILENAMES = [
     'docker-compose.yml',
     'docker-compose.yaml',
-    'fig.yml',
-    'fig.yaml',
 ]
 
 DEFAULT_OVERRIDE_FILENAME = 'docker-compose.override.yml'
@@ -162,10 +160,6 @@ def get_default_config_files(base_dir):
         log.warn("Found multiple config files with supported names: %s", ", ".join(candidates))
         log.warn("Using %s\n", winner)
 
-    if winner.startswith("fig."):
-        log.warn("%s is deprecated and will not be supported in future. "
-                 "Please rename your config file to docker-compose.yml\n" % winner)
-
     return [os.path.join(path, winner)] + get_default_override_file(path)
 
 
diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 497a8184..c18e4f6d 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -28,7 +28,7 @@ __docker_compose_nospace() {
 # Support for these filenames might be dropped in some future version.
 __docker_compose_compose_file() {
 	local file
-	for file in docker-compose.y{,a}ml fig.y{,a}ml ; do
+	for file in docker-compose.y{,a}ml ; do
 		[ -e $file ] && {
 			echo $file
 			return
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 67ca49bb..35c2b996 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -24,7 +24,7 @@
 # Support for these filenames might be dropped in some future version.
 __docker-compose_compose_file() {
     local file
-    for file in docker-compose.y{,a}ml fig.y{,a}ml ; do
+    for file in docker-compose.y{,a}ml ; do
         [ -e $file ] && {
             echo $file
             return
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 61cef6f6..a5767097 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -42,13 +42,6 @@ class CLITestCase(unittest.TestCase):
         project_name = get_project_name(None, project_name=name)
         self.assertEquals('explicitprojectname', project_name)
 
-    def test_project_name_from_environment_old_var(self):
-        name = 'namefromenv'
-        with mock.patch.dict(os.environ):
-            os.environ['FIG_PROJECT_NAME'] = name
-            project_name = get_project_name(None)
-        self.assertEquals(project_name, name)
-
     def test_project_name_from_environment_new_var(self):
         name = 'namefromenv'
         with mock.patch.dict(os.environ):
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 2185b792..e975cb9d 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1616,8 +1616,6 @@ class GetDefaultConfigFilesTestCase(unittest.TestCase):
     files = [
         'docker-compose.yml',
         'docker-compose.yaml',
-        'fig.yml',
-        'fig.yaml',
     ]
 
     def test_get_config_path_default_file_in_basedir(self):

From ad9011ed96dc35ef6880badd1068276a4493da37 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 5 Jan 2016 17:30:27 -0500
Subject: [PATCH 0592/1265] Don't warn when the container volume is specified
 as a compose option.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py         |  1 +
 tests/unit/service_test.py | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/compose/service.py b/compose/service.py
index d1509871..5540d734 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -880,6 +880,7 @@ def warn_on_masked_volume(volumes_option, container_volumes, service):
 
     for volume in volumes_option:
         if (
+            volume.external and
             volume.internal in container_volumes and
             container_volumes.get(volume.internal) != volume.external
         ):
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 1c8b441f..637bf3ba 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -742,6 +742,18 @@ class ServiceVolumesTest(unittest.TestCase):
 
         assert not mock_log.warn.called
 
+    def test_warn_on_masked_no_warning_with_container_only_option(self):
+        volumes_option = [VolumeSpec(None, '/path', 'rw')]
+        container_volumes = [
+            VolumeSpec('/var/lib/docker/volume/path', '/path', 'rw')
+        ]
+        service = 'service_name'
+
+        with mock.patch('compose.service.log', autospec=True) as mock_log:
+            warn_on_masked_volume(volumes_option, container_volumes, service)
+
+        assert not mock_log.warn.called
+
     def test_create_with_special_volume_mode(self):
         self.mock_client.inspect_image.return_value = {'Id': 'imageid'}
 

From 73de81b51c0f613ed543f4446a5d76ed9e788659 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 2 Oct 2015 19:04:39 -0400
Subject: [PATCH 0593/1265] Upgrade tests to use new Mounts in container
 inspect.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/docker_client.py         |  2 +-
 compose/container.py                 |  6 ++++++
 tests/acceptance/cli_test.py         |  2 +-
 tests/integration/project_test.py    | 20 +++++++++++++-------
 tests/integration/resilience_test.py |  8 ++++----
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 734f4237..24828b11 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -9,7 +9,7 @@ from ..const import HTTP_TIMEOUT
 log = logging.getLogger(__name__)
 
 
-DEFAULT_API_VERSION = '1.19'
+DEFAULT_API_VERSION = '1.20'
 
 
 def docker_client(version=None):
diff --git a/compose/container.py b/compose/container.py
index 8f96a944..68218829 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -177,6 +177,12 @@ class Container(object):
         port = self.ports.get("%s/%s" % (port, protocol))
         return "{HostIp}:{HostPort}".format(**port[0]) if port else None
 
+    def get_mount(self, mount_dest):
+        for mount in self.get('Mounts'):
+            if mount['Destination'] == mount_dest:
+                return mount
+        return None
+
     def start(self, **options):
         return self.client.start(self.id, **options)
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index e6fa38a8..81d34a1a 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -871,7 +871,7 @@ class CLITestCase(DockerClientTestCase):
         self.dispatch(['up', '-d'], None)
 
         container = self.project.containers(stopped=True)[0]
-        actual_host_path = container.get('Volumes')['/container-path']
+        actual_host_path = container.get_mount('/container-path')['Source']
         components = actual_host_path.split('/')
         assert components[-2:] == ['home-dir', 'my-volume']
 
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 229f653a..bff19d55 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -331,15 +331,19 @@ class ProjectTest(DockerClientTestCase):
         project.up(['db'])
         self.assertEqual(len(project.containers()), 1)
         old_db_id = project.containers()[0].id
-        db_volume_path = project.containers()[0].inspect()['Volumes']['/var/db']
+
+        container, = project.containers()
+        db_volume_path = container.get_mount('/var/db')['Source']
 
         project.up(strategy=ConvergenceStrategy.never)
         self.assertEqual(len(project.containers()), 2)
 
         db_container = [c for c in project.containers() if 'db' in c.name][0]
         self.assertEqual(db_container.id, old_db_id)
-        self.assertEqual(db_container.inspect()['Volumes']['/var/db'],
-                         db_volume_path)
+        mount, = db_container.get('Mounts')
+        self.assertEqual(
+            db_container.get_mount('/var/db')['Source'],
+            db_volume_path)
 
     def test_project_up_with_no_recreate_stopped(self):
         web = self.create_service('web')
@@ -354,8 +358,9 @@ class ProjectTest(DockerClientTestCase):
         old_containers = project.containers(stopped=True)
 
         self.assertEqual(len(old_containers), 1)
-        old_db_id = old_containers[0].id
-        db_volume_path = old_containers[0].inspect()['Volumes']['/var/db']
+        old_container, = old_containers
+        old_db_id = old_container.id
+        db_volume_path = old_container.get_mount('/var/db')['Source']
 
         project.up(strategy=ConvergenceStrategy.never)
 
@@ -365,8 +370,9 @@ class ProjectTest(DockerClientTestCase):
 
         db_container = [c for c in new_containers if 'db' in c.name][0]
         self.assertEqual(db_container.id, old_db_id)
-        self.assertEqual(db_container.inspect()['Volumes']['/var/db'],
-                         db_volume_path)
+        self.assertEqual(
+            db_container.get_mount('/var/db')['Source'],
+            db_volume_path)
 
     def test_project_up_without_all_services(self):
         console = self.create_service('console')
diff --git a/tests/integration/resilience_test.py b/tests/integration/resilience_test.py
index 7f75356d..5df751c7 100644
--- a/tests/integration/resilience_test.py
+++ b/tests/integration/resilience_test.py
@@ -18,12 +18,12 @@ class ResilienceTest(DockerClientTestCase):
 
         container = self.db.create_container()
         container.start()
-        self.host_path = container.get('Volumes')['/var/db']
+        self.host_path = container.get_mount('/var/db')['Source']
 
     def test_successful_recreate(self):
         self.project.up(strategy=ConvergenceStrategy.always)
         container = self.db.containers()[0]
-        self.assertEqual(container.get('Volumes')['/var/db'], self.host_path)
+        self.assertEqual(container.get_mount('/var/db')['Source'], self.host_path)
 
     def test_create_failure(self):
         with mock.patch('compose.service.Service.create_container', crash):
@@ -32,7 +32,7 @@ class ResilienceTest(DockerClientTestCase):
 
         self.project.up()
         container = self.db.containers()[0]
-        self.assertEqual(container.get('Volumes')['/var/db'], self.host_path)
+        self.assertEqual(container.get_mount('/var/db')['Source'], self.host_path)
 
     def test_start_failure(self):
         with mock.patch('compose.container.Container.start', crash):
@@ -41,7 +41,7 @@ class ResilienceTest(DockerClientTestCase):
 
         self.project.up()
         container = self.db.containers()[0]
-        self.assertEqual(container.get('Volumes')['/var/db'], self.host_path)
+        self.assertEqual(container.get_mount('/var/db')['Source'], self.host_path)
 
 
 class Crash(Exception):

From 3bdcc9d95459618a1301eb801348fc3805a764a6 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 6 Oct 2015 18:37:43 -0700
Subject: [PATCH 0594/1265] Update service tests to use mounts instead of
 volumes

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/integration/service_test.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index ff571656..272fafde 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -88,13 +88,13 @@ class ServiceTest(DockerClientTestCase):
         service = self.create_service('db', volumes=[VolumeSpec.parse('/var/db')])
         container = service.create_container()
         container.start()
-        self.assertIn('/var/db', container.get('Volumes'))
+        self.assertIsNotNone(container.get_mount('/var/db'))
 
     def test_create_container_with_volume_driver(self):
         service = self.create_service('db', volume_driver='foodriver')
         container = service.create_container()
         container.start()
-        self.assertEqual('foodriver', container.get('Config.VolumeDriver'))
+        self.assertEqual('foodriver', container.get('HostConfig.VolumeDriver'))
 
     def test_create_container_with_cpu_shares(self):
         service = self.create_service('db', cpu_shares=73)
@@ -158,12 +158,10 @@ class ServiceTest(DockerClientTestCase):
             volumes=[VolumeSpec(host_path, container_path, 'rw')])
         container = service.create_container()
         container.start()
-
-        volumes = container.inspect()['Volumes']
-        self.assertIn(container_path, volumes)
+        self.assertIsNotNone(container.get_mount(container_path))
 
         # Match the last component ("host-path"), because boot2docker symlinks /tmp
-        actual_host_path = volumes[container_path]
+        actual_host_path = container.get_mount(container_path)['Source']
         self.assertTrue(path.basename(actual_host_path) == path.basename(host_path),
                         msg=("Last component differs: %s, %s" % (actual_host_path, host_path)))
 
@@ -173,10 +171,10 @@ class ServiceTest(DockerClientTestCase):
         """
         service = self.create_service('data', volumes=[VolumeSpec.parse('/data/')])
         old_container = create_and_start_container(service)
-        volume_path = old_container.get('Volumes')['/data']
+        volume_path = old_container.get_mount('/data')['Source']
 
         new_container = service.recreate_container(old_container)
-        self.assertEqual(new_container.get('Volumes')['/data'], volume_path)
+        self.assertEqual(new_container.get_mount('/data')['Source'], volume_path)
 
     def test_duplicate_volume_trailing_slash(self):
         """
@@ -250,7 +248,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(old_container.name, 'composetest_db_1')
         old_container.start()
         old_container.inspect()  # reload volume data
-        volume_path = old_container.get('Volumes')['/etc']
+        volume_path = old_container.get_mount('/etc')['Source']
 
         num_containers_before = len(self.client.containers(all=True))
 
@@ -262,7 +260,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(new_container.get('Config.Cmd'), ['-d', '1'])
         self.assertIn('FOO=2', new_container.get('Config.Env'))
         self.assertEqual(new_container.name, 'composetest_db_1')
-        self.assertEqual(new_container.get('Volumes')['/etc'], volume_path)
+        self.assertEqual(new_container.get_mount('/etc')['Source'], volume_path)
         self.assertIn(
             'affinity:container==%s' % old_container.id,
             new_container.get('Config.Env'))
@@ -305,14 +303,18 @@ class ServiceTest(DockerClientTestCase):
         )
 
         old_container = create_and_start_container(service)
-        self.assertEqual(list(old_container.get('Volumes').keys()), ['/data'])
-        volume_path = old_container.get('Volumes')['/data']
+        self.assertEqual(
+            [mount['Destination'] for mount in old_container.get('Mounts')], ['/data']
+        )
+        volume_path = old_container.get_mount('/data')['Source']
 
         new_container, = service.execute_convergence_plan(
             ConvergencePlan('recreate', [old_container]))
 
-        self.assertEqual(list(new_container.get('Volumes')), ['/data'])
-        self.assertEqual(new_container.get('Volumes')['/data'], volume_path)
+        self.assertEqual(
+            [mount['Destination'] for mount in new_container.get('Mounts')], ['/data']
+        )
+        self.assertEqual(new_container.get_mount('/data')['Source'], volume_path)
 
     def test_execute_convergence_plan_when_image_volume_masks_config(self):
         service = self.create_service(

From afab5c76eaf28651181b391cacc4614954134a4b Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 8 Oct 2015 06:02:26 -0700
Subject: [PATCH 0595/1265] Update service volume tests to use mounts key

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/unit/service_test.py | 54 +++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 10 deletions(-)

diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 1c8b441f..b2421a34 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -600,12 +600,33 @@ class ServiceVolumesTest(unittest.TestCase):
         }
         container = Container(self.mock_client, {
             'Image': 'ababab',
-            'Volumes': {
-                '/host/volume': '/host/volume',
-                '/existing/volume': '/var/lib/docker/aaaaaaaa',
-                '/removed/volume': '/var/lib/docker/bbbbbbbb',
-                '/mnt/image/data': '/var/lib/docker/cccccccc',
-            },
+            'Mounts': [
+                {
+                    'Source': '/host/volume',
+                    'Destination': '/host/volume',
+                    'Mode': '',
+                    'RW': True,
+                    'Name': 'hostvolume',
+                }, {
+                    'Source': '/var/lib/docker/aaaaaaaa',
+                    'Destination': '/existing/volume',
+                    'Mode': '',
+                    'RW': True,
+                    'Name': 'existingvolume',
+                }, {
+                    'Source': '/var/lib/docker/bbbbbbbb',
+                    'Destination': '/removed/volume',
+                    'Mode': '',
+                    'RW': True,
+                    'Name': 'removedvolume',
+                }, {
+                    'Source': '/var/lib/docker/cccccccc',
+                    'Destination': '/mnt/image/data',
+                    'Mode': '',
+                    'RW': True,
+                    'Name': 'imagedata',
+                },
+            ]
         }, has_been_inspected=True)
 
         expected = [
@@ -630,7 +651,13 @@ class ServiceVolumesTest(unittest.TestCase):
 
         intermediate_container = Container(self.mock_client, {
             'Image': 'ababab',
-            'Volumes': {'/existing/volume': '/var/lib/docker/aaaaaaaa'},
+            'Mounts': [{
+                'Source': '/var/lib/docker/aaaaaaaa',
+                'Destination': '/existing/volume',
+                'Mode': '',
+                'RW': True,
+                'Name': 'existingvolume',
+            }],
         }, has_been_inspected=True)
 
         expected = [
@@ -693,9 +720,16 @@ class ServiceVolumesTest(unittest.TestCase):
         self.mock_client.inspect_container.return_value = {
             'Id': '123123123',
             'Image': 'ababab',
-            'Volumes': {
-                '/data': '/mnt/sda1/host/path',
-            },
+            'Mounts': [
+                {
+                    'Destination': '/data',
+                    'Source': '/mnt/sda1/host/path',
+                    'Mode': '',
+                    'RW': True,
+                    'Driver': 'local',
+                    'Name': 'abcdefff1234'
+                },
+            ]
         }
 
         service._get_container_create_options(

From c64b7cbb10b9fd8f1e15d6f0e22a2de4abda7567 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 9 Oct 2015 15:42:15 -0400
Subject: [PATCH 0596/1265] Ignore errors from API about not being able to kill
 a container.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/integration/testcases.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 9ea68e39..04cbe352 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -25,8 +25,7 @@ class DockerClientTestCase(unittest.TestCase):
         for c in self.client.containers(
                 all=True,
                 filters={'label': '%s=composetest' % LABEL_PROJECT}):
-            self.client.kill(c['Id'])
-            self.client.remove_container(c['Id'])
+            self.client.remove_container(c['Id'], force=True)
         for i in self.client.images(
                 filters={'label': 'com.docker.compose.test_image'}):
             self.client.remove_image(i)

From 97fe2ee40c7018db3cbf0c40feb556e9e7940689 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 4 Nov 2015 17:09:40 -0500
Subject: [PATCH 0597/1265] Don't preserve host volumes on container recreate.

Fixes a regression after the API changed to use Mounts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py                | 14 ++++++++++----
 tests/integration/service_test.py | 17 ++++++++++++-----
 tests/unit/service_test.py        |  5 +++++
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index d1509871..251620e9 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -849,7 +849,13 @@ def get_container_data_volumes(container, volumes_option):
     a mapping of volume bindings for those volumes.
     """
     volumes = []
-    container_volumes = container.get('Volumes') or {}
+    volumes_option = volumes_option or []
+
+    container_mounts = dict(
+        (mount['Destination'], mount)
+        for mount in container.get('Mounts') or {}
+    )
+
     image_volumes = [
         VolumeSpec.parse(volume)
         for volume in
@@ -861,13 +867,13 @@ def get_container_data_volumes(container, volumes_option):
         if volume.external:
             continue
 
-        volume_path = container_volumes.get(volume.internal)
+        mount = container_mounts.get(volume.internal)
         # New volume, doesn't exist in the old container
-        if not volume_path:
+        if not mount:
             continue
 
         # Copy existing volume from old container
-        volume = volume._replace(external=volume_path)
+        volume = volume._replace(external=mount['Source'])
         volumes.append(volume)
 
     return volumes
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 272fafde..41d0800d 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -312,7 +312,8 @@ class ServiceTest(DockerClientTestCase):
             ConvergencePlan('recreate', [old_container]))
 
         self.assertEqual(
-            [mount['Destination'] for mount in new_container.get('Mounts')], ['/data']
+            [mount['Destination'] for mount in new_container.get('Mounts')],
+            ['/data']
         )
         self.assertEqual(new_container.get_mount('/data')['Source'], volume_path)
 
@@ -323,8 +324,11 @@ class ServiceTest(DockerClientTestCase):
         )
 
         old_container = create_and_start_container(service)
-        self.assertEqual(list(old_container.get('Volumes').keys()), ['/data'])
-        volume_path = old_container.get('Volumes')['/data']
+        self.assertEqual(
+            [mount['Destination'] for mount in old_container.get('Mounts')],
+            ['/data']
+        )
+        volume_path = old_container.get_mount('/data')['Source']
 
         service.options['volumes'] = [VolumeSpec.parse('/tmp:/data')]
 
@@ -338,8 +342,11 @@ class ServiceTest(DockerClientTestCase):
             "Service \"db\" is using volume \"/data\" from the previous container",
             args[0])
 
-        self.assertEqual(list(new_container.get('Volumes')), ['/data'])
-        self.assertEqual(new_container.get('Volumes')['/data'], volume_path)
+        self.assertEqual(
+            [mount['Destination'] for mount in new_container.get('Mounts')],
+            ['/data']
+        )
+        self.assertEqual(new_container.get_mount('/data')['Source'], volume_path)
 
     def test_execute_convergence_plan_without_start(self):
         service = self.create_service(
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index b2421a34..87d6af59 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -234,6 +234,7 @@ class ServiceTest(unittest.TestCase):
         prev_container = mock.Mock(
             id='ababab',
             image_config={'ContainerConfig': {}})
+        prev_container.get.return_value = None
 
         opts = service._get_container_create_options(
             {},
@@ -575,6 +576,10 @@ class NetTestCase(unittest.TestCase):
         self.assertEqual(net.service_name, service_name)
 
 
+def build_mount(destination, source, mode='rw'):
+    return {'Source': source, 'Destination': destination, 'Mode': mode}
+
+
 class ServiceVolumesTest(unittest.TestCase):
 
     def setUp(self):

From 4bf2f8c4f910b5216b2755377e7c394e7c5c7ee6 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 20 Oct 2015 12:49:45 -0400
Subject: [PATCH 0598/1265] Fix lookup of linked containers for API version
 1.20

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/container.py              | 10 ----------
 tests/acceptance/cli_test.py      |  7 +++++--
 tests/integration/project_test.py |  1 -
 tests/integration/service_test.py | 15 ++++++++-------
 tests/integration/state_test.py   |  5 +++--
 tests/integration/testcases.py    | 10 ++++++++++
 6 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/compose/container.py b/compose/container.py
index 68218829..5730f224 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -228,16 +228,6 @@ class Container(object):
         self.has_been_inspected = True
         return self.dictionary
 
-    # TODO: only used by tests, move to test module
-    def links(self):
-        links = []
-        for container in self.client.containers():
-            for name in container['Names']:
-                bits = name.split('/')
-                if len(bits) > 2 and bits[1] == self.name:
-                    links.append(bits[2])
-        return links
-
     def attach(self, *args, **kwargs):
         return self.client.attach(self.id, *args, **kwargs)
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 81d34a1a..1885727a 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -16,6 +16,7 @@ from compose.cli.command import get_project
 from compose.cli.docker_client import docker_client
 from compose.container import Container
 from tests.integration.testcases import DockerClientTestCase
+from tests.integration.testcases import get_links
 from tests.integration.testcases import pull_busybox
 
 
@@ -909,7 +910,7 @@ class CLITestCase(DockerClientTestCase):
 
         web, other, db = containers
         self.assertEqual(web.human_readable_command, 'top')
-        self.assertTrue({'db', 'other'} <= set(web.links()))
+        self.assertTrue({'db', 'other'} <= set(get_links(web)))
         self.assertEqual(db.human_readable_command, 'top')
         self.assertEqual(other.human_readable_command, 'top')
 
@@ -931,7 +932,9 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(containers), 2)
         web = containers[1]
 
-        self.assertEqual(set(web.links()), set(['db', 'mydb_1', 'extends_mydb_1']))
+        self.assertEqual(
+            set(get_links(web)),
+            set(['db', 'mydb_1', 'extends_mydb_1']))
 
         expected_env = set([
             "FOO=1",
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index bff19d55..d33cf535 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -340,7 +340,6 @@ class ProjectTest(DockerClientTestCase):
 
         db_container = [c for c in project.containers() if 'db' in c.name][0]
         self.assertEqual(db_container.id, old_db_id)
-        mount, = db_container.get('Mounts')
         self.assertEqual(
             db_container.get_mount('/var/db')['Source'],
             db_volume_path)
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 41d0800d..c288a8ad 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -12,6 +12,7 @@ from six import text_type
 
 from .. import mock
 from .testcases import DockerClientTestCase
+from .testcases import get_links
 from .testcases import pull_busybox
 from compose import __version__
 from compose.config.types import VolumeFromSpec
@@ -88,7 +89,7 @@ class ServiceTest(DockerClientTestCase):
         service = self.create_service('db', volumes=[VolumeSpec.parse('/var/db')])
         container = service.create_container()
         container.start()
-        self.assertIsNotNone(container.get_mount('/var/db'))
+        assert container.get_mount('/var/db')
 
     def test_create_container_with_volume_driver(self):
         service = self.create_service('db', volume_driver='foodriver')
@@ -158,7 +159,7 @@ class ServiceTest(DockerClientTestCase):
             volumes=[VolumeSpec(host_path, container_path, 'rw')])
         container = service.create_container()
         container.start()
-        self.assertIsNotNone(container.get_mount(container_path))
+        assert container.get_mount(container_path)
 
         # Match the last component ("host-path"), because boot2docker symlinks /tmp
         actual_host_path = container.get_mount(container_path)['Source']
@@ -385,7 +386,7 @@ class ServiceTest(DockerClientTestCase):
         create_and_start_container(web)
 
         self.assertEqual(
-            set(web.containers()[0].links()),
+            set(get_links(web.containers()[0])),
             set([
                 'composetest_db_1', 'db_1',
                 'composetest_db_2', 'db_2',
@@ -401,7 +402,7 @@ class ServiceTest(DockerClientTestCase):
         create_and_start_container(web)
 
         self.assertEqual(
-            set(web.containers()[0].links()),
+            set(get_links(web.containers()[0])),
             set([
                 'composetest_db_1', 'db_1',
                 'composetest_db_2', 'db_2',
@@ -419,7 +420,7 @@ class ServiceTest(DockerClientTestCase):
         create_and_start_container(web)
 
         self.assertEqual(
-            set(web.containers()[0].links()),
+            set(get_links(web.containers()[0])),
             set([
                 'composetest_db_1',
                 'composetest_db_2',
@@ -433,7 +434,7 @@ class ServiceTest(DockerClientTestCase):
         create_and_start_container(db)
 
         c = create_and_start_container(db)
-        self.assertEqual(set(c.links()), set([]))
+        self.assertEqual(set(get_links(c)), set([]))
 
     def test_start_one_off_container_creates_links_to_its_own_service(self):
         db = self.create_service('db')
@@ -444,7 +445,7 @@ class ServiceTest(DockerClientTestCase):
         c = create_and_start_container(db, one_off=True)
 
         self.assertEqual(
-            set(c.links()),
+            set(get_links(c)),
             set([
                 'composetest_db_1', 'db_1',
                 'composetest_db_2', 'db_2',
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index 1fecce87..a54eefa6 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -7,6 +7,7 @@ from __future__ import unicode_literals
 import py
 
 from .testcases import DockerClientTestCase
+from .testcases import get_links
 from compose.config import config
 from compose.project import Project
 from compose.service import ConvergenceStrategy
@@ -186,8 +187,8 @@ class ProjectWithDependenciesTest(ProjectTestCase):
         web, = [c for c in containers if c.service == 'web']
         nginx, = [c for c in containers if c.service == 'nginx']
 
-        self.assertEqual(web.links(), ['composetest_db_1', 'db', 'db_1'])
-        self.assertEqual(nginx.links(), ['composetest_web_1', 'web', 'web_1'])
+        self.assertEqual(set(get_links(web)), {'composetest_db_1', 'db', 'db_1'})
+        self.assertEqual(set(get_links(nginx)), {'composetest_web_1', 'web', 'web_1'})
 
 
 class ServiceStateTest(DockerClientTestCase):
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 04cbe352..469859b9 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -16,6 +16,16 @@ def pull_busybox(client):
     client.pull('busybox:latest', stream=False)
 
 
+def get_links(container):
+    links = container.get('HostConfig.Links') or []
+
+    def format_link(link):
+        _, alias = link.split(':')
+        return alias.split('/')[-1]
+
+    return [format_link(link) for link in links]
+
+
 class DockerClientTestCase(unittest.TestCase):
     @classmethod
     def setUpClass(cls):

From b4be7b870fb99ed39eb47b5f5cc41d82c5af85e2 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 16 Nov 2015 19:21:56 -0800
Subject: [PATCH 0599/1265] Add support for declaring named volumes in compose
 files

* Bump default API version to 1.21 (required for named volume management)
* Introduce new, versioned compose file format while maintaining support
  for current (legacy) format
* Test updates to reflect changes made to the internal API

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/command.py               |  5 +-
 compose/cli/docker_client.py         |  3 +-
 compose/config/config.py             | 79 +++++++++++++++++++++++++---
 compose/config/fields_schema_v2.json | 43 +++++++++++++++
 compose/config/validation.py         |  9 ++--
 compose/project.py                   | 31 +++++++++--
 compose/volume.py                    | 19 +++++++
 requirements.txt                     |  3 +-
 tests/integration/project_test.py    | 25 +++++----
 tests/integration/service_test.py    |  1 +
 tests/integration/state_test.py      |  4 +-
 tests/integration/testcases.py       |  4 ++
 tests/unit/config/config_test.py     | 53 ++++++++++---------
 tests/unit/project_test.py           | 64 +++++++++++++++-------
 14 files changed, 262 insertions(+), 81 deletions(-)
 create mode 100644 compose/config/fields_schema_v2.json
 create mode 100644 compose/volume.py

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 21d6ff0d..b278af3a 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -80,12 +80,13 @@ def get_project(base_dir, config_path=None, project_name=None, verbose=False,
     config_details = config.find(base_dir, config_path)
 
     api_version = '1.21' if use_networking else None
-    return Project.from_dicts(
+    return Project.from_config(
         get_project_name(config_details.working_dir, project_name),
         config.load(config_details),
         get_client(verbose=verbose, version=api_version),
         use_networking=use_networking,
-        network_driver=network_driver)
+        network_driver=network_driver
+    )
 
 
 def get_project_name(working_dir, project_name=None):
diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 24828b11..177d5d6c 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -8,8 +8,7 @@ from ..const import HTTP_TIMEOUT
 
 log = logging.getLogger(__name__)
 
-
-DEFAULT_API_VERSION = '1.20'
+DEFAULT_API_VERSION = '1.21'
 
 
 def docker_client(version=None):
diff --git a/compose/config/config.py b/compose/config/config.py
index 195665b5..1e82068f 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -117,6 +117,17 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
         return cls(filename, load_yaml(filename))
 
 
+class Config(namedtuple('_Config', 'version services volumes')):
+    """
+    :param version: configuration version
+    :type  version: int
+    :param services: List of service description dictionaries
+    :type  services: :class:`list`
+    :param volumes: List of volume description dictionaries
+    :type  volumes: :class:`list`
+    """
+
+
 class ServiceConfig(namedtuple('_ServiceConfig', 'working_dir filename name config')):
 
     @classmethod
@@ -148,6 +159,24 @@ def find(base_dir, filenames):
         [ConfigFile.from_filename(f) for f in filenames])
 
 
+def get_config_version(config_details):
+    def get_version(config):
+        validate_top_level_object(config)
+        return config.config.get('version')
+    main_file = config_details.config_files[0]
+    version = get_version(main_file)
+    for next_file in config_details.config_files[1:]:
+        next_file_version = get_version(next_file)
+        if version != next_file_version:
+            raise ConfigurationError(
+                "Version mismatch: main file {0} specifies version {1} but "
+                "extension file {2} uses version {3}".format(
+                    main_file.filename, version, next_file.filename, next_file_version
+                )
+            )
+    return version
+
+
 def get_default_config_files(base_dir):
     (candidates, path) = find_candidates_in_parent_dirs(SUPPORTED_FILENAMES, base_dir)
 
@@ -194,10 +223,46 @@ def load(config_details):
 
     Return a fully interpolated, extended and validated configuration.
     """
+    version = get_config_version(config_details)
+    processed_files = []
+    for config_file in config_details.config_files:
+        processed_files.append(
+            process_config_file(config_file, version=version)
+        )
+    config_details = config_details._replace(config_files=processed_files)
 
+    if not version or isinstance(version, dict):
+        service_dicts = load_services(
+            config_details.working_dir, config_details.config_files
+        )
+        volumes = {}
+    elif version == 2:
+        config_files = [
+            ConfigFile(f.filename, f.config.get('services', {}))
+            for f in config_details.config_files
+        ]
+        service_dicts = load_services(
+            config_details.working_dir, config_files
+        )
+        volumes = load_volumes(config_details.config_files)
+    else:
+        raise ConfigurationError('Invalid config version provided: {0}'.format(version))
+
+    return Config(version, service_dicts, volumes)
+
+
+def load_volumes(config_files):
+    volumes = {}
+    for config_file in config_files:
+        for name, volume_config in config_file.config.get('volumes', {}).items():
+            volumes.update({name: volume_config})
+    return volumes
+
+
+def load_services(working_dir, config_files):
     def build_service(filename, service_name, service_dict):
         service_config = ServiceConfig.with_abs_paths(
-            config_details.working_dir,
+            working_dir,
             filename,
             service_name,
             service_dict)
@@ -227,20 +292,20 @@ def load(config_details):
             for name in all_service_names
         }
 
-    config_file = process_config_file(config_details.config_files[0])
-    for next_file in config_details.config_files[1:]:
-        next_file = process_config_file(next_file)
-
+    config_file = config_files[0]
+    for next_file in config_files[1:]:
         config = merge_services(config_file.config, next_file.config)
         config_file = config_file._replace(config=config)
 
     return build_services(config_file)
 
 
-def process_config_file(config_file, service_name=None):
+def process_config_file(config_file, service_name=None, version=None):
     validate_top_level_object(config_file)
     processed_config = interpolate_environment_variables(config_file.config)
-    validate_against_fields_schema(processed_config, config_file.filename)
+    validate_against_fields_schema(
+        processed_config, config_file.filename, version
+    )
 
     if service_name and service_name not in processed_config:
         raise ConfigurationError(
diff --git a/compose/config/fields_schema_v2.json b/compose/config/fields_schema_v2.json
new file mode 100644
index 00000000..2ca41c47
--- /dev/null
+++ b/compose/config/fields_schema_v2.json
@@ -0,0 +1,43 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+  "properties": {
+    "version": {
+      "enum": [2]
+    },
+    "services": {
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "fields_schema.json#/definitions/service"
+        }
+      }
+    },
+    "volumes": {
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/volume"
+        }
+      }
+    }
+  },
+
+  "definitions": {
+    "volume": {
+      "type": "object",
+      "properties": {
+        "driver": {"type": "string"},
+        "driver_opts": {
+          "type": "object",
+          "patternProperties": {
+            "^.+$": {"type": ["boolean", "string", "number"]}
+          },
+          "additionalProperties": false
+        }
+      }
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/compose/config/validation.py b/compose/config/validation.py
index d16bdb9d..861cb10f 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -281,11 +281,14 @@ def process_errors(errors, service_name=None):
     return '\n'.join(format_error_message(error, service_name) for error in errors)
 
 
-def validate_against_fields_schema(config, filename):
+def validate_against_fields_schema(config, filename, version=None):
+    schema_filename = "fields_schema.json"
+    if version:
+        schema_filename = "fields_schema_v{0}.json".format(version)
     _validate_against_schema(
         config,
-        "fields_schema.json",
-        format_checker=["ports", "expose", "bool-value-in-mapping"],
+        schema_filename,
+        format_checker=["ports", "environment", "bool-value-in-mapping"],
         filename=filename)
 
 
diff --git a/compose/project.py b/compose/project.py
index 76dccfe2..b7f33e3f 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -20,6 +20,7 @@ from .service import ConvergenceStrategy
 from .service import Net
 from .service import Service
 from .service import ServiceNet
+from .volume import Volume
 
 
 log = logging.getLogger(__name__)
@@ -29,12 +30,13 @@ class Project(object):
     """
     A collection of services.
     """
-    def __init__(self, name, services, client, use_networking=False, network_driver=None):
+    def __init__(self, name, services, client, volumes=None, use_networking=False, network_driver=None):
         self.name = name
         self.services = services
         self.client = client
         self.use_networking = use_networking
         self.network_driver = network_driver
+        self.volumes = volumes or []
 
     def labels(self, one_off=False):
         return [
@@ -43,16 +45,16 @@ class Project(object):
         ]
 
     @classmethod
-    def from_dicts(cls, name, service_dicts, client, use_networking=False, network_driver=None):
+    def from_config(cls, name, config_data, client, use_networking=False, network_driver=None):
         """
-        Construct a ServiceCollection from a list of dicts representing services.
+        Construct a Project from a config.Config object.
         """
         project = cls(name, [], client, use_networking=use_networking, network_driver=network_driver)
 
         if use_networking:
-            remove_links(service_dicts)
+            remove_links(config_data.services)
 
-        for service_dict in service_dicts:
+        for service_dict in config_data.services:
             links = project.get_links(service_dict)
             volumes_from = project.get_volumes_from(service_dict)
             net = project.get_net(service_dict)
@@ -66,6 +68,14 @@ class Project(object):
                     net=net,
                     volumes_from=volumes_from,
                     **service_dict))
+        if config_data.volumes:
+            for vol_name, data in config_data.volumes.items():
+                project.volumes.append(
+                    Volume(
+                        client=client, project=name, name=vol_name,
+                        driver=data.get('driver'), driver_opts=data.get('driver_opts')
+                    )
+                )
         return project
 
     @property
@@ -218,6 +228,15 @@ class Project(object):
     def remove_stopped(self, service_names=None, **options):
         parallel.parallel_remove(self.containers(service_names, stopped=True), options)
 
+    def initialize_volumes(self):
+        try:
+            for volume in self.volumes:
+                volume.create()
+        except NotFound:
+            raise ConfigurationError(
+                'Volume %s sepcifies nonexistent driver %s' % (volume.name, volume.driver)
+            )
+
     def restart(self, service_names=None, **options):
         containers = self.containers(service_names, stopped=True)
         parallel.parallel_restart(containers, options)
@@ -253,6 +272,8 @@ class Project(object):
         if self.use_networking and self.uses_default_network():
             self.ensure_network_exists()
 
+        self.initialize_volumes()
+
         return [
             container
             for service in services
diff --git a/compose/volume.py b/compose/volume.py
new file mode 100644
index 00000000..304633d0
--- /dev/null
+++ b/compose/volume.py
@@ -0,0 +1,19 @@
+from __future__ import unicode_literals
+
+
+class Volume(object):
+    def __init__(self, client, project, name, driver=None, driver_opts=None):
+        self.client = client
+        self.project = project
+        self.name = name
+        self.driver = driver
+        self.driver_opts = driver_opts
+
+    def create(self):
+        return self.client.create_volume(self.name, self.driver, self.driver_opts)
+
+    def remove(self):
+        return self.client.remove_volume(self.name)
+
+    def inspect(self):
+        return self.client.inspect_volume(self.name)
diff --git a/requirements.txt b/requirements.txt
index 659cb57f..ac02b8db 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
+-e git://github.com/docker/docker-py.git@881e24c231ab9921eb0cbd475e85706137983f89#egg=docker-py
 PyYAML==3.11
-docker-py==1.5.0
+# docker-py==1.5.1
 dockerpty==0.3.4
 docopt==0.6.1
 enum34==1.0.4
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index d33cf535..4107c6cf 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -69,9 +69,9 @@ class ProjectTest(DockerClientTestCase):
                 'volumes_from': ['data'],
             },
         })
-        project = Project.from_dicts(
+        project = Project.from_config(
             name='composetest',
-            service_dicts=service_dicts,
+            config_data=service_dicts,
             client=self.client,
         )
         db = project.get_service('db')
@@ -86,9 +86,9 @@ class ProjectTest(DockerClientTestCase):
             name='composetest_data_container',
             labels={LABEL_PROJECT: 'composetest'},
         )
-        project = Project.from_dicts(
+        project = Project.from_config(
             name='composetest',
-            service_dicts=build_service_dicts({
+            config_data=build_service_dicts({
                 'db': {
                     'image': 'busybox:latest',
                     'volumes_from': ['composetest_data_container'],
@@ -117,9 +117,9 @@ class ProjectTest(DockerClientTestCase):
         assert project.get_network()['Name'] == network_name
 
     def test_net_from_service(self):
-        project = Project.from_dicts(
+        project = Project.from_config(
             name='composetest',
-            service_dicts=build_service_dicts({
+            config_data=build_service_dicts({
                 'net': {
                     'image': 'busybox:latest',
                     'command': ["top"]
@@ -149,9 +149,9 @@ class ProjectTest(DockerClientTestCase):
         )
         net_container.start()
 
-        project = Project.from_dicts(
+        project = Project.from_config(
             name='composetest',
-            service_dicts=build_service_dicts({
+            config_data=build_service_dicts({
                 'web': {
                     'image': 'busybox:latest',
                     'net': 'container:composetest_net_container'
@@ -331,7 +331,6 @@ class ProjectTest(DockerClientTestCase):
         project.up(['db'])
         self.assertEqual(len(project.containers()), 1)
         old_db_id = project.containers()[0].id
-
         container, = project.containers()
         db_volume_path = container.get_mount('/var/db')['Source']
 
@@ -401,9 +400,9 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(console.containers()), 0)
 
     def test_project_up_starts_depends(self):
-        project = Project.from_dicts(
+        project = Project.from_config(
             name='composetest',
-            service_dicts=build_service_dicts({
+            config_data=build_service_dicts({
                 'console': {
                     'image': 'busybox:latest',
                     'command': ["top"],
@@ -436,9 +435,9 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(project.get_service('console').containers()), 0)
 
     def test_project_up_with_no_deps(self):
-        project = Project.from_dicts(
+        project = Project.from_config(
             name='composetest',
-            service_dicts=build_service_dicts({
+            config_data=build_service_dicts({
                 'console': {
                     'image': 'busybox:latest',
                     'command': ["top"],
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index c288a8ad..4a0eaacb 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -163,6 +163,7 @@ class ServiceTest(DockerClientTestCase):
 
         # Match the last component ("host-path"), because boot2docker symlinks /tmp
         actual_host_path = container.get_mount(container_path)['Source']
+
         self.assertTrue(path.basename(actual_host_path) == path.basename(host_path),
                         msg=("Last component differs: %s, %s" % (actual_host_path, host_path)))
 
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index a54eefa6..d07dfa82 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -26,10 +26,10 @@ class ProjectTestCase(DockerClientTestCase):
         details = config.ConfigDetails(
             'working_dir',
             [config.ConfigFile(None, cfg)])
-        return Project.from_dicts(
+        return Project.from_config(
             name='composetest',
             client=self.client,
-            service_dicts=config.load(details))
+            config_data=config.load(details))
 
 
 class BasicProjectTest(ProjectTestCase):
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 469859b9..a9f5e7bb 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -39,6 +39,10 @@ class DockerClientTestCase(unittest.TestCase):
         for i in self.client.images(
                 filters={'label': 'com.docker.compose.test_image'}):
             self.client.remove_image(i)
+        volumes = self.client.volumes().get('Volumes') or []
+        for v in volumes:
+            if 'composetests_' in v['Name']:
+                self.client.remove_volume(v['Name'])
 
     def create_service(self, name, **kwargs):
         if 'image' not in kwargs and 'build' not in kwargs:
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index e975cb9d..426146cc 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -51,7 +51,7 @@ class ConfigTest(unittest.TestCase):
                 'tests/fixtures/extends',
                 'common.yml'
             )
-        )
+        ).services
 
         self.assertEqual(
             service_sort(service_dicts),
@@ -143,7 +143,7 @@ class ConfigTest(unittest.TestCase):
             })
         details = config.ConfigDetails('.', [base_file, override_file])
 
-        service_dicts = config.load(details)
+        service_dicts = config.load(details).services
         expected = [
             {
                 'name': 'web',
@@ -207,7 +207,7 @@ class ConfigTest(unittest.TestCase):
               labels: ['label=one']
         """)
         with tmpdir.as_cwd():
-            service_dicts = config.load(details)
+            service_dicts = config.load(details).services
 
         expected = [
             {
@@ -260,7 +260,7 @@ class ConfigTest(unittest.TestCase):
                 build_config_details(
                     {valid_name: {'image': 'busybox'}},
                     'tests/fixtures/extends',
-                    'common.yml'))
+                    'common.yml')).services
             assert services[0]['name'] == valid_name
 
     def test_config_hint(self):
@@ -451,7 +451,7 @@ class ConfigTest(unittest.TestCase):
                     'working_dir',
                     'filename.yml'
                 )
-            )
+            ).services
             self.assertEqual(service[0]['expose'], expose)
 
     def test_valid_config_oneof_string_or_list(self):
@@ -466,7 +466,7 @@ class ConfigTest(unittest.TestCase):
                     'working_dir',
                     'filename.yml'
                 )
-            )
+            ).services
             self.assertEqual(service[0]['entrypoint'], entrypoint)
 
     @mock.patch('compose.config.validation.log')
@@ -496,7 +496,7 @@ class ConfigTest(unittest.TestCase):
                 'working_dir',
                 'filename.yml'
             )
-        )
+        ).services
         self.assertEqual(services[0]['environment']['SPRING_JPA_HIBERNATE_DDL-AUTO'], 'none')
 
     def test_load_yaml_with_yaml_error(self):
@@ -655,7 +655,7 @@ class InterpolationTest(unittest.TestCase):
 
         service_dicts = config.load(
             config.find('tests/fixtures/environment-interpolation', None),
-        )
+        ).services
 
         self.assertEqual(service_dicts, [
             {
@@ -722,7 +722,7 @@ class InterpolationTest(unittest.TestCase):
                 '.',
                 None,
             )
-        )[0]
+        ).services[0]
         self.assertEquals(service_dict['environment']['POSTGRES_PASSWORD'], '')
 
 
@@ -734,11 +734,15 @@ class VolumeConfigTest(unittest.TestCase):
     @mock.patch.dict(os.environ)
     def test_volume_binding_with_environment_variable(self):
         os.environ['VOLUME_PATH'] = '/host/path'
-        d = config.load(build_config_details(
-            {'foo': {'build': '.', 'volumes': ['${VOLUME_PATH}:/container/path']}},
-            '.',
-        ))[0]
-        self.assertEqual(d['volumes'], [VolumeSpec.parse('/host/path:/container/path')])
+
+        d = config.load(
+            build_config_details(
+                {'foo': {'build': '.', 'volumes': ['${VOLUME_PATH}:/container/path']}},
+                '.',
+                None,
+            )
+        ).services[0]
+        self.assertEqual(d['volumes'], ['/host/path:/container/path'])
 
     @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='posix paths')
     @mock.patch.dict(os.environ)
@@ -1012,7 +1016,7 @@ class MemoryOptionsTest(unittest.TestCase):
                 'tests/fixtures/extends',
                 'common.yml'
             )
-        )
+        ).services
         self.assertEqual(service_dict[0]['memswap_limit'], 2000000)
 
     def test_memswap_can_be_a_string(self):
@@ -1022,7 +1026,7 @@ class MemoryOptionsTest(unittest.TestCase):
                 'tests/fixtures/extends',
                 'common.yml'
             )
-        )
+        ).services
         self.assertEqual(service_dict[0]['memswap_limit'], "512M")
 
 
@@ -1126,24 +1130,21 @@ class EnvTest(unittest.TestCase):
                 {'foo': {'build': '.', 'volumes': ['$HOSTENV:$CONTAINERENV']}},
                 "tests/fixtures/env",
             )
-        )[0]
-        self.assertEqual(
-            set(service_dict['volumes']),
-            set([VolumeSpec.parse('/tmp:/host/tmp')]))
+
+        ).services[0]
+        self.assertEqual(set(service_dict['volumes']), set(['/tmp:/host/tmp']))
 
         service_dict = config.load(
             build_config_details(
                 {'foo': {'build': '.', 'volumes': ['/opt${HOSTENV}:/opt${CONTAINERENV}']}},
                 "tests/fixtures/env",
             )
-        )[0]
-        self.assertEqual(
-            set(service_dict['volumes']),
-            set([VolumeSpec.parse('/opt/tmp:/opt/host/tmp')]))
+        ).services[0]
+        self.assertEqual(set(service_dict['volumes']), set(['/opt/tmp:/opt/host/tmp']))
 
 
 def load_from_filename(filename):
-    return config.load(config.find('.', [filename]))
+    return config.load(config.find('.', [filename])).services
 
 
 class ExtendsTest(unittest.TestCase):
@@ -1313,7 +1314,7 @@ class ExtendsTest(unittest.TestCase):
                 'tests/fixtures/extends',
                 'common.yml'
             )
-        )
+        ).services
 
         self.assertEquals(len(service), 1)
         self.assertIsInstance(service[0], dict)
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index f4c6f8ca..c0ed5e33 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -4,6 +4,7 @@ import docker
 
 from .. import mock
 from .. import unittest
+from compose.config.config import Config
 from compose.config.types import VolumeFromSpec
 from compose.const import LABEL_SERVICE
 from compose.container import Container
@@ -18,7 +19,7 @@ class ProjectTest(unittest.TestCase):
         self.mock_client = mock.create_autospec(docker.Client)
 
     def test_from_dict(self):
-        project = Project.from_dicts('composetest', [
+        project = Project.from_config('composetest', Config(None, [
             {
                 'name': 'web',
                 'image': 'busybox:latest'
@@ -27,15 +28,38 @@ class ProjectTest(unittest.TestCase):
                 'name': 'db',
                 'image': 'busybox:latest'
             },
-        ], None)
+        ], None), None)
         self.assertEqual(len(project.services), 2)
         self.assertEqual(project.get_service('web').name, 'web')
         self.assertEqual(project.get_service('web').options['image'], 'busybox:latest')
         self.assertEqual(project.get_service('db').name, 'db')
         self.assertEqual(project.get_service('db').options['image'], 'busybox:latest')
 
+    def test_from_dict_sorts_in_dependency_order(self):
+        project = Project.from_config('composetest', Config(None, [
+            {
+                'name': 'web',
+                'image': 'busybox:latest',
+                'links': ['db'],
+            },
+            {
+                'name': 'db',
+                'image': 'busybox:latest',
+                'volumes_from': ['volume']
+            },
+            {
+                'name': 'volume',
+                'image': 'busybox:latest',
+                'volumes': ['/tmp'],
+            }
+        ], None), None)
+
+        self.assertEqual(project.services[0].name, 'volume')
+        self.assertEqual(project.services[1].name, 'db')
+        self.assertEqual(project.services[2].name, 'web')
+
     def test_from_config(self):
-        dicts = [
+        dicts = Config(None, [
             {
                 'name': 'web',
                 'image': 'busybox:latest',
@@ -44,8 +68,8 @@ class ProjectTest(unittest.TestCase):
                 'name': 'db',
                 'image': 'busybox:latest',
             },
-        ]
-        project = Project.from_dicts('composetest', dicts, None)
+        ], None)
+        project = Project.from_config('composetest', dicts, None)
         self.assertEqual(len(project.services), 2)
         self.assertEqual(project.get_service('web').name, 'web')
         self.assertEqual(project.get_service('web').options['image'], 'busybox:latest')
@@ -141,13 +165,13 @@ class ProjectTest(unittest.TestCase):
         container_id = 'aabbccddee'
         container_dict = dict(Name='aaa', Id=container_id)
         self.mock_client.inspect_container.return_value = container_dict
-        project = Project.from_dicts('test', [
+        project = Project.from_config('test', Config(None, [
             {
                 'name': 'test',
                 'image': 'busybox:latest',
                 'volumes_from': [VolumeFromSpec('aaa', 'rw')]
             }
-        ], self.mock_client)
+        ], None), self.mock_client)
         self.assertEqual(project.get_service('test')._get_volumes_from(), [container_id + ":rw"])
 
     def test_use_volumes_from_service_no_container(self):
@@ -160,7 +184,7 @@ class ProjectTest(unittest.TestCase):
                 "Image": 'busybox:latest'
             }
         ]
-        project = Project.from_dicts('test', [
+        project = Project.from_config('test', Config(None, [
             {
                 'name': 'vol',
                 'image': 'busybox:latest'
@@ -170,13 +194,13 @@ class ProjectTest(unittest.TestCase):
                 'image': 'busybox:latest',
                 'volumes_from': [VolumeFromSpec('vol', 'rw')]
             }
-        ], self.mock_client)
+        ], None), self.mock_client)
         self.assertEqual(project.get_service('test')._get_volumes_from(), [container_name + ":rw"])
 
     def test_use_volumes_from_service_container(self):
         container_ids = ['aabbccddee', '12345']
 
-        project = Project.from_dicts('test', [
+        project = Project.from_config('test', Config(None, [
             {
                 'name': 'vol',
                 'image': 'busybox:latest'
@@ -186,7 +210,7 @@ class ProjectTest(unittest.TestCase):
                 'image': 'busybox:latest',
                 'volumes_from': [VolumeFromSpec('vol', 'rw')]
             }
-        ], None)
+        ], None), None)
         with mock.patch.object(Service, 'containers') as mock_return:
             mock_return.return_value = [
                 mock.Mock(id=container_id, spec=Container)
@@ -196,12 +220,12 @@ class ProjectTest(unittest.TestCase):
                 [container_ids[0] + ':rw'])
 
     def test_net_unset(self):
-        project = Project.from_dicts('test', [
+        project = Project.from_config('test', Config(None, [
             {
                 'name': 'test',
                 'image': 'busybox:latest',
             }
-        ], self.mock_client)
+        ], None), self.mock_client)
         service = project.get_service('test')
         self.assertEqual(service.net.id, None)
         self.assertNotIn('NetworkMode', service._get_container_host_config({}))
@@ -210,13 +234,13 @@ class ProjectTest(unittest.TestCase):
         container_id = 'aabbccddee'
         container_dict = dict(Name='aaa', Id=container_id)
         self.mock_client.inspect_container.return_value = container_dict
-        project = Project.from_dicts('test', [
+        project = Project.from_config('test', Config(None, [
             {
                 'name': 'test',
                 'image': 'busybox:latest',
                 'net': 'container:aaa'
             }
-        ], self.mock_client)
+        ], None), self.mock_client)
         service = project.get_service('test')
         self.assertEqual(service.net.mode, 'container:' + container_id)
 
@@ -230,7 +254,7 @@ class ProjectTest(unittest.TestCase):
                 "Image": 'busybox:latest'
             }
         ]
-        project = Project.from_dicts('test', [
+        project = Project.from_config('test', Config(None, [
             {
                 'name': 'aaa',
                 'image': 'busybox:latest'
@@ -240,7 +264,7 @@ class ProjectTest(unittest.TestCase):
                 'image': 'busybox:latest',
                 'net': 'container:aaa'
             }
-        ], self.mock_client)
+        ], None), self.mock_client)
 
         service = project.get_service('test')
         self.assertEqual(service.net.mode, 'container:' + container_name)
@@ -285,12 +309,12 @@ class ProjectTest(unittest.TestCase):
                 },
             },
         }
-        project = Project.from_dicts(
+        project = Project.from_config(
             'test',
-            [{
+            Config(None, [{
                 'name': 'web',
                 'image': 'busybox:latest',
-            }],
+            }], None),
             self.mock_client,
         )
         self.assertEqual([c.id for c in project.containers()], ['1'])

From b253efd8a77447c7ad4f6a6aa5101510704782b1 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 18 Nov 2015 17:45:10 -0800
Subject: [PATCH 0600/1265] Update docs to define and document new compose.yml
 file format

Add volume configuration reference section.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 docs/compose-file.md | 86 ++++++++++++++++++++++++++++++++++++++++++++
 docs/index.md        | 26 ++++++++------
 2 files changed, 102 insertions(+), 10 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 2a6028b8..29e0c647 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -24,6 +24,64 @@ As with `docker run`, options specified in the Dockerfile (e.g., `CMD`,
 `EXPOSE`, `VOLUME`, `ENV`) are respected by default - you don't need to
 specify them again in `docker-compose.yml`.
 
+## Versioning
+
+It is possible to use different versions of the `compose.yml` format.
+Below are the formats currently supported by compose.
+
+
+### Version 1
+
+Compose files that do not declare a version are considered "version 1". In
+those files, all the [services](#service-configuration-reference) are declared
+at the root of the document.
+
+Version 1 files do not support the declaration of
+named [volumes](#volume-configuration-reference)
+
+Example:
+
+    web:
+      build: .
+      ports:
+       - "5000:5000"
+      volumes:
+       - .:/code
+       - logvolume01:/var/log
+      links:
+       - redis
+    redis:
+      image: redis
+
+
+### Version 2
+
+Compose files using the version 2 syntax must indicate the version number at
+the root of the document. All [services](#service-configuration-reference)
+must be declared under the `services` key.
+Named [volumes](#volume-configuration-reference) must be declared under the
+`volumes` key.
+
+Example:
+
+    version: 2
+    services:
+      web:
+        build: .
+        ports:
+         - "5000:5000"
+        volumes:
+         - .:/code
+         - logvolume01:/var/log
+        links:
+         - redis
+      redis:
+        image: redis
+    volumes:
+      logvolume01:
+        driver: default
+
+
 ## Service configuration reference
 
 This section contains a list of all configuration options supported by a service
@@ -413,6 +471,34 @@ Each of these is a single value, analogous to its
     stdin_open: true
     tty: true
 
+
+## Volume configuration reference
+
+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/)
+subcommand documentation for more information.
+
+### driver
+
+Specify which volume driver should be used for this volume. Defaults to
+`local`. An exception will be raised if the driver is not available.
+
+      driver: foobar
+
+### driver_opts
+
+Specify a list of options as key-value pairs to pass to the driver for this
+volume. Those options are driver dependent - consult the driver's
+documentation for more information. Optional.
+
+      driver_opts:
+        foo: "bar"
+        baz: 1
+
+
 ## Variable substitution
 
 Your configuration options can contain environment variables. Compose uses the
diff --git a/docs/index.md b/docs/index.md
index 36b93a39..6e8f2090 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -31,16 +31,22 @@ they can be run together in an isolated environment.
 
 A `docker-compose.yml` looks like this:
 
-    web:
-      build: .
-      ports:
-       - "5000:5000"
-      volumes:
-       - .:/code
-      links:
-       - redis
-    redis:
-      image: redis
+    version: 2
+    services:
+      web:
+        build: .
+        ports:
+         - "5000:5000"
+        volumes:
+         - .:/code
+         - logvolume01:/var/log
+        links:
+         - redis
+      redis:
+        image: redis
+    volumes:
+      logvolume01:
+        driver: default
 
 For more information about the Compose file, see the
 [Compose file reference](compose-file.md)

From abe145bbe77d09a5b31ee1453a37938e132604e1 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 1 Dec 2015 17:26:32 -0800
Subject: [PATCH 0601/1265] Update config resolution to always use explicit
 version numbers

Also includes several bugfixes for resolution and validation.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py                      | 46 +++++++++++++------
 ...elds_schema.json => fields_schema_v1.json} |  2 +-
 compose/config/fields_schema_v2.json          | 16 +++++--
 compose/config/interpolation.py               | 12 +++--
 compose/config/service_schema.json            |  2 +-
 compose/config/validation.py                  | 18 ++++----
 compose/const.py                              |  1 +
 docker-compose.spec                           | 10 +++-
 8 files changed, 73 insertions(+), 34 deletions(-)
 rename compose/config/{fields_schema.json => fields_schema_v1.json} (99%)

diff --git a/compose/config/config.py b/compose/config/config.py
index 1e82068f..295dc494 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -10,6 +10,7 @@ from collections import namedtuple
 import six
 import yaml
 
+from ..const import COMPOSEFILE_VERSIONS
 from .errors import CircularReference
 from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
@@ -24,6 +25,7 @@ from .validation import validate_against_fields_schema
 from .validation import validate_against_service_schema
 from .validation import validate_extends_file_path
 from .validation import validate_top_level_object
+from .validation import validate_top_level_service_objects
 
 
 DOCKER_CONFIG_KEYS = [
@@ -161,13 +163,24 @@ def find(base_dir, filenames):
 
 def get_config_version(config_details):
     def get_version(config):
-        validate_top_level_object(config)
-        return config.config.get('version')
+        if config.config is None:
+            return None
+        version = config.config.get('version', 1)
+        if isinstance(version, dict):
+            version = 1
+        return version
+
     main_file = config_details.config_files[0]
+    validate_top_level_object(main_file)
     version = get_version(main_file)
     for next_file in config_details.config_files[1:]:
+        validate_top_level_object(next_file)
         next_file_version = get_version(next_file)
-        if version != next_file_version:
+        if version is None:
+            version = next_file_version
+            continue
+
+        if version != next_file_version and next_file_version is not None:
             raise ConfigurationError(
                 "Version mismatch: main file {0} specifies version {1} but "
                 "extension file {2} uses version {3}".format(
@@ -224,6 +237,9 @@ def load(config_details):
     Return a fully interpolated, extended and validated configuration.
     """
     version = get_config_version(config_details)
+    if version not in COMPOSEFILE_VERSIONS:
+        raise ConfigurationError('Invalid config version provided: {0}'.format(version))
+
     processed_files = []
     for config_file in config_details.config_files:
         processed_files.append(
@@ -231,9 +247,10 @@ def load(config_details):
         )
     config_details = config_details._replace(config_files=processed_files)
 
-    if not version or isinstance(version, dict):
+    if version == 1:
         service_dicts = load_services(
-            config_details.working_dir, config_details.config_files
+            config_details.working_dir, config_details.config_files,
+            version
         )
         volumes = {}
     elif version == 2:
@@ -242,11 +259,9 @@ def load(config_details):
             for f in config_details.config_files
         ]
         service_dicts = load_services(
-            config_details.working_dir, config_files
+            config_details.working_dir, config_files, version
         )
         volumes = load_volumes(config_details.config_files)
-    else:
-        raise ConfigurationError('Invalid config version provided: {0}'.format(version))
 
     return Config(version, service_dicts, volumes)
 
@@ -259,14 +274,14 @@ def load_volumes(config_files):
     return volumes
 
 
-def load_services(working_dir, config_files):
+def load_services(working_dir, config_files, version):
     def build_service(filename, service_name, service_dict):
         service_config = ServiceConfig.with_abs_paths(
             working_dir,
             filename,
             service_name,
             service_dict)
-        resolver = ServiceExtendsResolver(service_config)
+        resolver = ServiceExtendsResolver(service_config, version)
         service_dict = process_service(resolver.run())
 
         # TODO: move to validate_service()
@@ -301,8 +316,8 @@ def load_services(working_dir, config_files):
 
 
 def process_config_file(config_file, service_name=None, version=None):
-    validate_top_level_object(config_file)
-    processed_config = interpolate_environment_variables(config_file.config)
+    validate_top_level_service_objects(config_file, version)
+    processed_config = interpolate_environment_variables(config_file.config, version)
     validate_against_fields_schema(
         processed_config, config_file.filename, version
     )
@@ -316,10 +331,11 @@ def process_config_file(config_file, service_name=None, version=None):
 
 
 class ServiceExtendsResolver(object):
-    def __init__(self, service_config, already_seen=None):
+    def __init__(self, service_config, version, already_seen=None):
         self.service_config = service_config
         self.working_dir = service_config.working_dir
         self.already_seen = already_seen or []
+        self.version = version
 
     @property
     def signature(self):
@@ -348,7 +364,8 @@ class ServiceExtendsResolver(object):
 
         extended_file = process_config_file(
             ConfigFile.from_filename(config_path),
-            service_name=service_name)
+            service_name=service_name, version=self.version
+        )
         service_config = extended_file.config[service_name]
         return config_path, service_config, service_name
 
@@ -359,6 +376,7 @@ class ServiceExtendsResolver(object):
                 extended_config_path,
                 service_name,
                 service_dict),
+            self.version,
             already_seen=self.already_seen + [self.signature])
 
         service_config = resolver.run()
diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema_v1.json
similarity index 99%
rename from compose/config/fields_schema.json
rename to compose/config/fields_schema_v1.json
index fdf56fd9..6f0a3631 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema_v1.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
 
   "type": "object",
-  "id": "fields_schema.json",
+  "id": "fields_schema_v1.json",
 
   "patternProperties": {
     "^[a-zA-Z0-9._-]+$": {
diff --git a/compose/config/fields_schema_v2.json b/compose/config/fields_schema_v2.json
index 2ca41c47..49cab367 100644
--- a/compose/config/fields_schema_v2.json
+++ b/compose/config/fields_schema_v2.json
@@ -1,38 +1,44 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-
   "type": "object",
+  "id": "fields_schema_v2.json",
+
   "properties": {
     "version": {
       "enum": [2]
     },
     "services": {
+      "id": "#/properties/services",
       "type": "object",
       "patternProperties": {
         "^[a-zA-Z0-9._-]+$": {
-          "$ref": "fields_schema.json#/definitions/service"
+          "$ref": "fields_schema_v1.json#/definitions/service"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "volumes": {
+      "id": "#/properties/volumes",
       "type": "object",
       "patternProperties": {
         "^[a-zA-Z0-9._-]+$": {
           "$ref": "#/definitions/volume"
         }
-      }
+      },
+      "additionalProperties": false
     }
   },
 
   "definitions": {
     "volume": {
+      "id": "#/definitions/volume",
       "type": "object",
       "properties": {
         "driver": {"type": "string"},
         "driver_opts": {
           "type": "object",
           "patternProperties": {
-            "^.+$": {"type": ["boolean", "string", "number"]}
+            "^.+$": {"type": ["string", "number"]}
           },
           "additionalProperties": false
         }
diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index ba7e35c1..a8ff08d8 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -8,13 +8,19 @@ from .errors import ConfigurationError
 log = logging.getLogger(__name__)
 
 
-def interpolate_environment_variables(config):
+def interpolate_environment_variables(config, version):
     mapping = BlankDefaultDict(os.environ)
+    service_dicts = config if version == 1 else config.get('services', {})
 
-    return dict(
+    interpolated = dict(
         (service_name, process_service(service_name, service_dict, mapping))
-        for (service_name, service_dict) in config.items()
+        for (service_name, service_dict) in service_dicts.items()
     )
+    if version == 1:
+        return interpolated
+    result = dict(config)
+    result.update({'services': interpolated})
+    return result
 
 
 def process_service(service_name, service_dict, mapping):
diff --git a/compose/config/service_schema.json b/compose/config/service_schema.json
index 05774efd..91a1e005 100644
--- a/compose/config/service_schema.json
+++ b/compose/config/service_schema.json
@@ -5,7 +5,7 @@
   "type": "object",
 
   "allOf": [
-    {"$ref": "fields_schema.json#/definitions/service"},
+    {"$ref": "fields_schema_v1.json#/definitions/service"},
     {"$ref": "#/definitions/constraints"}
   ],
 
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 861cb10f..617c95b6 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -74,14 +74,15 @@ def format_boolean_in_environment(instance):
     return True
 
 
-def validate_top_level_service_objects(config_file):
+def validate_top_level_service_objects(config_file, version):
     """Perform some high level validation of the service name and value.
 
     This validation must happen before interpolation, which must happen
     before the rest of validation, which is why it's separate from the
     rest of the service validation.
     """
-    for service_name, service_dict in config_file.config.items():
+    service_dicts = config_file.config if version == 1 else config_file.config.get('services', {})
+    for service_name, service_dict in service_dicts.items():
         if not isinstance(service_name, six.string_types):
             raise ConfigurationError(
                 "In file '{}' service name: {} needs to be a string, eg '{}'".format(
@@ -105,7 +106,6 @@ def validate_top_level_object(config_file):
             "that you have defined a service at the top level.".format(
                 config_file.filename,
                 type(config_file.config)))
-    validate_top_level_service_objects(config_file)
 
 
 def validate_extends_file_path(service_name, extends_options, filename):
@@ -134,10 +134,14 @@ def anglicize_validator(validator):
     return 'a ' + validator
 
 
+def is_service_dict_schema(schema_id):
+    return schema_id == 'fields_schema_v1.json' or schema_id == '#/properties/services'
+
+
 def handle_error_for_schema_with_id(error, service_name):
     schema_id = error.schema['id']
 
-    if schema_id == 'fields_schema.json' and error.validator == 'additionalProperties':
+    if is_service_dict_schema(schema_id) and error.validator == 'additionalProperties':
         return "Invalid service name '{}' - only {} characters are allowed".format(
             # The service_name is the key to the json object
             list(error.instance)[0],
@@ -281,10 +285,8 @@ def process_errors(errors, service_name=None):
     return '\n'.join(format_error_message(error, service_name) for error in errors)
 
 
-def validate_against_fields_schema(config, filename, version=None):
-    schema_filename = "fields_schema.json"
-    if version:
-        schema_filename = "fields_schema_v{0}.json".format(version)
+def validate_against_fields_schema(config, filename, version):
+    schema_filename = "fields_schema_v{0}.json".format(version)
     _validate_against_schema(
         config,
         schema_filename,
diff --git a/compose/const.py b/compose/const.py
index 1b689418..9c607ca2 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -10,3 +10,4 @@ LABEL_PROJECT = 'com.docker.compose.project'
 LABEL_SERVICE = 'com.docker.compose.service'
 LABEL_VERSION = 'com.docker.compose.version'
 LABEL_CONFIG_HASH = 'com.docker.compose.config-hash'
+COMPOSEFILE_VERSIONS = (1, 2)
diff --git a/docker-compose.spec b/docker-compose.spec
index 24d03e05..c760d7b4 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -18,8 +18,13 @@ exe = EXE(pyz,
           a.datas,
           [
             (
-                'compose/config/fields_schema.json',
-                'compose/config/fields_schema.json',
+                'compose/config/fields_schema_v1.json',
+                'compose/config/fields_schema_v1.json',
+                'DATA'
+            ),
+            (
+                'compose/config/fields_schema_v2.json',
+                'compose/config/fields_schema_v2.json',
                 'DATA'
             ),
             (
@@ -33,6 +38,7 @@ exe = EXE(pyz,
                 'DATA'
             )
           ],
+
           name='docker-compose',
           debug=False,
           strip=None,

From df6877a277e1c4bfce24a1fed0bdaa63bdcc84e2 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 1 Dec 2015 17:28:15 -0800
Subject: [PATCH 0602/1265] Use newer docker-py version

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ac02b8db..8c6d5f3a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,5 @@
--e git://github.com/docker/docker-py.git@881e24c231ab9921eb0cbd475e85706137983f89#egg=docker-py
 PyYAML==3.11
-# docker-py==1.5.1
+docker-py==1.6.0
 dockerpty==0.3.4
 docopt==0.6.1
 enum34==1.0.4

From ecef5d37a7eae730eed47648cbe4eb600eef3004 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 1 Dec 2015 17:28:42 -0800
Subject: [PATCH 0603/1265] Add v2 configuration tests

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/validation.py      |   2 +-
 compose/service.py                |   1 +
 tests/integration/project_test.py |  80 ++++++++++++++
 tests/unit/config/config_test.py  | 176 ++++++++++++++++++++++++++++--
 tests/unit/project_test.py        |  23 ----
 5 files changed, 251 insertions(+), 31 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 617c95b6..6e943974 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -290,7 +290,7 @@ def validate_against_fields_schema(config, filename, version):
     _validate_against_schema(
         config,
         schema_filename,
-        format_checker=["ports", "environment", "bool-value-in-mapping"],
+        format_checker=["ports", "expose", "bool-value-in-mapping"],
         filename=filename)
 
 
diff --git a/compose/service.py b/compose/service.py
index 251620e9..24fa6394 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -868,6 +868,7 @@ def get_container_data_volumes(container, volumes_option):
             continue
 
         mount = container_mounts.get(volume.internal)
+
         # New volume, doesn't exist in the old container
         if not mount:
             continue
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 4107c6cf..b4acda40 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -1,5 +1,7 @@
 from __future__ import unicode_literals
 
+import random
+
 from .testcases import DockerClientTestCase
 from compose.cli.docker_client import docker_client
 from compose.config import config
@@ -508,3 +510,81 @@ class ProjectTest(DockerClientTestCase):
         project.up()
         service = project.get_service('web')
         self.assertEqual(len(service.containers()), 1)
+
+    def test_project_up_volumes(self):
+        vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        config_data = config.Config(
+            2, [{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'command': 'top'
+            }], {vol_name: {'driver': 'local'}}
+        )
+
+        project = Project.from_config(
+            name='composetest',
+            config_data=config_data, client=self.client
+        )
+        project.up()
+        self.assertEqual(len(project.containers()), 1)
+
+        volume_data = self.client.inspect_volume(vol_name)
+        self.assertEqual(volume_data['Name'], vol_name)
+        self.assertEqual(volume_data['Driver'], 'local')
+
+    def test_initialize_volumes(self):
+        vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        config_data = config.Config(
+            2, [{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'command': 'top'
+            }], {vol_name: {}}
+        )
+
+        project = Project.from_config(
+            name='composetest',
+            config_data=config_data, client=self.client
+        )
+        project.initialize_volumes()
+
+        volume_data = self.client.inspect_volume(vol_name)
+        self.assertEqual(volume_data['Name'], vol_name)
+        self.assertEqual(volume_data['Driver'], 'local')
+
+    def test_project_up_implicit_volume_driver(self):
+        vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        config_data = config.Config(
+            2, [{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'command': 'top'
+            }], {vol_name: {}}
+        )
+
+        project = Project.from_config(
+            name='composetest',
+            config_data=config_data, client=self.client
+        )
+        project.up()
+
+        volume_data = self.client.inspect_volume(vol_name)
+        self.assertEqual(volume_data['Name'], vol_name)
+        self.assertEqual(volume_data['Driver'], 'local')
+
+    def test_project_up_invalid_volume_driver(self):
+        vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        config_data = config.Config(
+            2, [{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'command': 'top'
+            }], {vol_name: {'driver': 'foobar'}}
+        )
+
+        project = Project.from_config(
+            name='composetest',
+            config_data=config_data, client=self.client
+        )
+        with self.assertRaises(config.ConfigurationError):
+            project.initialize_volumes()
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 426146cc..dac573ed 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -26,7 +26,7 @@ def make_service_dict(name, service_dict, working_dir, filename=None):
         working_dir=working_dir,
         filename=filename,
         name=name,
-        config=service_dict))
+        config=service_dict), version=1)
     return config.process_service(resolver.run())
 
 
@@ -68,6 +68,85 @@ class ConfigTest(unittest.TestCase):
             ])
         )
 
+    def test_load_v2(self):
+        config_data = config.load(
+            build_config_details({
+                'version': 2,
+                'services': {
+                    'foo': {'image': 'busybox'},
+                    'bar': {'image': 'busybox', 'environment': ['FOO=1']},
+                },
+                'volumes': {
+                    'hello': {
+                        'driver': 'default',
+                        'driver_opts': {'beep': 'boop'}
+                    }
+                }
+            }, 'working_dir', 'filename.yml')
+        )
+        service_dicts = config_data.services
+        volume_dict = config_data.volumes
+        self.assertEqual(
+            service_sort(service_dicts),
+            service_sort([
+                {
+                    'name': 'bar',
+                    'image': 'busybox',
+                    'environment': {'FOO': '1'},
+                },
+                {
+                    'name': 'foo',
+                    'image': 'busybox',
+                }
+            ])
+        )
+        self.assertEqual(volume_dict, {
+            'hello': {
+                'driver': 'default',
+                'driver_opts': {'beep': 'boop'}
+            }
+        })
+
+    def test_load_service_with_name_version(self):
+        config_data = config.load(
+            build_config_details({
+                'version': {
+                    'image': 'busybox'
+                }
+            }, 'working_dir', 'filename.yml')
+        )
+        service_dicts = config_data.services
+        self.assertEqual(
+            service_sort(service_dicts),
+            service_sort([
+                {
+                    'name': 'version',
+                    'image': 'busybox',
+                }
+            ])
+        )
+
+    def test_load_invalid_version(self):
+        with self.assertRaises(ConfigurationError):
+            config.load(
+                build_config_details({
+                    'version': 18,
+                    'services': {
+                        'foo': {'image': 'busybox'}
+                    }
+                }, 'working_dir', 'filename.yml')
+            )
+
+        with self.assertRaises(ConfigurationError):
+            config.load(
+                build_config_details({
+                    'version': 'two point oh',
+                    'services': {
+                        'foo': {'image': 'busybox'}
+                    }
+                }, 'working_dir', 'filename.yml')
+            )
+
     def test_load_throws_error_when_not_dict(self):
         with self.assertRaises(ConfigurationError):
             config.load(
@@ -78,6 +157,16 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_load_throws_error_when_not_dict_v2(self):
+        with self.assertRaises(ConfigurationError):
+            config.load(
+                build_config_details(
+                    {'version': 2, 'services': {'web': 'busybox:latest'}},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+
     def test_load_config_invalid_service_names(self):
         for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
             with pytest.raises(ConfigurationError) as exc:
@@ -87,6 +176,17 @@ class ConfigTest(unittest.TestCase):
                     'filename.yml'))
             assert 'Invalid service name \'%s\'' % invalid_name in exc.exconly()
 
+    def test_config_invalid_service_names_v2(self):
+        for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
+            with pytest.raises(ConfigurationError) as exc:
+                config.load(
+                    build_config_details({
+                        'version': 2,
+                        'services': {invalid_name: {'image': 'busybox'}}
+                    }, 'working_dir', 'filename.yml')
+                )
+            assert 'Invalid service name \'%s\'' % invalid_name in exc.exconly()
+
     def test_load_with_invalid_field_name(self):
         config_details = build_config_details(
             {'web': {'image': 'busybox', 'name': 'bogus'}},
@@ -120,6 +220,22 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_config_integer_service_name_raise_validation_error_v2(self):
+        expected_error_msg = ("In file 'filename.yml' service name: 1 needs to "
+                              "be a string, eg '1'")
+
+        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+            config.load(
+                build_config_details(
+                    {
+                        'version': 2,
+                        'services': {1: {'image': 'busybox'}}
+                    },
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
     def test_load_with_multiple_files(self):
         base_file = config.ConfigFile(
@@ -248,12 +364,55 @@ class ConfigTest(unittest.TestCase):
                 'volumes': ['/tmp'],
             }
         })
-        services = config.load(config_details)
+        services = config.load(config_details).services
 
         assert services[0]['name'] == 'volume'
         assert services[1]['name'] == 'db'
         assert services[2]['name'] == 'web'
 
+    def test_load_with_multiple_files_v2(self):
+        base_file = config.ConfigFile(
+            'base.yaml',
+            {
+                'version': 2,
+                'services': {
+                    'web': {
+                        'image': 'example/web',
+                        'links': ['db'],
+                    },
+                    'db': {
+                        'image': 'example/db',
+                    }
+                },
+            })
+        override_file = config.ConfigFile(
+            'override.yaml',
+            {
+                'version': 2,
+                'services': {
+                    'web': {
+                        'build': '/',
+                        'volumes': ['/home/user/project:/code'],
+                    },
+                }
+            })
+        details = config.ConfigDetails('.', [base_file, override_file])
+
+        service_dicts = config.load(details).services
+        expected = [
+            {
+                'name': 'web',
+                'build': os.path.abspath('/'),
+                'links': ['db'],
+                'volumes': [VolumeSpec.parse('/home/user/project:/code')],
+            },
+            {
+                'name': 'db',
+                'image': 'example/db',
+            },
+        ]
+        self.assertEqual(service_sort(service_dicts), service_sort(expected))
+
     def test_config_valid_service_names(self):
         for valid_name in ['_', '-', '.__.', '_what-up.', 'what_.up----', 'whatup']:
             services = config.load(
@@ -742,7 +901,7 @@ class VolumeConfigTest(unittest.TestCase):
                 None,
             )
         ).services[0]
-        self.assertEqual(d['volumes'], ['/host/path:/container/path'])
+        self.assertEqual(d['volumes'], [VolumeSpec.parse('/host/path:/container/path')])
 
     @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='posix paths')
     @mock.patch.dict(os.environ)
@@ -1130,9 +1289,10 @@ class EnvTest(unittest.TestCase):
                 {'foo': {'build': '.', 'volumes': ['$HOSTENV:$CONTAINERENV']}},
                 "tests/fixtures/env",
             )
-
         ).services[0]
-        self.assertEqual(set(service_dict['volumes']), set(['/tmp:/host/tmp']))
+        self.assertEqual(
+            set(service_dict['volumes']),
+            set([VolumeSpec.parse('/tmp:/host/tmp')]))
 
         service_dict = config.load(
             build_config_details(
@@ -1140,7 +1300,9 @@ class EnvTest(unittest.TestCase):
                 "tests/fixtures/env",
             )
         ).services[0]
-        self.assertEqual(set(service_dict['volumes']), set(['/opt/tmp:/opt/host/tmp']))
+        self.assertEqual(
+            set(service_dict['volumes']),
+            set([VolumeSpec.parse('/opt/tmp:/opt/host/tmp')]))
 
 
 def load_from_filename(filename):
@@ -1595,7 +1757,7 @@ class BuildPathTest(unittest.TestCase):
         for valid_url in valid_urls:
             service_dict = config.load(build_config_details({
                 'validurl': {'build': valid_url},
-            }, '.', None))
+            }, '.', None)).services
             assert service_dict[0]['build'] == valid_url
 
     def test_invalid_url_in_build_path(self):
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index c0ed5e33..4bf5f463 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -35,29 +35,6 @@ class ProjectTest(unittest.TestCase):
         self.assertEqual(project.get_service('db').name, 'db')
         self.assertEqual(project.get_service('db').options['image'], 'busybox:latest')
 
-    def test_from_dict_sorts_in_dependency_order(self):
-        project = Project.from_config('composetest', Config(None, [
-            {
-                'name': 'web',
-                'image': 'busybox:latest',
-                'links': ['db'],
-            },
-            {
-                'name': 'db',
-                'image': 'busybox:latest',
-                'volumes_from': ['volume']
-            },
-            {
-                'name': 'volume',
-                'image': 'busybox:latest',
-                'volumes': ['/tmp'],
-            }
-        ], None), None)
-
-        self.assertEqual(project.services[0].name, 'volume')
-        self.assertEqual(project.services[1].name, 'db')
-        self.assertEqual(project.services[2].name, 'web')
-
     def test_from_config(self):
         dicts = Config(None, [
             {

From ec5111f1c29c5dd66d161906042ca39183ebd659 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 8 Dec 2015 17:21:20 -0800
Subject: [PATCH 0604/1265] Volumes are now prefixed with the project name

When created through the compose file, volumes are prefixed
with the name of the project they belong to + underscore,
similarly to how containers are currently handled.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py               |  4 +--
 compose/volume.py                 | 12 +++++--
 tests/integration/project_test.py | 16 +++++----
 tests/integration/testcases.py    |  2 +-
 tests/integration/volume_test.py  | 55 +++++++++++++++++++++++++++++++
 5 files changed, 77 insertions(+), 12 deletions(-)
 create mode 100644 tests/integration/volume_test.py

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 4a766133..006d33ec 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -211,11 +211,11 @@ class TopLevelCommand(DocoptCommand):
             return
 
         if options['--services']:
-            print('\n'.join(service['name'] for service in compose_config))
+            print('\n'.join(service['name'] for service in compose_config.services))
             return
 
         compose_config = dict(
-            (service.pop('name'), service) for service in compose_config)
+            (service.pop('name'), service) for service in compose_config.services)
         print(yaml.dump(
             compose_config,
             default_flow_style=False,
diff --git a/compose/volume.py b/compose/volume.py
index 304633d0..055bd6ab 100644
--- a/compose/volume.py
+++ b/compose/volume.py
@@ -10,10 +10,16 @@ class Volume(object):
         self.driver_opts = driver_opts
 
     def create(self):
-        return self.client.create_volume(self.name, self.driver, self.driver_opts)
+        return self.client.create_volume(
+            self.full_name, self.driver, self.driver_opts
+        )
 
     def remove(self):
-        return self.client.remove_volume(self.name)
+        return self.client.remove_volume(self.full_name)
 
     def inspect(self):
-        return self.client.inspect_volume(self.name)
+        return self.client.inspect_volume(self.full_name)
+
+    @property
+    def full_name(self):
+        return '{0}_{1}'.format(self.project, self.name)
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index b4acda40..70def617 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -513,6 +513,7 @@ class ProjectTest(DockerClientTestCase):
 
     def test_project_up_volumes(self):
         vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
             2, [{
                 'name': 'web',
@@ -528,12 +529,13 @@ class ProjectTest(DockerClientTestCase):
         project.up()
         self.assertEqual(len(project.containers()), 1)
 
-        volume_data = self.client.inspect_volume(vol_name)
-        self.assertEqual(volume_data['Name'], vol_name)
+        volume_data = self.client.inspect_volume(full_vol_name)
+        self.assertEqual(volume_data['Name'], full_vol_name)
         self.assertEqual(volume_data['Driver'], 'local')
 
     def test_initialize_volumes(self):
         vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
             2, [{
                 'name': 'web',
@@ -548,12 +550,13 @@ class ProjectTest(DockerClientTestCase):
         )
         project.initialize_volumes()
 
-        volume_data = self.client.inspect_volume(vol_name)
-        self.assertEqual(volume_data['Name'], vol_name)
+        volume_data = self.client.inspect_volume(full_vol_name)
+        self.assertEqual(volume_data['Name'], full_vol_name)
         self.assertEqual(volume_data['Driver'], 'local')
 
     def test_project_up_implicit_volume_driver(self):
         vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
             2, [{
                 'name': 'web',
@@ -568,12 +571,13 @@ class ProjectTest(DockerClientTestCase):
         )
         project.up()
 
-        volume_data = self.client.inspect_volume(vol_name)
-        self.assertEqual(volume_data['Name'], vol_name)
+        volume_data = self.client.inspect_volume(full_vol_name)
+        self.assertEqual(volume_data['Name'], full_vol_name)
         self.assertEqual(volume_data['Driver'], 'local')
 
     def test_project_up_invalid_volume_driver(self):
         vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+
         config_data = config.Config(
             2, [{
                 'name': 'web',
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index a9f5e7bb..8e0525ee 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -41,7 +41,7 @@ class DockerClientTestCase(unittest.TestCase):
             self.client.remove_image(i)
         volumes = self.client.volumes().get('Volumes') or []
         for v in volumes:
-            if 'composetests_' in v['Name']:
+            if 'composetest_' in v['Name']:
                 self.client.remove_volume(v['Name'])
 
     def create_service(self, name, **kwargs):
diff --git a/tests/integration/volume_test.py b/tests/integration/volume_test.py
new file mode 100644
index 00000000..b6086040
--- /dev/null
+++ b/tests/integration/volume_test.py
@@ -0,0 +1,55 @@
+from __future__ import unicode_literals
+
+from docker.errors import DockerException
+
+from .testcases import DockerClientTestCase
+from compose.volume import Volume
+
+
+class VolumeTest(DockerClientTestCase):
+    def setUp(self):
+        self.tmp_volumes = []
+
+    def tearDown(self):
+        for volume in self.tmp_volumes:
+            try:
+                self.client.remove_volume(volume.full_name)
+            except DockerException:
+                pass
+
+    def create_volume(self, name, driver=None, opts=None):
+        vol = Volume(
+            self.client, 'composetest', name, driver=driver, driver_opts=opts
+        )
+        self.tmp_volumes.append(vol)
+        return vol
+
+    def test_create_volume(self):
+        vol = self.create_volume('volume01')
+        vol.create()
+        info = self.client.inspect_volume(vol.full_name)
+        assert info['Name'] == vol.full_name
+
+    def test_recreate_existing_volume(self):
+        vol = self.create_volume('volume01')
+
+        vol.create()
+        info = self.client.inspect_volume(vol.full_name)
+        assert info['Name'] == vol.full_name
+
+        vol.create()
+        info = self.client.inspect_volume(vol.full_name)
+        assert info['Name'] == vol.full_name
+
+    def test_inspect_volume(self):
+        vol = self.create_volume('volume01')
+        vol.create()
+        info = vol.inspect()
+        assert info['Name'] == vol.full_name
+
+    def test_remove_volume(self):
+        vol = Volume(self.client, 'composetest', 'volume01')
+        vol.create()
+        vol.remove()
+        volumes = self.client.volumes()['Volumes']
+        assert len([v for v in volumes if v['Name'] == vol.full_name]) == 0

From 661519ac1c8fa7913cd9d289951c41447eeebff9 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 9 Dec 2015 14:47:09 -0800
Subject: [PATCH 0605/1265] Only test latest version in CI script

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 script/test-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/test-versions b/script/test-versions
index 623b107b..a905cedf 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -18,7 +18,7 @@ get_versions="docker run --rm
 if [ "$DOCKER_VERSIONS" == "" ]; then
   DOCKER_VERSIONS="$($get_versions default)"
 elif [ "$DOCKER_VERSIONS" == "all" ]; then
-  DOCKER_VERSIONS="$($get_versions recent -n 2)"
+  DOCKER_VERSIONS="$($get_versions recent -n 1)"
 fi
 
 

From f3a9533dc04cfa43be128d97bea3b30fc003b7c6 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 9 Dec 2015 17:06:56 -0800
Subject: [PATCH 0606/1265] version no longer optional arg for
 process_config_file

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py          |  4 ++--
 compose/project.py                |  2 +-
 tests/integration/project_test.py | 20 ++++++++++----------
 tests/unit/config/config_test.py  |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 295dc494..63ef44c3 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -315,7 +315,7 @@ def load_services(working_dir, config_files, version):
     return build_services(config_file)
 
 
-def process_config_file(config_file, service_name=None, version=None):
+def process_config_file(config_file, version, service_name=None):
     validate_top_level_service_objects(config_file, version)
     processed_config = interpolate_environment_variables(config_file.config, version)
     validate_against_fields_schema(
@@ -364,7 +364,7 @@ class ServiceExtendsResolver(object):
 
         extended_file = process_config_file(
             ConfigFile.from_filename(config_path),
-            service_name=service_name, version=self.version
+            version=self.version, service_name=service_name
         )
         service_config = extended_file.config[service_name]
         return config_path, service_config, service_name
diff --git a/compose/project.py b/compose/project.py
index b7f33e3f..36855f16 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -234,7 +234,7 @@ class Project(object):
                 volume.create()
         except NotFound:
             raise ConfigurationError(
-                'Volume %s sepcifies nonexistent driver %s' % (volume.name, volume.driver)
+                'Volume %s specifies nonexistent driver %s' % (volume.name, volume.driver)
             )
 
     def restart(self, service_names=None, **options):
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 70def617..f2c65084 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -512,14 +512,14 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(service.containers()), 1)
 
     def test_project_up_volumes(self):
-        vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
-            2, [{
+            version=2, services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], {vol_name: {'driver': 'local'}}
+            }], volumes={vol_name: {'driver': 'local'}}
         )
 
         project = Project.from_config(
@@ -534,14 +534,14 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(volume_data['Driver'], 'local')
 
     def test_initialize_volumes(self):
-        vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
-            2, [{
+            version=2, services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], {vol_name: {}}
+            }], volumes={vol_name: {}}
         )
 
         project = Project.from_config(
@@ -555,14 +555,14 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(volume_data['Driver'], 'local')
 
     def test_project_up_implicit_volume_driver(self):
-        vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
-            2, [{
+            version=2, services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], {vol_name: {}}
+            }], volumes={vol_name: {}}
         )
 
         project = Project.from_config(
@@ -576,7 +576,7 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(volume_data['Driver'], 'local')
 
     def test_project_up_invalid_volume_driver(self):
-        vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        vol_name = '{0:x}'.format(random.getrandbits(32))
 
         config_data = config.Config(
             2, [{
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index dac573ed..74978150 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -702,7 +702,7 @@ class ConfigTest(unittest.TestCase):
                 'dns_search': 'domain.local',
             }
         }))
-        assert actual == [
+        assert actual.services == [
             {
                 'name': 'web',
                 'image': 'alpine',

From a7689f3da8a671b2a5dacd58ebc9259c86793f86 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 11 Dec 2015 17:21:04 -0800
Subject: [PATCH 0607/1265] Handle volume driver change error in config.

Assume version=1 if file is empty in get_config_version
Empty files are invalid anyway, so this simplifies the algorithm
somewhat.
https://github.com/docker/compose/pull/2421#discussion_r47223144

Don't leak version considerations in interpolation/service validation

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py          | 22 +++++++++++++-----
 compose/config/interpolation.py   | 10 ++------
 compose/config/validation.py      | 10 ++++----
 compose/project.py                | 12 ++++++++++
 tests/integration/project_test.py | 38 +++++++++++++++++++++++++++++--
 tests/unit/config/config_test.py  | 23 +++++++++++++++++++
 6 files changed, 94 insertions(+), 21 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 63ef44c3..c77e6100 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -118,6 +118,9 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
     def from_filename(cls, filename):
         return cls(filename, load_yaml(filename))
 
+    def get_service_dicts(self, version):
+        return self.config if version == 1 else self.config.get('services', {})
+
 
 class Config(namedtuple('_Config', 'version services volumes')):
     """
@@ -164,9 +167,11 @@ def find(base_dir, filenames):
 def get_config_version(config_details):
     def get_version(config):
         if config.config is None:
-            return None
+            return 1
         version = config.config.get('version', 1)
         if isinstance(version, dict):
+            # in that case 'version' is probably a service name, so assume
+            # this is a legacy (version=1) file
             version = 1
         return version
 
@@ -176,9 +181,6 @@ def get_config_version(config_details):
     for next_file in config_details.config_files[1:]:
         validate_top_level_object(next_file)
         next_file_version = get_version(next_file)
-        if version is None:
-            version = next_file_version
-            continue
 
         if version != next_file_version and next_file_version is not None:
             raise ConfigurationError(
@@ -316,8 +318,16 @@ def load_services(working_dir, config_files, version):
 
 
 def process_config_file(config_file, version, service_name=None):
-    validate_top_level_service_objects(config_file, version)
-    processed_config = interpolate_environment_variables(config_file.config, version)
+    service_dicts = config_file.get_service_dicts(version)
+    validate_top_level_service_objects(
+        config_file.filename, service_dicts
+    )
+    interpolated_config = interpolate_environment_variables(service_dicts)
+    if version == 2:
+        processed_config = dict(config_file.config)
+        processed_config.update({'services': interpolated_config})
+    if version == 1:
+        processed_config = interpolated_config
     validate_against_fields_schema(
         processed_config, config_file.filename, version
     )
diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index a8ff08d8..12eb497b 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -8,19 +8,13 @@ from .errors import ConfigurationError
 log = logging.getLogger(__name__)
 
 
-def interpolate_environment_variables(config, version):
+def interpolate_environment_variables(service_dicts):
     mapping = BlankDefaultDict(os.environ)
-    service_dicts = config if version == 1 else config.get('services', {})
 
-    interpolated = dict(
+    return dict(
         (service_name, process_service(service_name, service_dict, mapping))
         for (service_name, service_dict) in service_dicts.items()
     )
-    if version == 1:
-        return interpolated
-    result = dict(config)
-    result.update({'services': interpolated})
-    return result
 
 
 def process_service(service_name, service_dict, mapping):
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 6e943974..091014f6 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -74,19 +74,18 @@ def format_boolean_in_environment(instance):
     return True
 
 
-def validate_top_level_service_objects(config_file, version):
+def validate_top_level_service_objects(filename, service_dicts):
     """Perform some high level validation of the service name and value.
 
     This validation must happen before interpolation, which must happen
     before the rest of validation, which is why it's separate from the
     rest of the service validation.
     """
-    service_dicts = config_file.config if version == 1 else config_file.config.get('services', {})
     for service_name, service_dict in service_dicts.items():
         if not isinstance(service_name, six.string_types):
             raise ConfigurationError(
                 "In file '{}' service name: {} needs to be a string, eg '{}'".format(
-                    config_file.filename,
+                    filename,
                     service_name,
                     service_name))
 
@@ -95,8 +94,9 @@ def validate_top_level_service_objects(config_file, version):
                 "In file '{}' service '{}' doesn\'t have any configuration options. "
                 "All top level keys in your docker-compose.yml must map "
                 "to a dictionary of configuration options.".format(
-                    config_file.filename,
-                    service_name))
+                    filename, service_name
+                )
+            )
 
 
 def validate_top_level_object(config_file):
diff --git a/compose/project.py b/compose/project.py
index 36855f16..3801bbb9 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -236,6 +236,18 @@ class Project(object):
             raise ConfigurationError(
                 'Volume %s specifies nonexistent driver %s' % (volume.name, volume.driver)
             )
+        except APIError as e:
+            if 'Choose a different volume name' in str(e):
+                raise ConfigurationError(
+                    'Configuration for volume {0} specifies driver {1}, but '
+                    'a volume with the same name uses a different driver '
+                    '({3}). If you wish to use the new configuration, please '
+                    'remove the existing volume "{2}" first:\n'
+                    '$ docker volume rm {2}'.format(
+                        volume.name, volume.driver, volume.full_name,
+                        volume.inspect()['Driver']
+                    )
+                )
 
     def restart(self, service_names=None, **options):
         containers = self.containers(service_names, stopped=True)
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index f2c65084..d51830bb 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -579,11 +579,11 @@ class ProjectTest(DockerClientTestCase):
         vol_name = '{0:x}'.format(random.getrandbits(32))
 
         config_data = config.Config(
-            2, [{
+            version=2, services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], {vol_name: {'driver': 'foobar'}}
+            }], volumes={vol_name: {'driver': 'foobar'}}
         )
 
         project = Project.from_config(
@@ -592,3 +592,37 @@ class ProjectTest(DockerClientTestCase):
         )
         with self.assertRaises(config.ConfigurationError):
             project.initialize_volumes()
+
+    def test_project_up_updated_driver(self):
+        vol_name = '{0:x}'.format(random.getrandbits(32))
+        full_vol_name = 'composetest_{0}'.format(vol_name)
+
+        config_data = config.Config(
+            version=2, services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'command': 'top'
+            }], volumes={vol_name: {'driver': 'local'}}
+        )
+        project = Project.from_config(
+            name='composetest',
+            config_data=config_data, client=self.client
+        )
+        project.initialize_volumes()
+
+        volume_data = self.client.inspect_volume(full_vol_name)
+        self.assertEqual(volume_data['Name'], full_vol_name)
+        self.assertEqual(volume_data['Driver'], 'local')
+
+        config_data = config_data._replace(
+            volumes={vol_name: {'driver': 'smb'}}
+        )
+        project = Project.from_config(
+            name='composetest',
+            config_data=config_data, client=self.client
+        )
+        with self.assertRaises(config.ConfigurationError) as e:
+            project.initialize_volumes()
+        assert 'Configuration for volume {0} specifies driver smb'.format(
+            vol_name
+        ) in str(e.exception)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 74978150..281e81d1 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -286,6 +286,18 @@ class ConfigTest(unittest.TestCase):
         error_msg = "Top level object in 'override.yml' needs to be an object"
         assert error_msg in exc.exconly()
 
+    def test_load_with_multiple_files_and_empty_override_v2(self):
+        base_file = config.ConfigFile(
+            'base.yml',
+            {'version': 2, 'services': {'web': {'image': 'example/web'}}})
+        override_file = config.ConfigFile('override.yml', None)
+        details = config.ConfigDetails('.', [base_file, override_file])
+
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(details)
+        error_msg = "Top level object in 'override.yml' needs to be an object"
+        assert error_msg in exc.exconly()
+
     def test_load_with_multiple_files_and_empty_base(self):
         base_file = config.ConfigFile('base.yml', None)
         override_file = config.ConfigFile(
@@ -297,6 +309,17 @@ class ConfigTest(unittest.TestCase):
             config.load(details)
         assert "Top level object in 'base.yml' needs to be an object" in exc.exconly()
 
+    def test_load_with_multiple_files_and_empty_base_v2(self):
+        base_file = config.ConfigFile('base.yml', None)
+        override_file = config.ConfigFile(
+            'override.tml',
+            {'version': 2, 'services': {'web': {'image': 'example/web'}}}
+        )
+        details = config.ConfigDetails('.', [base_file, override_file])
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(details)
+        assert "Top level object in 'base.yml' needs to be an object" in exc.exconly()
+
     def test_load_with_multiple_files_and_extends_in_override_file(self):
         base_file = config.ConfigFile(
             'base.yaml',

From 1dcdd98da4d8f5bce52eddf013875b730e2ed130 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 5 Jan 2016 15:24:58 -0800
Subject: [PATCH 0608/1265] Add TODO note to restore n-1 version testing after
 1.10 release

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 script/test-versions | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/test-versions b/script/test-versions
index a905cedf..76e55e11 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -18,6 +18,7 @@ get_versions="docker run --rm
 if [ "$DOCKER_VERSIONS" == "" ]; then
   DOCKER_VERSIONS="$($get_versions default)"
 elif [ "$DOCKER_VERSIONS" == "all" ]; then
+  # TODO: `-n 2` when engine 1.10 releases
   DOCKER_VERSIONS="$($get_versions recent -n 1)"
 fi
 

From c7b71422c0bea8ce19b8f28e426fe4ea597eb83c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 6 Jan 2016 13:30:40 -0500
Subject: [PATCH 0609/1265] Fix extends with multiple files.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         |  2 ++
 tests/unit/config/config_test.py | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/compose/config/config.py b/compose/config/config.py
index 195665b5..9e62ef1c 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -422,6 +422,8 @@ def merge_service_dicts_from_files(base, override):
     new_service = merge_service_dicts(base, override)
     if 'extends' in override:
         new_service['extends'] = override['extends']
+    elif 'extends' in base:
+        new_service['extends'] = base['extends']
     return new_service
 
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index e975cb9d..97a0838f 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -552,6 +552,37 @@ class ConfigTest(unittest.TestCase):
             }
         ]
 
+    def test_merge_service_dicts_from_files_with_extends_in_base(self):
+        base = {
+            'volumes': ['.:/app'],
+            'extends': {'service': 'app'}
+        }
+        override = {
+            'image': 'alpine:edge',
+        }
+        actual = config.merge_service_dicts_from_files(base, override)
+        assert actual == {
+            'image': 'alpine:edge',
+            'volumes': ['.:/app'],
+            'extends': {'service': 'app'}
+        }
+
+    def test_merge_service_dicts_from_files_with_extends_in_override(self):
+        base = {
+            'volumes': ['.:/app'],
+            'extends': {'service': 'app'}
+        }
+        override = {
+            'image': 'alpine:edge',
+            'extends': {'service': 'foo'}
+        }
+        actual = config.merge_service_dicts_from_files(base, override)
+        assert actual == {
+            'image': 'alpine:edge',
+            'volumes': ['.:/app'],
+            'extends': {'service': 'foo'}
+        }
+
 
 class PortsTest(unittest.TestCase):
     INVALID_PORTS_TYPES = [

From 77d2aae72dbed943e0b7ae58e392a5bca49a4263 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Wed, 23 Dec 2015 23:53:32 +0100
Subject: [PATCH 0610/1265] Fix typo in unpause reference doc

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 docs/reference/unpause.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference/unpause.md b/docs/reference/unpause.md
index 6434b09c..846b229e 100644
--- a/docs/reference/unpause.md
+++ b/docs/reference/unpause.md
@@ -9,7 +9,7 @@ parent = "smn_compose_cli"
 +++
 <![end-metadata]-->
 
-# pause
+# unpause
 
 ```
 Usage: unpause [SERVICE...]

From 4e75ed42319b372ac79c7b8762c5fec794afa841 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Wed, 23 Dec 2015 23:59:48 +0100
Subject: [PATCH 0611/1265] Add missing --name flag to run reference doc

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 docs/reference/run.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/reference/run.md b/docs/reference/run.md
index c1efb9a7..21890c60 100644
--- a/docs/reference/run.md
+++ b/docs/reference/run.md
@@ -17,6 +17,7 @@ Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]
 Options:
 -d                    Detached mode: Run container in the background, print
                           new container name.
+--name NAME           Assign a name to the container
 --entrypoint CMD      Override the entrypoint of the image.
 -e KEY=VAL            Set an environment variable (can be used multiple times)
 -u, --user=""         Run as specified username or uid

From 0bca8d9cb39a01736f2ce043f2ea7b6407ffc281 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Wed, 6 Jan 2016 21:28:47 +0100
Subject: [PATCH 0612/1265] Add config and create to docs/reference

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 docs/reference/config.md | 23 +++++++++++++++++++++++
 docs/reference/create.md | 25 +++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 docs/reference/config.md
 create mode 100644 docs/reference/create.md

diff --git a/docs/reference/config.md b/docs/reference/config.md
new file mode 100644
index 00000000..1a9706f4
--- /dev/null
+++ b/docs/reference/config.md
@@ -0,0 +1,23 @@
+<!--[metadata]>
++++
+title = "config"
+description = "Config validates and view the compose file."
+keywords = ["fig, composition, compose, docker, orchestration, cli, config"]
+[menu.main]
+identifier="config.compose"
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# config
+
+```:
+Usage: config [options]
+
+Options:
+-q, --quiet     Only validate the configuration, don't print
+                anything.
+--services      Print the service names, one per line.
+```
+
+Validate and view the compose file.
diff --git a/docs/reference/create.md b/docs/reference/create.md
new file mode 100644
index 00000000..a785e2c7
--- /dev/null
+++ b/docs/reference/create.md
@@ -0,0 +1,25 @@
+<!--[metadata]>
++++
+title = "create"
+description = "Create creates containers for a service."
+keywords = ["fig, composition, compose, docker, orchestration, cli, create"]
+[menu.main]
+identifier="create.compose"
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# create
+
+```
+Usage: create [options] [SERVICE...]
+
+Options:
+--force-recreate       Recreate containers even if their configuration and
+                       image haven't changed. Incompatible with --no-recreate.
+--no-recreate          If containers already exist, don't recreate them.
+                       Incompatible with --force-recreate.
+--no-build             Don't build an image, even if it's missing
+```
+
+Creates containers for a service.

From 475a09176850c3f6d9fd51fc6e82e03263a3d733 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 30 Oct 2015 16:22:51 -0400
Subject: [PATCH 0613/1265] Update pre-commit config to enforace that future
 imports exist in all files.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 .pre-commit-config.yaml                 | 7 ++++++-
 compose/__init__.py                     | 1 +
 compose/cli/colors.py                   | 1 +
 compose/cli/docker_client.py            | 3 +++
 compose/cli/errors.py                   | 1 +
 compose/cli/main.py                     | 1 +
 compose/cli/multiplexer.py              | 1 +
 compose/cli/verbose_proxy.py            | 3 +++
 compose/config/__init__.py              | 3 +++
 compose/config/config.py                | 1 +
 compose/config/errors.py                | 4 ++++
 compose/config/interpolation.py         | 3 +++
 compose/config/validation.py            | 3 +++
 compose/const.py                        | 3 +++
 compose/progress_stream.py              | 3 +++
 compose/utils.py                        | 3 +++
 script/travis/render-bintray-config.py  | 2 ++
 script/versions.py                      | 2 ++
 tests/__init__.py                       | 3 +++
 tests/acceptance/cli_test.py            | 1 +
 tests/integration/project_test.py       | 1 +
 tests/integration/state_test.py         | 1 +
 tests/unit/cli/command_test.py          | 1 +
 tests/unit/cli/main_test.py             | 1 +
 tests/unit/config/config_test.py        | 2 ++
 tests/unit/config/sort_services_test.py | 3 +++
 tests/unit/container_test.py            | 1 +
 tests/unit/interpolation_test.py        | 3 +++
 tests/unit/multiplexer_test.py          | 3 +++
 tests/unit/project_test.py              | 1 +
 tests/unit/utils_test.py                | 1 +
 31 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3fad8ddc..db2b6506 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,7 +14,12 @@
     - id: requirements-txt-fixer
     - id: trailing-whitespace
 - repo: git://github.com/asottile/reorder_python_imports
-  sha: 3d86483455ab5bd06cc1069fdd5ac57be5463f10
+  sha: v0.1.0
   hooks:
     - id: reorder-python-imports
       language_version: 'python2.7'
+      args:
+        - --add-import
+        - from __future__ import absolute_import
+        - --add-import
+        - from __future__ import unicode_literals
diff --git a/compose/__init__.py b/compose/__init__.py
index 7c16c97b..3ba90fde 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 __version__ = '1.6.0dev'
diff --git a/compose/cli/colors.py b/compose/cli/colors.py
index af4a32ab..3c18886f 100644
--- a/compose/cli/colors.py
+++ b/compose/cli/colors.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import unicode_literals
 NAMES = [
     'grey',
diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 177d5d6c..48ba97bd 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import logging
 import os
 
diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index ca4413bd..03d6a50c 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from textwrap import dedent
 
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 006d33ec..9ea9df71 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import print_function
 from __future__ import unicode_literals
 
diff --git a/compose/cli/multiplexer.py b/compose/cli/multiplexer.py
index 4c73c6cd..5e8d91a4 100644
--- a/compose/cli/multiplexer.py
+++ b/compose/cli/multiplexer.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from threading import Thread
 
diff --git a/compose/cli/verbose_proxy.py b/compose/cli/verbose_proxy.py
index 68dfabe5..b1592eab 100644
--- a/compose/cli/verbose_proxy.py
+++ b/compose/cli/verbose_proxy.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import functools
 import logging
 import pprint
diff --git a/compose/config/__init__.py b/compose/config/__init__.py
index 6fe9ff9f..dd01f221 100644
--- a/compose/config/__init__.py
+++ b/compose/config/__init__.py
@@ -1,4 +1,7 @@
 # flake8: noqa
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 from .config import ConfigurationError
 from .config import DOCKER_CONFIG_KEYS
 from .config import find
diff --git a/compose/config/config.py b/compose/config/config.py
index c77e6100..61b40589 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import codecs
 import logging
diff --git a/compose/config/errors.py b/compose/config/errors.py
index 6d6a69df..99129f3d 100644
--- a/compose/config/errors.py
+++ b/compose/config/errors.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+
 class ConfigurationError(Exception):
     def __init__(self, msg):
         self.msg = msg
diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index 12eb497b..7a757644 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import logging
 import os
 from string import Template
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 091014f6..f2162a87 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import json
 import logging
 import os
diff --git a/compose/const.py b/compose/const.py
index 9c607ca2..f1493cdd 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import os
 import sys
 
diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index a6c8e0a2..1f873d1d 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 from compose import utils
 
 
diff --git a/compose/utils.py b/compose/utils.py
index 362629bc..4a7df334 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import codecs
 import hashlib
 import json
diff --git a/script/travis/render-bintray-config.py b/script/travis/render-bintray-config.py
index fc5d409a..c2b11ca3 100755
--- a/script/travis/render-bintray-config.py
+++ b/script/travis/render-bintray-config.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 from __future__ import print_function
+from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import datetime
 import os.path
diff --git a/script/versions.py b/script/versions.py
index 513ca754..98f97ef3 100755
--- a/script/versions.py
+++ b/script/versions.py
@@ -21,7 +21,9 @@ For example, if the list of versions is:
 `default` would return `1.7.1` and
 `recent -n 3` would return `1.8.0-rc2 1.7.1 1.6.2`
 """
+from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import argparse
 import itertools
diff --git a/tests/__init__.py b/tests/__init__.py
index d3cfb864..1ac1b21c 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import sys
 
 if sys.version_info >= (2, 7):
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 1885727a..6859c774 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import os
 import shlex
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index d51830bb..2cf5f556 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import random
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index d07dfa82..6e656c29 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -2,6 +2,7 @@
 Integration tests which cover state convergence (aka smart recreate) performed
 by `docker-compose up`.
 """
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import py
diff --git a/tests/unit/cli/command_test.py b/tests/unit/cli/command_test.py
index 0d4324e3..18044672 100644
--- a/tests/unit/cli/command_test.py
+++ b/tests/unit/cli/command_test.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import pytest
 from requests.exceptions import ConnectionError
diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py
index db37ac1a..ab236866 100644
--- a/tests/unit/cli/main_test.py
+++ b/tests/unit/cli/main_test.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import logging
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 281e81d1..8cb5d9b2 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1,5 +1,7 @@
 # encoding: utf-8
+from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import os
 import shutil
diff --git a/tests/unit/config/sort_services_test.py b/tests/unit/config/sort_services_test.py
index 8d0c3ae4..c2ebbc67 100644
--- a/tests/unit/config/sort_services_test.py
+++ b/tests/unit/config/sort_services_test.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 from compose.config.errors import DependencyError
 from compose.config.sort_services import sort_service_dicts
 from compose.config.types import VolumeFromSpec
diff --git a/tests/unit/container_test.py b/tests/unit/container_test.py
index 5f7bf1ea..88691150 100644
--- a/tests/unit/container_test.py
+++ b/tests/unit/container_test.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import docker
diff --git a/tests/unit/interpolation_test.py b/tests/unit/interpolation_test.py
index 7444884c..317982a9 100644
--- a/tests/unit/interpolation_test.py
+++ b/tests/unit/interpolation_test.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import unittest
 
 from compose.config.interpolation import BlankDefaultDict as bddict
diff --git a/tests/unit/multiplexer_test.py b/tests/unit/multiplexer_test.py
index d565d39d..c56ece1b 100644
--- a/tests/unit/multiplexer_test.py
+++ b/tests/unit/multiplexer_test.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import unittest
 
 from compose.cli.multiplexer import Multiplexer
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 4bf5f463..a182680b 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import docker
diff --git a/tests/unit/utils_test.py b/tests/unit/utils_test.py
index 15999dde..8ee37b07 100644
--- a/tests/unit/utils_test.py
+++ b/tests/unit/utils_test.py
@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 from compose import utils

From bf1552da7982b22b874b1938af9bf80094c884e8 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 30 Oct 2015 16:50:31 -0400
Subject: [PATCH 0614/1265] Use json to encode invalid values in configuration
 errors so that the user sees a proper repr of the value.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/__main__.py                    | 3 +++
 compose/config/sort_services.py        | 3 +++
 compose/config/validation.py           | 3 ++-
 compose/volume.py                      | 1 +
 script/travis/render-bintray-config.py | 2 +-
 tests/integration/volume_test.py       | 1 +
 tests/unit/config/config_test.py       | 4 +++-
 tests/unit/config/types_test.py        | 3 +++
 8 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/compose/__main__.py b/compose/__main__.py
index 199ba2ae..27a7acbb 100644
--- a/compose/__main__.py
+++ b/compose/__main__.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 from compose.cli.main import main
 
 main()
diff --git a/compose/config/sort_services.py b/compose/config/sort_services.py
index 5d9adab1..05552122 100644
--- a/compose/config/sort_services.py
+++ b/compose/config/sort_services.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 from compose.config.errors import DependencyError
 
 
diff --git a/compose/config/validation.py b/compose/config/validation.py
index f2162a87..74dd461f 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -254,7 +254,8 @@ def _parse_oneof_validator(error):
             )
             return "{}contains {}, which is an invalid type, it should be {}".format(
                 invalid_config_key,
-                context.instance,
+                # Always print the json repr of the invalid value
+                json.dumps(context.instance),
                 _parse_valid_types_from_validator(context.validator_value))
 
         if context.validator == 'uniqueItems':
diff --git a/compose/volume.py b/compose/volume.py
index 055bd6ab..fb8bd580 100644
--- a/compose/volume.py
+++ b/compose/volume.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 
diff --git a/script/travis/render-bintray-config.py b/script/travis/render-bintray-config.py
index c2b11ca3..b5364a0b 100755
--- a/script/travis/render-bintray-config.py
+++ b/script/travis/render-bintray-config.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import print_function
 from __future__ import unicode_literals
 
 import datetime
diff --git a/tests/integration/volume_test.py b/tests/integration/volume_test.py
index b6086040..8ae35378 100644
--- a/tests/integration/volume_test.py
+++ b/tests/integration/volume_test.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 from docker.errors import DockerException
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 8cb5d9b2..abb891a2 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -552,7 +552,9 @@ class ConfigTest(unittest.TestCase):
             )
 
     def test_config_extra_hosts_list_of_dicts_validation_error(self):
-        expected_error_msg = "key 'extra_hosts' contains {'somehost': '162.242.195.82'}, which is an invalid type, it should be a string"
+        expected_error_msg = (
+            "key 'extra_hosts' contains {\"somehost\": \"162.242.195.82\"}, "
+            "which is an invalid type, it should be a string")
 
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
             config.load(
diff --git a/tests/unit/config/types_test.py b/tests/unit/config/types_test.py
index 4df66548..245b854f 100644
--- a/tests/unit/config/types_test.py
+++ b/tests/unit/config/types_test.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import pytest
 
 from compose.config.errors import ConfigurationError

From ed5f7bd3949b289cebace496d9a40e67e05db466 Mon Sep 17 00:00:00 2001
From: Dimitar Bonev <dimitar.bonev@gmail.com>
Date: Thu, 17 Dec 2015 23:23:00 +0200
Subject: [PATCH 0615/1265] log_driver and log_opt moved to logging key.

Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
---
 compose/config/config.py                      |  3 +-
 compose/config/fields_schema_v1.json          | 11 +++++-
 compose/service.py                            | 25 +++++++++++--
 docs/compose-file.md                          | 28 +++++++++-----
 tests/acceptance/cli_test.py                  | 37 +++++++++++++++++++
 .../fixtures/logging-composefile/compose2.yml |  3 ++
 .../logging-composefile/docker-compose.yml    | 12 ++++++
 tests/integration/service_test.py             |  4 +-
 tests/unit/service_test.py                    |  3 +-
 9 files changed, 105 insertions(+), 21 deletions(-)
 create mode 100644 tests/fixtures/logging-composefile/compose2.yml
 create mode 100644 tests/fixtures/logging-composefile/docker-compose.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 61b40589..0012aefd 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -51,8 +51,6 @@ DOCKER_CONFIG_KEYS = [
     'ipc',
     'labels',
     'links',
-    'log_driver',
-    'log_opt',
     'mac_address',
     'mem_limit',
     'memswap_limit',
@@ -78,6 +76,7 @@ ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
     'dockerfile',
     'expose',
     'external_links',
+    'logging',
 ]
 
 DOCKER_VALID_URL_PREFIXES = (
diff --git a/compose/config/fields_schema_v1.json b/compose/config/fields_schema_v1.json
index 6f0a3631..790ace34 100644
--- a/compose/config/fields_schema_v1.json
+++ b/compose/config/fields_schema_v1.json
@@ -75,8 +75,15 @@
         "labels": {"$ref": "#/definitions/list_or_dict"},
         "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
 
-        "log_driver": {"type": "string"},
-        "log_opt": {"type": "object"},
+        "logging": {
+            "type": "object",
+
+            "properties": {
+                "driver": {"type": "string"},
+                "options": {"type": "object"}
+            },
+            "additionalProperties": false
+        },
 
         "mac_address": {"type": "string"},
         "mem_limit": {"type": ["number", "string"]},
diff --git a/compose/service.py b/compose/service.py
index 24fa6394..366833dd 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -510,6 +510,13 @@ class Service(object):
 
         return volumes_from
 
+    def get_logging_options(self):
+        logging_dict = self.options.get('logging', {})
+        return {
+            'log_driver': logging_dict.get('driver', ""),
+            'log_opt': logging_dict.get('options', None)
+        }
+
     def _get_container_create_options(
             self,
             override_options,
@@ -523,6 +530,8 @@ class Service(object):
             for k in DOCKER_CONFIG_KEYS if k in self.options)
         container_options.update(override_options)
 
+        container_options.update(self.get_logging_options())
+
         if self.custom_container_name() and not one_off:
             container_options['name'] = self.custom_container_name()
         elif not container_options.get('name'):
@@ -590,10 +599,9 @@ class Service(object):
     def _get_container_host_config(self, override_options, one_off=False):
         options = dict(self.options, **override_options)
 
-        log_config = LogConfig(
-            type=options.get('log_driver', ""),
-            config=options.get('log_opt', None)
-        )
+        logging_dict = options.get('logging', None)
+        log_config = get_log_config(logging_dict)
+
         return self.client.create_host_config(
             links=self._get_links(link_to_self=one_off),
             port_bindings=build_port_bindings(options.get('ports') or []),
@@ -953,3 +961,12 @@ def build_ulimits(ulimit_config):
             ulimits.append(ulimit_dict)
 
     return ulimits
+
+
+def get_log_config(logging_dict):
+    log_driver = logging_dict.get('driver', "") if logging_dict else ""
+    log_options = logging_dict.get('options', None) if logging_dict else None
+    return LogConfig(
+        type=log_driver,
+        config=log_options
+    )
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 29e0c647..40a3cf02 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -324,29 +324,37 @@ for this service, e.g:
 Environment variables will also be created - see the [environment variable
 reference](env.md) for details.
 
-### log_driver
+### logging
 
-Specify a logging driver for the service's containers, as with the ``--log-driver``
-option for docker run ([documented here](https://docs.docker.com/engine/reference/logging/overview/)).
+Logging configuration for the service. This configuration replaces the previous
+`log_driver` and `log_opt` keys.
+
+    logging:
+        driver: log_driver
+        options:
+            syslog-address: "tcp://192.168.0.42:123"
+
+The `driver`  name specifies a logging driver for the service's
+containers, as with the ``--log-driver`` option for docker run
+([documented here](https://docs.docker.com/engine/reference/logging/overview/)).
 
 The default value is json-file.
 
-    log_driver: "json-file"
-    log_driver: "syslog"
-    log_driver: "none"
+    driver: "json-file"
+    driver: "syslog"
+    driver: "none"
 
 > **Note:** Only the `json-file` driver makes the logs available directly from
 > `docker-compose up` and `docker-compose logs`. Using any other driver will not
 > print any logs.
 
-### log_opt
+Specify logging options for the logging driver with the ``options`` key, as with the ``--log-opt`` option for `docker run`.
 
-Specify logging options with `log_opt` for the logging driver, as with the ``--log-opt`` option for `docker run`.
 
 Logging options are key value pairs. An example of `syslog` options:
 
-    log_driver: "syslog"
-    log_opt:
+    driver: "syslog"
+    options:
       syslog-address: "tcp://192.168.0.42:123"
 
 ### net
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 6859c774..c5df3079 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -716,6 +716,43 @@ class CLITestCase(DockerClientTestCase):
         result = self.dispatch(['start'], returncode=1)
         assert 'No containers to start' in result.stderr
 
+    def test_up_logging(self):
+        self.base_dir = 'tests/fixtures/logging-composefile'
+        self.dispatch(['up', '-d'])
+        simple = self.project.get_service('simple').containers()[0]
+        log_config = simple.get('HostConfig.LogConfig')
+        self.assertTrue(log_config)
+        self.assertEqual(log_config.get('Type'), 'none')
+
+        another = self.project.get_service('another').containers()[0]
+        log_config = another.get('HostConfig.LogConfig')
+        self.assertTrue(log_config)
+        self.assertEqual(log_config.get('Type'), 'json-file')
+        self.assertEqual(log_config.get('Config')['max-size'], '10m')
+
+    def test_up_logging_with_multiple_files(self):
+        self.base_dir = 'tests/fixtures/logging-composefile'
+        config_paths = [
+            'docker-compose.yml',
+            'compose2.yml',
+        ]
+        self._project = get_project(self.base_dir, config_paths)
+        self.dispatch(
+            [
+                '-f', config_paths[0],
+                '-f', config_paths[1],
+                'up', '-d',
+            ],
+            None)
+
+        containers = self.project.containers()
+        self.assertEqual(len(containers), 2)
+
+        another = self.project.get_service('another').containers()[0]
+        log_config = another.get('HostConfig.LogConfig')
+        self.assertTrue(log_config)
+        self.assertEqual(log_config.get('Type'), 'none')
+
     def test_pause_unpause(self):
         self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
diff --git a/tests/fixtures/logging-composefile/compose2.yml b/tests/fixtures/logging-composefile/compose2.yml
new file mode 100644
index 00000000..ba582969
--- /dev/null
+++ b/tests/fixtures/logging-composefile/compose2.yml
@@ -0,0 +1,3 @@
+another:
+  logging:
+    driver: "none"
diff --git a/tests/fixtures/logging-composefile/docker-compose.yml b/tests/fixtures/logging-composefile/docker-compose.yml
new file mode 100644
index 00000000..877ee5e2
--- /dev/null
+++ b/tests/fixtures/logging-composefile/docker-compose.yml
@@ -0,0 +1,12 @@
+simple:
+  image: busybox:latest
+  command: top
+  logging:
+    driver: "none"
+another:
+  image: busybox:latest
+  command: top
+  logging:
+    driver: "json-file"
+    options:
+        max-size: "10m"
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 4a0eaacb..86bc4d9d 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -888,7 +888,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertNotEqual(one_off_container.name, 'my-web-container')
 
     def test_log_drive_invalid(self):
-        service = self.create_service('web', log_driver='xxx')
+        service = self.create_service('web', logging={'driver': 'xxx'})
         expected_error_msg = "logger: no log driver named 'xxx' is registered"
 
         with self.assertRaisesRegexp(APIError, expected_error_msg):
@@ -902,7 +902,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertFalse(log_config['Config'])
 
     def test_log_drive_none(self):
-        service = self.create_service('web', log_driver='none')
+        service = self.create_service('web', logging={'driver': 'none'})
         log_config = create_and_start_container(service).log_config
 
         self.assertEqual('none', log_config['Type'])
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 87d6af59..9cc35c7b 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -156,7 +156,8 @@ class ServiceTest(unittest.TestCase):
         self.mock_client.create_host_config.return_value = {}
 
         log_opt = {'syslog-address': 'tcp://192.168.0.42:123'}
-        service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, log_driver='syslog', log_opt=log_opt)
+        logging = {'driver': 'syslog', 'options': log_opt}
+        service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, logging=logging)
         service._get_container_create_options({'some': 'overrides'}, 1)
 
         self.assertTrue(self.mock_client.create_host_config.called)

From 978e9cf38f057a8dc08fd74b969fd38873a27ba6 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 8 Jan 2016 13:10:05 +0000
Subject: [PATCH 0616/1265] Fix script/clean on systems where `find` requires a
 path argument

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/clean | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/clean b/script/clean
index 35faf4db..fb7ba3be 100755
--- a/script/clean
+++ b/script/clean
@@ -3,5 +3,5 @@ set -e
 
 find . -type f -name '*.pyc' -delete
 find . -name .coverage.* -delete
-find -name __pycache__ -delete
+find . -name __pycache__ -delete
 rm -rf docs/_site build dist docker-compose.egg-info

From d1d3969661f549311bccde53703a2939402cf769 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Mon, 31 Aug 2015 14:31:20 -0400
Subject: [PATCH 0617/1265] Add docker-compose event

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py          | 23 +++++++++++
 compose/const.py             |  1 +
 compose/project.py           | 38 ++++++++++++++++-
 compose/utils.py             |  4 ++
 docs/reference/events.md     | 34 ++++++++++++++++
 docs/reference/index.md      | 11 ++---
 tests/acceptance/cli_test.py | 11 +++++
 tests/unit/project_test.py   | 79 ++++++++++++++++++++++++++++++++++++
 8 files changed, 195 insertions(+), 6 deletions(-)
 create mode 100644 docs/reference/events.md

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 9ea9df71..d99816cf 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import json
 import logging
 import re
 import signal
@@ -132,6 +133,7 @@ class TopLevelCommand(DocoptCommand):
       build              Build or rebuild services
       config             Validate and view the compose file
       create             Create services
+      events             Receive real time events from containers
       help               Get help on a command
       kill               Kill containers
       logs               View output from containers
@@ -244,6 +246,27 @@ class TopLevelCommand(DocoptCommand):
             do_build=not options['--no-build']
         )
 
+    def events(self, project, options):
+        """
+        Receive real time events from containers.
+
+        Usage: events [options] [SERVICE...]
+
+        Options:
+            --json      Output events as a stream of json objects
+        """
+        def format_event(event):
+            return ("{time}: service={service} event={event} "
+                    "container={container} image={image}").format(**event)
+
+        def json_format_event(event):
+            event['time'] = event['time'].isoformat()
+            return json.dumps(event)
+
+        for event in project.events():
+            formatter = json_format_event if options['--json'] else format_event
+            print(formatter(event))
+
     def help(self, project, options):
         """
         Get help on a command.
diff --git a/compose/const.py b/compose/const.py
index f1493cdd..84a5057a 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -6,6 +6,7 @@ import sys
 
 DEFAULT_TIMEOUT = 10
 HTTP_TIMEOUT = int(os.environ.get('COMPOSE_HTTP_TIMEOUT', os.environ.get('DOCKER_CLIENT_TIMEOUT', 60)))
+IMAGE_EVENTS = ['delete', 'import', 'pull', 'push', 'tag', 'untag']
 IS_WINDOWS_PLATFORM = (sys.platform == "win32")
 LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
 LABEL_ONE_OFF = 'com.docker.compose.oneoff'
diff --git a/compose/project.py b/compose/project.py
index 3801bbb9..b4eed7c8 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import datetime
 import logging
 from functools import reduce
 
@@ -11,6 +12,7 @@ from . import parallel
 from .config import ConfigurationError
 from .config.sort_services import get_service_name_from_net
 from .const import DEFAULT_TIMEOUT
+from .const import IMAGE_EVENTS
 from .const import LABEL_ONE_OFF
 from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
@@ -20,6 +22,7 @@ from .service import ConvergenceStrategy
 from .service import Net
 from .service import Service
 from .service import ServiceNet
+from .utils import microseconds_from_time_nano
 from .volume import Volume
 
 
@@ -267,7 +270,40 @@ class Project(object):
         plans = self._get_convergence_plans(services, strategy)
 
         for service in services:
-            service.execute_convergence_plan(plans[service.name], do_build, detached=True, start=False)
+            service.execute_convergence_plan(
+                plans[service.name],
+                do_build,
+                detached=True,
+                start=False)
+
+    def events(self):
+        def build_container_event(event, container):
+            time = datetime.datetime.fromtimestamp(event['time'])
+            time = time.replace(
+                microsecond=microseconds_from_time_nano(event['timeNano']))
+            return {
+                'service': container.service,
+                'event': event['status'],
+                'container': container.id,
+                'image': event['from'],
+                'time': time,
+            }
+
+        service_names = set(self.service_names)
+        for event in self.client.events(
+            filters={'label': self.labels()},
+            decode=True
+        ):
+            if event['status'] in IMAGE_EVENTS:
+                # We don't receive any image events because labels aren't applied
+                # to images
+                continue
+
+            # TODO: get labels from the API v1.22 , see github issue 2618
+            container = Container.from_id(self.client, event['id'])
+            if container.service not in service_names:
+                continue
+            yield build_container_event(event, container)
 
     def up(self,
            service_names=None,
diff --git a/compose/utils.py b/compose/utils.py
index 4a7df334..29d8a695 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -88,3 +88,7 @@ def json_hash(obj):
     h = hashlib.sha256()
     h.update(dump.encode('utf8'))
     return h.hexdigest()
+
+
+def microseconds_from_time_nano(time_nano):
+    return int(time_nano % 1000000000 / 1000)
diff --git a/docs/reference/events.md b/docs/reference/events.md
new file mode 100644
index 00000000..827258f2
--- /dev/null
+++ b/docs/reference/events.md
@@ -0,0 +1,34 @@
+<!--[metadata]>
++++
+title = "events"
+description = "Receive real time events from containers."
+keywords = ["fig, composition, compose, docker, orchestration, cli, events"]
+[menu.main]
+identifier="events.compose"
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# events
+
+```
+Usage: events [options] [SERVICE...]
+
+Options:
+    --json      Output events as a stream of json objects
+```
+
+Stream container events for every container in the project.
+
+With the `--json` flag, a json object will be printed one per line with the
+format:
+
+```
+{
+    "service": "web",
+    "event": "create",
+    "container": "213cf75fc39a",
+    "image": "alpine:edge",
+    "time": "2015-11-20T18:01:03.615550",
+}
+```
diff --git a/docs/reference/index.md b/docs/reference/index.md
index b2fb5bca..1635b60c 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -14,19 +14,20 @@ parent = "smn_compose_ref"
 The following pages describe the usage information for the [docker-compose](docker-compose.md) subcommands. You can also see this information by running `docker-compose [SUBCOMMAND] --help` from the command line.
 
 * [build](build.md)
+* [events](events.md)
 * [help](help.md)
 * [kill](kill.md)
-* [ps](ps.md)
-* [restart](restart.md)
-* [run](run.md)
-* [start](start.md)
-* [up](up.md)
 * [logs](logs.md)
 * [port](port.md)
+* [ps](ps.md)
 * [pull](pull.md)
+* [restart](restart.md)
 * [rm](rm.md)
+* [run](run.md)
 * [scale](scale.md)
+* [start](start.md)
 * [stop](stop.md)
+* [up](up.md)
 
 ## Where to go next
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 6859c774..322d9b5a 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import json
 import os
 import shlex
 import signal
@@ -855,6 +856,16 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(get_port(3000, index=2), containers[1].get_local_port(3000))
         self.assertEqual(get_port(3002), "")
 
+    def test_events_json(self):
+        events_proc = start_process(self.base_dir, ['events', '--json'])
+        self.dispatch(['up', '-d'])
+        wait_on_condition(ContainerCountCondition(self.project, 2))
+
+        os.kill(events_proc.pid, signal.SIGINT)
+        result = wait_on_process(events_proc, returncode=1)
+        lines = [json.loads(line) for line in result.stdout.rstrip().split('\n')]
+        assert [e['event'] for e in lines] == ['create', 'start', 'create', 'start']
+
     def test_env_file_relative_to_compose_file(self):
         config_path = os.path.abspath('tests/fixtures/env-file/docker-compose.yml')
         self.dispatch(['-f', config_path, 'up', '-d'], None)
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index a182680b..a4b61b64 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -1,6 +1,8 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import datetime
+
 import docker
 
 from .. import mock
@@ -197,6 +199,83 @@ class ProjectTest(unittest.TestCase):
                 project.get_service('test')._get_volumes_from(),
                 [container_ids[0] + ':rw'])
 
+    def test_events(self):
+        services = [Service(name='web'), Service(name='db')]
+        project = Project('test', services, self.mock_client)
+        self.mock_client.events.return_value = iter([
+            {
+                'status': 'create',
+                'from': 'example/image',
+                'id': 'abcde',
+                'time': 1420092061,
+                'timeNano': 14200920610000002000,
+            },
+            {
+                'status': 'attach',
+                'from': 'example/image',
+                'id': 'abcde',
+                'time': 1420092061,
+                'timeNano': 14200920610000003000,
+            },
+            {
+                'status': 'create',
+                'from': 'example/other',
+                'id': 'bdbdbd',
+                'time': 1420092061,
+                'timeNano': 14200920610000005000,
+            },
+            {
+                'status': 'create',
+                'from': 'example/db',
+                'id': 'ababa',
+                'time': 1420092061,
+                'timeNano': 14200920610000004000,
+            },
+        ])
+
+        def dt_with_microseconds(dt, us):
+            return datetime.datetime.fromtimestamp(dt).replace(microsecond=us)
+
+        def get_container(cid):
+            if cid == 'abcde':
+                labels = {LABEL_SERVICE: 'web'}
+            elif cid == 'ababa':
+                labels = {LABEL_SERVICE: 'db'}
+            else:
+                labels = {}
+            return {'Id': cid, 'Config': {'Labels': labels}}
+
+        self.mock_client.inspect_container.side_effect = get_container
+
+        events = project.events()
+
+        events_list = list(events)
+        # Assert the return value is a generator
+        assert not list(events)
+        assert events_list == [
+            {
+                'service': 'web',
+                'event': 'create',
+                'container': 'abcde',
+                'image': 'example/image',
+                'time': dt_with_microseconds(1420092061, 2),
+            },
+            {
+                'service': 'web',
+                'event': 'attach',
+                'container': 'abcde',
+                'image': 'example/image',
+                'time': dt_with_microseconds(1420092061, 3),
+            },
+            {
+                'service': 'db',
+                'event': 'create',
+                'container': 'ababa',
+                'image': 'example/db',
+                'time': dt_with_microseconds(1420092061, 4),
+            },
+        ]
+
     def test_net_unset(self):
         project = Project.from_config('test', Config(None, [
             {

From 21aae13e77b43ce1cd3a07c660bb411f15993c27 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 8 Jan 2016 13:21:45 -0800
Subject: [PATCH 0618/1265] Move logging config changes to v2 spec

Reorganize JSON schemas
Update fixtures
Update service validation function

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py                      |   2 +-
 compose/config/fields_schema_v1.json          | 161 +--------------
 compose/config/fields_schema_v2.json          |   2 +-
 compose/config/service_schema.json            |  30 ---
 compose/config/service_schema_v1.json         | 175 +++++++++++++++++
 compose/config/service_schema_v2.json         | 184 ++++++++++++++++++
 compose/config/validation.py                  |   4 +-
 docker-compose.spec                           |   9 +-
 .../fixtures/logging-composefile/compose2.yml |   8 +-
 .../logging-composefile/docker-compose.yml    |  26 +--
 10 files changed, 391 insertions(+), 210 deletions(-)
 delete mode 100644 compose/config/service_schema.json
 create mode 100644 compose/config/service_schema_v1.json
 create mode 100644 compose/config/service_schema_v2.json

diff --git a/compose/config/config.py b/compose/config/config.py
index 0012aefd..0e794259 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -287,7 +287,7 @@ def load_services(working_dir, config_files, version):
         service_dict = process_service(resolver.run())
 
         # TODO: move to validate_service()
-        validate_against_service_schema(service_dict, service_config.name)
+        validate_against_service_schema(service_dict, service_config.name, version)
         validate_paths(service_dict)
 
         service_dict = finalize_service(service_config._replace(config=service_dict))
diff --git a/compose/config/fields_schema_v1.json b/compose/config/fields_schema_v1.json
index 790ace34..8f6a8c0a 100644
--- a/compose/config/fields_schema_v1.json
+++ b/compose/config/fields_schema_v1.json
@@ -6,165 +6,8 @@
 
   "patternProperties": {
     "^[a-zA-Z0-9._-]+$": {
-      "$ref": "#/definitions/service"
+      "$ref": "service_schema_v1.json#/definitions/service"
     }
   },
-  "additionalProperties": false,
-
-  "definitions": {
-    "service": {
-      "id": "#/definitions/service",
-      "type": "object",
-
-      "properties": {
-        "build": {"type": "string"},
-        "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "cgroup_parent": {"type": "string"},
-        "command": {
-          "oneOf": [
-            {"type": "string"},
-            {"type": "array", "items": {"type": "string"}}
-          ]
-        },
-        "container_name": {"type": "string"},
-        "cpu_shares": {"type": ["number", "string"]},
-        "cpu_quota": {"type": ["number", "string"]},
-        "cpuset": {"type": "string"},
-        "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "dns": {"$ref": "#/definitions/string_or_list"},
-        "dns_search": {"$ref": "#/definitions/string_or_list"},
-        "dockerfile": {"type": "string"},
-        "domainname": {"type": "string"},
-        "entrypoint": {"$ref": "#/definitions/string_or_list"},
-        "env_file": {"$ref": "#/definitions/string_or_list"},
-        "environment": {"$ref": "#/definitions/list_or_dict"},
-
-        "expose": {
-          "type": "array",
-          "items": {
-            "type": ["string", "number"],
-            "format": "expose"
-          },
-          "uniqueItems": true
-        },
-
-        "extends": {
-          "oneOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "object",
-
-              "properties": {
-                "service": {"type": "string"},
-                "file": {"type": "string"}
-              },
-              "required": ["service"],
-              "additionalProperties": false
-            }
-          ]
-        },
-
-        "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
-        "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "hostname": {"type": "string"},
-        "image": {"type": "string"},
-        "ipc": {"type": "string"},
-        "labels": {"$ref": "#/definitions/list_or_dict"},
-        "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-
-        "logging": {
-            "type": "object",
-
-            "properties": {
-                "driver": {"type": "string"},
-                "options": {"type": "object"}
-            },
-            "additionalProperties": false
-        },
-
-        "mac_address": {"type": "string"},
-        "mem_limit": {"type": ["number", "string"]},
-        "memswap_limit": {"type": ["number", "string"]},
-        "net": {"type": "string"},
-        "pid": {"type": ["string", "null"]},
-
-        "ports": {
-          "type": "array",
-          "items": {
-            "type": ["string", "number"],
-            "format": "ports"
-          },
-          "uniqueItems": true
-        },
-
-        "privileged": {"type": "boolean"},
-        "read_only": {"type": "boolean"},
-        "restart": {"type": "string"},
-        "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "stdin_open": {"type": "boolean"},
-        "tty": {"type": "boolean"},
-        "ulimits": {
-          "type": "object",
-          "patternProperties": {
-            "^[a-z]+$": {
-              "oneOf": [
-                {"type": "integer"},
-                {
-                  "type":"object",
-                  "properties": {
-                    "hard": {"type": "integer"},
-                    "soft": {"type": "integer"}
-                  },
-                  "required": ["soft", "hard"],
-                  "additionalProperties": false
-                }
-              ]
-            }
-          }
-        },
-        "user": {"type": "string"},
-        "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "volume_driver": {"type": "string"},
-        "volumes_from": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "working_dir": {"type": "string"}
-      },
-
-      "dependencies": {
-        "memswap_limit": ["mem_limit"]
-      },
-      "additionalProperties": false
-    },
-
-    "string_or_list": {
-      "oneOf": [
-        {"type": "string"},
-        {"$ref": "#/definitions/list_of_strings"}
-      ]
-    },
-
-    "list_of_strings": {
-      "type": "array",
-      "items": {"type": "string"},
-      "uniqueItems": true
-    },
-
-    "list_or_dict": {
-      "oneOf": [
-        {
-          "type": "object",
-          "patternProperties": {
-            ".+": {
-              "type": ["string", "number", "boolean", "null"],
-              "format": "bool-value-in-mapping"
-            }
-          },
-          "additionalProperties": false
-        },
-        {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
-      ]
-    }
-  }
+  "additionalProperties": false
 }
diff --git a/compose/config/fields_schema_v2.json b/compose/config/fields_schema_v2.json
index 49cab367..22ff839f 100644
--- a/compose/config/fields_schema_v2.json
+++ b/compose/config/fields_schema_v2.json
@@ -12,7 +12,7 @@
       "type": "object",
       "patternProperties": {
         "^[a-zA-Z0-9._-]+$": {
-          "$ref": "fields_schema_v1.json#/definitions/service"
+          "$ref": "service_schema_v2.json#/definitions/service"
         }
       },
       "additionalProperties": false
diff --git a/compose/config/service_schema.json b/compose/config/service_schema.json
deleted file mode 100644
index 91a1e005..00000000
--- a/compose/config/service_schema.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "service_schema.json",
-
-  "type": "object",
-
-  "allOf": [
-    {"$ref": "fields_schema_v1.json#/definitions/service"},
-    {"$ref": "#/definitions/constraints"}
-  ],
-
-  "definitions": {
-    "constraints": {
-      "id": "#/definitions/constraints",
-      "anyOf": [
-        {
-          "required": ["build"],
-          "not": {"required": ["image"]}
-        },
-        {
-          "required": ["image"],
-          "not": {"anyOf": [
-            {"required": ["build"]},
-            {"required": ["dockerfile"]}
-          ]}
-        }
-      ]
-    }
-  }
-}
diff --git a/compose/config/service_schema_v1.json b/compose/config/service_schema_v1.json
new file mode 100644
index 00000000..d51c7f73
--- /dev/null
+++ b/compose/config/service_schema_v1.json
@@ -0,0 +1,175 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "service_schema_v1.json",
+
+  "type": "object",
+
+  "allOf": [
+    {"$ref": "#/definitions/service"},
+    {"$ref": "#/definitions/constraints"}
+  ],
+
+  "definitions": {
+    "service": {
+      "id": "#/definitions/service",
+      "type": "object",
+
+      "properties": {
+        "build": {"type": "string"},
+        "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "cgroup_parent": {"type": "string"},
+        "command": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
+        "container_name": {"type": "string"},
+        "cpu_shares": {"type": ["number", "string"]},
+        "cpu_quota": {"type": ["number", "string"]},
+        "cpuset": {"type": "string"},
+        "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "dns": {"$ref": "#/definitions/string_or_list"},
+        "dns_search": {"$ref": "#/definitions/string_or_list"},
+        "dockerfile": {"type": "string"},
+        "domainname": {"type": "string"},
+        "entrypoint": {"$ref": "#/definitions/string_or_list"},
+        "env_file": {"$ref": "#/definitions/string_or_list"},
+        "environment": {"$ref": "#/definitions/list_or_dict"},
+
+        "expose": {
+          "type": "array",
+          "items": {
+            "type": ["string", "number"],
+            "format": "expose"
+          },
+          "uniqueItems": true
+        },
+
+        "extends": {
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "object",
+
+              "properties": {
+                "service": {"type": "string"},
+                "file": {"type": "string"}
+              },
+              "required": ["service"],
+              "additionalProperties": false
+            }
+          ]
+        },
+
+        "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
+        "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "hostname": {"type": "string"},
+        "image": {"type": "string"},
+        "ipc": {"type": "string"},
+        "labels": {"$ref": "#/definitions/list_or_dict"},
+        "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "log_driver": {"type": "string"},
+        "log_opt": {"type": "object"},
+        "mac_address": {"type": "string"},
+        "mem_limit": {"type": ["number", "string"]},
+        "memswap_limit": {"type": ["number", "string"]},
+        "net": {"type": "string"},
+        "pid": {"type": ["string", "null"]},
+
+        "ports": {
+          "type": "array",
+          "items": {
+            "type": ["string", "number"],
+            "format": "ports"
+          },
+          "uniqueItems": true
+        },
+
+        "privileged": {"type": "boolean"},
+        "read_only": {"type": "boolean"},
+        "restart": {"type": "string"},
+        "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "stdin_open": {"type": "boolean"},
+        "tty": {"type": "boolean"},
+        "ulimits": {
+          "type": "object",
+          "patternProperties": {
+            "^[a-z]+$": {
+              "oneOf": [
+                {"type": "integer"},
+                {
+                  "type":"object",
+                  "properties": {
+                    "hard": {"type": "integer"},
+                    "soft": {"type": "integer"}
+                  },
+                  "required": ["soft", "hard"],
+                  "additionalProperties": false
+                }
+              ]
+            }
+          }
+        },
+        "user": {"type": "string"},
+        "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "volume_driver": {"type": "string"},
+        "volumes_from": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "working_dir": {"type": "string"}
+      },
+
+      "dependencies": {
+        "memswap_limit": ["mem_limit"]
+      },
+      "additionalProperties": false
+    },
+
+    "string_or_list": {
+      "oneOf": [
+        {"type": "string"},
+        {"$ref": "#/definitions/list_of_strings"}
+      ]
+    },
+
+    "list_of_strings": {
+      "type": "array",
+      "items": {"type": "string"},
+      "uniqueItems": true
+    },
+
+    "list_or_dict": {
+      "oneOf": [
+        {
+          "type": "object",
+          "patternProperties": {
+            ".+": {
+              "type": ["string", "number", "boolean", "null"],
+              "format": "bool-value-in-mapping"
+            }
+          },
+          "additionalProperties": false
+        },
+        {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
+      ]
+    },
+    "constraints": {
+      "id": "#/definitions/constraints",
+      "anyOf": [
+        {
+          "required": ["build"],
+          "not": {"required": ["image"]}
+        },
+        {
+          "required": ["image"],
+          "not": {"anyOf": [
+            {"required": ["build"]},
+            {"required": ["dockerfile"]}
+          ]}
+        }
+      ]
+    }
+  }
+}
diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
new file mode 100644
index 00000000..a64b3bdc
--- /dev/null
+++ b/compose/config/service_schema_v2.json
@@ -0,0 +1,184 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "service_schema_v2.json",
+
+  "type": "object",
+
+  "allOf": [
+    {"$ref": "#/definitions/service"},
+    {"$ref": "#/definitions/constraints"}
+  ],
+
+  "definitions": {
+    "service": {
+      "id": "#/definitions/service",
+      "type": "object",
+
+      "properties": {
+        "build": {"type": "string"},
+        "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "cgroup_parent": {"type": "string"},
+        "command": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
+        "container_name": {"type": "string"},
+        "cpu_shares": {"type": ["number", "string"]},
+        "cpu_quota": {"type": ["number", "string"]},
+        "cpuset": {"type": "string"},
+        "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "dns": {"$ref": "#/definitions/string_or_list"},
+        "dns_search": {"$ref": "#/definitions/string_or_list"},
+        "dockerfile": {"type": "string"},
+        "domainname": {"type": "string"},
+        "entrypoint": {"$ref": "#/definitions/string_or_list"},
+        "env_file": {"$ref": "#/definitions/string_or_list"},
+        "environment": {"$ref": "#/definitions/list_or_dict"},
+
+        "expose": {
+          "type": "array",
+          "items": {
+            "type": ["string", "number"],
+            "format": "expose"
+          },
+          "uniqueItems": true
+        },
+
+        "extends": {
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "object",
+
+              "properties": {
+                "service": {"type": "string"},
+                "file": {"type": "string"}
+              },
+              "required": ["service"],
+              "additionalProperties": false
+            }
+          ]
+        },
+
+        "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
+        "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "hostname": {"type": "string"},
+        "image": {"type": "string"},
+        "ipc": {"type": "string"},
+        "labels": {"$ref": "#/definitions/list_or_dict"},
+        "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+
+        "logging": {
+            "type": "object",
+
+            "properties": {
+                "driver": {"type": "string"},
+                "options": {"type": "object"}
+            },
+            "additionalProperties": false
+        },
+
+        "mac_address": {"type": "string"},
+        "mem_limit": {"type": ["number", "string"]},
+        "memswap_limit": {"type": ["number", "string"]},
+        "net": {"type": "string"},
+        "pid": {"type": ["string", "null"]},
+
+        "ports": {
+          "type": "array",
+          "items": {
+            "type": ["string", "number"],
+            "format": "ports"
+          },
+          "uniqueItems": true
+        },
+
+        "privileged": {"type": "boolean"},
+        "read_only": {"type": "boolean"},
+        "restart": {"type": "string"},
+        "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "stdin_open": {"type": "boolean"},
+        "tty": {"type": "boolean"},
+        "ulimits": {
+          "type": "object",
+          "patternProperties": {
+            "^[a-z]+$": {
+              "oneOf": [
+                {"type": "integer"},
+                {
+                  "type":"object",
+                  "properties": {
+                    "hard": {"type": "integer"},
+                    "soft": {"type": "integer"}
+                  },
+                  "required": ["soft", "hard"],
+                  "additionalProperties": false
+                }
+              ]
+            }
+          }
+        },
+        "user": {"type": "string"},
+        "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "volume_driver": {"type": "string"},
+        "volumes_from": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "working_dir": {"type": "string"}
+      },
+
+      "dependencies": {
+        "memswap_limit": ["mem_limit"]
+      },
+      "additionalProperties": false
+    },
+
+    "string_or_list": {
+      "oneOf": [
+        {"type": "string"},
+        {"$ref": "#/definitions/list_of_strings"}
+      ]
+    },
+
+    "list_of_strings": {
+      "type": "array",
+      "items": {"type": "string"},
+      "uniqueItems": true
+    },
+
+    "list_or_dict": {
+      "oneOf": [
+        {
+          "type": "object",
+          "patternProperties": {
+            ".+": {
+              "type": ["string", "number", "boolean", "null"],
+              "format": "bool-value-in-mapping"
+            }
+          },
+          "additionalProperties": false
+        },
+        {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
+      ]
+    },
+    "constraints": {
+      "id": "#/definitions/constraints",
+      "anyOf": [
+        {
+          "required": ["build"],
+          "not": {"required": ["image"]}
+        },
+        {
+          "required": ["image"],
+          "not": {"anyOf": [
+            {"required": ["build"]},
+            {"required": ["dockerfile"]}
+          ]}
+        }
+      ]
+    }
+  }
+}
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 74dd461f..fea9a22b 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -298,10 +298,10 @@ def validate_against_fields_schema(config, filename, version):
         filename=filename)
 
 
-def validate_against_service_schema(config, service_name):
+def validate_against_service_schema(config, service_name, version):
     _validate_against_schema(
         config,
-        "service_schema.json",
+        "service_schema_v{0}.json".format(version),
         format_checker=["ports"],
         service_name=service_name)
 
diff --git a/docker-compose.spec b/docker-compose.spec
index c760d7b4..f7f2059f 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -28,8 +28,13 @@ exe = EXE(pyz,
                 'DATA'
             ),
             (
-                'compose/config/service_schema.json',
-                'compose/config/service_schema.json',
+                'compose/config/service_schema_v1.json',
+                'compose/config/service_schema_v1.json',
+                'DATA'
+            ),
+            (
+                'compose/config/service_schema_v2.json',
+                'compose/config/service_schema_v2.json',
                 'DATA'
             ),
             (
diff --git a/tests/fixtures/logging-composefile/compose2.yml b/tests/fixtures/logging-composefile/compose2.yml
index ba582969..69889761 100644
--- a/tests/fixtures/logging-composefile/compose2.yml
+++ b/tests/fixtures/logging-composefile/compose2.yml
@@ -1,3 +1,5 @@
-another:
-  logging:
-    driver: "none"
+version: 2
+services:
+  another:
+    logging:
+      driver: "none"
diff --git a/tests/fixtures/logging-composefile/docker-compose.yml b/tests/fixtures/logging-composefile/docker-compose.yml
index 877ee5e2..0a73030a 100644
--- a/tests/fixtures/logging-composefile/docker-compose.yml
+++ b/tests/fixtures/logging-composefile/docker-compose.yml
@@ -1,12 +1,14 @@
-simple:
-  image: busybox:latest
-  command: top
-  logging:
-    driver: "none"
-another:
-  image: busybox:latest
-  command: top
-  logging:
-    driver: "json-file"
-    options:
-        max-size: "10m"
+version: 2
+services:
+  simple:
+    image: busybox:latest
+    command: top
+    logging:
+      driver: "none"
+  another:
+    image: busybox:latest
+    command: top
+    logging:
+      driver: "json-file"
+      options:
+          max-size: "10m"

From 46585fb8e17a4b6cb5763f055ef00d0aa3d952c9 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 8 Jan 2016 14:37:07 -0800
Subject: [PATCH 0619/1265] Support legacy logging options format

Additional test for legacy compose file.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py                           | 10 ++++++++++
 tests/acceptance/cli_test.py                       | 14 ++++++++++++++
 .../logging-composefile-legacy/docker-compose.yml  | 10 ++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 tests/fixtures/logging-composefile-legacy/docker-compose.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 0e794259..c59f384d 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -504,6 +504,16 @@ def finalize_service(service_config):
     if 'restart' in service_dict:
         service_dict['restart'] = parse_restart_spec(service_dict['restart'])
 
+    if 'log_driver' in service_dict or 'log_opt' in service_dict:
+        if 'logging' not in service_dict:
+            service_dict['logging'] = {}
+        if 'log_driver' in service_dict:
+            service_dict['logging']['driver'] = service_dict['log_driver']
+            del service_dict['log_driver']
+        if 'log_opt' in service_dict:
+            service_dict['logging']['options'] = service_dict['log_opt']
+            del service_dict['log_opt']
+
     return service_dict
 
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index c5df3079..8abdf785 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -730,6 +730,20 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(log_config.get('Type'), 'json-file')
         self.assertEqual(log_config.get('Config')['max-size'], '10m')
 
+    def test_up_logging_legacy(self):
+        self.base_dir = 'tests/fixtures/logging-composefile-legacy'
+        self.dispatch(['up', '-d'])
+        simple = self.project.get_service('simple').containers()[0]
+        log_config = simple.get('HostConfig.LogConfig')
+        self.assertTrue(log_config)
+        self.assertEqual(log_config.get('Type'), 'none')
+
+        another = self.project.get_service('another').containers()[0]
+        log_config = another.get('HostConfig.LogConfig')
+        self.assertTrue(log_config)
+        self.assertEqual(log_config.get('Type'), 'json-file')
+        self.assertEqual(log_config.get('Config')['max-size'], '10m')
+
     def test_up_logging_with_multiple_files(self):
         self.base_dir = 'tests/fixtures/logging-composefile'
         config_paths = [
diff --git a/tests/fixtures/logging-composefile-legacy/docker-compose.yml b/tests/fixtures/logging-composefile-legacy/docker-compose.yml
new file mode 100644
index 00000000..ee994107
--- /dev/null
+++ b/tests/fixtures/logging-composefile-legacy/docker-compose.yml
@@ -0,0 +1,10 @@
+simple:
+  image: busybox:latest
+  command: top
+  log_driver: "none"
+another:
+  image: busybox:latest
+  command: top
+  log_driver: "json-file"
+  log_opt:
+    max-size: "10m"

From d3cd038b845d9708c42b9281253be342e2fe97d0 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 8 Jan 2016 16:54:35 -0500
Subject: [PATCH 0620/1265] Update event field names to match the new API
 fields.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py          |  7 ++++--
 compose/project.py           | 12 ++++++----
 tests/acceptance/cli_test.py | 22 +++++++++++++++++-
 tests/unit/project_test.py   | 43 ++++++++++++++++++++++++++----------
 4 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index d99816cf..d10b9582 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -256,8 +256,10 @@ class TopLevelCommand(DocoptCommand):
             --json      Output events as a stream of json objects
         """
         def format_event(event):
-            return ("{time}: service={service} event={event} "
-                    "container={container} image={image}").format(**event)
+            attributes = ["%s=%s" % item for item in event['attributes'].items()]
+            return ("{time} {type} {action} {id} ({attrs})").format(
+                attrs=", ".join(sorted(attributes)),
+                **event)
 
         def json_format_event(event):
             event['time'] = event['time'].isoformat()
@@ -266,6 +268,7 @@ class TopLevelCommand(DocoptCommand):
         for event in project.events():
             formatter = json_format_event if options['--json'] else format_event
             print(formatter(event))
+            sys.stdout.flush()
 
     def help(self, project, options):
         """
diff --git a/compose/project.py b/compose/project.py
index b4eed7c8..50f991be 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -282,11 +282,15 @@ class Project(object):
             time = time.replace(
                 microsecond=microseconds_from_time_nano(event['timeNano']))
             return {
-                'service': container.service,
-                'event': event['status'],
-                'container': container.id,
-                'image': event['from'],
                 'time': time,
+                'type': 'container',
+                'action': event['status'],
+                'id': container.id,
+                'service': container.service,
+                'attributes': {
+                    'name': container.name,
+                    'image': event['from'],
+                }
             }
 
         service_names = set(self.service_names)
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 322d9b5a..db3e1b43 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import datetime
 import json
 import os
 import shlex
@@ -864,7 +865,26 @@ class CLITestCase(DockerClientTestCase):
         os.kill(events_proc.pid, signal.SIGINT)
         result = wait_on_process(events_proc, returncode=1)
         lines = [json.loads(line) for line in result.stdout.rstrip().split('\n')]
-        assert [e['event'] for e in lines] == ['create', 'start', 'create', 'start']
+        assert [e['action'] for e in lines] == ['create', 'start', 'create', 'start']
+
+    def test_events_human_readable(self):
+        events_proc = start_process(self.base_dir, ['events'])
+        self.dispatch(['up', '-d', 'simple'])
+        wait_on_condition(ContainerCountCondition(self.project, 1))
+
+        os.kill(events_proc.pid, signal.SIGINT)
+        result = wait_on_process(events_proc, returncode=1)
+        lines = result.stdout.rstrip().split('\n')
+        assert len(lines) == 2
+
+        container, = self.project.containers()
+        expected_template = (
+            ' container {} {} (image=busybox:latest, '
+            'name=simplecomposefile_simple_1)')
+
+        assert expected_template.format('create', container.id) in lines[0]
+        assert expected_template.format('start', container.id) in lines[1]
+        assert lines[0].startswith(datetime.date.today().isoformat())
 
     def test_env_file_relative_to_compose_file(self):
         config_path = os.path.abspath('tests/fixtures/env-file/docker-compose.yml')
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index a4b61b64..c8590a1f 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -238,12 +238,19 @@ class ProjectTest(unittest.TestCase):
 
         def get_container(cid):
             if cid == 'abcde':
-                labels = {LABEL_SERVICE: 'web'}
+                name = 'web'
+                labels = {LABEL_SERVICE: name}
             elif cid == 'ababa':
-                labels = {LABEL_SERVICE: 'db'}
+                name = 'db'
+                labels = {LABEL_SERVICE: name}
             else:
                 labels = {}
-            return {'Id': cid, 'Config': {'Labels': labels}}
+                name = ''
+            return {
+                'Id': cid,
+                'Config': {'Labels': labels},
+                'Name': '/project_%s_1' % name,
+            }
 
         self.mock_client.inspect_container.side_effect = get_container
 
@@ -254,24 +261,36 @@ class ProjectTest(unittest.TestCase):
         assert not list(events)
         assert events_list == [
             {
+                'type': 'container',
                 'service': 'web',
-                'event': 'create',
-                'container': 'abcde',
-                'image': 'example/image',
+                'action': 'create',
+                'id': 'abcde',
+                'attributes': {
+                    'name': 'project_web_1',
+                    'image': 'example/image',
+                },
                 'time': dt_with_microseconds(1420092061, 2),
             },
             {
+                'type': 'container',
                 'service': 'web',
-                'event': 'attach',
-                'container': 'abcde',
-                'image': 'example/image',
+                'action': 'attach',
+                'id': 'abcde',
+                'attributes': {
+                    'name': 'project_web_1',
+                    'image': 'example/image',
+                },
                 'time': dt_with_microseconds(1420092061, 3),
             },
             {
+                'type': 'container',
                 'service': 'db',
-                'event': 'create',
-                'container': 'ababa',
-                'image': 'example/db',
+                'action': 'create',
+                'id': 'ababa',
+                'attributes': {
+                    'name': 'project_db_1',
+                    'image': 'example/db',
+                },
                 'time': dt_with_microseconds(1420092061, 4),
             },
         ]

From f7a7e68df63dad82d7bc382cc8832510856c5296 Mon Sep 17 00:00:00 2001
From: Thomas Hourlier <thomas.hourlier@cnode.fr>
Date: Mon, 11 Jan 2016 09:48:52 -0800
Subject: [PATCH 0621/1265] Mount $HOME in /root to share docker config.

Fixes #2630

Signed-off-by: Thomas Hourlier <thomas.hourlier@cnode.fr>
---
 script/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/run.sh b/script/run.sh
index 514a5389..087c2692 100755
--- a/script/run.sh
+++ b/script/run.sh
@@ -40,7 +40,7 @@ if [ -n "$compose_dir" ]; then
     VOLUMES="$VOLUMES -v $compose_dir:$compose_dir"
 fi
 if [ -n "$HOME" ]; then
-    VOLUMES="$VOLUMES -v $HOME:$HOME"
+    VOLUMES="$VOLUMES -v $HOME:$HOME -v $HOME:/root" # mount $HOME in /root to share docker.config
 fi
 
 # Only allocate tty if we detect one

From c32991a8d491f8af1e4f3502bdb7bc8131922143 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 11 Jan 2016 15:39:59 -0800
Subject: [PATCH 0622/1265] Remove superfluous service code

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/service.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 366833dd..9fd679f8 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -510,13 +510,6 @@ class Service(object):
 
         return volumes_from
 
-    def get_logging_options(self):
-        logging_dict = self.options.get('logging', {})
-        return {
-            'log_driver': logging_dict.get('driver', ""),
-            'log_opt': logging_dict.get('options', None)
-        }
-
     def _get_container_create_options(
             self,
             override_options,
@@ -530,8 +523,6 @@ class Service(object):
             for k in DOCKER_CONFIG_KEYS if k in self.options)
         container_options.update(override_options)
 
-        container_options.update(self.get_logging_options())
-
         if self.custom_container_name() and not one_off:
             container_options['name'] = self.custom_container_name()
         elif not container_options.get('name'):

From 46a474ecd9132fcf84eb5568df4245bd13e3ca26 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 11 Jan 2016 15:53:28 -0800
Subject: [PATCH 0623/1265] Move v1-v2 config normalization to separate
 function.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compose/config/config.py b/compose/config/config.py
index c59f384d..2ca5fa22 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -504,6 +504,10 @@ def finalize_service(service_config):
     if 'restart' in service_dict:
         service_dict['restart'] = parse_restart_spec(service_dict['restart'])
 
+    return normalize_v1_service_format(service_dict)
+
+
+def normalize_v1_service_format(service_dict):
     if 'log_driver' in service_dict or 'log_opt' in service_dict:
         if 'logging' not in service_dict:
             service_dict['logging'] = {}

From ca634649bbdb92cd7c52a98ee693d0c55a1e153b Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 11 Jan 2016 16:25:19 -0800
Subject: [PATCH 0624/1265] Changed logging override test into integration test

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/acceptance/cli_test.py                  | 23 --------
 .../fixtures/logging-composefile/compose2.yml |  5 --
 tests/integration/project_test.py             | 53 +++++++++++++++++++
 3 files changed, 53 insertions(+), 28 deletions(-)
 delete mode 100644 tests/fixtures/logging-composefile/compose2.yml

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 8abdf785..caadb62f 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -744,29 +744,6 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(log_config.get('Type'), 'json-file')
         self.assertEqual(log_config.get('Config')['max-size'], '10m')
 
-    def test_up_logging_with_multiple_files(self):
-        self.base_dir = 'tests/fixtures/logging-composefile'
-        config_paths = [
-            'docker-compose.yml',
-            'compose2.yml',
-        ]
-        self._project = get_project(self.base_dir, config_paths)
-        self.dispatch(
-            [
-                '-f', config_paths[0],
-                '-f', config_paths[1],
-                'up', '-d',
-            ],
-            None)
-
-        containers = self.project.containers()
-        self.assertEqual(len(containers), 2)
-
-        another = self.project.get_service('another').containers()[0]
-        log_config = another.get('HostConfig.LogConfig')
-        self.assertTrue(log_config)
-        self.assertEqual(log_config.get('Type'), 'none')
-
     def test_pause_unpause(self):
         self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
diff --git a/tests/fixtures/logging-composefile/compose2.yml b/tests/fixtures/logging-composefile/compose2.yml
deleted file mode 100644
index 69889761..00000000
--- a/tests/fixtures/logging-composefile/compose2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-version: 2
-services:
-  another:
-    logging:
-      driver: "none"
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 2cf5f556..5a1444b6 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -3,6 +3,8 @@ from __future__ import unicode_literals
 
 import random
 
+import py
+
 from .testcases import DockerClientTestCase
 from compose.cli.docker_client import docker_client
 from compose.config import config
@@ -534,6 +536,57 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(volume_data['Name'], full_vol_name)
         self.assertEqual(volume_data['Driver'], 'local')
 
+    def test_project_up_logging_with_multiple_files(self):
+        base_file = config.ConfigFile(
+            'base.yml',
+            {
+                'version': 2,
+                'services': {
+                    'simple': {'image': 'busybox:latest', 'command': 'top'},
+                    'another': {
+                        'image': 'busybox:latest',
+                        'command': 'top',
+                        'logging': {
+                            'driver': "json-file",
+                            'options': {
+                                'max-size': "10m"
+                            }
+                        }
+                    }
+                }
+
+            })
+        override_file = config.ConfigFile(
+            'override.yml',
+            {
+                'version': 2,
+                'services': {
+                    'another': {
+                        'logging': {
+                            'driver': "none"
+                        }
+                    }
+                }
+
+            })
+        details = config.ConfigDetails('.', [base_file, override_file])
+
+        tmpdir = py.test.ensuretemp('logging_test')
+        self.addCleanup(tmpdir.remove)
+        with tmpdir.as_cwd():
+            config_data = config.load(details)
+        project = Project.from_config(
+            name='composetest', config_data=config_data, client=self.client
+        )
+        project.up()
+        containers = project.containers()
+        self.assertEqual(len(containers), 2)
+
+        another = project.get_service('another').containers()[0]
+        log_config = another.get('HostConfig.LogConfig')
+        self.assertTrue(log_config)
+        self.assertEqual(log_config.get('Type'), 'none')
+
     def test_initialize_volumes(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)

From 12b5405420ebfd2a3b260f3a4421bfadd52e8a97 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 12 Jan 2016 13:27:18 -0500
Subject: [PATCH 0625/1265] Fix pre-commit on master.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/signals.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/compose/cli/signals.py b/compose/cli/signals.py
index 38474ba4..68a0598e 100644
--- a/compose/cli/signals.py
+++ b/compose/cli/signals.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import signal
 
 

From 6c205a8e017569f3a18ae697edf6310f221860f6 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Tue, 12 Jan 2016 10:51:04 -0800
Subject: [PATCH 0626/1265]  Add bash completion for `docker-compose events`

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index c18e4f6d..2b1d689c 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -133,6 +133,24 @@ _docker_compose_docker_compose() {
 }
 
 
+_docker_compose_events() {
+	case "$prev" in
+		--json)
+			return
+			;;
+	esac
+
+	case "$cur" in
+		-*)
+			COMPREPLY=( $( compgen -W "--help --json" -- "$cur" ) )
+			;;
+		*)
+			__docker_compose_services_all
+			;;
+	esac
+}
+
+
 _docker_compose_help() {
 	COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
 }
@@ -379,6 +397,7 @@ _docker_compose() {
 	local commands=(
 		build
 		config
+		events
 		help
 		kill
 		logs

From ed4db542d6f6d4ec062bb29d8c99a6ea5c9523d7 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 12 Jan 2016 14:02:30 -0500
Subject: [PATCH 0627/1265] Fix pep8 errors from the new pep8 release.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/project.py | 4 ++--
 compose/service.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index 50f991be..d41b1f52 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -344,8 +344,8 @@ class Project(object):
             updated_dependencies = [
                 name
                 for name in service.get_dependency_names()
-                if name in plans
-                and plans[name].action in ('recreate', 'create')
+                if name in plans and
+                plans[name].action in ('recreate', 'create')
             ]
 
             if updated_dependencies and strategy.allows_recreate:
diff --git a/compose/service.py b/compose/service.py
index 693e1980..bd8143e7 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -535,9 +535,9 @@ class Service(object):
         # unqualified hostname and a domainname unless domainname
         # was also given explicitly. This matches the behavior of
         # the official Docker CLI in that scenario.
-        if ('hostname' in container_options
-                and 'domainname' not in container_options
-                and '.' in container_options['hostname']):
+        if ('hostname' in container_options and
+                'domainname' not in container_options and
+                '.' in container_options['hostname']):
             parts = container_options['hostname'].partition('.')
             container_options['hostname'] = parts[0]
             container_options['domainname'] = parts[2]

From e98ab0e534a0a0b9ec86f18f0867b05188fc8b02 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 12 Jan 2016 11:24:06 -0500
Subject: [PATCH 0628/1265] Allow both image and build together.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py              |  25 +++--
 compose/config/service_schema_v2.json |  13 +--
 compose/config/validation.py          |   4 +-
 compose/service.py                    |  12 +--
 tests/integration/service_test.py     |  16 ++-
 tests/unit/config/config_test.py      | 144 ++++++++++++++------------
 tests/unit/service_test.py            |   9 ++
 7 files changed, 121 insertions(+), 102 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index db2f67ea..918946b3 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -305,7 +305,8 @@ def load_services(working_dir, config_files, version):
         return {
             name: merge_service_dicts_from_files(
                 base.get(name, {}),
-                override.get(name, {}))
+                override.get(name, {}),
+                version)
             for name in all_service_names
         }
 
@@ -397,7 +398,10 @@ class ServiceExtendsResolver(object):
             service_name,
         )
 
-        return merge_service_dicts(other_service_dict, self.service_config.config)
+        return merge_service_dicts(
+            other_service_dict,
+            self.service_config.config,
+            self.version)
 
     def get_extended_config_path(self, extends_options):
         """Service we are extending either has a value for 'file' set, which we
@@ -521,12 +525,12 @@ def normalize_v1_service_format(service_dict):
     return service_dict
 
 
-def merge_service_dicts_from_files(base, override):
+def merge_service_dicts_from_files(base, override, version):
     """When merging services from multiple files we need to merge the `extends`
     field. This is not handled by `merge_service_dicts()` which is used to
     perform the `extends`.
     """
-    new_service = merge_service_dicts(base, override)
+    new_service = merge_service_dicts(base, override, version)
     if 'extends' in override:
         new_service['extends'] = override['extends']
     elif 'extends' in base:
@@ -534,7 +538,7 @@ def merge_service_dicts_from_files(base, override):
     return new_service
 
 
-def merge_service_dicts(base, override):
+def merge_service_dicts(base, override, version):
     d = {}
 
     def merge_field(field, merge_func, default=None):
@@ -545,7 +549,6 @@ def merge_service_dicts(base, override):
 
     merge_field('environment', merge_environment)
     merge_field('labels', merge_labels)
-    merge_image_or_build(base, override, d)
 
     for field in ['volumes', 'devices']:
         merge_field(field, merge_path_mappings)
@@ -556,15 +559,19 @@ def merge_service_dicts(base, override):
     for field in ['dns', 'dns_search', 'env_file']:
         merge_field(field, merge_list_or_string)
 
-    already_merged_keys = set(d) | {'image', 'build'}
-    for field in set(ALLOWED_KEYS) - already_merged_keys:
+    for field in set(ALLOWED_KEYS) - set(d):
         if field in base or field in override:
             d[field] = override.get(field, base.get(field))
 
+    if version == 1:
+        legacy_v1_merge_image_or_build(d, base, override)
+
     return d
 
 
-def merge_image_or_build(base, override, output):
+def legacy_v1_merge_image_or_build(output, base, override):
+    output.pop('image', None)
+    output.pop('build', None)
     if 'image' in override:
         output['image'] = override['image']
     elif 'build' in override:
diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
index a64b3bdc..d1d0854f 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.json
@@ -167,17 +167,8 @@
     "constraints": {
       "id": "#/definitions/constraints",
       "anyOf": [
-        {
-          "required": ["build"],
-          "not": {"required": ["image"]}
-        },
-        {
-          "required": ["image"],
-          "not": {"anyOf": [
-            {"required": ["build"]},
-            {"required": ["dockerfile"]}
-          ]}
-        }
+          {"required": ["build"]},
+          {"required": ["image"]}
       ]
     }
   }
diff --git a/compose/config/validation.py b/compose/config/validation.py
index fea9a22b..e7006d5a 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -151,6 +151,7 @@ def handle_error_for_schema_with_id(error, service_name):
             VALID_NAME_CHARS)
 
     if schema_id == '#/definitions/constraints':
+        # TODO: only applies to v1
         if 'image' in error.instance and 'build' in error.instance:
             return (
                 "Service '{}' has both an image and build path specified. "
@@ -159,7 +160,8 @@ def handle_error_for_schema_with_id(error, service_name):
         if 'image' not in error.instance and 'build' not in error.instance:
             return (
                 "Service '{}' has neither an image nor a build path "
-                "specified. Exactly one must be provided.".format(service_name))
+                "specified. At least one must be provided.".format(service_name))
+        # TODO: only applies to v1
         if 'image' in error.instance and 'dockerfile' in error.instance:
             return (
                 "Service '{}' has both an image and alternate Dockerfile. "
diff --git a/compose/service.py b/compose/service.py
index bd8143e7..d5c36f1a 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -275,10 +275,7 @@ class Service(object):
 
     @property
     def image_name(self):
-        if self.can_be_built():
-            return self.full_name
-        else:
-            return self.options['image']
+        return self.options.get('image', '{s.project}_{s.name}'.format(s=self))
 
     def convergence_plan(self, strategy=ConvergenceStrategy.changed):
         containers = self.containers(stopped=True)
@@ -665,13 +662,6 @@ class Service(object):
     def can_be_built(self):
         return 'build' in self.options
 
-    @property
-    def full_name(self):
-        """
-        The tag to give to images built for this service.
-        """
-        return '%s_%s' % (self.project, self.name)
-
     def labels(self, one_off=False):
         return [
             '{0}={1}'.format(LABEL_PROJECT, self.project),
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 86bc4d9d..539be5a9 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -491,7 +491,7 @@ class ServiceTest(DockerClientTestCase):
             f.write("FROM busybox\n")
 
         self.create_service('web', build=base_dir).build()
-        self.assertEqual(len(self.client.images(name='composetest_web')), 1)
+        assert self.client.inspect_image('composetest_web')
 
     def test_build_non_ascii_filename(self):
         base_dir = tempfile.mkdtemp()
@@ -504,7 +504,19 @@ class ServiceTest(DockerClientTestCase):
             f.write("hello world\n")
 
         self.create_service('web', build=text_type(base_dir)).build()
-        self.assertEqual(len(self.client.images(name='composetest_web')), 1)
+        assert self.client.inspect_image('composetest_web')
+
+    def test_build_with_image_name(self):
+        base_dir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, base_dir)
+
+        with open(os.path.join(base_dir, 'Dockerfile'), 'w') as f:
+            f.write("FROM busybox\n")
+
+        image_name = 'examples/composetest:latest'
+        self.addCleanup(self.client.remove_image, image_name)
+        self.create_service('web', build=base_dir, image=image_name).build()
+        assert self.client.inspect_image(image_name)
 
     def test_build_with_git_url(self):
         build_url = "https://github.com/dnephin/docker-build-from-url.git"
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 1c2876f5..a59d1d34 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -19,6 +19,9 @@ from compose.const import IS_WINDOWS_PLATFORM
 from tests import mock
 from tests import unittest
 
+DEFAULT_VERSION = 2
+V1 = 1
+
 
 def make_service_dict(name, service_dict, working_dir, filename=None):
     """
@@ -238,8 +241,7 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-    @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
-    def test_load_with_multiple_files(self):
+    def test_load_with_multiple_files_v1(self):
         base_file = config.ConfigFile(
             'base.yaml',
             {
@@ -265,7 +267,7 @@ class ConfigTest(unittest.TestCase):
         expected = [
             {
                 'name': 'web',
-                'build': '/',
+                'build': os.path.abspath('/'),
                 'links': ['db'],
                 'volumes': [VolumeSpec.parse('/home/user/project:/code')],
             },
@@ -274,7 +276,7 @@ class ConfigTest(unittest.TestCase):
                 'image': 'example/db',
             },
         ]
-        self.assertEqual(service_sort(service_dicts), service_sort(expected))
+        assert service_sort(service_dicts) == service_sort(expected)
 
     def test_load_with_multiple_files_and_empty_override(self):
         base_file = config.ConfigFile(
@@ -428,6 +430,7 @@ class ConfigTest(unittest.TestCase):
             {
                 'name': 'web',
                 'build': os.path.abspath('/'),
+                'image': 'example/web',
                 'links': ['db'],
                 'volumes': [VolumeSpec.parse('/home/user/project:/code')],
             },
@@ -436,7 +439,7 @@ class ConfigTest(unittest.TestCase):
                 'image': 'example/db',
             },
         ]
-        self.assertEqual(service_sort(service_dicts), service_sort(expected))
+        assert service_sort(service_dicts) == service_sort(expected)
 
     def test_config_valid_service_names(self):
         for valid_name in ['_', '-', '.__.', '_what-up.', 'what_.up----', 'whatup']:
@@ -525,16 +528,15 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-    def test_config_image_and_dockerfile_raise_validation_error(self):
-        expected_error_msg = "Service 'web' has both an image and alternate Dockerfile."
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
-            config.load(
-                build_config_details(
-                    {'web': {'image': 'busybox', 'dockerfile': 'Dockerfile.alt'}},
-                    'working_dir',
-                    'filename.yml'
-                )
-            )
+    def test_load_config_dockerfile_without_build_raises_error(self):
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(build_config_details({
+                'web': {
+                    'image': 'busybox',
+                    'dockerfile': 'Dockerfile.alt'
+                }
+            }))
+        assert "Service 'web' has both an image and alternate Dockerfile." in exc.exconly()
 
     def test_config_extra_hosts_string_raises_validation_error(self):
         expected_error_msg = "Service 'web' configuration key 'extra_hosts' contains an invalid type"
@@ -746,7 +748,10 @@ class ConfigTest(unittest.TestCase):
         override = {
             'image': 'alpine:edge',
         }
-        actual = config.merge_service_dicts_from_files(base, override)
+        actual = config.merge_service_dicts_from_files(
+            base,
+            override,
+            DEFAULT_VERSION)
         assert actual == {
             'image': 'alpine:edge',
             'volumes': ['.:/app'],
@@ -762,7 +767,10 @@ class ConfigTest(unittest.TestCase):
             'image': 'alpine:edge',
             'extends': {'service': 'foo'}
         }
-        actual = config.merge_service_dicts_from_files(base, override)
+        actual = config.merge_service_dicts_from_files(
+            base,
+            override,
+            DEFAULT_VERSION)
         assert actual == {
             'image': 'alpine:edge',
             'volumes': ['.:/app'],
@@ -1023,43 +1031,43 @@ class MergePathMappingTest(object):
         return ""
 
     def test_empty(self):
-        service_dict = config.merge_service_dicts({}, {})
-        self.assertNotIn(self.config_name(), service_dict)
+        service_dict = config.merge_service_dicts({}, {}, DEFAULT_VERSION)
+        assert self.config_name() not in service_dict
 
     def test_no_override(self):
         service_dict = config.merge_service_dicts(
             {self.config_name(): ['/foo:/code', '/data']},
             {},
-        )
-        self.assertEqual(set(service_dict[self.config_name()]), set(['/foo:/code', '/data']))
+            DEFAULT_VERSION)
+        assert set(service_dict[self.config_name()]) == set(['/foo:/code', '/data'])
 
     def test_no_base(self):
         service_dict = config.merge_service_dicts(
             {},
             {self.config_name(): ['/bar:/code']},
-        )
-        self.assertEqual(set(service_dict[self.config_name()]), set(['/bar:/code']))
+            DEFAULT_VERSION)
+        assert set(service_dict[self.config_name()]) == set(['/bar:/code'])
 
     def test_override_explicit_path(self):
         service_dict = config.merge_service_dicts(
             {self.config_name(): ['/foo:/code', '/data']},
             {self.config_name(): ['/bar:/code']},
-        )
-        self.assertEqual(set(service_dict[self.config_name()]), set(['/bar:/code', '/data']))
+            DEFAULT_VERSION)
+        assert set(service_dict[self.config_name()]) == set(['/bar:/code', '/data'])
 
     def test_add_explicit_path(self):
         service_dict = config.merge_service_dicts(
             {self.config_name(): ['/foo:/code', '/data']},
             {self.config_name(): ['/bar:/code', '/quux:/data']},
-        )
-        self.assertEqual(set(service_dict[self.config_name()]), set(['/bar:/code', '/quux:/data']))
+            DEFAULT_VERSION)
+        assert set(service_dict[self.config_name()]) == set(['/bar:/code', '/quux:/data'])
 
     def test_remove_explicit_path(self):
         service_dict = config.merge_service_dicts(
             {self.config_name(): ['/foo:/code', '/quux:/data']},
             {self.config_name(): ['/bar:/code', '/data']},
-        )
-        self.assertEqual(set(service_dict[self.config_name()]), set(['/bar:/code', '/data']))
+            DEFAULT_VERSION)
+        assert set(service_dict[self.config_name()]) == set(['/bar:/code', '/data'])
 
 
 class MergeVolumesTest(unittest.TestCase, MergePathMappingTest):
@@ -1075,63 +1083,62 @@ class MergeDevicesTest(unittest.TestCase, MergePathMappingTest):
 class BuildOrImageMergeTest(unittest.TestCase):
     def test_merge_build_or_image_no_override(self):
         self.assertEqual(
-            config.merge_service_dicts({'build': '.'}, {}),
+            config.merge_service_dicts({'build': '.'}, {}, V1),
             {'build': '.'},
         )
 
         self.assertEqual(
-            config.merge_service_dicts({'image': 'redis'}, {}),
+            config.merge_service_dicts({'image': 'redis'}, {}, V1),
             {'image': 'redis'},
         )
 
     def test_merge_build_or_image_override_with_same(self):
         self.assertEqual(
-            config.merge_service_dicts({'build': '.'}, {'build': './web'}),
+            config.merge_service_dicts({'build': '.'}, {'build': './web'}, V1),
             {'build': './web'},
         )
 
         self.assertEqual(
-            config.merge_service_dicts({'image': 'redis'}, {'image': 'postgres'}),
+            config.merge_service_dicts({'image': 'redis'}, {'image': 'postgres'}, V1),
             {'image': 'postgres'},
         )
 
     def test_merge_build_or_image_override_with_other(self):
         self.assertEqual(
-            config.merge_service_dicts({'build': '.'}, {'image': 'redis'}),
-            {'image': 'redis'}
+            config.merge_service_dicts({'build': '.'}, {'image': 'redis'}, V1),
+            {'image': 'redis'},
         )
 
         self.assertEqual(
-            config.merge_service_dicts({'image': 'redis'}, {'build': '.'}),
-            {'build': '.'}
+            config.merge_service_dicts({'image': 'redis'}, {'build': '.'}, V1),
+            {'build': '.'},
         )
 
 
 class MergeListsTest(unittest.TestCase):
     def test_empty(self):
-        service_dict = config.merge_service_dicts({}, {})
-        self.assertNotIn('ports', service_dict)
+        assert 'ports' not in config.merge_service_dicts({}, {}, DEFAULT_VERSION)
 
     def test_no_override(self):
         service_dict = config.merge_service_dicts(
             {'ports': ['10:8000', '9000']},
             {},
-        )
-        self.assertEqual(set(service_dict['ports']), set(['10:8000', '9000']))
+            DEFAULT_VERSION)
+        assert set(service_dict['ports']) == set(['10:8000', '9000'])
 
     def test_no_base(self):
         service_dict = config.merge_service_dicts(
             {},
             {'ports': ['10:8000', '9000']},
-        )
-        self.assertEqual(set(service_dict['ports']), set(['10:8000', '9000']))
+            DEFAULT_VERSION)
+        assert set(service_dict['ports']) == set(['10:8000', '9000'])
 
     def test_add_item(self):
         service_dict = config.merge_service_dicts(
             {'ports': ['10:8000', '9000']},
             {'ports': ['20:8000']},
-        )
-        self.assertEqual(set(service_dict['ports']), set(['10:8000', '9000', '20:8000']))
+            DEFAULT_VERSION)
+        assert set(service_dict['ports']) == set(['10:8000', '9000', '20:8000'])
 
 
 class MergeStringsOrListsTest(unittest.TestCase):
@@ -1139,70 +1146,69 @@ class MergeStringsOrListsTest(unittest.TestCase):
         service_dict = config.merge_service_dicts(
             {'dns': '8.8.8.8'},
             {},
-        )
-        self.assertEqual(set(service_dict['dns']), set(['8.8.8.8']))
+            DEFAULT_VERSION)
+        assert set(service_dict['dns']) == set(['8.8.8.8'])
 
     def test_no_base(self):
         service_dict = config.merge_service_dicts(
             {},
             {'dns': '8.8.8.8'},
-        )
-        self.assertEqual(set(service_dict['dns']), set(['8.8.8.8']))
+            DEFAULT_VERSION)
+        assert set(service_dict['dns']) == set(['8.8.8.8'])
 
     def test_add_string(self):
         service_dict = config.merge_service_dicts(
             {'dns': ['8.8.8.8']},
             {'dns': '9.9.9.9'},
-        )
-        self.assertEqual(set(service_dict['dns']), set(['8.8.8.8', '9.9.9.9']))
+            DEFAULT_VERSION)
+        assert set(service_dict['dns']) == set(['8.8.8.8', '9.9.9.9'])
 
     def test_add_list(self):
         service_dict = config.merge_service_dicts(
             {'dns': '8.8.8.8'},
             {'dns': ['9.9.9.9']},
-        )
-        self.assertEqual(set(service_dict['dns']), set(['8.8.8.8', '9.9.9.9']))
+            DEFAULT_VERSION)
+        assert set(service_dict['dns']) == set(['8.8.8.8', '9.9.9.9'])
 
 
 class MergeLabelsTest(unittest.TestCase):
     def test_empty(self):
-        service_dict = config.merge_service_dicts({}, {})
-        self.assertNotIn('labels', service_dict)
+        assert 'labels' not in config.merge_service_dicts({}, {}, DEFAULT_VERSION)
 
     def test_no_override(self):
         service_dict = config.merge_service_dicts(
             make_service_dict('foo', {'build': '.', 'labels': ['foo=1', 'bar']}, 'tests/'),
             make_service_dict('foo', {'build': '.'}, 'tests/'),
-        )
-        self.assertEqual(service_dict['labels'], {'foo': '1', 'bar': ''})
+            DEFAULT_VERSION)
+        assert service_dict['labels'] == {'foo': '1', 'bar': ''}
 
     def test_no_base(self):
         service_dict = config.merge_service_dicts(
             make_service_dict('foo', {'build': '.'}, 'tests/'),
             make_service_dict('foo', {'build': '.', 'labels': ['foo=2']}, 'tests/'),
-        )
-        self.assertEqual(service_dict['labels'], {'foo': '2'})
+            DEFAULT_VERSION)
+        assert service_dict['labels'] == {'foo': '2'}
 
     def test_override_explicit_value(self):
         service_dict = config.merge_service_dicts(
             make_service_dict('foo', {'build': '.', 'labels': ['foo=1', 'bar']}, 'tests/'),
             make_service_dict('foo', {'build': '.', 'labels': ['foo=2']}, 'tests/'),
-        )
-        self.assertEqual(service_dict['labels'], {'foo': '2', 'bar': ''})
+            DEFAULT_VERSION)
+        assert service_dict['labels'] == {'foo': '2', 'bar': ''}
 
     def test_add_explicit_value(self):
         service_dict = config.merge_service_dicts(
             make_service_dict('foo', {'build': '.', 'labels': ['foo=1', 'bar']}, 'tests/'),
             make_service_dict('foo', {'build': '.', 'labels': ['bar=2']}, 'tests/'),
-        )
-        self.assertEqual(service_dict['labels'], {'foo': '1', 'bar': '2'})
+            DEFAULT_VERSION)
+        assert service_dict['labels'] == {'foo': '1', 'bar': '2'}
 
     def test_remove_explicit_value(self):
         service_dict = config.merge_service_dicts(
             make_service_dict('foo', {'build': '.', 'labels': ['foo=1', 'bar=2']}, 'tests/'),
             make_service_dict('foo', {'build': '.', 'labels': ['bar']}, 'tests/'),
-        )
-        self.assertEqual(service_dict['labels'], {'foo': '1', 'bar': ''})
+            DEFAULT_VERSION)
+        assert service_dict['labels'] == {'foo': '1', 'bar': ''}
 
 
 class MemoryOptionsTest(unittest.TestCase):
@@ -1541,10 +1547,12 @@ class ExtendsTest(unittest.TestCase):
         self.assertEquals(service[0]['command'], "/bin/true")
 
     def test_extended_service_with_invalid_config(self):
-        expected_error_msg = "Service 'myweb' has neither an image nor a build path specified"
-
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+        with pytest.raises(ConfigurationError) as exc:
             load_from_filename('tests/fixtures/extends/service-with-invalid-schema.yml')
+        assert (
+            "Service 'myweb' has neither an image nor a build path specified" in
+            exc.exconly()
+        )
 
     def test_extended_service_with_valid_config(self):
         service = load_from_filename('tests/fixtures/extends/service-with-valid-composite-extends.yml')
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index d7080fae..63cf658e 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -492,6 +492,15 @@ class ServiceTest(unittest.TestCase):
             use_networking=True)
         self.assertEqual(service._get_links(link_to_self=True), [])
 
+    def test_image_name_from_config(self):
+        image_name = 'example/web:latest'
+        service = Service('foo', image=image_name)
+        assert service.image_name == image_name
+
+    def test_image_name_default(self):
+        service = Service('foo', project='testing')
+        assert service.image_name == 'testing_foo'
+
 
 def sort_by_name(dictionary_list):
     return sorted(dictionary_list, key=lambda k: k['name'])

From b59387401c0f5c2eea11153eb024932db2748855 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Tue, 12 Jan 2016 22:04:05 +0100
Subject: [PATCH 0629/1265] Add zsh completion for 'docker-compose events'

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 35c2b996..710dadd4 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -203,6 +203,12 @@ __docker-compose_subcommand() {
                 '(--quiet -q)'{--quiet,-q}"[Only validate the configuration, don't print anything.]" \
                 '--services[Print the service names, one per line.]' && ret=0
             ;;
+        (events)
+            _arguments \
+                $opts_help \
+                '--json[Output events as a stream of json objects.]' \
+                '*:services:__docker-compose_services_all' && ret=0
+            ;;
         (help)
             _arguments ':subcommand:__docker-compose_commands' && ret=0
             ;;

From b786b47bc8425dd75d5f6a257d948d5fd8fda022 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 12 Jan 2016 17:35:48 +0000
Subject: [PATCH 0630/1265] Remove version checks from tests requiring API
 v1.21

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py      | 21 ++++++---------------
 tests/integration/project_test.py | 23 +++++++----------------
 tests/integration/service_test.py |  2 --
 3 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 3a3c89b0..7348edb0 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -16,7 +16,6 @@ from docker import errors
 
 from .. import mock
 from compose.cli.command import get_project
-from compose.cli.docker_client import docker_client
 from compose.container import Container
 from tests.integration.testcases import DockerClientTestCase
 from tests.integration.testcases import get_links
@@ -336,13 +335,10 @@ class CLITestCase(DockerClientTestCase):
         assert 'another_1 | another' in result.stdout
 
     def test_up_without_networking(self):
-        self.require_api_version('1.21')
-
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['up', '-d'], None)
-        client = docker_client(version='1.21')
 
-        networks = client.networks(names=[self.project.name])
+        networks = self.client.networks(names=[self.project.name])
         self.assertEqual(len(networks), 0)
 
         for service in self.project.get_services():
@@ -354,21 +350,18 @@ class CLITestCase(DockerClientTestCase):
         self.assertTrue(web_container.get('HostConfig.Links'))
 
     def test_up_with_networking(self):
-        self.require_api_version('1.21')
-
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['--x-networking', 'up', '-d'], None)
-        client = docker_client(version='1.21')
 
         services = self.project.get_services()
 
-        networks = client.networks(names=[self.project.name])
+        networks = self.client.networks(names=[self.project.name])
         for n in networks:
-            self.addCleanup(client.remove_network, n['Id'])
+            self.addCleanup(self.client.remove_network, n['Id'])
         self.assertEqual(len(networks), 1)
         self.assertEqual(networks[0]['Driver'], 'bridge')
 
-        network = client.inspect_network(networks[0]['Id'])
+        network = self.client.inspect_network(networks[0]['Id'])
         self.assertEqual(len(network['Containers']), len(services))
 
         for service in services:
@@ -652,15 +645,13 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(container.name, name)
 
     def test_run_with_networking(self):
-        self.require_api_version('1.21')
-        client = docker_client(version='1.21')
         self.base_dir = 'tests/fixtures/simple-dockerfile'
         self.dispatch(['--x-networking', 'run', 'simple', 'true'], None)
         service = self.project.get_service('simple')
         container, = service.containers(stopped=True, one_off=True)
-        networks = client.networks(names=[self.project.name])
+        networks = self.client.networks(names=[self.project.name])
         for n in networks:
-            self.addCleanup(client.remove_network, n['Id'])
+            self.addCleanup(self.client.remove_network, n['Id'])
         self.assertEqual(len(networks), 1)
         self.assertEqual(container.human_readable_command, u'true')
 
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 5a1444b6..1a342c8a 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -6,7 +6,6 @@ import random
 import py
 
 from .testcases import DockerClientTestCase
-from compose.cli.docker_client import docker_client
 from compose.config import config
 from compose.config.types import VolumeFromSpec
 from compose.config.types import VolumeSpec
@@ -105,20 +104,14 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(db._get_volumes_from(), [data_container.id + ':rw'])
 
     def test_get_network_does_not_exist(self):
-        self.require_api_version('1.21')
-        client = docker_client(version='1.21')
-
-        project = Project('composetest', [], client)
+        project = Project('composetest', [], self.client)
         assert project.get_network() is None
 
     def test_get_network(self):
-        self.require_api_version('1.21')
-        client = docker_client(version='1.21')
-
         network_name = 'network_does_exist'
-        project = Project(network_name, [], client)
-        client.create_network(network_name)
-        self.addCleanup(client.remove_network, network_name)
+        project = Project(network_name, [], self.client)
+        self.client.create_network(network_name)
+        self.addCleanup(self.client.remove_network, network_name)
         assert project.get_network()['Name'] == network_name
 
     def test_net_from_service(self):
@@ -476,15 +469,13 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(project.get_service('console').containers()), 0)
 
     def test_project_up_with_custom_network(self):
-        self.require_api_version('1.21')
-        client = docker_client(version='1.21')
         network_name = 'composetest-custom'
 
-        client.create_network(network_name)
-        self.addCleanup(client.remove_network, network_name)
+        self.client.create_network(network_name)
+        self.addCleanup(self.client.remove_network, network_name)
 
         web = self.create_service('web', net=Net(network_name))
-        project = Project('composetest', [web], client, use_networking=True)
+        project = Project('composetest', [web], self.client, use_networking=True)
         project.up()
 
         assert project.get_network() is None
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 539be5a9..3eb50942 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -718,8 +718,6 @@ class ServiceTest(DockerClientTestCase):
         """Test that calling scale on a service that has a custom container name
         results in warning output.
         """
-        # Disable this test against earlier versions because it is flaky
-        self.require_api_version('1.21')
         service = self.create_service('app', container_name='custom-container')
         self.assertEqual(service.custom_container_name(), 'custom-container')
 

From 1a66543461c610ff0b6c1dcf117ed965edd5c249 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 12 Jan 2016 16:25:15 +0000
Subject: [PATCH 0631/1265] Make the default network name '{project
 name}_default'

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py                | 14 +++++++++-----
 tests/acceptance/cli_test.py      |  4 ++--
 tests/integration/project_test.py |  8 ++++++--
 tests/unit/project_test.py        |  2 +-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index d41b1f52..71e353ec 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -185,7 +185,7 @@ class Project(object):
         net = service_dict.pop('net', None)
         if not net:
             if self.use_networking:
-                return Net(self.name)
+                return Net(self.default_network_name)
             return Net(None)
 
         net_name = get_service_name_from_net(net)
@@ -383,7 +383,7 @@ class Project(object):
 
     def get_network(self):
         try:
-            return self.client.inspect_network(self.name)
+            return self.client.inspect_network(self.default_network_name)
         except NotFound:
             return None
 
@@ -396,9 +396,9 @@ class Project(object):
 
             log.info(
                 'Creating network "{}" with {}'
-                .format(self.name, driver_name)
+                .format(self.default_network_name, driver_name)
             )
-            self.client.create_network(self.name, driver=self.network_driver)
+            self.client.create_network(self.default_network_name, driver=self.network_driver)
 
     def remove_network(self):
         network = self.get_network()
@@ -406,7 +406,11 @@ class Project(object):
             self.client.remove_network(network['Id'])
 
     def uses_default_network(self):
-        return any(service.net.mode == self.name for service in self.services)
+        return any(service.net.mode == self.default_network_name for service in self.services)
+
+    @property
+    def default_network_name(self):
+        return '{}_default'.format(self.name)
 
     def _inject_deps(self, acc, service):
         dep_names = service.get_dependency_names()
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 7348edb0..46ed4237 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -355,7 +355,7 @@ class CLITestCase(DockerClientTestCase):
 
         services = self.project.get_services()
 
-        networks = self.client.networks(names=[self.project.name])
+        networks = self.client.networks(names=[self.project.default_network_name])
         for n in networks:
             self.addCleanup(self.client.remove_network, n['Id'])
         self.assertEqual(len(networks), 1)
@@ -649,7 +649,7 @@ class CLITestCase(DockerClientTestCase):
         self.dispatch(['--x-networking', 'run', 'simple', 'true'], None)
         service = self.project.get_service('simple')
         container, = service.containers(stopped=True, one_off=True)
-        networks = self.client.networks(names=[self.project.name])
+        networks = self.client.networks(names=[self.project.default_network_name])
         for n in networks:
             self.addCleanup(self.client.remove_network, n['Id'])
         self.assertEqual(len(networks), 1)
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 1a342c8a..a3e0f33a 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -108,10 +108,14 @@ class ProjectTest(DockerClientTestCase):
         assert project.get_network() is None
 
     def test_get_network(self):
-        network_name = 'network_does_exist'
-        project = Project(network_name, [], self.client)
+        project_name = 'network_does_exist'
+        network_name = '{}_default'.format(project_name)
+
+        project = Project(project_name, [], self.client)
         self.client.create_network(network_name)
         self.addCleanup(self.client.remove_network, network_name)
+
+        assert isinstance(project.get_network(), dict)
         assert project.get_network()['Name'] == network_name
 
     def test_net_from_service(self):
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index c8590a1f..63953376 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -346,7 +346,7 @@ class ProjectTest(unittest.TestCase):
         self.assertEqual(service.net.mode, 'container:' + container_name)
 
     def test_uses_default_network_true(self):
-        web = Service('web', project='test', image="alpine", net=Net('test'))
+        web = Service('web', project='test', image="alpine", net=Net('test_default'))
         db = Service('web', project='test', image="alpine", net=Net('other'))
         project = Project('test', [web, db], None)
         assert project.uses_default_network()

From a027a0079c17c87b1e531c82cf8250086dbfbf66 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 12 Jan 2016 16:26:20 +0000
Subject: [PATCH 0632/1265] Use networking for version 2 Compose files

- Remove --x-networking and --x-network-driver
- There's now no way to set a network driver - this will be added back
  with the 'networks' key

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/command.py                      | 18 ++++++------------
 compose/cli/main.py                         |  4 ----
 compose/project.py                          |  5 +++--
 contrib/completion/bash/docker-compose      |  9 +--------
 contrib/completion/zsh/_docker-compose      |  2 --
 tests/acceptance/cli_test.py                | 12 ++++++------
 tests/fixtures/v2-simple/docker-compose.yml |  8 ++++++++
 tests/integration/testcases.py              |  7 +++++++
 tests/unit/project_test.py                  | 20 ++++++++++++++++++--
 9 files changed, 49 insertions(+), 36 deletions(-)
 create mode 100644 tests/fixtures/v2-simple/docker-compose.yml

diff --git a/compose/cli/command.py b/compose/cli/command.py
index b278af3a..f14388c6 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -49,8 +49,6 @@ def project_from_options(base_dir, options):
         get_config_path_from_options(options),
         project_name=options.get('--project-name'),
         verbose=options.get('--verbose'),
-        use_networking=options.get('--x-networking'),
-        network_driver=options.get('--x-network-driver'),
     )
 
 
@@ -75,18 +73,14 @@ def get_client(verbose=False, version=None):
     return client
 
 
-def get_project(base_dir, config_path=None, project_name=None, verbose=False,
-                use_networking=False, network_driver=None):
+def get_project(base_dir, config_path=None, project_name=None, verbose=False):
     config_details = config.find(base_dir, config_path)
+    project_name = get_project_name(config_details.working_dir, project_name)
+    config_data = config.load(config_details)
+    api_version = '1.21' if config_data.version < 2 else None
+    client = get_client(verbose=verbose, version=api_version)
 
-    api_version = '1.21' if use_networking else None
-    return Project.from_config(
-        get_project_name(config_details.working_dir, project_name),
-        config.load(config_details),
-        get_client(verbose=verbose, version=api_version),
-        use_networking=use_networking,
-        network_driver=network_driver
-    )
+    return Project.from_config(project_name, config_data, client)
 
 
 def get_project_name(working_dir, project_name=None):
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 82cf05c9..7c6d1cb5 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -122,10 +122,6 @@ class TopLevelCommand(DocoptCommand):
     Options:
       -f, --file FILE           Specify an alternate compose file (default: docker-compose.yml)
       -p, --project-name NAME   Specify an alternate project name (default: directory name)
-      --x-networking            (EXPERIMENTAL) Use new Docker networking functionality.
-                                Requires Docker 1.9 or later.
-      --x-network-driver DRIVER (EXPERIMENTAL) Specify a network driver (default: "bridge").
-                                Requires Docker 1.9 or later.
       --verbose                 Show more output
       -v, --version             Print version and exit
 
diff --git a/compose/project.py b/compose/project.py
index 71e353ec..fa3eace2 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -48,11 +48,12 @@ class Project(object):
         ]
 
     @classmethod
-    def from_config(cls, name, config_data, client, use_networking=False, network_driver=None):
+    def from_config(cls, name, config_data, client):
         """
         Construct a Project from a config.Config object.
         """
-        project = cls(name, [], client, use_networking=use_networking, network_driver=network_driver)
+        use_networking = (config_data.version and config_data.version >= 2)
+        project = cls(name, [], client, use_networking=use_networking)
 
         if use_networking:
             remove_links(config_data.services)
diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index c18e4f6d..caea2a23 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -116,15 +116,11 @@ _docker_compose_docker_compose() {
 		--project-name|-p)
 			return
 			;;
-		--x-network-driver)
-			COMPREPLY=( $( compgen -W "bridge host none overlay" -- "$cur" ) )
-			return
-			;;
 	esac
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--file -f --help -h --project-name -p --verbose --version -v --x-networking --x-network-driver" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--file -f --help -h --project-name -p --verbose --version -v" -- "$cur" ) )
 			;;
 		*)
 			COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
@@ -416,9 +412,6 @@ _docker_compose() {
 				(( counter++ ))
 				compose_project="${words[$counter]}"
 				;;
-			--x-network-driver)
-				(( counter++ ))
-				;;
 			-*)
 				;;
 			*)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 35c2b996..2a19dd59 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -332,8 +332,6 @@ _docker-compose() {
         '(- :)'{-v,--version}'[Print version and exit]' \
         '(-f --file)'{-f,--file}'[Specify an alternate docker-compose file (default: docker-compose.yml)]:file:_files -g "*.yml"' \
         '(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \
-        '--x-networking[(EXPERIMENTAL) Use new Docker networking functionality. Requires Docker 1.9 or later.]' \
-        '--x-network-driver[(EXPERIMENTAL) Specify a network driver (default: "bridge"). Requires Docker 1.9 or later.]:Network Driver:(bridge host none overlay)' \
         '(-): :->command' \
         '(-)*:: :->option-or-argument' && ret=0
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 46ed4237..25808c94 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -338,7 +338,7 @@ class CLITestCase(DockerClientTestCase):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['up', '-d'], None)
 
-        networks = self.client.networks(names=[self.project.name])
+        networks = self.client.networks(names=[self.project.default_network_name])
         self.assertEqual(len(networks), 0)
 
         for service in self.project.get_services():
@@ -350,8 +350,8 @@ class CLITestCase(DockerClientTestCase):
         self.assertTrue(web_container.get('HostConfig.Links'))
 
     def test_up_with_networking(self):
-        self.base_dir = 'tests/fixtures/links-composefile'
-        self.dispatch(['--x-networking', 'up', '-d'], None)
+        self.base_dir = 'tests/fixtures/v2-simple'
+        self.dispatch(['up', '-d'], None)
 
         services = self.project.get_services()
 
@@ -369,7 +369,7 @@ class CLITestCase(DockerClientTestCase):
             self.assertEqual(len(containers), 1)
             self.assertIn(containers[0].id, network['Containers'])
 
-        web_container = self.project.get_service('web').containers()[0]
+        web_container = self.project.get_service('simple').containers()[0]
         self.assertFalse(web_container.get('HostConfig.Links'))
 
     def test_up_with_links(self):
@@ -645,8 +645,8 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(container.name, name)
 
     def test_run_with_networking(self):
-        self.base_dir = 'tests/fixtures/simple-dockerfile'
-        self.dispatch(['--x-networking', 'run', 'simple', 'true'], None)
+        self.base_dir = 'tests/fixtures/v2-simple'
+        self.dispatch(['run', 'simple', 'true'], None)
         service = self.project.get_service('simple')
         container, = service.containers(stopped=True, one_off=True)
         networks = self.client.networks(names=[self.project.default_network_name])
diff --git a/tests/fixtures/v2-simple/docker-compose.yml b/tests/fixtures/v2-simple/docker-compose.yml
new file mode 100644
index 00000000..12a9de72
--- /dev/null
+++ b/tests/fixtures/v2-simple/docker-compose.yml
@@ -0,0 +1,8 @@
+version: 2
+services:
+  simple:
+    image: busybox:latest
+    command: top
+  another:
+    image: busybox:latest
+    command: top
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 8e0525ee..3002539e 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -36,14 +36,21 @@ class DockerClientTestCase(unittest.TestCase):
                 all=True,
                 filters={'label': '%s=composetest' % LABEL_PROJECT}):
             self.client.remove_container(c['Id'], force=True)
+
         for i in self.client.images(
                 filters={'label': 'com.docker.compose.test_image'}):
             self.client.remove_image(i)
+
         volumes = self.client.volumes().get('Volumes') or []
         for v in volumes:
             if 'composetest_' in v['Name']:
                 self.client.remove_volume(v['Name'])
 
+        networks = self.client.networks()
+        for n in networks:
+            if 'composetest_' in n['Name']:
+                self.client.remove_network(n['Name'])
+
     def create_service(self, name, **kwargs):
         if 'image' not in kwargs and 'build' not in kwargs:
             kwargs['image'] = 'busybox:latest'
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 63953376..f63135ae 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -39,7 +39,7 @@ class ProjectTest(unittest.TestCase):
         self.assertEqual(project.get_service('db').options['image'], 'busybox:latest')
 
     def test_from_config(self):
-        dicts = Config(None, [
+        config = Config(None, [
             {
                 'name': 'web',
                 'image': 'busybox:latest',
@@ -49,12 +49,28 @@ class ProjectTest(unittest.TestCase):
                 'image': 'busybox:latest',
             },
         ], None)
-        project = Project.from_config('composetest', dicts, None)
+        project = Project.from_config('composetest', config, None)
         self.assertEqual(len(project.services), 2)
         self.assertEqual(project.get_service('web').name, 'web')
         self.assertEqual(project.get_service('web').options['image'], 'busybox:latest')
         self.assertEqual(project.get_service('db').name, 'db')
         self.assertEqual(project.get_service('db').options['image'], 'busybox:latest')
+        self.assertFalse(project.use_networking)
+
+    def test_from_config_v2(self):
+        config = Config(2, [
+            {
+                'name': 'web',
+                'image': 'busybox:latest',
+            },
+            {
+                'name': 'db',
+                'image': 'busybox:latest',
+            },
+        ], None)
+        project = Project.from_config('composetest', config, None)
+        self.assertEqual(len(project.services), 2)
+        self.assertTrue(project.use_networking)
 
     def test_get_service(self):
         web = Service(

From 9e17cff0efaff14f2b03d5d0ba70559661733b26 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 12 Jan 2016 18:12:53 +0000
Subject: [PATCH 0633/1265] Refactor API version switching logic

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/command.py       | 6 +++++-
 compose/cli/docker_client.py | 7 ++-----
 compose/const.py             | 7 +++++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index f14388c6..c1681ffc 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -13,6 +13,7 @@ from requests.exceptions import SSLError
 from . import errors
 from . import verbose_proxy
 from .. import config
+from ..const import API_VERSIONS
 from ..project import Project
 from .docker_client import docker_client
 from .utils import call_silently
@@ -77,7 +78,10 @@ def get_project(base_dir, config_path=None, project_name=None, verbose=False):
     config_details = config.find(base_dir, config_path)
     project_name = get_project_name(config_details.working_dir, project_name)
     config_data = config.load(config_details)
-    api_version = '1.21' if config_data.version < 2 else None
+
+    api_version = os.environ.get(
+        'COMPOSE_API_VERSION',
+        API_VERSIONS[config_data.version])
     client = get_client(verbose=verbose, version=api_version)
 
     return Project.from_config(project_name, config_data, client)
diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 48ba97bd..611997df 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -11,8 +11,6 @@ from ..const import HTTP_TIMEOUT
 
 log = logging.getLogger(__name__)
 
-DEFAULT_API_VERSION = '1.21'
-
 
 def docker_client(version=None):
     """
@@ -23,8 +21,7 @@ def docker_client(version=None):
         log.warn('The DOCKER_CLIENT_TIMEOUT environment variable is deprecated. Please use COMPOSE_HTTP_TIMEOUT instead.')
 
     kwargs = kwargs_from_env(assert_hostname=False)
-    kwargs['version'] = version or os.environ.get(
-        'COMPOSE_API_VERSION',
-        DEFAULT_API_VERSION)
+    if version:
+        kwargs['version'] = version
     kwargs['timeout'] = HTTP_TIMEOUT
     return Client(**kwargs)
diff --git a/compose/const.py b/compose/const.py
index 84a5057a..331895b1 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -15,3 +15,10 @@ LABEL_SERVICE = 'com.docker.compose.service'
 LABEL_VERSION = 'com.docker.compose.version'
 LABEL_CONFIG_HASH = 'com.docker.compose.config-hash'
 COMPOSEFILE_VERSIONS = (1, 2)
+
+API_VERSIONS = {
+    1: '1.21',
+
+    # TODO: update to 1.22 when there's a Docker 1.10 build to test against
+    2: '1.21',
+}

From 70cce961a8223403d36e8d209925e112f1ebd02f Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 12 Jan 2016 17:26:18 +0000
Subject: [PATCH 0634/1265] Don't allow links or external_links in v2 files

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/service_schema_v2.json      |  2 --
 tests/acceptance/cli_test.py               | 13 ++++++++++++-
 tests/fixtures/v2-simple/links-invalid.yml | 10 ++++++++++
 tests/unit/config/config_test.py           |  4 +---
 4 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 tests/fixtures/v2-simple/links-invalid.yml

diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
index d1d0854f..47b195fc 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.json
@@ -66,12 +66,10 @@
         },
 
         "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
-        "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "hostname": {"type": "string"},
         "image": {"type": "string"},
         "ipc": {"type": "string"},
         "labels": {"$ref": "#/definitions/list_or_dict"},
-        "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
 
         "logging": {
             "type": "object",
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 25808c94..eab4bdae 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -372,7 +372,18 @@ class CLITestCase(DockerClientTestCase):
         web_container = self.project.get_service('simple').containers()[0]
         self.assertFalse(web_container.get('HostConfig.Links'))
 
-    def test_up_with_links(self):
+    def test_up_with_links_is_invalid(self):
+        self.base_dir = 'tests/fixtures/v2-simple'
+
+        result = self.dispatch(
+            ['-f', 'links-invalid.yml', 'up', '-d'],
+            returncode=1)
+
+        # TODO: fix validation error messages for v2 files
+        # assert "Unsupported config option for service 'simple': 'links'" in result.stderr
+        assert "Unsupported config option" in result.stderr
+
+    def test_up_with_links_v1(self):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['up', '-d', 'web'], None)
         web = self.project.get_service('web')
diff --git a/tests/fixtures/v2-simple/links-invalid.yml b/tests/fixtures/v2-simple/links-invalid.yml
new file mode 100644
index 00000000..422f9314
--- /dev/null
+++ b/tests/fixtures/v2-simple/links-invalid.yml
@@ -0,0 +1,10 @@
+version: 2
+services:
+  simple:
+    image: busybox:latest
+    command: top
+    links:
+      - another
+  another:
+    image: busybox:latest
+    command: top
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index a59d1d34..25483e52 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -268,8 +268,8 @@ class ConfigTest(unittest.TestCase):
             {
                 'name': 'web',
                 'build': os.path.abspath('/'),
-                'links': ['db'],
                 'volumes': [VolumeSpec.parse('/home/user/project:/code')],
+                'links': ['db'],
             },
             {
                 'name': 'db',
@@ -405,7 +405,6 @@ class ConfigTest(unittest.TestCase):
                 'services': {
                     'web': {
                         'image': 'example/web',
-                        'links': ['db'],
                     },
                     'db': {
                         'image': 'example/db',
@@ -431,7 +430,6 @@ class ConfigTest(unittest.TestCase):
                 'name': 'web',
                 'build': os.path.abspath('/'),
                 'image': 'example/web',
-                'links': ['db'],
                 'volumes': [VolumeSpec.parse('/home/user/project:/code')],
             },
             {

From 2f07e2ac3628617b9817dc9f7815d6c3a730aaac Mon Sep 17 00:00:00 2001
From: Dimitar Bonev <dimitar.bonev@gmail.com>
Date: Thu, 7 Jan 2016 21:21:47 +0200
Subject: [PATCH 0635/1265] Ulimits are now merged into extended services

Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
---
 compose/config/config.py                      | 25 +++++++++++++------
 .../extends/common-env-labels-ulimits.yml     | 13 ++++++++++
 tests/unit/config/config_test.py              | 18 +++++++++++++
 3 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 tests/fixtures/extends/common-env-labels-ulimits.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 918946b3..11cc3ce9 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -547,8 +547,15 @@ def merge_service_dicts(base, override, version):
                 base.get(field, default),
                 override.get(field, default))
 
-    merge_field('environment', merge_environment)
-    merge_field('labels', merge_labels)
+    def merge_mapping(mapping, parse_func):
+        if mapping in base or mapping in override:
+            merged = parse_func(base.get(mapping, None))
+            merged.update(parse_func(override.get(mapping, None)))
+            d[mapping] = merged
+
+    merge_mapping('environment', parse_environment)
+    merge_mapping('labels', parse_labels)
+    merge_mapping('ulimits', parse_ulimits)
 
     for field in ['volumes', 'devices']:
         merge_field(field, merge_path_mappings)
@@ -723,12 +730,6 @@ def join_path_mapping(pair):
         return ":".join((host, container))
 
 
-def merge_labels(base, override):
-    labels = parse_labels(base)
-    labels.update(parse_labels(override))
-    return labels
-
-
 def parse_labels(labels):
     if not labels:
         return {}
@@ -747,6 +748,14 @@ def split_label(label):
         return label, ''
 
 
+def parse_ulimits(ulimits):
+    if not ulimits:
+        return {}
+
+    if isinstance(ulimits, dict):
+        return dict(ulimits)
+
+
 def expand_path(working_dir, path):
     return os.path.abspath(os.path.join(working_dir, os.path.expanduser(path)))
 
diff --git a/tests/fixtures/extends/common-env-labels-ulimits.yml b/tests/fixtures/extends/common-env-labels-ulimits.yml
new file mode 100644
index 00000000..09efb4e7
--- /dev/null
+++ b/tests/fixtures/extends/common-env-labels-ulimits.yml
@@ -0,0 +1,13 @@
+web:
+  extends:
+    file: common.yml
+    service: web
+  environment:
+    - FOO=2
+    - BAZ=3
+  labels: ['label=one']
+  ulimits:
+    nproc: 65535
+    memlock:
+        soft: 1024
+        hard: 2048
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index a59d1d34..fb324c57 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1396,6 +1396,24 @@ class ExtendsTest(unittest.TestCase):
             }
         ]))
 
+    def test_merging_env_labels_ulimits(self):
+        service_dicts = load_from_filename('tests/fixtures/extends/common-env-labels-ulimits.yml')
+
+        self.assertEqual(service_sort(service_dicts), service_sort([
+            {
+                'name': 'web',
+                'image': 'busybox',
+                'command': '/bin/true',
+                'environment': {
+                    "FOO": "2",
+                    "BAR": "1",
+                    "BAZ": "3",
+                },
+                'labels': {'label': 'one'},
+                'ulimits': {'nproc': 65535, 'memlock': {'soft': 1024, 'hard': 2048}}
+            }
+        ]))
+
     def test_nested(self):
         service_dicts = load_from_filename('tests/fixtures/extends/nested.yml')
 

From 3a46abd17fe0b631643a62e2ca5e51a6c9ced462 Mon Sep 17 00:00:00 2001
From: Dimitar Bonev <dimitar.bonev@gmail.com>
Date: Sun, 10 Jan 2016 18:15:13 +0200
Subject: [PATCH 0636/1265] Allowed port range in exposed ports

Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
---
 compose/config/validation.py                  |  2 +-
 tests/acceptance/cli_test.py                  | 22 +++++++++++++++++++
 .../expose-composefile/docker-compose.yml     | 11 ++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 tests/fixtures/expose-composefile/docker-compose.yml

diff --git a/compose/config/validation.py b/compose/config/validation.py
index e7006d5a..74ae5c9c 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -38,7 +38,7 @@ DOCKER_CONFIG_HINTS = {
 
 
 VALID_NAME_CHARS = '[a-zA-Z0-9\._\-]'
-VALID_EXPOSE_FORMAT = r'^\d+(\/[a-zA-Z]+)?$'
+VALID_EXPOSE_FORMAT = r'^\d+(\-\d+)?(\/[a-zA-Z]+)?$'
 
 
 @FormatChecker.cls_checks(format="ports", raises=ValidationError)
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 3a3c89b0..a882f9de 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -642,6 +642,28 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_short, "127.0.0.1:30000")
         self.assertEqual(port_full, "127.0.0.1:30001")
 
+    def test_run_with_expose_ports(self):
+        # create one off container
+        self.base_dir = 'tests/fixtures/expose-composefile'
+        self.dispatch(['run', '-d', '--service-ports', 'simple'])
+        container = self.project.get_service('simple').containers(one_off=True)[0]
+
+        ports = container.ports
+        self.assertEqual(len(ports), 9)
+        # exposed ports are not mapped to host ports
+        assert ports['3000/tcp'] is None
+        assert ports['3001/tcp'] is None
+        assert ports['3001/udp'] is None
+        assert ports['3002/tcp'] is None
+        assert ports['3003/tcp'] is None
+        assert ports['3004/tcp'] is None
+        assert ports['3005/tcp'] is None
+        assert ports['3006/udp'] is None
+        assert ports['3007/udp'] is None
+
+        # close all one off containers we just created
+        container.stop()
+
     def test_run_with_custom_name(self):
         self.base_dir = 'tests/fixtures/environment-composefile'
         name = 'the-container-name'
diff --git a/tests/fixtures/expose-composefile/docker-compose.yml b/tests/fixtures/expose-composefile/docker-compose.yml
new file mode 100644
index 00000000..d14a468d
--- /dev/null
+++ b/tests/fixtures/expose-composefile/docker-compose.yml
@@ -0,0 +1,11 @@
+
+simple:
+  image: busybox:latest
+  command: top
+  expose:
+    - '3000'
+    - '3001/tcp'
+    - '3001/udp'
+    - '3002-3003'
+    - '3004-3005/tcp'
+    - '3006-3007/udp'

From 5d8c2d3cec432fd1853268804b21cdebe3ed81ce Mon Sep 17 00:00:00 2001
From: Jonathan Stewmon <jstewmon@rmn.com>
Date: Fri, 4 Dec 2015 16:40:09 -0600
Subject: [PATCH 0637/1265] add support for stop_signal to compose file

Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
---
 compose/config/config.py                             |  1 +
 compose/config/service_schema_v1.json                |  1 +
 compose/config/service_schema_v2.json                |  1 +
 compose/container.py                                 |  8 ++++++++
 tests/acceptance/cli_test.py                         | 12 ++++++++++++
 .../stop-signal-composefile/docker-compose.yml       | 10 ++++++++++
 tests/integration/service_test.py                    |  6 ++++++
 7 files changed, 39 insertions(+)
 create mode 100644 tests/fixtures/stop-signal-composefile/docker-compose.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 918946b3..cdd35e12 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -62,6 +62,7 @@ DOCKER_CONFIG_KEYS = [
     'restart',
     'security_opt',
     'stdin_open',
+    'stop_signal',
     'tty',
     'user',
     'volume_driver',
diff --git a/compose/config/service_schema_v1.json b/compose/config/service_schema_v1.json
index d51c7f73..43e7c8b8 100644
--- a/compose/config/service_schema_v1.json
+++ b/compose/config/service_schema_v1.json
@@ -94,6 +94,7 @@
         "restart": {"type": "string"},
         "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "stdin_open": {"type": "boolean"},
+        "stop_signal": {"type": "string"},
         "tty": {"type": "boolean"},
         "ulimits": {
           "type": "object",
diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
index 47b195fc..10331dcc 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.json
@@ -101,6 +101,7 @@
         "restart": {"type": "string"},
         "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "stdin_open": {"type": "boolean"},
+        "stop_signal": {"type": "string"},
         "tty": {"type": "boolean"},
         "ulimits": {
           "type": "object",
diff --git a/compose/container.py b/compose/container.py
index 5730f224..2565c8ff 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -107,6 +107,10 @@ class Container(object):
     def labels(self):
         return self.get('Config.Labels') or {}
 
+    @property
+    def stop_signal(self):
+        return self.get('Config.StopSignal')
+
     @property
     def log_config(self):
         return self.get('HostConfig.LogConfig') or None
@@ -132,6 +136,10 @@ class Container(object):
     def environment(self):
         return dict(var.split("=", 1) for var in self.get('Config.Env') or [])
 
+    @property
+    def exit_code(self):
+        return self.get('State.ExitCode')
+
     @property
     def is_running(self):
         return self.get('State.Running')
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index eab4bdae..90dca298 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -717,6 +717,18 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(service.containers(stopped=True)), 1)
         self.assertFalse(service.containers(stopped=True)[0].is_running)
 
+    def test_stop_signal(self):
+        self.base_dir = 'tests/fixtures/stop-signal-composefile'
+        self.dispatch(['up', '-d'], None)
+        service = self.project.get_service('simple')
+        self.assertEqual(len(service.containers()), 1)
+        self.assertTrue(service.containers()[0].is_running)
+
+        self.dispatch(['stop', '-t', '1'], None)
+        self.assertEqual(len(service.containers(stopped=True)), 1)
+        self.assertFalse(service.containers(stopped=True)[0].is_running)
+        self.assertEqual(service.containers(stopped=True)[0].exit_code, 0)
+
     def test_start_no_containers(self):
         result = self.dispatch(['start'], returncode=1)
         assert 'No containers to start' in result.stderr
diff --git a/tests/fixtures/stop-signal-composefile/docker-compose.yml b/tests/fixtures/stop-signal-composefile/docker-compose.yml
new file mode 100644
index 00000000..04f58aa9
--- /dev/null
+++ b/tests/fixtures/stop-signal-composefile/docker-compose.yml
@@ -0,0 +1,10 @@
+simple:
+  image: busybox:latest
+  command:
+    - sh
+    - '-c'
+    - |
+        trap 'exit 0' SIGINT
+        trap 'exit 1' SIGTERM
+        while true; do :; done
+  stop_signal: SIGINT
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 3eb50942..4818e47a 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -887,6 +887,12 @@ class ServiceTest(DockerClientTestCase):
         for name in labels_dict:
             self.assertIn((name, ''), labels)
 
+    def test_stop_signal(self):
+        stop_signal = 'SIGINT'
+        service = self.create_service('web', stop_signal=stop_signal)
+        container = create_and_start_container(service)
+        self.assertEqual(container.stop_signal, stop_signal)
+
     def test_custom_container_name(self):
         service = self.create_service('web', container_name='my-web-container')
         self.assertEqual(service.custom_container_name(), 'my-web-container')

From 05935b5e5448436f210cb5488a65338aae6e722f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 4 Jan 2016 15:10:32 -0800
Subject: [PATCH 0638/1265] Don't recreate pre-existing volumes.

During the initialize_volumes phase, if a volume using the
non-namespaced name already exists, don't create the namespaced
equivalent.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/project.py                |  6 ++++++
 compose/volume.py                 | 11 +++++++++++
 tests/integration/project_test.py | 26 ++++++++++++++++++++++++--
 tests/integration/volume_test.py  | 10 ++++++++++
 4 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index fa3eace2..f5bb8beb 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -235,6 +235,12 @@ class Project(object):
     def initialize_volumes(self):
         try:
             for volume in self.volumes:
+                if volume.is_user_created:
+                    log.info(
+                        'Found user-created volume "{0}". No new namespaced '
+                        'volume will be created.'.format(volume.name)
+                    )
+                    continue
                 volume.create()
         except NotFound:
             raise ConfigurationError(
diff --git a/compose/volume.py b/compose/volume.py
index fb8bd580..9bd98fa5 100644
--- a/compose/volume.py
+++ b/compose/volume.py
@@ -1,6 +1,8 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+from docker.errors import NotFound
+
 
 class Volume(object):
     def __init__(self, client, project, name, driver=None, driver_opts=None):
@@ -21,6 +23,15 @@ class Volume(object):
     def inspect(self):
         return self.client.inspect_volume(self.full_name)
 
+    @property
+    def is_user_created(self):
+        try:
+            self.client.inspect_volume(self.name)
+        except NotFound:
+            return False
+
+        return True
+
     @property
     def full_name(self):
         return '{0}_{1}'.format(self.project, self.name)
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index a3e0f33a..d1b1fdf0 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 import random
 
 import py
+from docker.errors import NotFound
 
 from .testcases import DockerClientTestCase
 from compose.config import config
@@ -624,7 +625,7 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(volume_data['Name'], full_vol_name)
         self.assertEqual(volume_data['Driver'], 'local')
 
-    def test_project_up_invalid_volume_driver(self):
+    def test_initialize_volumes_invalid_volume_driver(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
 
         config_data = config.Config(
@@ -642,7 +643,7 @@ class ProjectTest(DockerClientTestCase):
         with self.assertRaises(config.ConfigurationError):
             project.initialize_volumes()
 
-    def test_project_up_updated_driver(self):
+    def test_initialize_volumes_updated_driver(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
 
@@ -675,3 +676,24 @@ class ProjectTest(DockerClientTestCase):
         assert 'Configuration for volume {0} specifies driver smb'.format(
             vol_name
         ) in str(e.exception)
+
+    def test_initialize_volumes_user_created_volumes(self):
+        # Use composetest_ prefix so it gets garbage-collected in tearDown()
+        vol_name = 'composetest_{0:x}'.format(random.getrandbits(32))
+        full_vol_name = 'composetest_{0}'.format(vol_name)
+        self.client.create_volume(vol_name)
+        config_data = config.Config(
+            version=2, services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'command': 'top'
+            }], volumes={vol_name: {'driver': 'local'}}
+        )
+        project = Project.from_config(
+            name='composetest',
+            config_data=config_data, client=self.client
+        )
+        project.initialize_volumes()
+
+        with self.assertRaises(NotFound):
+            self.client.inspect_volume(full_vol_name)
diff --git a/tests/integration/volume_test.py b/tests/integration/volume_test.py
index 8ae35378..8bcce0e1 100644
--- a/tests/integration/volume_test.py
+++ b/tests/integration/volume_test.py
@@ -54,3 +54,13 @@ class VolumeTest(DockerClientTestCase):
         vol.remove()
         volumes = self.client.volumes()['Volumes']
         assert len([v for v in volumes if v['Name'] == vol.full_name]) == 0
+
+    def test_is_user_created(self):
+        vol = Volume(self.client, 'composetest', 'uservolume01')
+        try:
+            self.client.create_volume('uservolume01')
+            assert vol.is_user_created is True
+        finally:
+            self.client.remove_volume('uservolume01')
+        vol2 = Volume(self.client, 'composetest', 'volume01')
+        assert vol2.is_user_created is False

From 9cb58b796e2ea70f37ea857909fa4a3044d8861b Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 12 Jan 2016 16:53:49 -0800
Subject: [PATCH 0639/1265] Implement ability to specify external volumes

External volumes are created and managed by the user.
They are not namespaced.
They are expected to exist at the beginning of the up phase.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/fields_schema_v2.json |  7 +++++++
 compose/project.py                   | 14 ++++++++++---
 compose/volume.py                    | 21 ++++++++++++++-----
 tests/integration/project_test.py    | 24 ++++++++++++++++++++--
 tests/integration/volume_test.py     | 30 ++++++++++++++++++----------
 tests/unit/config/config_test.py     | 18 +++++++++++++++++
 6 files changed, 93 insertions(+), 21 deletions(-)

diff --git a/compose/config/fields_schema_v2.json b/compose/config/fields_schema_v2.json
index 22ff839f..61bd7628 100644
--- a/compose/config/fields_schema_v2.json
+++ b/compose/config/fields_schema_v2.json
@@ -41,6 +41,13 @@
             "^.+$": {"type": ["string", "number"]}
           },
           "additionalProperties": false
+        },
+        "external": {
+          "type": ["boolean", "object"],
+          "properties": {
+            "name": {"type": "string"}
+          },
+          "additionalProperties": false
         }
       }
     }
diff --git a/compose/project.py b/compose/project.py
index f5bb8beb..49b54e10 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -77,7 +77,9 @@ class Project(object):
                 project.volumes.append(
                     Volume(
                         client=client, project=name, name=vol_name,
-                        driver=data.get('driver'), driver_opts=data.get('driver_opts')
+                        driver=data.get('driver'),
+                        driver_opts=data.get('driver_opts'),
+                        external=data.get('external', False)
                     )
                 )
         return project
@@ -235,11 +237,17 @@ class Project(object):
     def initialize_volumes(self):
         try:
             for volume in self.volumes:
-                if volume.is_user_created:
+                if volume.external:
                     log.info(
-                        'Found user-created volume "{0}". No new namespaced '
+                        'Volume {0} declared as external. No new '
                         'volume will be created.'.format(volume.name)
                     )
+                    if not volume.exists():
+                        raise ConfigurationError(
+                            'Volume {0} declared as external, but could not be'
+                            ' found. Please create the volume manually and try'
+                            ' again.'.format(volume.full_name)
+                        )
                     continue
                 volume.create()
         except NotFound:
diff --git a/compose/volume.py b/compose/volume.py
index 9bd98fa5..64671ca9 100644
--- a/compose/volume.py
+++ b/compose/volume.py
@@ -5,12 +5,19 @@ from docker.errors import NotFound
 
 
 class Volume(object):
-    def __init__(self, client, project, name, driver=None, driver_opts=None):
+    def __init__(self, client, project, name, driver=None, driver_opts=None,
+                 external=False):
         self.client = client
         self.project = project
         self.name = name
         self.driver = driver
         self.driver_opts = driver_opts
+        self.external_name = None
+        if external:
+            if isinstance(external, dict):
+                self.external_name = external.get('name')
+            else:
+                self.external_name = self.name
 
     def create(self):
         return self.client.create_volume(
@@ -23,15 +30,19 @@ class Volume(object):
     def inspect(self):
         return self.client.inspect_volume(self.full_name)
 
-    @property
-    def is_user_created(self):
+    def exists(self):
         try:
-            self.client.inspect_volume(self.name)
+            self.inspect()
         except NotFound:
             return False
-
         return True
 
+    @property
+    def external(self):
+        return bool(self.external_name)
+
     @property
     def full_name(self):
+        if self.external_name:
+            return self.external_name
         return '{0}_{1}'.format(self.project, self.name)
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index d1b1fdf0..36b736b4 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -677,7 +677,7 @@ class ProjectTest(DockerClientTestCase):
             vol_name
         ) in str(e.exception)
 
-    def test_initialize_volumes_user_created_volumes(self):
+    def test_initialize_volumes_external_volumes(self):
         # Use composetest_ prefix so it gets garbage-collected in tearDown()
         vol_name = 'composetest_{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
@@ -687,7 +687,7 @@ class ProjectTest(DockerClientTestCase):
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], volumes={vol_name: {'driver': 'local'}}
+            }], volumes={vol_name: {'external': True}}
         )
         project = Project.from_config(
             name='composetest',
@@ -697,3 +697,23 @@ class ProjectTest(DockerClientTestCase):
 
         with self.assertRaises(NotFound):
             self.client.inspect_volume(full_vol_name)
+
+    def test_initialize_volumes_inexistent_external_volume(self):
+        vol_name = '{0:x}'.format(random.getrandbits(32))
+
+        config_data = config.Config(
+            version=2, services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'command': 'top'
+            }], volumes={vol_name: {'external': True}}
+        )
+        project = Project.from_config(
+            name='composetest',
+            config_data=config_data, client=self.client
+        )
+        with self.assertRaises(config.ConfigurationError) as e:
+            project.initialize_volumes()
+        assert 'Volume {0} declared as external'.format(
+            vol_name
+        ) in str(e.exception)
diff --git a/tests/integration/volume_test.py b/tests/integration/volume_test.py
index 8bcce0e1..fbb4aaa2 100644
--- a/tests/integration/volume_test.py
+++ b/tests/integration/volume_test.py
@@ -18,9 +18,10 @@ class VolumeTest(DockerClientTestCase):
             except DockerException:
                 pass
 
-    def create_volume(self, name, driver=None, opts=None):
+    def create_volume(self, name, driver=None, opts=None, external=False):
         vol = Volume(
-            self.client, 'composetest', name, driver=driver, driver_opts=opts
+            self.client, 'composetest', name, driver=driver, driver_opts=opts,
+            external=external
         )
         self.tmp_volumes.append(vol)
         return vol
@@ -55,12 +56,19 @@ class VolumeTest(DockerClientTestCase):
         volumes = self.client.volumes()['Volumes']
         assert len([v for v in volumes if v['Name'] == vol.full_name]) == 0
 
-    def test_is_user_created(self):
-        vol = Volume(self.client, 'composetest', 'uservolume01')
-        try:
-            self.client.create_volume('uservolume01')
-            assert vol.is_user_created is True
-        finally:
-            self.client.remove_volume('uservolume01')
-        vol2 = Volume(self.client, 'composetest', 'volume01')
-        assert vol2.is_user_created is False
+    def test_external_volume(self):
+        vol = self.create_volume('volume01', external=True)
+        assert vol.external is True
+        assert vol.full_name == vol.name
+        vol.create()
+        info = vol.inspect()
+        assert info['Name'] == vol.name
+
+    def test_external_aliased_volume(self):
+        alias_name = 'alias01'
+        vol = self.create_volume('volume01', external={'name': alias_name})
+        assert vol.external is True
+        assert vol.full_name == alias_name
+        vol.create()
+        info = vol.inspect()
+        assert info['Name'] == alias_name
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 25483e52..679125bc 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -775,6 +775,24 @@ class ConfigTest(unittest.TestCase):
             'extends': {'service': 'foo'}
         }
 
+    def test_external_volume_config(self):
+        config_details = build_config_details({
+            'version': 2,
+            'services': {
+                'bogus': {'image': 'busybox'}
+            },
+            'volumes': {
+                'ext': {'external': True},
+                'ext2': {'external': {'name': 'aliased'}}
+            }
+        })
+        config_result = config.load(config_details)
+        volumes = config_result.volumes
+        assert 'ext' in volumes
+        assert volumes['ext']['external'] is True
+        assert 'ext2' in volumes
+        assert volumes['ext2']['external']['name'] == 'aliased'
+
 
 class PortsTest(unittest.TestCase):
     INVALID_PORTS_TYPES = [

From f774422d18c32f3d9233e7c697ccf65e30a3fc06 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 12 Jan 2016 16:58:24 -0800
Subject: [PATCH 0640/1265] Test Volume.exists() behavior

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/integration/volume_test.py | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/tests/integration/volume_test.py b/tests/integration/volume_test.py
index fbb4aaa2..2e65f0be 100644
--- a/tests/integration/volume_test.py
+++ b/tests/integration/volume_test.py
@@ -57,7 +57,7 @@ class VolumeTest(DockerClientTestCase):
         assert len([v for v in volumes if v['Name'] == vol.full_name]) == 0
 
     def test_external_volume(self):
-        vol = self.create_volume('volume01', external=True)
+        vol = self.create_volume('composetest_volume_ext', external=True)
         assert vol.external is True
         assert vol.full_name == vol.name
         vol.create()
@@ -65,10 +65,28 @@ class VolumeTest(DockerClientTestCase):
         assert info['Name'] == vol.name
 
     def test_external_aliased_volume(self):
-        alias_name = 'alias01'
+        alias_name = 'composetest_alias01'
         vol = self.create_volume('volume01', external={'name': alias_name})
         assert vol.external is True
         assert vol.full_name == alias_name
         vol.create()
         info = vol.inspect()
         assert info['Name'] == alias_name
+
+    def test_exists(self):
+        vol = self.create_volume('volume01')
+        assert vol.exists() is False
+        vol.create()
+        assert vol.exists() is True
+
+    def test_exists_external(self):
+        vol = self.create_volume('volume01', external=True)
+        assert vol.exists() is False
+        vol.create()
+        assert vol.exists() is True
+
+    def test_exists_external_aliased(self):
+        vol = self.create_volume('volume01', external={'name': 'composetest_alias01'})
+        assert vol.exists() is False
+        vol.create()
+        assert vol.exists() is True

From bf48a781dbc4d82e8b9fa940522b68b78e4c12e3 Mon Sep 17 00:00:00 2001
From: Evgeniy Dobrohvalov <scipetr@gmail.com>
Date: Fri, 2 Oct 2015 20:07:44 +0300
Subject: [PATCH 0641/1265] Add flag for stops all containers if any container
 was stopped.

Signed-off-by: Evgeniy Dobrohvalov <scipetr@gmail.com>
---
 compose/cli/log_printer.py     |  5 +++--
 compose/cli/main.py            | 38 ++++++++++++++++++++--------------
 compose/cli/multiplexer.py     |  8 +++++--
 docs/reference/up.md           | 28 ++++++++++++++-----------
 tests/unit/cli/main_test.py    |  4 ++--
 tests/unit/multiplexer_test.py | 18 ++++++++++++++++
 6 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 864657a4..85fef794 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -13,10 +13,11 @@ from compose.utils import split_buffer
 class LogPrinter(object):
     """Print logs from many containers to a single output stream."""
 
-    def __init__(self, containers, output=sys.stdout, monochrome=False):
+    def __init__(self, containers, output=sys.stdout, monochrome=False, cascade_stop=False):
         self.containers = containers
         self.output = utils.get_output_stream(output)
         self.monochrome = monochrome
+        self.cascade_stop = cascade_stop
 
     def run(self):
         if not self.containers:
@@ -24,7 +25,7 @@ class LogPrinter(object):
 
         prefix_width = max_name_width(self.containers)
         generators = list(self._make_log_generators(self.monochrome, prefix_width))
-        for line in Multiplexer(generators).loop():
+        for line in Multiplexer(generators, cascade_stop=self.cascade_stop).loop():
             self.output.write(line)
             self.output.flush()
 
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 7c6d1cb5..a46521f3 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -590,25 +590,33 @@ class TopLevelCommand(DocoptCommand):
         Usage: up [options] [SERVICE...]
 
         Options:
-            -d                     Detached mode: Run containers in the background,
-                                   print new container names.
-            --no-color             Produce monochrome output.
-            --no-deps              Don't start linked services.
-            --force-recreate       Recreate containers even if their configuration and
-                                   image haven't changed. Incompatible with --no-recreate.
-            --no-recreate          If containers already exist, don't recreate them.
-                                   Incompatible with --force-recreate.
-            --no-build             Don't build an image, even if it's missing
-            -t, --timeout TIMEOUT  Use this timeout in seconds for container shutdown
-                                   when attached or when containers are already
-                                   running. (default: 10)
+            -d                         Detached mode: Run containers in the background,
+                                       print new container names.
+                                       Incompatible with --abort-on-container-exit.
+            --no-color                 Produce monochrome output.
+            --no-deps                  Don't start linked services.
+            --force-recreate           Recreate containers even if their configuration
+                                       and image haven't changed.
+                                       Incompatible with --no-recreate.
+            --no-recreate              If containers already exist, don't recreate them.
+                                       Incompatible with --force-recreate.
+            --no-build                 Don't build an image, even if it's missing
+            --abort-on-container-exit  Stops all containers if any container was stopped.
+                                       Incompatible with -d.
+            -t, --timeout TIMEOUT      Use this timeout in seconds for container shutdown
+                                       when attached or when containers are already
+                                       running. (default: 10)
         """
         monochrome = options['--no-color']
         start_deps = not options['--no-deps']
+        cascade_stop = options['--abort-on-container-exit']
         service_names = options['SERVICE']
         timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
         detached = options.get('-d')
 
+        if detached and cascade_stop:
+            raise UserError("--abort-on-container-exit and -d cannot be combined.")
+
         to_attach = project.up(
             service_names=service_names,
             start_deps=start_deps,
@@ -619,7 +627,7 @@ class TopLevelCommand(DocoptCommand):
         )
 
         if not detached:
-            log_printer = build_log_printer(to_attach, service_names, monochrome)
+            log_printer = build_log_printer(to_attach, service_names, monochrome, cascade_stop)
             attach_to_logs(project, log_printer, service_names, timeout)
 
     def version(self, project, options):
@@ -695,13 +703,13 @@ def run_one_off_container(container_options, project, service, options):
     sys.exit(exit_code)
 
 
-def build_log_printer(containers, service_names, monochrome):
+def build_log_printer(containers, service_names, monochrome, cascade_stop):
     if service_names:
         containers = [
             container
             for container in containers if container.service in service_names
         ]
-    return LogPrinter(containers, monochrome=monochrome)
+    return LogPrinter(containers, monochrome=monochrome, cascade_stop=cascade_stop)
 
 
 def attach_to_logs(project, log_printer, service_names, timeout):
diff --git a/compose/cli/multiplexer.py b/compose/cli/multiplexer.py
index 5e8d91a4..e6e63f24 100644
--- a/compose/cli/multiplexer.py
+++ b/compose/cli/multiplexer.py
@@ -20,8 +20,9 @@ class Multiplexer(object):
     parallel and yielding results as they come in.
     """
 
-    def __init__(self, iterators):
+    def __init__(self, iterators, cascade_stop=False):
         self.iterators = iterators
+        self.cascade_stop = cascade_stop
         self._num_running = len(iterators)
         self.queue = Queue()
 
@@ -36,7 +37,10 @@ class Multiplexer(object):
                     raise exception
 
                 if item is STOP:
-                    self._num_running -= 1
+                    if self.cascade_stop is True:
+                        break
+                    else:
+                        self._num_running -= 1
                 else:
                     yield item
             except Empty:
diff --git a/docs/reference/up.md b/docs/reference/up.md
index 966aff1e..a02358ec 100644
--- a/docs/reference/up.md
+++ b/docs/reference/up.md
@@ -15,18 +15,22 @@ parent = "smn_compose_cli"
 Usage: up [options] [SERVICE...]
 
 Options:
--d                     Detached mode: Run containers in the background,
-                       print new container names.
---no-color             Produce monochrome output.
---no-deps              Don't start linked services.
---force-recreate       Recreate containers even if their configuration and
-                       image haven't changed. Incompatible with --no-recreate.
---no-recreate          If containers already exist, don't recreate them.
-                       Incompatible with --force-recreate.
---no-build             Don't build an image, even if it's missing
--t, --timeout TIMEOUT  Use this timeout in seconds for container shutdown
-                       when attached or when containers are already
-                       running. (default: 10)
+-d                         Detached mode: Run containers in the background,
+                           print new container names.
+                           Incompatible with --abort-on-container-exit.
+--no-color                 Produce monochrome output.
+--no-deps                  Don't start linked services.
+--force-recreate           Recreate containers even if their configuration
+                           and image haven't changed.
+                           Incompatible with --no-recreate.
+--no-recreate              If containers already exist, don't recreate them.
+                           Incompatible with --force-recreate.
+--no-build                 Don't build an image, even if it's missing
+--abort-on-container-exit  Stops all containers if any container was stopped.
+                           Incompatible with -d.
+-t, --timeout TIMEOUT      Use this timeout in seconds for container shutdown
+                           when attached or when containers are already
+                           running. (default: 10)
 ```
 
 Builds, (re)creates, starts, and attaches to containers for a service.
diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py
index f62b2bcc..6f5dd3ca 100644
--- a/tests/unit/cli/main_test.py
+++ b/tests/unit/cli/main_test.py
@@ -36,7 +36,7 @@ class CLIMainTestCase(unittest.TestCase):
             mock_container('another', 1),
         ]
         service_names = ['web', 'db']
-        log_printer = build_log_printer(containers, service_names, True)
+        log_printer = build_log_printer(containers, service_names, True, False)
         self.assertEqual(log_printer.containers, containers[:3])
 
     def test_build_log_printer_all_services(self):
@@ -46,7 +46,7 @@ class CLIMainTestCase(unittest.TestCase):
             mock_container('other', 1),
         ]
         service_names = []
-        log_printer = build_log_printer(containers, service_names, True)
+        log_printer = build_log_printer(containers, service_names, True, False)
         self.assertEqual(log_printer.containers, containers)
 
     def test_attach_to_logs(self):
diff --git a/tests/unit/multiplexer_test.py b/tests/unit/multiplexer_test.py
index c56ece1b..750faad8 100644
--- a/tests/unit/multiplexer_test.py
+++ b/tests/unit/multiplexer_test.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import unittest
+from time import sleep
 
 from compose.cli.multiplexer import Multiplexer
 
@@ -46,3 +47,20 @@ class MultiplexerTest(unittest.TestCase):
 
         with self.assertRaises(Problem):
             list(mux.loop())
+
+    def test_cascade_stop(self):
+        mux = Multiplexer([
+            ((lambda x: sleep(0.01) or x)(x) for x in ['after 0.01 sec T1',
+                                                       'after 0.02 sec T1',
+                                                       'after 0.03 sec T1']),
+            ((lambda x: sleep(0.02) or x)(x) for x in ['after 0.02 sec T2',
+                                                       'after 0.04 sec T2',
+                                                       'after 0.06 sec T2']),
+        ], cascade_stop=True)
+
+        self.assertEqual(
+            ['after 0.01 sec T1',
+             'after 0.02 sec T1',
+             'after 0.02 sec T2',
+             'after 0.03 sec T1'],
+            sorted(list(mux.loop())))

From 8616b2de515f64d0d2541bcc61f8abcac15ac070 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 13 Jan 2016 11:22:57 -0800
Subject: [PATCH 0642/1265] Update error message when external volume is
 missing

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/project.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index 49b54e10..08843a6e 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -238,15 +238,18 @@ class Project(object):
         try:
             for volume in self.volumes:
                 if volume.external:
-                    log.info(
+                    log.debug(
                         'Volume {0} declared as external. No new '
                         'volume will be created.'.format(volume.name)
                     )
                     if not volume.exists():
                         raise ConfigurationError(
-                            'Volume {0} declared as external, but could not be'
-                            ' found. Please create the volume manually and try'
-                            ' again.'.format(volume.full_name)
+                            'Volume {name} declared as external, but could'
+                            ' not be found. Please create the volume manually'
+                            ' using `{command}{name}` and try again.'.format(
+                                name=volume.full_name,
+                                command='docker volume create --name='
+                            )
                         )
                     continue
                 volume.create()

From d601199eb5d31da117179c113d77f9d070b3507b Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 13 Jan 2016 12:07:08 -0800
Subject: [PATCH 0643/1265] Normalize external_name

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py          |  7 +++++++
 compose/project.py                |  2 +-
 compose/volume.py                 |  9 ++-------
 tests/integration/project_test.py |  8 ++++++--
 tests/integration/volume_test.py  | 10 ++++++----
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 918946b3..88722318 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -273,6 +273,13 @@ def load_volumes(config_files):
     for config_file in config_files:
         for name, volume_config in config_file.config.get('volumes', {}).items():
             volumes.update({name: volume_config})
+            external = volume_config.get('external')
+            if external:
+                if isinstance(external, dict):
+                    volume_config['external_name'] = external.get('name')
+                else:
+                    volume_config['external_name'] = name
+
     return volumes
 
 
diff --git a/compose/project.py b/compose/project.py
index 08843a6e..e882713c 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -79,7 +79,7 @@ class Project(object):
                         client=client, project=name, name=vol_name,
                         driver=data.get('driver'),
                         driver_opts=data.get('driver_opts'),
-                        external=data.get('external', False)
+                        external_name=data.get('external_name')
                     )
                 )
         return project
diff --git a/compose/volume.py b/compose/volume.py
index 64671ca9..b78aa029 100644
--- a/compose/volume.py
+++ b/compose/volume.py
@@ -6,18 +6,13 @@ from docker.errors import NotFound
 
 class Volume(object):
     def __init__(self, client, project, name, driver=None, driver_opts=None,
-                 external=False):
+                 external_name=None):
         self.client = client
         self.project = project
         self.name = name
         self.driver = driver
         self.driver_opts = driver_opts
-        self.external_name = None
-        if external:
-            if isinstance(external, dict):
-                self.external_name = external.get('name')
-            else:
-                self.external_name = self.name
+        self.external_name = external_name
 
     def create(self):
         return self.client.create_volume(
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 36b736b4..467eb786 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -687,7 +687,9 @@ class ProjectTest(DockerClientTestCase):
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], volumes={vol_name: {'external': True}}
+            }], volumes={
+                vol_name: {'external': True, 'external_name': vol_name}
+            }
         )
         project = Project.from_config(
             name='composetest',
@@ -706,7 +708,9 @@ class ProjectTest(DockerClientTestCase):
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], volumes={vol_name: {'external': True}}
+            }], volumes={
+                vol_name: {'external': True, 'external_name': vol_name}
+            }
         )
         project = Project.from_config(
             name='composetest',
diff --git a/tests/integration/volume_test.py b/tests/integration/volume_test.py
index 2e65f0be..706179ed 100644
--- a/tests/integration/volume_test.py
+++ b/tests/integration/volume_test.py
@@ -18,10 +18,12 @@ class VolumeTest(DockerClientTestCase):
             except DockerException:
                 pass
 
-    def create_volume(self, name, driver=None, opts=None, external=False):
+    def create_volume(self, name, driver=None, opts=None, external=None):
+        if external and isinstance(external, bool):
+            external = name
         vol = Volume(
             self.client, 'composetest', name, driver=driver, driver_opts=opts,
-            external=external
+            external_name=external
         )
         self.tmp_volumes.append(vol)
         return vol
@@ -66,7 +68,7 @@ class VolumeTest(DockerClientTestCase):
 
     def test_external_aliased_volume(self):
         alias_name = 'composetest_alias01'
-        vol = self.create_volume('volume01', external={'name': alias_name})
+        vol = self.create_volume('volume01', external=alias_name)
         assert vol.external is True
         assert vol.full_name == alias_name
         vol.create()
@@ -86,7 +88,7 @@ class VolumeTest(DockerClientTestCase):
         assert vol.exists() is True
 
     def test_exists_external_aliased(self):
-        vol = self.create_volume('volume01', external={'name': 'composetest_alias01'})
+        vol = self.create_volume('volume01', external='composetest_alias01')
         assert vol.exists() is False
         vol.create()
         assert vol.exists() is True

From 85a210d9eb4d3f7f0de537469680724d94a8abe4 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 13 Jan 2016 20:34:07 +0000
Subject: [PATCH 0644/1265] Increase timeout on signal-handling tests

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index eab4bdae..2f6dfba4 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -454,14 +454,14 @@ class CLITestCase(DockerClientTestCase):
         wait_on_condition(ContainerCountCondition(self.project, 2))
 
         os.kill(proc.pid, signal.SIGINT)
-        wait_on_condition(ContainerCountCondition(self.project, 0))
+        wait_on_condition(ContainerCountCondition(self.project, 0), timeout=30)
 
     def test_up_handles_sigterm(self):
         proc = start_process(self.base_dir, ['up', '-t', '2'])
         wait_on_condition(ContainerCountCondition(self.project, 2))
 
         os.kill(proc.pid, signal.SIGTERM)
-        wait_on_condition(ContainerCountCondition(self.project, 0))
+        wait_on_condition(ContainerCountCondition(self.project, 0), timeout=30)
 
     def test_run_service_without_links(self):
         self.base_dir = 'tests/fixtures/links-composefile'

From e76b2679eb8f3117c7c0e0444e70bfc4d7fa502d Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 13 Jan 2016 13:52:59 -0800
Subject: [PATCH 0645/1265] external volume disallows other config keys

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/fields_schema_v2.json | 42 +++++++++++++++++-----------
 tests/unit/config/config_test.py     | 13 +++++++++
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/compose/config/fields_schema_v2.json b/compose/config/fields_schema_v2.json
index 61bd7628..310dbf96 100644
--- a/compose/config/fields_schema_v2.json
+++ b/compose/config/fields_schema_v2.json
@@ -32,24 +32,32 @@
   "definitions": {
     "volume": {
       "id": "#/definitions/volume",
-      "type": "object",
-      "properties": {
-        "driver": {"type": "string"},
-        "driver_opts": {
-          "type": "object",
-          "patternProperties": {
-            "^.+$": {"type": ["string", "number"]}
-          },
-          "additionalProperties": false
+      "oneOf": [{
+        "type": "object",
+        "properties": {
+          "driver": {"type": "string"},
+          "driver_opts": {
+            "type": "object",
+            "patternProperties": {
+              "^.+$": {"type": ["string", "number"]}
+            },
+            "additionalProperties": false
+          }
         },
-        "external": {
-          "type": ["boolean", "object"],
-          "properties": {
-            "name": {"type": "string"}
-          },
-          "additionalProperties": false
-        }
-      }
+        "additionalProperties": false
+      }, {
+        "type": "object",
+        "properties": {
+          "external": {
+            "type": ["boolean", "object"],
+            "properties": {
+              "name": {"type": "string"}
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }]
     }
   },
   "additionalProperties": false
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 679125bc..b1759880 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -793,6 +793,19 @@ class ConfigTest(unittest.TestCase):
         assert 'ext2' in volumes
         assert volumes['ext2']['external']['name'] == 'aliased'
 
+    def test_external_volume_invalid_config(self):
+        config_details = build_config_details({
+            'version': 2,
+            'services': {
+                'bogus': {'image': 'busybox'}
+            },
+            'volumes': {
+                'ext': {'external': True, 'driver': 'foo'}
+            }
+        })
+        with self.assertRaises(ConfigurationError):
+            config.load(config_details)
+
 
 class PortsTest(unittest.TestCase):
     INVALID_PORTS_TYPES = [

From b6618815b91a8e01f87c691d67c1ea9839377e69 Mon Sep 17 00:00:00 2001
From: Jonathan Stewmon <jstewmon@rmn.com>
Date: Wed, 13 Jan 2016 16:18:00 -0600
Subject: [PATCH 0646/1265] update docker-py requirement to use master branch

Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 8c6d5f3a..313c6b7a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 PyYAML==3.11
-docker-py==1.6.0
 dockerpty==0.3.4
 docopt==0.6.1
 enum34==1.0.4
+git+https://github.com/docker/docker-py.git@master#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3

From 59a4ab9634ab227f6bd8a5f2e579661c64aa6813 Mon Sep 17 00:00:00 2001
From: "Michael A. Smith" <msmith3@ebay.com>
Date: Tue, 12 Jan 2016 13:49:14 -0500
Subject: [PATCH 0647/1265] Allow Entrypoints to be Lists

Signed-off-by: Michael A. Smith <msmith3@ebay.com>
---
 compose/config/service_schema_v1.json | 7 ++++++-
 compose/config/service_schema_v2.json | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/compose/config/service_schema_v1.json b/compose/config/service_schema_v1.json
index d51c7f73..cee6ad74 100644
--- a/compose/config/service_schema_v1.json
+++ b/compose/config/service_schema_v1.json
@@ -34,7 +34,12 @@
         "dns_search": {"$ref": "#/definitions/string_or_list"},
         "dockerfile": {"type": "string"},
         "domainname": {"type": "string"},
-        "entrypoint": {"$ref": "#/definitions/string_or_list"},
+        "entrypoint": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
         "env_file": {"$ref": "#/definitions/string_or_list"},
         "environment": {"$ref": "#/definitions/list_or_dict"},
 
diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
index 47b195fc..17a5387f 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.json
@@ -34,7 +34,12 @@
         "dns_search": {"$ref": "#/definitions/string_or_list"},
         "dockerfile": {"type": "string"},
         "domainname": {"type": "string"},
-        "entrypoint": {"$ref": "#/definitions/string_or_list"},
+        "entrypoint": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
         "env_file": {"$ref": "#/definitions/string_or_list"},
         "environment": {"$ref": "#/definitions/list_or_dict"},
 

From 9bff308251d1629a9f7107adc5b25f71a3844e12 Mon Sep 17 00:00:00 2001
From: "Michael A. Smith" <msmith3@ebay.com>
Date: Fri, 8 Jan 2016 15:46:49 -0500
Subject: [PATCH 0648/1265] Document Entrypoints and Commands as Lists

Signed-off-by: Michael A. Smith <msmith3@ebay.com>
---
 docs/compose-file.md | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 40a3cf02..4759cde0 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -120,6 +120,10 @@ Override the default command.
 
     command: bundle exec thin -p 3000
 
+The command can also be a list, in a manner similar to [dockerfile](https://docs.docker.com/engine/reference/builder/#cmd):
+
+    command: [bundle, exec, thin, -p, 3000]
+
 ### cgroup_parent
 
 Specify an optional parent cgroup for the container.
@@ -174,6 +178,22 @@ specified using the `build` key.
 
 Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
 
+### entrypoint
+
+Override the default entrypoint.
+
+    entrypoint: /code/entrypoint.sh
+
+The entrypoint can also be a list, in a manner similar to [dockerfile](https://docs.docker.com/engine/reference/builder/#entrypoint):
+
+    entrypoint:
+        - php
+        - -d
+        - zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20100525/xdebug.so
+        - -d
+        - memory_limit=-1
+        - vendor/bin/phpunit
+
 ### env_file
 
 Add environment variables from a file. Can be a single value or a list.
@@ -451,7 +471,7 @@ specifying read-only access(``ro``) or read-write(``rw``).
      - container_name
      - service_name:rw
 
-### cpu\_shares, cpu\_quota, cpuset, domainname, entrypoint, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, stdin\_open, tty, user, working\_dir
+### cpu\_shares, cpu\_quota, cpuset, domainname, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, stdin\_open, tty, user, working\_dir
 
 Each of these is a single value, analogous to its
 [docker run](https://docs.docker.com/engine/reference/run/) counterpart.
@@ -460,7 +480,6 @@ Each of these is a single value, analogous to its
     cpu_quota: 50000
     cpuset: 0,1
 
-    entrypoint: /code/entrypoint.sh
     user: postgresql
     working_dir: /code
 

From 6877c6ca06ef605e1227b79092cf8054996df27a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 13 Jan 2016 20:51:39 -0500
Subject: [PATCH 0649/1265] Fix flaky multiplex test.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/unit/multiplexer_test.py | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/tests/unit/multiplexer_test.py b/tests/unit/multiplexer_test.py
index 750faad8..737ba25d 100644
--- a/tests/unit/multiplexer_test.py
+++ b/tests/unit/multiplexer_test.py
@@ -49,18 +49,13 @@ class MultiplexerTest(unittest.TestCase):
             list(mux.loop())
 
     def test_cascade_stop(self):
-        mux = Multiplexer([
-            ((lambda x: sleep(0.01) or x)(x) for x in ['after 0.01 sec T1',
-                                                       'after 0.02 sec T1',
-                                                       'after 0.03 sec T1']),
-            ((lambda x: sleep(0.02) or x)(x) for x in ['after 0.02 sec T2',
-                                                       'after 0.04 sec T2',
-                                                       'after 0.06 sec T2']),
-        ], cascade_stop=True)
+        def fast_stream():
+            for num in range(3):
+                yield "stream1 %s" % num
 
-        self.assertEqual(
-            ['after 0.01 sec T1',
-             'after 0.02 sec T1',
-             'after 0.02 sec T2',
-             'after 0.03 sec T1'],
-            sorted(list(mux.loop())))
+        def slow_stream():
+            sleep(5)
+            yield "stream2 FAIL"
+
+        mux = Multiplexer([fast_stream(), slow_stream()], cascade_stop=True)
+        assert "stream2 FAIL" not in set(mux.loop())

From e41e6c1241a7e17fddd5c3abf536f462ed5ab1c4 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 13 Jan 2016 18:22:29 -0800
Subject: [PATCH 0650/1265] Properly validate volume definition

Test valid empty volume definitions

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py             | 12 +++++++++
 compose/config/fields_schema_v2.json | 38 +++++++++++-----------------
 tests/unit/config/config_test.py     | 17 +++++++++++++
 3 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index d2b75e71..17fd2db4 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -272,9 +272,21 @@ def load_volumes(config_files):
     volumes = {}
     for config_file in config_files:
         for name, volume_config in config_file.config.get('volumes', {}).items():
+            if volume_config is None:
+                volumes.update({name: {}})
+                continue
+
             volumes.update({name: volume_config})
             external = volume_config.get('external')
             if external:
+                if len(volume_config.keys()) > 1:
+                    raise ConfigurationError(
+                        'Volume {0} declared as external but specifies'
+                        ' additional attributes ({1}). '.format(
+                            name,
+                            ', '.join([k for k in volume_config.keys() if k != 'external'])
+                        )
+                    )
                 if isinstance(external, dict):
                     volume_config['external_name'] = external.get('name')
                 else:
diff --git a/compose/config/fields_schema_v2.json b/compose/config/fields_schema_v2.json
index 310dbf96..25126ed1 100644
--- a/compose/config/fields_schema_v2.json
+++ b/compose/config/fields_schema_v2.json
@@ -32,32 +32,24 @@
   "definitions": {
     "volume": {
       "id": "#/definitions/volume",
-      "oneOf": [{
-        "type": "object",
-        "properties": {
-          "driver": {"type": "string"},
-          "driver_opts": {
-            "type": "object",
-            "patternProperties": {
-              "^.+$": {"type": ["string", "number"]}
-            },
-            "additionalProperties": false
+      "type": ["object", "null"],
+      "properties": {
+        "driver": {"type": "string"},
+        "driver_opts": {
+          "type": "object",
+          "patternProperties": {
+            "^.+$": {"type": ["string", "number"]}
+          }
+        },
+        "external": {
+          "type": ["boolean", "object"],
+          "properties": {
+            "name": {"type": "string"}
           }
         },
         "additionalProperties": false
-      }, {
-        "type": "object",
-        "properties": {
-          "external": {
-            "type": ["boolean", "object"],
-            "properties": {
-              "name": {"type": "string"}
-            },
-            "additionalProperties": false
-          }
-        },
-        "additionalProperties": false
-      }]
+      },
+      "additionalProperties": false
     }
   },
   "additionalProperties": false
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 05fea27d..77c55ad9 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -112,6 +112,23 @@ class ConfigTest(unittest.TestCase):
             }
         })
 
+    def test_named_volume_config_empty(self):
+        config_details = build_config_details({
+            'version': 2,
+            'services': {
+                'simple': {'image': 'busybox'}
+            },
+            'volumes': {
+                'simple': None,
+                'other': {},
+            }
+        })
+        config_result = config.load(config_details)
+        volumes = config_result.volumes
+        assert 'simple' in volumes
+        assert volumes['simple'] == {}
+        assert volumes['other'] == {}
+
     def test_load_service_with_name_version(self):
         config_data = config.load(
             build_config_details({

From c8ed1568063d67595a0a38522d2d9355c637b899 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 27 Nov 2015 12:19:43 -0500
Subject: [PATCH 0651/1265] Adding docker-compose down

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py          | 27 +++++++++++++++++++++++++++
 compose/project.py           | 20 ++++++++++++++++++++
 compose/service.py           | 21 +++++++++++++++++++++
 tests/acceptance/cli_test.py |  8 ++++++++
 tests/unit/service_test.py   | 34 ++++++++++++++++++++++++++++++++++
 5 files changed, 110 insertions(+)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index a46521f3..8c1a55ff 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -25,6 +25,7 @@ from ..progress_stream import StreamOutputError
 from ..project import NoSuchService
 from ..service import BuildError
 from ..service import ConvergenceStrategy
+from ..service import ImageType
 from ..service import NeedsBuildError
 from .command import friendly_error_message
 from .command import get_config_path_from_options
@@ -129,6 +130,7 @@ class TopLevelCommand(DocoptCommand):
       build              Build or rebuild services
       config             Validate and view the compose file
       create             Create services
+      down               Stop and remove containers, networks, images, and volumes
       events             Receive real time events from containers
       help               Get help on a command
       kill               Kill containers
@@ -242,6 +244,22 @@ class TopLevelCommand(DocoptCommand):
             do_build=not options['--no-build']
         )
 
+    def down(self, project, options):
+        """
+        Stop containers and remove containers, networks, volumes, and images
+        created by `up`.
+
+        Usage: down [options]
+
+        Options:
+            --rmi type      Remove images, type may be one of: 'all' to remove
+                            all images, or 'local' to remove only images that
+                            don't have an custom name set by the `image` field
+            -v, --volumes   Remove data volumes
+        """
+        image_type = image_type_from_opt('--rmi', options['--rmi'])
+        project.down(image_type, options['--volumes'])
+
     def events(self, project, options):
         """
         Receive real time events from containers.
@@ -660,6 +678,15 @@ def convergence_strategy_from_opts(options):
     return ConvergenceStrategy.changed
 
 
+def image_type_from_opt(flag, value):
+    if not value:
+        return ImageType.none
+    try:
+        return ImageType[value]
+    except KeyError:
+        raise UserError("%s flag must be one of: all, local" % flag)
+
+
 def run_one_off_container(container_options, project, service, options):
     if not options['--no-deps']:
         deps = service.get_linked_service_names()
diff --git a/compose/project.py b/compose/project.py
index e882713c..0774a400 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -270,6 +270,24 @@ class Project(object):
                     )
                 )
 
+    def down(self, remove_image_type, include_volumes):
+        self.stop()
+        self.remove_stopped()
+        self.remove_network()
+
+        if include_volumes:
+            self.remove_volumes()
+
+        self.remove_images(remove_image_type)
+
+    def remove_images(self, remove_image_type):
+        for service in self.get_services():
+            service.remove_image(remove_image_type)
+
+    def remove_volumes(self):
+        for volume in self.volumes:
+            volume.remove()
+
     def restart(self, service_names=None, **options):
         containers = self.containers(service_names, stopped=True)
         parallel.parallel_restart(containers, options)
@@ -419,6 +437,8 @@ class Project(object):
             self.client.create_network(self.default_network_name, driver=self.network_driver)
 
     def remove_network(self):
+        if not self.use_networking:
+            return
         network = self.get_network()
         if network:
             self.client.remove_network(network['Id'])
diff --git a/compose/service.py b/compose/service.py
index d5c36f1a..1972b1b1 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -98,6 +98,14 @@ class ConvergenceStrategy(enum.Enum):
         return self is not type(self).never
 
 
+@enum.unique
+class ImageType(enum.Enum):
+    """Enumeration for the types of images known to compose."""
+    none = 0
+    local = 1
+    all = 2
+
+
 class Service(object):
     def __init__(
         self,
@@ -672,6 +680,19 @@ class Service(object):
     def custom_container_name(self):
         return self.options.get('container_name')
 
+    def remove_image(self, image_type):
+        if not image_type or image_type == ImageType.none:
+            return False
+        if image_type == ImageType.local and self.options.get('image'):
+            return False
+
+        try:
+            self.client.remove_image(self.image_name)
+            return True
+        except APIError as e:
+            log.error("Failed to remove image for service %s: %s", self.name, e)
+            return False
+
     def specifies_host_port(self):
         def has_host_port(binding):
             _, external_bindings = split_port(binding)
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 8b5892ab..a06f14dc 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -314,6 +314,14 @@ class CLITestCase(DockerClientTestCase):
             ['create', '--force-recreate', '--no-recreate'],
             returncode=1)
 
+    def test_down_invalid_rmi_flag(self):
+        result = self.dispatch(['down', '--rmi', 'bogus'], returncode=1)
+        assert '--rmi flag must be' in result.stderr
+
+    def test_down(self):
+        result = self.dispatch(['down'])
+        # TODO:
+
     def test_up_detached(self):
         self.dispatch(['up', '-d'])
         service = self.project.get_service('simple')
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 63cf658e..fa58929b 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import docker
+from docker.errors import APIError
 
 from .. import mock
 from .. import unittest
@@ -16,6 +17,7 @@ from compose.service import build_ulimits
 from compose.service import build_volume_binding
 from compose.service import ContainerNet
 from compose.service import get_container_data_volumes
+from compose.service import ImageType
 from compose.service import merge_volume_bindings
 from compose.service import NeedsBuildError
 from compose.service import Net
@@ -422,6 +424,38 @@ class ServiceTest(unittest.TestCase):
         }
         self.assertEqual(config_dict, expected)
 
+    def test_remove_image_none(self):
+        web = Service('web', image='example', client=self.mock_client)
+        assert not web.remove_image(ImageType.none)
+        assert not self.mock_client.remove_image.called
+
+    def test_remove_image_local_with_image_name_doesnt_remove(self):
+        web = Service('web', image='example', client=self.mock_client)
+        assert not web.remove_image(ImageType.local)
+        assert not self.mock_client.remove_image.called
+
+    def test_remove_image_local_without_image_name_does_remove(self):
+        web = Service('web', build='.', client=self.mock_client)
+        assert web.remove_image(ImageType.local)
+        self.mock_client.remove_image.assert_called_once_with(web.image_name)
+
+    def test_remove_image_all_does_remove(self):
+        web = Service('web', image='example', client=self.mock_client)
+        assert web.remove_image(ImageType.all)
+        self.mock_client.remove_image.assert_called_once_with(web.image_name)
+
+    def test_remove_image_with_error(self):
+        self.mock_client.remove_image.side_effect = error = APIError(
+            message="testing",
+            response={},
+            explanation="Boom")
+
+        web = Service('web', image='example', client=self.mock_client)
+        with mock.patch('compose.service.log', autospec=True) as mock_log:
+            assert not web.remove_image(ImageType.all)
+        mock_log.error.assert_called_once_with(
+            "Failed to remove image for service %s: %s", web.name, error)
+
     def test_specifies_host_port_with_no_ports(self):
         service = Service(
             'foo',

From c64af0a459ed0a96c38547451a0b5da69c3da079 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 12 Jan 2016 17:33:17 -0500
Subject: [PATCH 0652/1265] Add an acceptance test and docs for the down
 subcommand

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py                        |  2 +-
 compose/parallel.py                        |  2 +-
 compose/project.py                         |  3 ++-
 compose/service.py                         |  1 +
 compose/volume.py                          |  9 ++++++++
 docs/index.md                              |  3 +--
 docs/reference/down.md                     | 26 ++++++++++++++++++++++
 docs/reference/index.md                    |  5 +++++
 tests/acceptance/cli_test.py               | 12 ++++++++--
 tests/fixtures/shutdown/Dockerfile         |  4 ++++
 tests/fixtures/shutdown/docker-compose.yml | 10 +++++++++
 tests/integration/service_test.py          | 12 +++++-----
 tests/unit/volume_test.py                  | 26 ++++++++++++++++++++++
 13 files changed, 102 insertions(+), 13 deletions(-)
 create mode 100644 docs/reference/down.md
 create mode 100644 tests/fixtures/shutdown/Dockerfile
 create mode 100644 tests/fixtures/shutdown/docker-compose.yml
 create mode 100644 tests/unit/volume_test.py

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 8c1a55ff..9957d391 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -247,7 +247,7 @@ class TopLevelCommand(DocoptCommand):
     def down(self, project, options):
         """
         Stop containers and remove containers, networks, volumes, and images
-        created by `up`.
+        created by `up`. Only containers and networks are removed by default.
 
         Usage: down [options]
 
diff --git a/compose/parallel.py b/compose/parallel.py
index 2735a397..b8415e5e 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -24,7 +24,7 @@ def parallel_execute(objects, func, index_func, msg):
     object we give it.
     """
     objects = list(objects)
-    stream = get_output_stream(sys.stdout)
+    stream = get_output_stream(sys.stderr)
     writer = ParallelStreamWriter(stream, msg)
 
     for obj in objects:
diff --git a/compose/project.py b/compose/project.py
index 0774a400..3ba9532f 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -272,7 +272,7 @@ class Project(object):
 
     def down(self, remove_image_type, include_volumes):
         self.stop()
-        self.remove_stopped()
+        self.remove_stopped(v=include_volumes)
         self.remove_network()
 
         if include_volumes:
@@ -441,6 +441,7 @@ class Project(object):
             return
         network = self.get_network()
         if network:
+            log.info("Removing network %s", self.default_network_name)
             self.client.remove_network(network['Id'])
 
     def uses_default_network(self):
diff --git a/compose/service.py b/compose/service.py
index 1972b1b1..1c848ca3 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -686,6 +686,7 @@ class Service(object):
         if image_type == ImageType.local and self.options.get('image'):
             return False
 
+        log.info("Removing image %s", self.image_name)
         try:
             self.client.remove_image(self.image_name)
             return True
diff --git a/compose/volume.py b/compose/volume.py
index b78aa029..469e406a 100644
--- a/compose/volume.py
+++ b/compose/volume.py
@@ -1,9 +1,14 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import logging
+
 from docker.errors import NotFound
 
 
+log = logging.getLogger(__name__)
+
+
 class Volume(object):
     def __init__(self, client, project, name, driver=None, driver_opts=None,
                  external_name=None):
@@ -20,6 +25,10 @@ class Volume(object):
         )
 
     def remove(self):
+        if self.external:
+            log.info("Volume %s is external, skipping", self.full_name)
+            return
+        log.info("Removing volume %s", self.full_name)
         return self.client.remove_volume(self.full_name)
 
     def inspect(self):
diff --git a/docs/index.md b/docs/index.md
index 6e8f2090..887df99d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -154,8 +154,7 @@ environments in just a few commands:
 
     $ docker-compose up -d
     $ ./run_tests
-    $ docker-compose stop
-    $ docker-compose rm -f
+    $ docker-compose down
 
 ### Single host deployments
 
diff --git a/docs/reference/down.md b/docs/reference/down.md
new file mode 100644
index 00000000..428e4e58
--- /dev/null
+++ b/docs/reference/down.md
@@ -0,0 +1,26 @@
+<!--[metadata]>
++++
+title = "down"
+description = "down"
+keywords = ["fig, composition, compose, docker, orchestration, cli,  down"]
+[menu.main]
+identifier="build.compose"
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# down
+
+```
+Stop containers and remove containers, networks, volumes, and images
+created by `up`. Only containers and networks are removed by default.
+
+Usage: down [options]
+
+Options:
+    --rmi type      Remove images, type may be one of: 'all' to remove
+                    all images, or 'local' to remove only images that
+                    don't have an custom name set by the `image` field
+    -v, --volumes   Remove data volumes
+
+```
diff --git a/docs/reference/index.md b/docs/reference/index.md
index 1635b60c..5406b9c7 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -14,10 +14,14 @@ parent = "smn_compose_ref"
 The following pages describe the usage information for the [docker-compose](docker-compose.md) subcommands. You can also see this information by running `docker-compose [SUBCOMMAND] --help` from the command line.
 
 * [build](build.md)
+* [config](config.md)
+* [create](create.md)
+* [down](down.md)
 * [events](events.md)
 * [help](help.md)
 * [kill](kill.md)
 * [logs](logs.md)
+* [pause](pause.md)
 * [port](port.md)
 * [ps](ps.md)
 * [pull](pull.md)
@@ -27,6 +31,7 @@ The following pages describe the usage information for the [docker-compose](dock
 * [scale](scale.md)
 * [start](start.md)
 * [stop](stop.md)
+* [unpause](unpause.md)
 * [up](up.md)
 
 ## Where to go next
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index a06f14dc..cb04918b 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -319,8 +319,16 @@ class CLITestCase(DockerClientTestCase):
         assert '--rmi flag must be' in result.stderr
 
     def test_down(self):
-        result = self.dispatch(['down'])
-        # TODO:
+        self.base_dir = 'tests/fixtures/shutdown'
+        self.dispatch(['up', '-d'])
+        wait_on_condition(ContainerCountCondition(self.project, 1))
+
+        result = self.dispatch(['down', '--rmi=local', '--volumes'])
+        assert 'Stopping shutdown_web_1' in result.stderr
+        assert 'Removing shutdown_web_1' in result.stderr
+        assert 'Removing volume shutdown_data' in result.stderr
+        assert 'Removing image shutdown_web' in result.stderr
+        assert 'Removing network shutdown_default' in result.stderr
 
     def test_up_detached(self):
         self.dispatch(['up', '-d'])
diff --git a/tests/fixtures/shutdown/Dockerfile b/tests/fixtures/shutdown/Dockerfile
new file mode 100644
index 00000000..51ed0d90
--- /dev/null
+++ b/tests/fixtures/shutdown/Dockerfile
@@ -0,0 +1,4 @@
+
+FROM busybox:latest
+RUN  echo something
+CMD  top
diff --git a/tests/fixtures/shutdown/docker-compose.yml b/tests/fixtures/shutdown/docker-compose.yml
new file mode 100644
index 00000000..c83c3d63
--- /dev/null
+++ b/tests/fixtures/shutdown/docker-compose.yml
@@ -0,0 +1,10 @@
+
+version: 2
+
+volumes:
+  data:
+    driver: local
+
+services:
+  web:
+    build: .
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 4818e47a..314076cd 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -616,13 +616,13 @@ class ServiceTest(DockerClientTestCase):
         service.create_container(number=next_number)
         service.create_container(number=next_number + 1)
 
-        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+        with mock.patch('sys.stderr', new_callable=StringIO) as mock_stderr:
             service.scale(2)
         for container in service.containers():
             self.assertTrue(container.is_running)
             self.assertTrue(container.number in valid_numbers)
 
-        captured_output = mock_stdout.getvalue()
+        captured_output = mock_stderr.getvalue()
         self.assertNotIn('Creating', captured_output)
         self.assertIn('Starting', captured_output)
 
@@ -639,14 +639,14 @@ class ServiceTest(DockerClientTestCase):
         for container in service.containers():
             self.assertFalse(container.is_running)
 
-        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+        with mock.patch('sys.stderr', new_callable=StringIO) as mock_stderr:
             service.scale(2)
 
         self.assertEqual(len(service.containers()), 2)
         for container in service.containers():
             self.assertTrue(container.is_running)
 
-        captured_output = mock_stdout.getvalue()
+        captured_output = mock_stderr.getvalue()
         self.assertIn('Creating', captured_output)
         self.assertIn('Starting', captured_output)
 
@@ -665,12 +665,12 @@ class ServiceTest(DockerClientTestCase):
                 response={},
                 explanation="Boom")):
 
-            with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+            with mock.patch('sys.stderr', new_callable=StringIO) as mock_stderr:
                 service.scale(3)
 
         self.assertEqual(len(service.containers()), 1)
         self.assertTrue(service.containers()[0].is_running)
-        self.assertIn("ERROR: for 2  Boom", mock_stdout.getvalue())
+        self.assertIn("ERROR: for 2  Boom", mock_stderr.getvalue())
 
     def test_scale_with_unexpected_exception(self):
         """Test that when scaling if the API returns an error, that is not of type
diff --git a/tests/unit/volume_test.py b/tests/unit/volume_test.py
new file mode 100644
index 00000000..d7ad0792
--- /dev/null
+++ b/tests/unit/volume_test.py
@@ -0,0 +1,26 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import docker
+import pytest
+
+from compose import volume
+from tests import mock
+
+
+@pytest.fixture
+def mock_client():
+    return mock.create_autospec(docker.Client)
+
+
+class TestVolume(object):
+
+    def test_remove_local_volume(self, mock_client):
+        vol = volume.Volume(mock_client, 'foo', 'project')
+        vol.remove()
+        mock_client.remove_volume.assert_called_once_with('foo_project')
+
+    def test_remove_external_volume(self, mock_client):
+        vol = volume.Volume(mock_client, 'foo', 'project', external_name='data')
+        vol.remove()
+        assert not mock_client.remove_volume.called

From de949284f5b126d07e42c2322f1c80c62f9c68a5 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 13 Jan 2016 12:55:59 -0500
Subject: [PATCH 0653/1265] Refactor config loading for handling volumes_from
 in v2.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py | 60 +++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 7eb2ce2c..82ff40aa 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -122,6 +122,9 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
     def get_service_dicts(self, version):
         return self.config if version == 1 else self.config.get('services', {})
 
+    def get_volumes(self, version):
+        return {} if version == 1 else self.config.get('volumes', {})
+
 
 class Config(namedtuple('_Config', 'version services volumes')):
     """
@@ -243,41 +246,29 @@ def load(config_details):
     if version not in COMPOSEFILE_VERSIONS:
         raise ConfigurationError('Invalid config version provided: {0}'.format(version))
 
-    processed_files = []
-    for config_file in config_details.config_files:
-        processed_files.append(
-            process_config_file(config_file, version=version)
-        )
+    processed_files = [
+        process_config_file(config_file, version=version)
+        for config_file in config_details.config_files
+    ]
     config_details = config_details._replace(config_files=processed_files)
 
-    if version == 1:
-        service_dicts = load_services(
-            config_details.working_dir, config_details.config_files,
-            version
-        )
-        volumes = {}
-    elif version == 2:
-        config_files = [
-            ConfigFile(f.filename, f.config.get('services', {}))
-            for f in config_details.config_files
-        ]
-        service_dicts = load_services(
-            config_details.working_dir, config_files, version
-        )
-        volumes = load_volumes(config_details.config_files)
-
+    volumes = load_volumes(config_details.config_files)
+    service_dicts = load_services(
+        config_details.working_dir,
+        config_details.config_files[0].filename,
+        [file.get_service_dicts(version) for file in config_details.config_files],
+        version)
     return Config(version, service_dicts, volumes)
 
 
 def load_volumes(config_files):
     volumes = {}
     for config_file in config_files:
-        for name, volume_config in config_file.config.get('volumes', {}).items():
-            if volume_config is None:
-                volumes.update({name: {}})
+        for name, volume_config in config_file.get_volumes().items():
+            volumes[name] = volume_config or {}
+            if not volume_config:
                 continue
 
-            volumes.update({name: volume_config})
             external = volume_config.get('external')
             if external:
                 if len(volume_config.keys()) > 1:
@@ -296,8 +287,8 @@ def load_volumes(config_files):
     return volumes
 
 
-def load_services(working_dir, config_files, version):
-    def build_service(filename, service_name, service_dict):
+def load_services(working_dir, filename, service_configs, version):
+    def build_service(service_name, service_dict):
         service_config = ServiceConfig.with_abs_paths(
             working_dir,
             filename,
@@ -314,10 +305,10 @@ def load_services(working_dir, config_files, version):
         service_dict['name'] = service_config.name
         return service_dict
 
-    def build_services(config_file):
+    def build_services(service_config):
         return sort_service_dicts([
-            build_service(config_file.filename, name, service_dict)
-            for name, service_dict in config_file.config.items()
+            build_service(name, service_dict)
+            for name, service_dict in service_config.items()
         ])
 
     def merge_services(base, override):
@@ -330,12 +321,11 @@ def load_services(working_dir, config_files, version):
             for name in all_service_names
         }
 
-    config_file = config_files[0]
-    for next_file in config_files[1:]:
-        config = merge_services(config_file.config, next_file.config)
-        config_file = config_file._replace(config=config)
+    service_config = service_configs[0]
+    for next_config in service_configs[1:]:
+        service_config = merge_services(service_config, next_config)
 
-    return build_services(config_file)
+    return build_services(service_config)
 
 
 def process_config_file(config_file, version, service_name=None):

From c3968a439fa5d00ecedeb37963f5e8c0763ef6d1 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 13 Jan 2016 13:28:39 -0500
Subject: [PATCH 0654/1265] Refactor config loading to move version check into
 ConfigFile.

Adds the cached_property package.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py     | 92 +++++++++++++++++++-----------------
 compose/config/validation.py | 11 ++---
 requirements.txt             |  1 +
 setup.py                     |  1 +
 4 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 82ff40aa..203c4e9e 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -10,6 +10,7 @@ from collections import namedtuple
 
 import six
 import yaml
+from cached_property import cached_property
 
 from ..const import COMPOSEFILE_VERSIONS
 from .errors import CircularReference
@@ -119,11 +120,23 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
     def from_filename(cls, filename):
         return cls(filename, load_yaml(filename))
 
-    def get_service_dicts(self, version):
-        return self.config if version == 1 else self.config.get('services', {})
+    @cached_property
+    def version(self):
+        if self.config is None:
+            return 1
+        version = self.config.get('version', 1)
+        if isinstance(version, dict):
+            log.warn("Unexpected type for field 'version', in file {} assuming "
+                     "version is the name of a service, and defaulting to "
+                     "Compose file version 1".format(self.filename))
+            return 1
+        return version
 
-    def get_volumes(self, version):
-        return {} if version == 1 else self.config.get('volumes', {})
+    def get_service_dicts(self):
+        return self.config if self.version == 1 else self.config.get('services', {})
+
+    def get_volumes(self):
+        return {} if self.version == 1 else self.config.get('volumes', {})
 
 
 class Config(namedtuple('_Config', 'version services volumes')):
@@ -168,32 +181,24 @@ def find(base_dir, filenames):
         [ConfigFile.from_filename(f) for f in filenames])
 
 
-def get_config_version(config_details):
-    def get_version(config):
-        if config.config is None:
-            return 1
-        version = config.config.get('version', 1)
-        if isinstance(version, dict):
-            # in that case 'version' is probably a service name, so assume
-            # this is a legacy (version=1) file
-            version = 1
-        return version
-
+def validate_config_version(config_details):
     main_file = config_details.config_files[0]
     validate_top_level_object(main_file)
-    version = get_version(main_file)
     for next_file in config_details.config_files[1:]:
         validate_top_level_object(next_file)
-        next_file_version = get_version(next_file)
 
-        if version != next_file_version and next_file_version is not None:
+        if main_file.version != next_file.version:
             raise ConfigurationError(
-                "Version mismatch: main file {0} specifies version {1} but "
+                "Version mismatch: file {0} specifies version {1} but "
                 "extension file {2} uses version {3}".format(
-                    main_file.filename, version, next_file.filename, next_file_version
-                )
-            )
-    return version
+                    main_file.filename,
+                    main_file.version,
+                    next_file.filename,
+                    next_file.version))
+
+    if main_file.version not in COMPOSEFILE_VERSIONS:
+        raise ConfigurationError(
+            'Invalid Compose file version: {0}'.format(main_file.version))
 
 
 def get_default_config_files(base_dir):
@@ -242,23 +247,22 @@ def load(config_details):
 
     Return a fully interpolated, extended and validated configuration.
     """
-    version = get_config_version(config_details)
-    if version not in COMPOSEFILE_VERSIONS:
-        raise ConfigurationError('Invalid config version provided: {0}'.format(version))
+    validate_config_version(config_details)
 
     processed_files = [
-        process_config_file(config_file, version=version)
+        process_config_file(config_file)
         for config_file in config_details.config_files
     ]
     config_details = config_details._replace(config_files=processed_files)
 
+    main_file = config_details.config_files[0]
     volumes = load_volumes(config_details.config_files)
     service_dicts = load_services(
         config_details.working_dir,
-        config_details.config_files[0].filename,
-        [file.get_service_dicts(version) for file in config_details.config_files],
-        version)
-    return Config(version, service_dicts, volumes)
+        main_file.filename,
+        [file.get_service_dicts() for file in config_details.config_files],
+        main_file.version)
+    return Config(main_file.version, service_dicts, volumes)
 
 
 def load_volumes(config_files):
@@ -328,27 +332,28 @@ def load_services(working_dir, filename, service_configs, version):
     return build_services(service_config)
 
 
-def process_config_file(config_file, version, service_name=None):
-    service_dicts = config_file.get_service_dicts(version)
-    validate_top_level_service_objects(
-        config_file.filename, service_dicts
-    )
+def process_config_file(config_file, service_name=None):
+    service_dicts = config_file.get_service_dicts()
+    validate_top_level_service_objects(config_file.filename, service_dicts)
+
+    # TODO: interpolate config in volumes/network sections as well
     interpolated_config = interpolate_environment_variables(service_dicts)
-    if version == 2:
+
+    if config_file.version == 2:
         processed_config = dict(config_file.config)
         processed_config.update({'services': interpolated_config})
-    if version == 1:
+    if config_file.version == 1:
         processed_config = interpolated_config
-    validate_against_fields_schema(
-        processed_config, config_file.filename, version
-    )
+
+    config_file = config_file._replace(config=processed_config)
+    validate_against_fields_schema(config_file)
 
     if service_name and service_name not in processed_config:
         raise ConfigurationError(
             "Cannot extend service '{}' in {}: Service not found".format(
                 service_name, config_file.filename))
 
-    return config_file._replace(config=processed_config)
+    return config_file
 
 
 class ServiceExtendsResolver(object):
@@ -385,8 +390,7 @@ class ServiceExtendsResolver(object):
 
         extended_file = process_config_file(
             ConfigFile.from_filename(config_path),
-            version=self.version, service_name=service_name
-        )
+            service_name=service_name)
         service_config = extended_file.config[service_name]
         return config_path, service_config, service_name
 
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 74ae5c9c..0bf75691 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -105,8 +105,7 @@ def validate_top_level_service_objects(filename, service_dicts):
 def validate_top_level_object(config_file):
     if not isinstance(config_file.config, dict):
         raise ConfigurationError(
-            "Top level object in '{}' needs to be an object not '{}'. Check "
-            "that you have defined a service at the top level.".format(
+            "Top level object in '{}' needs to be an object not '{}'.".format(
                 config_file.filename,
                 type(config_file.config)))
 
@@ -291,13 +290,13 @@ def process_errors(errors, service_name=None):
     return '\n'.join(format_error_message(error, service_name) for error in errors)
 
 
-def validate_against_fields_schema(config, filename, version):
-    schema_filename = "fields_schema_v{0}.json".format(version)
+def validate_against_fields_schema(config_file):
+    schema_filename = "fields_schema_v{0}.json".format(config_file.version)
     _validate_against_schema(
-        config,
+        config_file.config,
         schema_filename,
         format_checker=["ports", "expose", "bool-value-in-mapping"],
-        filename=filename)
+        filename=config_file.filename)
 
 
 def validate_against_service_schema(config, service_name, version):
diff --git a/requirements.txt b/requirements.txt
index 313c6b7a..563baa10 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 PyYAML==3.11
+cached-property==1.2.0
 dockerpty==0.3.4
 docopt==0.6.1
 enum34==1.0.4
diff --git a/setup.py b/setup.py
index bd6f201d..f159d2b1 100644
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
+    'cached-property >= 1.2.0',
     'docopt >= 0.6.1, < 0.7',
     'PyYAML >= 3.10, < 4',
     'requests >= 2.6.1, < 2.8',

From b76dc1e05ecfa2ab95ef58ae62072afbf354abda Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 13 Jan 2016 14:41:34 -0500
Subject: [PATCH 0655/1265] Require volumes_from a container to be explicit in
 V2 config.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py                | 16 +++++---
 compose/config/types.py                 | 44 +++++++++++++++++++--
 compose/project.py                      | 52 ++++++++++++++-----------
 setup.py                                |  2 +-
 tests/integration/project_test.py       |  2 +-
 tests/integration/service_test.py       |  4 +-
 tests/unit/config/config_test.py        |  2 +-
 tests/unit/config/sort_services_test.py |  6 +--
 tests/unit/config/types_test.py         | 45 +++++++++++++++++++++
 tests/unit/project_test.py              | 17 ++++----
 tests/unit/service_test.py              | 29 +++++++++++---
 11 files changed, 166 insertions(+), 53 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 203c4e9e..8383fb5c 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -292,7 +292,7 @@ def load_volumes(config_files):
 
 
 def load_services(working_dir, filename, service_configs, version):
-    def build_service(service_name, service_dict):
+    def build_service(service_name, service_dict, service_names):
         service_config = ServiceConfig.with_abs_paths(
             working_dir,
             filename,
@@ -305,13 +305,17 @@ def load_services(working_dir, filename, service_configs, version):
         validate_against_service_schema(service_dict, service_config.name, version)
         validate_paths(service_dict)
 
-        service_dict = finalize_service(service_config._replace(config=service_dict))
+        service_dict = finalize_service(
+            service_config._replace(config=service_dict),
+            service_names,
+            version)
         service_dict['name'] = service_config.name
         return service_dict
 
     def build_services(service_config):
+        service_names = service_config.keys()
         return sort_service_dicts([
-            build_service(name, service_dict)
+            build_service(name, service_dict, service_names)
             for name, service_dict in service_config.items()
         ])
 
@@ -504,7 +508,7 @@ def process_service(service_config):
     return service_dict
 
 
-def finalize_service(service_config):
+def finalize_service(service_config, service_names, version):
     service_dict = dict(service_config.config)
 
     if 'environment' in service_dict or 'env_file' in service_dict:
@@ -513,7 +517,9 @@ def finalize_service(service_config):
 
     if 'volumes_from' in service_dict:
         service_dict['volumes_from'] = [
-            VolumeFromSpec.parse(vf) for vf in service_dict['volumes_from']]
+            VolumeFromSpec.parse(vf, service_names, version)
+            for vf in service_dict['volumes_from']
+        ]
 
     if 'volumes' in service_dict:
         service_dict['volumes'] = [
diff --git a/compose/config/types.py b/compose/config/types.py
index cec1f6cf..64e356fa 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -11,10 +11,16 @@ from compose.config.errors import ConfigurationError
 from compose.const import IS_WINDOWS_PLATFORM
 
 
-class VolumeFromSpec(namedtuple('_VolumeFromSpec', 'source mode')):
+class VolumeFromSpec(namedtuple('_VolumeFromSpec', 'source mode type')):
+
+    # TODO: drop service_names arg when v1 is removed
+    @classmethod
+    def parse(cls, volume_from_config, service_names, version):
+        func = cls.parse_v1 if version == 1 else cls.parse_v2
+        return func(service_names, volume_from_config)
 
     @classmethod
-    def parse(cls, volume_from_config):
+    def parse_v1(cls, service_names, volume_from_config):
         parts = volume_from_config.split(':')
         if len(parts) > 2:
             raise ConfigurationError(
@@ -27,7 +33,39 @@ class VolumeFromSpec(namedtuple('_VolumeFromSpec', 'source mode')):
         else:
             source, mode = parts
 
-        return cls(source, mode)
+        type = 'service' if source in service_names else 'container'
+        return cls(source, mode, type)
+
+    @classmethod
+    def parse_v2(cls, service_names, volume_from_config):
+        parts = volume_from_config.split(':')
+        if len(parts) > 3:
+            raise ConfigurationError(
+                "volume_from {} has incorrect format, should be one of "
+                "'<service name>[:<mode>]' or "
+                "'container:<container name>[:<mode>]'".format(volume_from_config))
+
+        if len(parts) == 1:
+            source = parts[0]
+            return cls(source, 'rw', 'service')
+
+        if len(parts) == 2:
+            if parts[0] == 'container':
+                type, source = parts
+                return cls(source, 'rw', type)
+
+            source, mode = parts
+            return cls(source, mode, 'service')
+
+        if len(parts) == 3:
+            type, source, mode = parts
+            if type not in ('service', 'container'):
+                raise ConfigurationError(
+                    "Unknown volumes_from type '{}' in '{}'".format(
+                        type,
+                        volume_from_config))
+
+        return cls(source, mode, type)
 
 
 def parse_restart_spec(restart_config):
diff --git a/compose/project.py b/compose/project.py
index e882713c..06f9eaea 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -60,7 +60,7 @@ class Project(object):
 
         for service_dict in config_data.services:
             links = project.get_links(service_dict)
-            volumes_from = project.get_volumes_from(service_dict)
+            volumes_from = get_volumes_from(project, service_dict)
             net = project.get_net(service_dict)
 
             project.services.append(
@@ -162,28 +162,6 @@ class Project(object):
             del service_dict['links']
         return links
 
-    def get_volumes_from(self, service_dict):
-        volumes_from = []
-        if 'volumes_from' in service_dict:
-            for volume_from_spec in service_dict.get('volumes_from', []):
-                # Get service
-                try:
-                    service = self.get_service(volume_from_spec.source)
-                    volume_from_spec = volume_from_spec._replace(source=service)
-                except NoSuchService:
-                    try:
-                        container = Container.from_id(self.client, volume_from_spec.source)
-                        volume_from_spec = volume_from_spec._replace(source=container)
-                    except APIError:
-                        raise ConfigurationError(
-                            'Service "%s" mounts volumes from "%s", which is '
-                            'not the name of a service or container.' % (
-                                service_dict['name'],
-                                volume_from_spec.source))
-                volumes_from.append(volume_from_spec)
-            del service_dict['volumes_from']
-        return volumes_from
-
     def get_net(self, service_dict):
         net = service_dict.pop('net', None)
         if not net:
@@ -465,6 +443,34 @@ def remove_links(service_dicts):
         del s['links']
 
 
+def get_volumes_from(project, service_dict):
+    volumes_from = service_dict.pop('volumes_from', None)
+    if not volumes_from:
+        return []
+
+    def build_volume_from(spec):
+        if spec.type == 'service':
+            try:
+                return spec._replace(source=project.get_service(spec.source))
+            except NoSuchService:
+                pass
+
+        if spec.type == 'container':
+            try:
+                container = Container.from_id(project.client, spec.source)
+                return spec._replace(source=container)
+            except APIError:
+                pass
+
+        raise ConfigurationError(
+            "Service \"{}\" mounts volumes from \"{}\", which is not the name "
+            "of a service or container.".format(
+                service_dict['name'],
+                spec.source))
+
+    return [build_volume_from(vf) for vf in volumes_from]
+
+
 class NoSuchService(Exception):
     def __init__(self, name):
         self.name = name
diff --git a/setup.py b/setup.py
index f159d2b1..b365e05b 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'cached-property >= 1.2.0',
+    'cached-property >= 1.2.0, < 2',
     'docopt >= 0.6.1, < 0.7',
     'PyYAML >= 3.10, < 4',
     'requests >= 2.6.1, < 2.8',
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 467eb786..535a9775 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -81,7 +81,7 @@ class ProjectTest(DockerClientTestCase):
         )
         db = project.get_service('db')
         data = project.get_service('data')
-        self.assertEqual(db.volumes_from, [VolumeFromSpec(data, 'rw')])
+        self.assertEqual(db.volumes_from, [VolumeFromSpec(data, 'rw', 'service')])
 
     def test_volumes_from_container(self):
         data_container = Container.create(
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 4818e47a..4ba1b635 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -224,8 +224,8 @@ class ServiceTest(DockerClientTestCase):
         host_service = self.create_service(
             'host',
             volumes_from=[
-                VolumeFromSpec(volume_service, 'rw'),
-                VolumeFromSpec(volume_container_2, 'rw')
+                VolumeFromSpec(volume_service, 'rw', 'service'),
+                VolumeFromSpec(volume_container_2, 'rw', 'container')
             ]
         )
         host_container = host_service.create_container()
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 77c55ad9..f0d432d5 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -19,7 +19,7 @@ from compose.const import IS_WINDOWS_PLATFORM
 from tests import mock
 from tests import unittest
 
-DEFAULT_VERSION = 2
+DEFAULT_VERSION = V2 = 2
 V1 = 1
 
 
diff --git a/tests/unit/config/sort_services_test.py b/tests/unit/config/sort_services_test.py
index c2ebbc67..ebe444fe 100644
--- a/tests/unit/config/sort_services_test.py
+++ b/tests/unit/config/sort_services_test.py
@@ -77,7 +77,7 @@ class SortServiceTest(unittest.TestCase):
             },
             {
                 'name': 'parent',
-                'volumes_from': [VolumeFromSpec('child', 'rw')]
+                'volumes_from': [VolumeFromSpec('child', 'rw', 'service')]
             },
             {
                 'links': ['parent'],
@@ -120,7 +120,7 @@ class SortServiceTest(unittest.TestCase):
             },
             {
                 'name': 'parent',
-                'volumes_from': [VolumeFromSpec('child', 'ro')]
+                'volumes_from': [VolumeFromSpec('child', 'ro', 'service')]
             },
             {
                 'name': 'child'
@@ -145,7 +145,7 @@ class SortServiceTest(unittest.TestCase):
             },
             {
                 'name': 'two',
-                'volumes_from': [VolumeFromSpec('one', 'rw')]
+                'volumes_from': [VolumeFromSpec('one', 'rw', 'service')]
             },
             {
                 'name': 'one'
diff --git a/tests/unit/config/types_test.py b/tests/unit/config/types_test.py
index 245b854f..214a0e31 100644
--- a/tests/unit/config/types_test.py
+++ b/tests/unit/config/types_test.py
@@ -5,8 +5,11 @@ import pytest
 
 from compose.config.errors import ConfigurationError
 from compose.config.types import parse_extra_hosts
+from compose.config.types import VolumeFromSpec
 from compose.config.types import VolumeSpec
 from compose.const import IS_WINDOWS_PLATFORM
+from tests.unit.config.config_test import V1
+from tests.unit.config.config_test import V2
 
 
 def test_parse_extra_hosts_list():
@@ -67,3 +70,45 @@ class TestVolumeSpec(object):
             "/opt/shiny/config",
             "ro"
         )
+
+
+class TestVolumesFromSpec(object):
+
+    services = ['servicea', 'serviceb']
+
+    def test_parse_v1_from_service(self):
+        volume_from = VolumeFromSpec.parse('servicea', self.services, V1)
+        assert volume_from == VolumeFromSpec('servicea', 'rw', 'service')
+
+    def test_parse_v1_from_container(self):
+        volume_from = VolumeFromSpec.parse('foo:ro', self.services, V1)
+        assert volume_from == VolumeFromSpec('foo', 'ro', 'container')
+
+    def test_parse_v1_invalid(self):
+        with pytest.raises(ConfigurationError):
+            VolumeFromSpec.parse('unknown:format:ro', self.services, V1)
+
+    def test_parse_v2_from_service(self):
+        volume_from = VolumeFromSpec.parse('servicea', self.services, V2)
+        assert volume_from == VolumeFromSpec('servicea', 'rw', 'service')
+
+    def test_parse_v2_from_service_with_mode(self):
+        volume_from = VolumeFromSpec.parse('servicea:ro', self.services, V2)
+        assert volume_from == VolumeFromSpec('servicea', 'ro', 'service')
+
+    def test_parse_v2_from_container(self):
+        volume_from = VolumeFromSpec.parse('container:foo', self.services, V2)
+        assert volume_from == VolumeFromSpec('foo', 'rw', 'container')
+
+    def test_parse_v2_from_container_with_mode(self):
+        volume_from = VolumeFromSpec.parse('container:foo:ro', self.services, V2)
+        assert volume_from == VolumeFromSpec('foo', 'ro', 'container')
+
+    def test_parse_v2_invalid_type(self):
+        with pytest.raises(ConfigurationError) as exc:
+            VolumeFromSpec.parse('bogus:foo:ro', self.services, V2)
+        assert "Unknown volumes_from type 'bogus'" in exc.exconly()
+
+    def test_parse_v2_invalid(self):
+        with pytest.raises(ConfigurationError):
+            VolumeFromSpec.parse('unknown:format:ro', self.services, V2)
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index f63135ae..861f9656 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -165,10 +165,10 @@ class ProjectTest(unittest.TestCase):
             {
                 'name': 'test',
                 'image': 'busybox:latest',
-                'volumes_from': [VolumeFromSpec('aaa', 'rw')]
+                'volumes_from': [VolumeFromSpec('aaa', 'rw', 'container')]
             }
         ], None), self.mock_client)
-        self.assertEqual(project.get_service('test')._get_volumes_from(), [container_id + ":rw"])
+        assert project.get_service('test')._get_volumes_from() == [container_id + ":rw"]
 
     def test_use_volumes_from_service_no_container(self):
         container_name = 'test_vol_1'
@@ -188,10 +188,10 @@ class ProjectTest(unittest.TestCase):
             {
                 'name': 'test',
                 'image': 'busybox:latest',
-                'volumes_from': [VolumeFromSpec('vol', 'rw')]
+                'volumes_from': [VolumeFromSpec('vol', 'rw', 'service')]
             }
         ], None), self.mock_client)
-        self.assertEqual(project.get_service('test')._get_volumes_from(), [container_name + ":rw"])
+        assert project.get_service('test')._get_volumes_from() == [container_name + ":rw"]
 
     def test_use_volumes_from_service_container(self):
         container_ids = ['aabbccddee', '12345']
@@ -204,16 +204,17 @@ class ProjectTest(unittest.TestCase):
             {
                 'name': 'test',
                 'image': 'busybox:latest',
-                'volumes_from': [VolumeFromSpec('vol', 'rw')]
+                'volumes_from': [VolumeFromSpec('vol', 'rw', 'service')]
             }
         ], None), None)
         with mock.patch.object(Service, 'containers') as mock_return:
             mock_return.return_value = [
                 mock.Mock(id=container_id, spec=Container)
                 for container_id in container_ids]
-            self.assertEqual(
-                project.get_service('test')._get_volumes_from(),
-                [container_ids[0] + ':rw'])
+            assert (
+                project.get_service('test')._get_volumes_from() ==
+                [container_ids[0] + ':rw']
+            )
 
     def test_events(self):
         services = [Service(name='web'), Service(name='db')]
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 63cf658e..9845ebc6 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -70,7 +70,11 @@ class ServiceTest(unittest.TestCase):
         service = Service(
             'test',
             image='foo',
-            volumes_from=[VolumeFromSpec(mock.Mock(id=container_id, spec=Container), 'rw')])
+            volumes_from=[
+                VolumeFromSpec(
+                    mock.Mock(id=container_id, spec=Container),
+                    'rw',
+                    'container')])
 
         self.assertEqual(service._get_volumes_from(), [container_id + ':rw'])
 
@@ -79,7 +83,11 @@ class ServiceTest(unittest.TestCase):
         service = Service(
             'test',
             image='foo',
-            volumes_from=[VolumeFromSpec(mock.Mock(id=container_id, spec=Container), 'ro')])
+            volumes_from=[
+                VolumeFromSpec(
+                    mock.Mock(id=container_id, spec=Container),
+                    'ro',
+                    'container')])
 
         self.assertEqual(service._get_volumes_from(), [container_id + ':ro'])
 
@@ -90,7 +98,10 @@ class ServiceTest(unittest.TestCase):
             mock.Mock(id=container_id, spec=Container)
             for container_id in container_ids
         ]
-        service = Service('test', volumes_from=[VolumeFromSpec(from_service, 'rw')], image='foo')
+        service = Service(
+            'test',
+            volumes_from=[VolumeFromSpec(from_service, 'rw', 'service')],
+            image='foo')
 
         self.assertEqual(service._get_volumes_from(), [container_ids[0] + ":rw"])
 
@@ -102,7 +113,10 @@ class ServiceTest(unittest.TestCase):
                 mock.Mock(id=container_id.split(':')[0], spec=Container)
                 for container_id in container_ids
             ]
-            service = Service('test', volumes_from=[VolumeFromSpec(from_service, mode)], image='foo')
+            service = Service(
+                'test',
+                volumes_from=[VolumeFromSpec(from_service, mode, 'service')],
+                image='foo')
 
             self.assertEqual(service._get_volumes_from(), [container_ids[0]])
 
@@ -113,7 +127,10 @@ class ServiceTest(unittest.TestCase):
         from_service.create_container.return_value = mock.Mock(
             id=container_id,
             spec=Container)
-        service = Service('test', image='foo', volumes_from=[VolumeFromSpec(from_service, 'rw')])
+        service = Service(
+            'test',
+            image='foo',
+            volumes_from=[VolumeFromSpec(from_service, 'rw', 'service')])
 
         self.assertEqual(service._get_volumes_from(), [container_id + ':rw'])
         from_service.create_container.assert_called_once_with()
@@ -389,7 +406,7 @@ class ServiceTest(unittest.TestCase):
             client=self.mock_client,
             net=ServiceNet(Service('other')),
             links=[(Service('one'), 'one')],
-            volumes_from=[VolumeFromSpec(Service('two'), 'rw')])
+            volumes_from=[VolumeFromSpec(Service('two'), 'rw', 'service')])
 
         config_dict = service.config_dict()
         expected = {

From 69ed5f9c48a5fe419ac041239659fe69304fe4a9 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 17 Dec 2015 17:49:48 +0000
Subject: [PATCH 0656/1265] Specify networks in Compose file

There's not yet a proper way for services to join networks

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py                           |   3 +-
 compose/config/config.py                      |  43 +--
 compose/config/fields_schema_v2.json          |  13 +
 compose/network.py                            |  57 ++++
 compose/project.py                            | 127 ++++-----
 tests/acceptance/cli_test.py                  |  19 +-
 tests/fixtures/networks/docker-compose.yml    |   7 +
 .../no-links-composefile/docker-compose.yml   |   9 +
 tests/integration/project_test.py             | 113 ++++----
 tests/unit/project_test.py                    | 248 +++++++++++-------
 10 files changed, 400 insertions(+), 239 deletions(-)
 create mode 100644 compose/network.py
 create mode 100644 tests/fixtures/networks/docker-compose.yml
 create mode 100644 tests/fixtures/no-links-composefile/docker-compose.yml

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 9957d391..62abcb10 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -696,8 +696,7 @@ def run_one_off_container(container_options, project, service, options):
                 start_deps=True,
                 strategy=ConvergenceStrategy.never)
 
-    if project.use_networking:
-        project.ensure_network_exists()
+    project.initialize_networks()
 
     container = service.create_container(
         quiet=True,
diff --git a/compose/config/config.py b/compose/config/config.py
index 8383fb5c..c8d93faf 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -139,14 +139,16 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
         return {} if self.version == 1 else self.config.get('volumes', {})
 
 
-class Config(namedtuple('_Config', 'version services volumes')):
+class Config(namedtuple('_Config', 'version services volumes networks')):
     """
     :param version: configuration version
     :type  version: int
     :param services: List of service description dictionaries
     :type  services: :class:`list`
-    :param volumes: List of volume description dictionaries
-    :type  volumes: :class:`list`
+    :param volumes: Dictionary mapping volume names to description dictionaries
+    :type  volumes: :class:`dict`
+    :param networks: Dictionary mapping network names to description dictionaries
+    :type  networks: :class:`dict`
     """
 
 
@@ -256,39 +258,44 @@ def load(config_details):
     config_details = config_details._replace(config_files=processed_files)
 
     main_file = config_details.config_files[0]
-    volumes = load_volumes(config_details.config_files)
+    volumes = load_mapping(config_details.config_files, 'volumes', 'Volume')
+    networks = load_mapping(config_details.config_files, 'networks', 'Network')
     service_dicts = load_services(
         config_details.working_dir,
         main_file.filename,
         [file.get_service_dicts() for file in config_details.config_files],
         main_file.version)
-    return Config(main_file.version, service_dicts, volumes)
+    return Config(main_file.version, service_dicts, volumes, networks)
 
 
-def load_volumes(config_files):
-    volumes = {}
+def load_mapping(config_files, key, entity_type):
+    mapping = {}
+
     for config_file in config_files:
-        for name, volume_config in config_file.get_volumes().items():
-            volumes[name] = volume_config or {}
-            if not volume_config:
+        for name, config in config_file.config.get(key, {}).items():
+            mapping[name] = config or {}
+            if not config:
                 continue
 
-            external = volume_config.get('external')
+            external = config.get('external')
             if external:
-                if len(volume_config.keys()) > 1:
+                if len(config.keys()) > 1:
                     raise ConfigurationError(
-                        'Volume {0} declared as external but specifies'
-                        ' additional attributes ({1}). '.format(
+                        '{} {} declared as external but specifies'
+                        ' additional attributes ({}). '.format(
+                            entity_type,
                             name,
-                            ', '.join([k for k in volume_config.keys() if k != 'external'])
+                            ', '.join([k for k in config.keys() if k != 'external'])
                         )
                     )
                 if isinstance(external, dict):
-                    volume_config['external_name'] = external.get('name')
+                    config['external_name'] = external.get('name')
                 else:
-                    volume_config['external_name'] = name
+                    config['external_name'] = name
 
-    return volumes
+            mapping[name] = config
+
+    return mapping
 
 
 def load_services(working_dir, filename, service_configs, version):
diff --git a/compose/config/fields_schema_v2.json b/compose/config/fields_schema_v2.json
index 25126ed1..b0f304e8 100644
--- a/compose/config/fields_schema_v2.json
+++ b/compose/config/fields_schema_v2.json
@@ -17,6 +17,15 @@
       },
       "additionalProperties": false
     },
+    "networks": {
+      "id": "#/properties/networks",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/network"
+        }
+      }
+    },
     "volumes": {
       "id": "#/properties/volumes",
       "type": "object",
@@ -30,6 +39,10 @@
   },
 
   "definitions": {
+    "network": {
+      "id": "#/definitions/network",
+      "type": "object"
+    },
     "volume": {
       "id": "#/definitions/volume",
       "type": ["object", "null"],
diff --git a/compose/network.py b/compose/network.py
new file mode 100644
index 00000000..0b4e40c6
--- /dev/null
+++ b/compose/network.py
@@ -0,0 +1,57 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import logging
+
+from docker.errors import NotFound
+
+from .config import ConfigurationError
+
+
+log = logging.getLogger(__name__)
+
+
+class Network(object):
+    def __init__(self, client, project, name, driver=None, driver_opts=None):
+        self.client = client
+        self.project = project
+        self.name = name
+        self.driver = driver
+        self.driver_opts = driver_opts
+
+    def ensure(self):
+        try:
+            data = self.inspect()
+            if self.driver and data['Driver'] != self.driver:
+                raise ConfigurationError(
+                    'Network {} needs to be recreated - driver has changed'
+                    .format(self.full_name))
+            if data['Options'] != (self.driver_opts or {}):
+                raise ConfigurationError(
+                    'Network {} needs to be recreated - options have changed'
+                    .format(self.full_name))
+        except NotFound:
+            driver_name = 'the default driver'
+            if self.driver:
+                driver_name = 'driver "{}"'.format(self.driver)
+
+            log.info(
+                'Creating network "{}" with {}'
+                .format(self.full_name, driver_name)
+            )
+
+            self.client.create_network(
+                self.full_name, self.driver, self.driver_opts
+            )
+
+    def remove(self):
+        # TODO: don't remove external networks
+        log.info("Removing network {}".format(self.full_name))
+        self.client.remove_network(self.full_name)
+
+    def inspect(self):
+        return self.client.inspect_network(self.full_name)
+
+    @property
+    def full_name(self):
+        return '{0}_{1}'.format(self.project, self.name)
diff --git a/compose/project.py b/compose/project.py
index 3e7c5afd..10d457a7 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -17,6 +17,7 @@ from .const import LABEL_ONE_OFF
 from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
 from .container import Container
+from .network import Network
 from .service import ContainerNet
 from .service import ConvergenceStrategy
 from .service import Net
@@ -33,12 +34,14 @@ class Project(object):
     """
     A collection of services.
     """
-    def __init__(self, name, services, client, volumes=None, use_networking=False, network_driver=None):
+    def __init__(self, name, services, client, networks=None, volumes=None,
+                 use_networking=False, network_driver=None):
         self.name = name
         self.services = services
         self.client = client
         self.use_networking = use_networking
         self.network_driver = network_driver
+        self.networks = networks or []
         self.volumes = volumes or []
 
     def labels(self, one_off=False):
@@ -55,9 +58,6 @@ class Project(object):
         use_networking = (config_data.version and config_data.version >= 2)
         project = cls(name, [], client, use_networking=use_networking)
 
-        if use_networking:
-            remove_links(config_data.services)
-
         for service_dict in config_data.services:
             links = project.get_links(service_dict)
             volumes_from = get_volumes_from(project, service_dict)
@@ -72,6 +72,16 @@ class Project(object):
                     net=net,
                     volumes_from=volumes_from,
                     **service_dict))
+
+        if config_data.networks:
+            for network_name, data in config_data.networks.items():
+                project.networks.append(
+                    Network(
+                        client=client, project=name, name=network_name,
+                        driver=data.get('driver'), driver_opts=data.get('driver_opts')
+                    )
+                )
+
         if config_data.volumes:
             for vol_name, data in config_data.volumes.items():
                 project.volumes.append(
@@ -82,6 +92,7 @@ class Project(object):
                         external_name=data.get('external_name')
                     )
                 )
+
         return project
 
     @property
@@ -124,20 +135,18 @@ class Project(object):
         Raises NoSuchService if any of the named services do not exist.
         """
         if service_names is None or len(service_names) == 0:
-            return self.get_services(
-                service_names=self.service_names,
-                include_deps=include_deps
-            )
-        else:
-            unsorted = [self.get_service(name) for name in service_names]
-            services = [s for s in self.services if s in unsorted]
+            service_names = self.service_names
 
-            if include_deps:
-                services = reduce(self._inject_deps, services, [])
+        unsorted = [self.get_service(name) for name in service_names]
+        services = [s for s in self.services if s in unsorted]
 
-            uniques = []
-            [uniques.append(s) for s in services if s not in uniques]
-            return uniques
+        if include_deps:
+            services = reduce(self._inject_deps, services, [])
+
+        uniques = []
+        [uniques.append(s) for s in services if s not in uniques]
+
+        return uniques
 
     def get_services_without_duplicate(self, service_names=None, include_deps=False):
         services = self.get_services(service_names, include_deps)
@@ -166,7 +175,7 @@ class Project(object):
         net = service_dict.pop('net', None)
         if not net:
             if self.use_networking:
-                return Net(self.default_network_name)
+                return Net(self.default_network.full_name)
             return Net(None)
 
         net_name = get_service_name_from_net(net)
@@ -251,7 +260,7 @@ class Project(object):
     def down(self, remove_image_type, include_volumes):
         self.stop()
         self.remove_stopped(v=include_volumes)
-        self.remove_network()
+        self.remove_default_network()
 
         if include_volumes:
             self.remove_volumes()
@@ -262,10 +271,34 @@ class Project(object):
         for service in self.get_services():
             service.remove_image(remove_image_type)
 
+    def remove_default_network(self):
+        if not self.use_networking:
+            return
+        if self.uses_default_network():
+            self.default_network.remove()
+
     def remove_volumes(self):
         for volume in self.volumes:
             volume.remove()
 
+    def initialize_networks(self):
+        networks = self.networks
+        if self.uses_default_network():
+            networks.append(self.default_network)
+
+        for network in networks:
+            network.ensure()
+
+    def uses_default_network(self):
+        return any(
+            service.net.mode == self.default_network.full_name
+            for service in self.services
+        )
+
+    @property
+    def default_network(self):
+        return Network(client=self.client, project=self.name, name='default')
+
     def restart(self, service_names=None, **options):
         containers = self.containers(service_names, stopped=True)
         parallel.parallel_restart(containers, options)
@@ -335,9 +368,7 @@ class Project(object):
 
         plans = self._get_convergence_plans(services, strategy)
 
-        if self.use_networking and self.uses_default_network():
-            self.ensure_network_exists()
-
+        self.initialize_networks()
         self.initialize_volumes()
 
         return [
@@ -395,40 +426,6 @@ class Project(object):
 
         return [c for c in containers if matches_service_names(c)]
 
-    def get_network(self):
-        try:
-            return self.client.inspect_network(self.default_network_name)
-        except NotFound:
-            return None
-
-    def ensure_network_exists(self):
-        # TODO: recreate network if driver has changed?
-        if self.get_network() is None:
-            driver_name = 'the default driver'
-            if self.network_driver:
-                driver_name = 'driver "{}"'.format(self.network_driver)
-
-            log.info(
-                'Creating network "{}" with {}'
-                .format(self.default_network_name, driver_name)
-            )
-            self.client.create_network(self.default_network_name, driver=self.network_driver)
-
-    def remove_network(self):
-        if not self.use_networking:
-            return
-        network = self.get_network()
-        if network:
-            log.info("Removing network %s", self.default_network_name)
-            self.client.remove_network(network['Id'])
-
-    def uses_default_network(self):
-        return any(service.net.mode == self.default_network_name for service in self.services)
-
-    @property
-    def default_network_name(self):
-        return '{}_default'.format(self.name)
-
     def _inject_deps(self, acc, service):
         dep_names = service.get_dependency_names()
 
@@ -444,26 +441,6 @@ class Project(object):
         return acc + dep_services
 
 
-def remove_links(service_dicts):
-    services_with_links = [s for s in service_dicts if 'links' in s]
-    if not services_with_links:
-        return
-
-    if len(services_with_links) == 1:
-        prefix = '"{}" defines'.format(services_with_links[0]['name'])
-    else:
-        prefix = 'Some services ({}) define'.format(
-            ", ".join('"{}"'.format(s['name']) for s in services_with_links))
-
-    log.warn(
-        '\n{} links, which are not compatible with Docker networking and will be ignored.\n'
-        'Future versions of Docker will not support links - you should remove them for '
-        'forwards-compatibility.\n'.format(prefix))
-
-    for s in services_with_links:
-        del s['links']
-
-
 def get_volumes_from(project, service_dict):
     volumes_from = service_dict.pop('volumes_from', None)
     if not volumes_from:
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index cb04918b..1e31988b 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -354,7 +354,7 @@ class CLITestCase(DockerClientTestCase):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['up', '-d'], None)
 
-        networks = self.client.networks(names=[self.project.default_network_name])
+        networks = self.client.networks(names=[self.project.default_network.full_name])
         self.assertEqual(len(networks), 0)
 
         for service in self.project.get_services():
@@ -371,7 +371,7 @@ class CLITestCase(DockerClientTestCase):
 
         services = self.project.get_services()
 
-        networks = self.client.networks(names=[self.project.default_network_name])
+        networks = self.client.networks(names=[self.project.default_network.full_name])
         for n in networks:
             self.addCleanup(self.client.remove_network, n['Id'])
         self.assertEqual(len(networks), 1)
@@ -388,6 +388,19 @@ class CLITestCase(DockerClientTestCase):
         web_container = self.project.get_service('simple').containers()[0]
         self.assertFalse(web_container.get('HostConfig.Links'))
 
+    def test_up_with_networks(self):
+        self.base_dir = 'tests/fixtures/networks'
+        self.dispatch(['up', '-d'], None)
+
+        networks = self.client.networks(names=[
+            '{}_{}'.format(self.project.name, n)
+            for n in ['foo', 'bar']])
+
+        self.assertEqual(len(networks), 2)
+
+        for net in networks:
+            self.assertEqual(net['Driver'], 'bridge')
+
     def test_up_with_links_is_invalid(self):
         self.base_dir = 'tests/fixtures/v2-simple'
 
@@ -698,7 +711,7 @@ class CLITestCase(DockerClientTestCase):
         self.dispatch(['run', 'simple', 'true'], None)
         service = self.project.get_service('simple')
         container, = service.containers(stopped=True, one_off=True)
-        networks = self.client.networks(names=[self.project.default_network_name])
+        networks = self.client.networks(names=[self.project.default_network.full_name])
         for n in networks:
             self.addCleanup(self.client.remove_network, n['Id'])
         self.assertEqual(len(networks), 1)
diff --git a/tests/fixtures/networks/docker-compose.yml b/tests/fixtures/networks/docker-compose.yml
new file mode 100644
index 00000000..c0795526
--- /dev/null
+++ b/tests/fixtures/networks/docker-compose.yml
@@ -0,0 +1,7 @@
+version: 2
+
+networks:
+  foo:
+    driver:
+
+  bar: {}
diff --git a/tests/fixtures/no-links-composefile/docker-compose.yml b/tests/fixtures/no-links-composefile/docker-compose.yml
new file mode 100644
index 00000000..75a6a085
--- /dev/null
+++ b/tests/fixtures/no-links-composefile/docker-compose.yml
@@ -0,0 +1,9 @@
+db:
+  image: busybox:latest
+  command: top
+web:
+  image: busybox:latest
+  command: top
+console:
+  image: busybox:latest
+  command: top
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 535a9775..ef8a084b 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -14,7 +14,6 @@ from compose.const import LABEL_PROJECT
 from compose.container import Container
 from compose.project import Project
 from compose.service import ConvergenceStrategy
-from compose.service import Net
 
 
 def build_service_dicts(service_config):
@@ -104,21 +103,6 @@ class ProjectTest(DockerClientTestCase):
         db = project.get_service('db')
         self.assertEqual(db._get_volumes_from(), [data_container.id + ':rw'])
 
-    def test_get_network_does_not_exist(self):
-        project = Project('composetest', [], self.client)
-        assert project.get_network() is None
-
-    def test_get_network(self):
-        project_name = 'network_does_exist'
-        network_name = '{}_default'.format(project_name)
-
-        project = Project(project_name, [], self.client)
-        self.client.create_network(network_name)
-        self.addCleanup(self.client.remove_network, network_name)
-
-        assert isinstance(project.get_network(), dict)
-        assert project.get_network()['Name'] == network_name
-
     def test_net_from_service(self):
         project = Project.from_config(
             name='composetest',
@@ -473,18 +457,6 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(project.get_service('data').containers(stopped=True)), 1)
         self.assertEqual(len(project.get_service('console').containers()), 0)
 
-    def test_project_up_with_custom_network(self):
-        network_name = 'composetest-custom'
-
-        self.client.create_network(network_name)
-        self.addCleanup(self.client.remove_network, network_name)
-
-        web = self.create_service('web', net=Net(network_name))
-        project = Project('composetest', [web], self.client, use_networking=True)
-        project.up()
-
-        assert project.get_network() is None
-
     def test_unscale_after_restart(self):
         web = self.create_service('web')
         project = Project('composetest', [web], self.client)
@@ -510,15 +482,50 @@ class ProjectTest(DockerClientTestCase):
         service = project.get_service('web')
         self.assertEqual(len(service.containers()), 1)
 
+    def test_project_up_networks(self):
+        config_data = config.Config(
+            version=2,
+            services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'command': 'top',
+            }],
+            volumes={},
+            networks={
+                'foo': {'driver': 'bridge'},
+                'bar': {'driver': None},
+                'baz': {},
+            },
+        )
+
+        project = Project.from_config(
+            client=self.client,
+            name='composetest',
+            config_data=config_data,
+        )
+        project.up()
+        self.assertEqual(len(project.containers()), 1)
+
+        for net_name in ['foo', 'bar', 'baz']:
+            full_net_name = 'composetest_{}'.format(net_name)
+            network_data = self.client.inspect_network(full_net_name)
+            self.assertEqual(network_data['Name'], full_net_name)
+
+        foo_data = self.client.inspect_network('composetest_foo')
+        self.assertEqual(foo_data['Driver'], 'bridge')
+
     def test_project_up_volumes(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
-            version=2, services=[{
+            version=2,
+            services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], volumes={vol_name: {'driver': 'local'}}
+            }],
+            volumes={vol_name: {'driver': 'local'}},
+            networks={},
         )
 
         project = Project.from_config(
@@ -587,11 +594,14 @@ class ProjectTest(DockerClientTestCase):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
-            version=2, services=[{
+            version=2,
+            services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], volumes={vol_name: {}}
+            }],
+            volumes={vol_name: {}},
+            networks={},
         )
 
         project = Project.from_config(
@@ -608,11 +618,14 @@ class ProjectTest(DockerClientTestCase):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
-            version=2, services=[{
+            version=2,
+            services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], volumes={vol_name: {}}
+            }],
+            volumes={vol_name: {}},
+            networks={},
         )
 
         project = Project.from_config(
@@ -629,11 +642,14 @@ class ProjectTest(DockerClientTestCase):
         vol_name = '{0:x}'.format(random.getrandbits(32))
 
         config_data = config.Config(
-            version=2, services=[{
+            version=2,
+            services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], volumes={vol_name: {'driver': 'foobar'}}
+            }],
+            volumes={vol_name: {'driver': 'foobar'}},
+            networks={},
         )
 
         project = Project.from_config(
@@ -648,11 +664,14 @@ class ProjectTest(DockerClientTestCase):
         full_vol_name = 'composetest_{0}'.format(vol_name)
 
         config_data = config.Config(
-            version=2, services=[{
+            version=2,
+            services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], volumes={vol_name: {'driver': 'local'}}
+            }],
+            volumes={vol_name: {'driver': 'local'}},
+            networks={},
         )
         project = Project.from_config(
             name='composetest',
@@ -683,13 +702,16 @@ class ProjectTest(DockerClientTestCase):
         full_vol_name = 'composetest_{0}'.format(vol_name)
         self.client.create_volume(vol_name)
         config_data = config.Config(
-            version=2, services=[{
+            version=2,
+            services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], volumes={
+            }],
+            volumes={
                 vol_name: {'external': True, 'external_name': vol_name}
-            }
+            },
+            networks=None,
         )
         project = Project.from_config(
             name='composetest',
@@ -704,13 +726,16 @@ class ProjectTest(DockerClientTestCase):
         vol_name = '{0:x}'.format(random.getrandbits(32))
 
         config_data = config.Config(
-            version=2, services=[{
+            version=2,
+            services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], volumes={
+            }],
+            volumes={
                 vol_name: {'external': True, 'external_name': vol_name}
-            }
+            },
+            networks=None,
         )
         project = Project.from_config(
             name='composetest',
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 861f9656..470e51ad 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -21,35 +21,27 @@ class ProjectTest(unittest.TestCase):
     def setUp(self):
         self.mock_client = mock.create_autospec(docker.Client)
 
-    def test_from_dict(self):
-        project = Project.from_config('composetest', Config(None, [
-            {
-                'name': 'web',
-                'image': 'busybox:latest'
-            },
-            {
-                'name': 'db',
-                'image': 'busybox:latest'
-            },
-        ], None), None)
-        self.assertEqual(len(project.services), 2)
-        self.assertEqual(project.get_service('web').name, 'web')
-        self.assertEqual(project.get_service('web').options['image'], 'busybox:latest')
-        self.assertEqual(project.get_service('db').name, 'db')
-        self.assertEqual(project.get_service('db').options['image'], 'busybox:latest')
-
     def test_from_config(self):
-        config = Config(None, [
-            {
-                'name': 'web',
-                'image': 'busybox:latest',
-            },
-            {
-                'name': 'db',
-                'image': 'busybox:latest',
-            },
-        ], None)
-        project = Project.from_config('composetest', config, None)
+        config = Config(
+            version=None,
+            services=[
+                {
+                    'name': 'web',
+                    'image': 'busybox:latest',
+                },
+                {
+                    'name': 'db',
+                    'image': 'busybox:latest',
+                },
+            ],
+            networks=None,
+            volumes=None,
+        )
+        project = Project.from_config(
+            name='composetest',
+            config_data=config,
+            client=None,
+        )
         self.assertEqual(len(project.services), 2)
         self.assertEqual(project.get_service('web').name, 'web')
         self.assertEqual(project.get_service('web').options['image'], 'busybox:latest')
@@ -58,16 +50,21 @@ class ProjectTest(unittest.TestCase):
         self.assertFalse(project.use_networking)
 
     def test_from_config_v2(self):
-        config = Config(2, [
-            {
-                'name': 'web',
-                'image': 'busybox:latest',
-            },
-            {
-                'name': 'db',
-                'image': 'busybox:latest',
-            },
-        ], None)
+        config = Config(
+            version=2,
+            services=[
+                {
+                    'name': 'web',
+                    'image': 'busybox:latest',
+                },
+                {
+                    'name': 'db',
+                    'image': 'busybox:latest',
+                },
+            ],
+            networks=None,
+            volumes=None,
+        )
         project = Project.from_config('composetest', config, None)
         self.assertEqual(len(project.services), 2)
         self.assertTrue(project.use_networking)
@@ -161,13 +158,20 @@ class ProjectTest(unittest.TestCase):
         container_id = 'aabbccddee'
         container_dict = dict(Name='aaa', Id=container_id)
         self.mock_client.inspect_container.return_value = container_dict
-        project = Project.from_config('test', Config(None, [
-            {
-                'name': 'test',
-                'image': 'busybox:latest',
-                'volumes_from': [VolumeFromSpec('aaa', 'rw', 'container')]
-            }
-        ], None), self.mock_client)
+        project = Project.from_config(
+            name='test',
+            client=self.mock_client,
+            config_data=Config(
+                version=None,
+                services=[{
+                    'name': 'test',
+                    'image': 'busybox:latest',
+                    'volumes_from': [VolumeFromSpec('aaa', 'rw', 'container')]
+                }],
+                networks=None,
+                volumes=None,
+            ),
+        )
         assert project.get_service('test')._get_volumes_from() == [container_id + ":rw"]
 
     def test_use_volumes_from_service_no_container(self):
@@ -180,33 +184,51 @@ class ProjectTest(unittest.TestCase):
                 "Image": 'busybox:latest'
             }
         ]
-        project = Project.from_config('test', Config(None, [
-            {
-                'name': 'vol',
-                'image': 'busybox:latest'
-            },
-            {
-                'name': 'test',
-                'image': 'busybox:latest',
-                'volumes_from': [VolumeFromSpec('vol', 'rw', 'service')]
-            }
-        ], None), self.mock_client)
+        project = Project.from_config(
+            name='test',
+            client=self.mock_client,
+            config_data=Config(
+                version=None,
+                services=[
+                    {
+                        'name': 'vol',
+                        'image': 'busybox:latest'
+                    },
+                    {
+                        'name': 'test',
+                        'image': 'busybox:latest',
+                        'volumes_from': [VolumeFromSpec('vol', 'rw', 'service')]
+                    }
+                ],
+                networks=None,
+                volumes=None,
+            ),
+        )
         assert project.get_service('test')._get_volumes_from() == [container_name + ":rw"]
 
     def test_use_volumes_from_service_container(self):
         container_ids = ['aabbccddee', '12345']
 
-        project = Project.from_config('test', Config(None, [
-            {
-                'name': 'vol',
-                'image': 'busybox:latest'
-            },
-            {
-                'name': 'test',
-                'image': 'busybox:latest',
-                'volumes_from': [VolumeFromSpec('vol', 'rw', 'service')]
-            }
-        ], None), None)
+        project = Project.from_config(
+            name='test',
+            client=None,
+            config_data=Config(
+                version=None,
+                services=[
+                    {
+                        'name': 'vol',
+                        'image': 'busybox:latest'
+                    },
+                    {
+                        'name': 'test',
+                        'image': 'busybox:latest',
+                        'volumes_from': [VolumeFromSpec('vol', 'rw', 'service')]
+                    }
+                ],
+                networks=None,
+                volumes=None,
+            ),
+        )
         with mock.patch.object(Service, 'containers') as mock_return:
             mock_return.return_value = [
                 mock.Mock(id=container_id, spec=Container)
@@ -313,12 +335,21 @@ class ProjectTest(unittest.TestCase):
         ]
 
     def test_net_unset(self):
-        project = Project.from_config('test', Config(None, [
-            {
-                'name': 'test',
-                'image': 'busybox:latest',
-            }
-        ], None), self.mock_client)
+        project = Project.from_config(
+            name='test',
+            client=self.mock_client,
+            config_data=Config(
+                version=None,
+                services=[
+                    {
+                        'name': 'test',
+                        'image': 'busybox:latest',
+                    }
+                ],
+                networks=None,
+                volumes=None,
+            ),
+        )
         service = project.get_service('test')
         self.assertEqual(service.net.id, None)
         self.assertNotIn('NetworkMode', service._get_container_host_config({}))
@@ -327,13 +358,22 @@ class ProjectTest(unittest.TestCase):
         container_id = 'aabbccddee'
         container_dict = dict(Name='aaa', Id=container_id)
         self.mock_client.inspect_container.return_value = container_dict
-        project = Project.from_config('test', Config(None, [
-            {
-                'name': 'test',
-                'image': 'busybox:latest',
-                'net': 'container:aaa'
-            }
-        ], None), self.mock_client)
+        project = Project.from_config(
+            name='test',
+            client=self.mock_client,
+            config_data=Config(
+                version=None,
+                services=[
+                    {
+                        'name': 'test',
+                        'image': 'busybox:latest',
+                        'net': 'container:aaa'
+                    },
+                ],
+                networks=None,
+                volumes=None,
+            ),
+        )
         service = project.get_service('test')
         self.assertEqual(service.net.mode, 'container:' + container_id)
 
@@ -347,17 +387,26 @@ class ProjectTest(unittest.TestCase):
                 "Image": 'busybox:latest'
             }
         ]
-        project = Project.from_config('test', Config(None, [
-            {
-                'name': 'aaa',
-                'image': 'busybox:latest'
-            },
-            {
-                'name': 'test',
-                'image': 'busybox:latest',
-                'net': 'container:aaa'
-            }
-        ], None), self.mock_client)
+        project = Project.from_config(
+            name='test',
+            client=self.mock_client,
+            config_data=Config(
+                version=None,
+                services=[
+                    {
+                        'name': 'aaa',
+                        'image': 'busybox:latest'
+                    },
+                    {
+                        'name': 'test',
+                        'image': 'busybox:latest',
+                        'net': 'container:aaa'
+                    },
+                ],
+                networks=None,
+                volumes=None,
+            ),
+        )
 
         service = project.get_service('test')
         self.assertEqual(service.net.mode, 'container:' + container_name)
@@ -403,11 +452,16 @@ class ProjectTest(unittest.TestCase):
             },
         }
         project = Project.from_config(
-            'test',
-            Config(None, [{
-                'name': 'web',
-                'image': 'busybox:latest',
-            }], None),
-            self.mock_client,
+            name='test',
+            client=self.mock_client,
+            config_data=Config(
+                version=None,
+                services=[{
+                    'name': 'web',
+                    'image': 'busybox:latest',
+                }],
+                networks=None,
+                volumes=None,
+            ),
         )
         self.assertEqual([c.id for c in project.containers()], ['1'])

From 35e347cf92b13a374ff767653aa8629ccdb64a71 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 13 Jan 2016 14:05:30 +0000
Subject: [PATCH 0657/1265] Disable the use of 'net' in v2

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/service_schema_v2.json         |  1 -
 tests/acceptance/cli_test.py                  | 24 +++++++++++++++++++
 .../fixtures/net-container/docker-compose.yml |  7 ++++++
 tests/fixtures/net-container/v2-invalid.yml   | 10 ++++++++
 4 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 tests/fixtures/net-container/docker-compose.yml
 create mode 100644 tests/fixtures/net-container/v2-invalid.yml

diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
index c911502f..1e54c666 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.json
@@ -89,7 +89,6 @@
         "mac_address": {"type": "string"},
         "mem_limit": {"type": ["number", "string"]},
         "memswap_limit": {"type": ["number", "string"]},
-        "net": {"type": "string"},
         "pid": {"type": ["string", "null"]},
 
         "ports": {
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 1e31988b..ceec400c 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -422,6 +422,30 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(db.containers()), 1)
         self.assertEqual(len(console.containers()), 0)
 
+    def test_up_with_net_is_invalid(self):
+        self.base_dir = 'tests/fixtures/net-container'
+
+        result = self.dispatch(
+            ['-f', 'v2-invalid.yml', 'up', '-d'],
+            returncode=1)
+
+        # TODO: fix validation error messages for v2 files
+        # assert "Unsupported config option for service 'web': 'net'" in exc.exconly()
+        assert "Unsupported config option" in result.stderr
+
+    def test_up_with_net_v1(self):
+        self.base_dir = 'tests/fixtures/net-container'
+        self.dispatch(['up', '-d'], None)
+
+        bar = self.project.get_service('bar')
+        bar_container = bar.containers()[0]
+
+        foo = self.project.get_service('foo')
+        foo_container = foo.containers()[0]
+
+        assert foo_container.get('HostConfig.NetworkMode') == \
+            'container:{}'.format(bar_container.id)
+
     def test_up_with_no_deps(self):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['up', '-d', '--no-deps', 'web'], None)
diff --git a/tests/fixtures/net-container/docker-compose.yml b/tests/fixtures/net-container/docker-compose.yml
new file mode 100644
index 00000000..b5506e0e
--- /dev/null
+++ b/tests/fixtures/net-container/docker-compose.yml
@@ -0,0 +1,7 @@
+foo:
+  image: busybox
+  command: top
+  net: "container:bar"
+bar:
+  image: busybox
+  command: top
diff --git a/tests/fixtures/net-container/v2-invalid.yml b/tests/fixtures/net-container/v2-invalid.yml
new file mode 100644
index 00000000..eac4b5f1
--- /dev/null
+++ b/tests/fixtures/net-container/v2-invalid.yml
@@ -0,0 +1,10 @@
+version: 2
+
+services:
+  foo:
+    image: busybox
+    command: top
+  bar:
+    image: busybox
+    command: top
+    net: "container:foo"

From 3f9038aea9abfde49ee2b8745369d7d8647f3262 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 13 Jan 2016 14:15:02 +0000
Subject: [PATCH 0658/1265] Remove test duplication

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index ceec400c..52e3d354 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -350,22 +350,7 @@ class CLITestCase(DockerClientTestCase):
         assert 'simple_1  | simple' in result.stdout
         assert 'another_1 | another' in result.stdout
 
-    def test_up_without_networking(self):
-        self.base_dir = 'tests/fixtures/links-composefile'
-        self.dispatch(['up', '-d'], None)
-
-        networks = self.client.networks(names=[self.project.default_network.full_name])
-        self.assertEqual(len(networks), 0)
-
-        for service in self.project.get_services():
-            containers = service.containers()
-            self.assertEqual(len(containers), 1)
-            self.assertNotEqual(containers[0].get('Config.Hostname'), service.name)
-
-        web_container = self.project.get_service('web').containers()[0]
-        self.assertTrue(web_container.get('HostConfig.Links'))
-
-    def test_up_with_networking(self):
+    def test_up(self):
         self.base_dir = 'tests/fixtures/v2-simple'
         self.dispatch(['up', '-d'], None)
 
@@ -385,9 +370,6 @@ class CLITestCase(DockerClientTestCase):
             self.assertEqual(len(containers), 1)
             self.assertIn(containers[0].id, network['Containers'])
 
-        web_container = self.project.get_service('simple').containers()[0]
-        self.assertFalse(web_container.get('HostConfig.Links'))
-
     def test_up_with_networks(self):
         self.base_dir = 'tests/fixtures/networks'
         self.dispatch(['up', '-d'], None)
@@ -415,13 +397,26 @@ class CLITestCase(DockerClientTestCase):
     def test_up_with_links_v1(self):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['up', '-d', 'web'], None)
+
+        # No network was created
+        networks = self.client.networks(names=[self.project.default_network.full_name])
+        for n in networks:
+            self.addCleanup(self.client.remove_network, n['Id'])
+        self.assertEqual(len(networks), 0)
+
         web = self.project.get_service('web')
         db = self.project.get_service('db')
         console = self.project.get_service('console')
+
+        # console was not started
         self.assertEqual(len(web.containers()), 1)
         self.assertEqual(len(db.containers()), 1)
         self.assertEqual(len(console.containers()), 0)
 
+        # web has links
+        web_container = web.containers()[0]
+        self.assertTrue(web_container.get('HostConfig.Links'))
+
     def test_up_with_net_is_invalid(self):
         self.base_dir = 'tests/fixtures/net-container'
 

From 3eafdbb01bc9c2e72098aa30eb16f5e29d2228ab Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 13 Jan 2016 17:00:31 +0000
Subject: [PATCH 0659/1265] Connect services to networks with the 'networks'
 key

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py                           |  3 +-
 compose/config/service_schema_v2.json         |  7 ++
 compose/network.py                            |  1 +
 compose/project.py                            | 48 ++++++++++---
 compose/service.py                            | 19 ++++--
 tests/acceptance/cli_test.py                  | 68 +++++++++++++++----
 tests/fixtures/networks/docker-compose.yml    | 20 ++++--
 tests/fixtures/networks/missing-network.yml   | 10 +++
 tests/fixtures/no-services/docker-compose.yml |  5 ++
 tests/integration/resilience_test.py          |  4 +-
 tests/integration/service_test.py             | 33 ++++-----
 tests/unit/project_test.py                    | 55 +++++++++------
 12 files changed, 195 insertions(+), 78 deletions(-)
 create mode 100644 tests/fixtures/networks/missing-network.yml
 create mode 100644 tests/fixtures/no-services/docker-compose.yml

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 62abcb10..473c6d60 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -704,7 +704,7 @@ def run_one_off_container(container_options, project, service, options):
         **container_options)
 
     if options['-d']:
-        container.start()
+        service.start_container(container)
         print(container.name)
         return
 
@@ -716,6 +716,7 @@ def run_one_off_container(container_options, project, service, options):
     try:
         try:
             dockerpty.start(project.client, container.id, interactive=not options['-T'])
+            service.connect_container_to_networks(container)
             exit_code = container.wait()
         except signals.ShutdownException:
             project.client.stop(container.id)
diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
index 1e54c666..5f4e0478 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.json
@@ -89,6 +89,13 @@
         "mac_address": {"type": "string"},
         "mem_limit": {"type": ["number", "string"]},
         "memswap_limit": {"type": ["number", "string"]},
+
+        "networks": {
+          "type": "array",
+          "items": {"type": "string"},
+          "uniqueItems": true
+        },
+
         "pid": {"type": ["string", "null"]},
 
         "ports": {
diff --git a/compose/network.py b/compose/network.py
index 0b4e40c6..a8f7e918 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -11,6 +11,7 @@ from .config import ConfigurationError
 log = logging.getLogger(__name__)
 
 
+# TODO: support external networks
 class Network(object):
     def __init__(self, client, project, name, driver=None, driver_opts=None):
         self.client = client
diff --git a/compose/project.py b/compose/project.py
index 10d457a7..292bf2f2 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -58,7 +58,21 @@ class Project(object):
         use_networking = (config_data.version and config_data.version >= 2)
         project = cls(name, [], client, use_networking=use_networking)
 
+        custom_networks = []
+        if config_data.networks:
+            for network_name, data in config_data.networks.items():
+                custom_networks.append(
+                    Network(
+                        client=client, project=name, name=network_name,
+                        driver=data.get('driver'), driver_opts=data.get('driver_opts')
+                    )
+                )
+
         for service_dict in config_data.services:
+            networks = project.get_networks(
+                service_dict,
+                custom_networks + [project.default_network])
+
             links = project.get_links(service_dict)
             volumes_from = get_volumes_from(project, service_dict)
             net = project.get_net(service_dict)
@@ -68,19 +82,15 @@ class Project(object):
                     client=client,
                     project=name,
                     use_networking=use_networking,
+                    networks=networks,
                     links=links,
                     net=net,
                     volumes_from=volumes_from,
                     **service_dict))
 
-        if config_data.networks:
-            for network_name, data in config_data.networks.items():
-                project.networks.append(
-                    Network(
-                        client=client, project=name, name=network_name,
-                        driver=data.get('driver'), driver_opts=data.get('driver_opts')
-                    )
-                )
+        project.networks += custom_networks
+        if project.uses_default_network():
+            project.networks.append(project.default_network)
 
         if config_data.volumes:
             for vol_name, data in config_data.volumes.items():
@@ -154,6 +164,18 @@ class Project(object):
             service.remove_duplicate_containers()
         return services
 
+    def get_networks(self, service_dict, network_definitions):
+        networks = []
+        for name in service_dict.pop('networks', ['default']):
+            matches = [n for n in network_definitions if n.name == name]
+            if matches:
+                networks.append(matches[0].full_name)
+            else:
+                raise ConfigurationError(
+                    'Service "{}" uses an undefined network "{}"'
+                    .format(service_dict['name'], name))
+        return networks
+
     def get_links(self, service_dict):
         links = []
         if 'links' in service_dict:
@@ -172,10 +194,11 @@ class Project(object):
         return links
 
     def get_net(self, service_dict):
+        if self.use_networking:
+            return Net(None)
+
         net = service_dict.pop('net', None)
         if not net:
-            if self.use_networking:
-                return Net(self.default_network.full_name)
             return Net(None)
 
         net_name = get_service_name_from_net(net)
@@ -282,6 +305,9 @@ class Project(object):
             volume.remove()
 
     def initialize_networks(self):
+        if not self.use_networking:
+            return
+
         networks = self.networks
         if self.uses_default_network():
             networks.append(self.default_network)
@@ -291,7 +317,7 @@ class Project(object):
 
     def uses_default_network(self):
         return any(
-            service.net.mode == self.default_network.full_name
+            self.default_network.full_name in service.networks
             for service in self.services
         )
 
diff --git a/compose/service.py b/compose/service.py
index 1c848ca3..0a7f0d8e 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -116,6 +116,7 @@ class Service(object):
         links=None,
         volumes_from=None,
         net=None,
+        networks=None,
         **options
     ):
         self.name = name
@@ -125,6 +126,7 @@ class Service(object):
         self.links = links or []
         self.volumes_from = volumes_from or []
         self.net = net or Net(None)
+        self.networks = networks or []
         self.options = options
 
     def containers(self, stopped=False, one_off=False, filters={}):
@@ -175,7 +177,7 @@ class Service(object):
 
         def create_and_start(service, number):
             container = service.create_container(number=number, quiet=True)
-            container.start()
+            service.start_container(container)
             return container
 
         running_containers = self.containers(stopped=False)
@@ -348,7 +350,7 @@ class Service(object):
                 container.attach_log_stream()
 
             if start:
-                container.start()
+                self.start_container(container)
 
             return [container]
 
@@ -406,7 +408,7 @@ class Service(object):
         if attach_logs:
             new_container.attach_log_stream()
         if start_new_container:
-            new_container.start()
+            self.start_container(new_container)
         container.remove()
         return new_container
 
@@ -415,9 +417,18 @@ class Service(object):
             log.info("Starting %s" % container.name)
             if attach_logs:
                 container.attach_log_stream()
-            container.start()
+            return self.start_container(container)
+
+    def start_container(self, container):
+        container.start()
+        self.connect_container_to_networks(container)
         return container
 
+    def connect_container_to_networks(self, container):
+        for network in self.networks:
+            log.debug('Connecting "{}" to "{}"'.format(container.name, network))
+            self.client.connect_container_to_network(container.id, network)
+
     def remove_duplicate_containers(self, timeout=DEFAULT_TIMEOUT):
         for c in self.duplicate_containers():
             log.info('Removing %s' % c.name)
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 52e3d354..ff9c34f1 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -103,8 +103,15 @@ class CLITestCase(DockerClientTestCase):
         if self.base_dir:
             self.project.kill()
             self.project.remove_stopped()
+
             for container in self.project.containers(stopped=True, one_off=True):
                 container.remove(force=True)
+
+            networks = self.client.networks()
+            for n in networks:
+                if n['Name'].startswith('{}_'.format(self.project.name)):
+                    self.client.remove_network(n['Name'])
+
         super(CLITestCase, self).tearDown()
 
     @property
@@ -357,12 +364,11 @@ class CLITestCase(DockerClientTestCase):
         services = self.project.get_services()
 
         networks = self.client.networks(names=[self.project.default_network.full_name])
-        for n in networks:
-            self.addCleanup(self.client.remove_network, n['Id'])
         self.assertEqual(len(networks), 1)
         self.assertEqual(networks[0]['Driver'], 'bridge')
 
         network = self.client.inspect_network(networks[0]['Id'])
+        # print self.project.services[0].containers()[0].get('NetworkSettings')
         self.assertEqual(len(network['Containers']), len(services))
 
         for service in services:
@@ -374,14 +380,52 @@ class CLITestCase(DockerClientTestCase):
         self.base_dir = 'tests/fixtures/networks'
         self.dispatch(['up', '-d'], None)
 
-        networks = self.client.networks(names=[
-            '{}_{}'.format(self.project.name, n)
-            for n in ['foo', 'bar']])
+        back_name = '{}_back'.format(self.project.name)
+        front_name = '{}_front'.format(self.project.name)
 
-        self.assertEqual(len(networks), 2)
+        networks = [
+            n for n in self.client.networks()
+            if n['Name'].startswith('{}_'.format(self.project.name))
+        ]
 
-        for net in networks:
-            self.assertEqual(net['Driver'], 'bridge')
+        # Two networks were created: back and front
+        assert sorted(n['Name'] for n in networks) == [back_name, front_name]
+
+        back_network = [n for n in networks if n['Name'] == back_name][0]
+        front_network = [n for n in networks if n['Name'] == front_name][0]
+
+        web_container = self.project.get_service('web').containers()[0]
+        app_container = self.project.get_service('app').containers()[0]
+        db_container = self.project.get_service('db').containers()[0]
+
+        # db and app joined the back network
+        assert sorted(back_network['Containers']) == sorted([db_container.id, app_container.id])
+
+        # web and app joined the front network
+        assert sorted(front_network['Containers']) == sorted([web_container.id, app_container.id])
+
+    def test_up_missing_network(self):
+        self.base_dir = 'tests/fixtures/networks'
+
+        result = self.dispatch(
+            ['-f', 'missing-network.yml', 'up', '-d'],
+            returncode=1)
+
+        assert 'Service "web" uses an undefined network "foo"' in result.stderr
+
+    def test_up_no_services(self):
+        self.base_dir = 'tests/fixtures/no-services'
+        self.dispatch(['up', '-d'], None)
+
+        network_names = [
+            n['Name'] for n in self.client.networks()
+            if n['Name'].startswith('{}_'.format(self.project.name))
+        ]
+
+        assert sorted(network_names) == [
+            '{}_{}'.format(self.project.name, name)
+            for name in ['bar', 'foo']
+        ]
 
     def test_up_with_links_is_invalid(self):
         self.base_dir = 'tests/fixtures/v2-simple'
@@ -400,9 +444,7 @@ class CLITestCase(DockerClientTestCase):
 
         # No network was created
         networks = self.client.networks(names=[self.project.default_network.full_name])
-        for n in networks:
-            self.addCleanup(self.client.remove_network, n['Id'])
-        self.assertEqual(len(networks), 0)
+        assert networks == []
 
         web = self.project.get_service('web')
         db = self.project.get_service('db')
@@ -731,8 +773,6 @@ class CLITestCase(DockerClientTestCase):
         service = self.project.get_service('simple')
         container, = service.containers(stopped=True, one_off=True)
         networks = self.client.networks(names=[self.project.default_network.full_name])
-        for n in networks:
-            self.addCleanup(self.client.remove_network, n['Id'])
         self.assertEqual(len(networks), 1)
         self.assertEqual(container.human_readable_command, u'true')
 
@@ -890,7 +930,7 @@ class CLITestCase(DockerClientTestCase):
     def test_restart(self):
         service = self.project.get_service('simple')
         container = service.create_container()
-        container.start()
+        service.start_container(container)
         started_at = container.dictionary['State']['StartedAt']
         self.dispatch(['restart', '-t', '1'], None)
         container.inspect()
diff --git a/tests/fixtures/networks/docker-compose.yml b/tests/fixtures/networks/docker-compose.yml
index c0795526..f1b79df0 100644
--- a/tests/fixtures/networks/docker-compose.yml
+++ b/tests/fixtures/networks/docker-compose.yml
@@ -1,7 +1,19 @@
 version: 2
 
-networks:
-  foo:
-    driver:
+services:
+  web:
+    image: busybox
+    command: top
+    networks: ["front"]
+  app:
+    image: busybox
+    command: top
+    networks: ["front", "back"]
+  db:
+    image: busybox
+    command: top
+    networks: ["back"]
 
-  bar: {}
+networks:
+  front: {}
+  back: {}
diff --git a/tests/fixtures/networks/missing-network.yml b/tests/fixtures/networks/missing-network.yml
new file mode 100644
index 00000000..666f7d34
--- /dev/null
+++ b/tests/fixtures/networks/missing-network.yml
@@ -0,0 +1,10 @@
+version: 2
+
+services:
+  web:
+    image: busybox
+    command: top
+    networks: ["foo"]
+
+networks:
+  bar: {}
diff --git a/tests/fixtures/no-services/docker-compose.yml b/tests/fixtures/no-services/docker-compose.yml
new file mode 100644
index 00000000..fa498784
--- /dev/null
+++ b/tests/fixtures/no-services/docker-compose.yml
@@ -0,0 +1,5 @@
+version: 2
+
+networks:
+  foo: {}
+  bar: {}
diff --git a/tests/integration/resilience_test.py b/tests/integration/resilience_test.py
index 5df751c7..b544783a 100644
--- a/tests/integration/resilience_test.py
+++ b/tests/integration/resilience_test.py
@@ -17,7 +17,7 @@ class ResilienceTest(DockerClientTestCase):
         self.project = Project('composetest', [self.db], self.client)
 
         container = self.db.create_container()
-        container.start()
+        self.db.start_container(container)
         self.host_path = container.get_mount('/var/db')['Source']
 
     def test_successful_recreate(self):
@@ -35,7 +35,7 @@ class ResilienceTest(DockerClientTestCase):
         self.assertEqual(container.get_mount('/var/db')['Source'], self.host_path)
 
     def test_start_failure(self):
-        with mock.patch('compose.container.Container.start', crash):
+        with mock.patch('compose.service.Service.start_container', crash):
             with self.assertRaises(Crash):
                 self.project.up(strategy=ConvergenceStrategy.always)
 
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 0ce4103e..37ceb65c 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -32,14 +32,7 @@ from compose.service import Service
 
 def create_and_start_container(service, **override_options):
     container = service.create_container(**override_options)
-    container.start()
-    return container
-
-
-def remove_stopped(service):
-    containers = [c for c in service.containers(stopped=True) if not c.is_running]
-    for container in containers:
-        container.remove()
+    return service.start_container(container)
 
 
 class ServiceTest(DockerClientTestCase):
@@ -88,19 +81,19 @@ class ServiceTest(DockerClientTestCase):
     def test_create_container_with_unspecified_volume(self):
         service = self.create_service('db', volumes=[VolumeSpec.parse('/var/db')])
         container = service.create_container()
-        container.start()
+        service.start_container(container)
         assert container.get_mount('/var/db')
 
     def test_create_container_with_volume_driver(self):
         service = self.create_service('db', volume_driver='foodriver')
         container = service.create_container()
-        container.start()
+        service.start_container(container)
         self.assertEqual('foodriver', container.get('HostConfig.VolumeDriver'))
 
     def test_create_container_with_cpu_shares(self):
         service = self.create_service('db', cpu_shares=73)
         container = service.create_container()
-        container.start()
+        service.start_container(container)
         self.assertEqual(container.get('HostConfig.CpuShares'), 73)
 
     def test_create_container_with_cpu_quota(self):
@@ -113,7 +106,7 @@ class ServiceTest(DockerClientTestCase):
         extra_hosts = ['somehost:162.242.195.82', 'otherhost:50.31.209.229']
         service = self.create_service('db', extra_hosts=extra_hosts)
         container = service.create_container()
-        container.start()
+        service.start_container(container)
         self.assertEqual(set(container.get('HostConfig.ExtraHosts')), set(extra_hosts))
 
     def test_create_container_with_extra_hosts_dicts(self):
@@ -121,33 +114,33 @@ class ServiceTest(DockerClientTestCase):
         extra_hosts_list = ['somehost:162.242.195.82', 'otherhost:50.31.209.229']
         service = self.create_service('db', extra_hosts=extra_hosts)
         container = service.create_container()
-        container.start()
+        service.start_container(container)
         self.assertEqual(set(container.get('HostConfig.ExtraHosts')), set(extra_hosts_list))
 
     def test_create_container_with_cpu_set(self):
         service = self.create_service('db', cpuset='0')
         container = service.create_container()
-        container.start()
+        service.start_container(container)
         self.assertEqual(container.get('HostConfig.CpusetCpus'), '0')
 
     def test_create_container_with_read_only_root_fs(self):
         read_only = True
         service = self.create_service('db', read_only=read_only)
         container = service.create_container()
-        container.start()
+        service.start_container(container)
         self.assertEqual(container.get('HostConfig.ReadonlyRootfs'), read_only, container.get('HostConfig'))
 
     def test_create_container_with_security_opt(self):
         security_opt = ['label:disable']
         service = self.create_service('db', security_opt=security_opt)
         container = service.create_container()
-        container.start()
+        service.start_container(container)
         self.assertEqual(set(container.get('HostConfig.SecurityOpt')), set(security_opt))
 
     def test_create_container_with_mac_address(self):
         service = self.create_service('db', mac_address='02:42:ac:11:65:43')
         container = service.create_container()
-        container.start()
+        service.start_container(container)
         self.assertEqual(container.inspect()['Config']['MacAddress'], '02:42:ac:11:65:43')
 
     def test_create_container_with_specified_volume(self):
@@ -158,7 +151,7 @@ class ServiceTest(DockerClientTestCase):
             'db',
             volumes=[VolumeSpec(host_path, container_path, 'rw')])
         container = service.create_container()
-        container.start()
+        service.start_container(container)
         assert container.get_mount(container_path)
 
         # Match the last component ("host-path"), because boot2docker symlinks /tmp
@@ -229,7 +222,7 @@ class ServiceTest(DockerClientTestCase):
             ]
         )
         host_container = host_service.create_container()
-        host_container.start()
+        host_service.start_container(host_container)
         self.assertIn(volume_container_1.id + ':rw',
                       host_container.get('HostConfig.VolumesFrom'))
         self.assertIn(volume_container_2.id + ':rw',
@@ -248,7 +241,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(old_container.get('Config.Cmd'), ['-d', '1'])
         self.assertIn('FOO=1', old_container.get('Config.Env'))
         self.assertEqual(old_container.name, 'composetest_db_1')
-        old_container.start()
+        service.start_container(old_container)
         old_container.inspect()  # reload volume data
         volume_path = old_container.get_mount('/etc')['Source']
 
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 470e51ad..ffd4455f 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -12,8 +12,6 @@ from compose.config.types import VolumeFromSpec
 from compose.const import LABEL_SERVICE
 from compose.container import Container
 from compose.project import Project
-from compose.service import ContainerNet
-from compose.service import Net
 from compose.service import Service
 
 
@@ -412,29 +410,42 @@ class ProjectTest(unittest.TestCase):
         self.assertEqual(service.net.mode, 'container:' + container_name)
 
     def test_uses_default_network_true(self):
-        web = Service('web', project='test', image="alpine", net=Net('test_default'))
-        db = Service('web', project='test', image="alpine", net=Net('other'))
-        project = Project('test', [web, db], None)
+        project = Project.from_config(
+            name='test',
+            client=self.mock_client,
+            config_data=Config(
+                version=2,
+                services=[
+                    {
+                        'name': 'foo',
+                        'image': 'busybox:latest'
+                    },
+                ],
+                networks=None,
+                volumes=None,
+            ),
+        )
+
         assert project.uses_default_network()
 
-    def test_uses_default_network_custom_name(self):
-        web = Service('web', project='test', image="alpine", net=Net('other'))
-        project = Project('test', [web], None)
-        assert not project.uses_default_network()
+    def test_uses_default_network_false(self):
+        project = Project.from_config(
+            name='test',
+            client=self.mock_client,
+            config_data=Config(
+                version=2,
+                services=[
+                    {
+                        'name': 'foo',
+                        'image': 'busybox:latest',
+                        'networks': ['custom']
+                    },
+                ],
+                networks={'custom': {}},
+                volumes=None,
+            ),
+        )
 
-    def test_uses_default_network_host(self):
-        web = Service('web', project='test', image="alpine", net=Net('host'))
-        project = Project('test', [web], None)
-        assert not project.uses_default_network()
-
-    def test_uses_default_network_container(self):
-        container = mock.Mock(id='test')
-        web = Service(
-            'web',
-            project='test',
-            image="alpine",
-            net=ContainerNet(container))
-        project = Project('test', [web], None)
         assert not project.uses_default_network()
 
     def test_container_without_name(self):

From 9c91cf29674f4e294f9d24a135933d2e7df4e546 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 14 Jan 2016 12:18:20 +0000
Subject: [PATCH 0660/1265] Test discoverability across multiple networks

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index ff9c34f1..4549a3cb 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -126,6 +126,20 @@ class CLITestCase(DockerClientTestCase):
         proc = start_process(self.base_dir, project_options + options)
         return wait_on_process(proc, returncode=returncode)
 
+    def execute(self, container, cmd):
+        # Remove once Hijack and CloseNotifier sign a peace treaty
+        self.client.close()
+        exc = self.client.exec_create(container.id, cmd)
+        self.client.exec_start(exc)
+        return self.client.exec_inspect(exc)['ExitCode']
+
+    def lookup(self, container, service_name):
+        exit_code = self.execute(container, [
+            "nslookup",
+            "{}_{}_1".format(self.project.name, service_name)
+        ])
+        return exit_code == 0
+
     def test_help(self):
         self.base_dir = 'tests/fixtures/no-composefile'
         result = self.dispatch(['help', 'up'], returncode=1)
@@ -404,6 +418,13 @@ class CLITestCase(DockerClientTestCase):
         # web and app joined the front network
         assert sorted(front_network['Containers']) == sorted([web_container.id, app_container.id])
 
+        # web can see app but not db
+        assert self.lookup(web_container, "app")
+        assert not self.lookup(web_container, "db")
+
+        # app can see db
+        assert self.lookup(app_container, "db")
+
     def test_up_missing_network(self):
         self.base_dir = 'tests/fixtures/networks'
 

From e75629392d5274697a668e3f405cbb5e82d99676 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 14 Jan 2016 13:01:17 +0000
Subject: [PATCH 0661/1265] Don't join the bridge network by default in v2

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py           | 18 ++++++++++--------
 tests/acceptance/cli_test.py |  9 ++++++---
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index 292bf2f2..8606c11e 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -69,13 +69,18 @@ class Project(object):
                 )
 
         for service_dict in config_data.services:
-            networks = project.get_networks(
-                service_dict,
-                custom_networks + [project.default_network])
+            if use_networking:
+                networks = project.get_networks(
+                    service_dict,
+                    custom_networks + [project.default_network])
+                net = Net(networks[0]) if networks else Net("none")
+                links = []
+            else:
+                networks = []
+                net = project.get_net(service_dict)
+                links = project.get_links(service_dict)
 
-            links = project.get_links(service_dict)
             volumes_from = get_volumes_from(project, service_dict)
-            net = project.get_net(service_dict)
 
             project.services.append(
                 Service(
@@ -194,9 +199,6 @@ class Project(object):
         return links
 
     def get_net(self, service_dict):
-        if self.use_networking:
-            return Net(None)
-
         net = service_dict.pop('net', None)
         if not net:
             return Net(None)
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 4549a3cb..8db9727b 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -382,13 +382,16 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(networks[0]['Driver'], 'bridge')
 
         network = self.client.inspect_network(networks[0]['Id'])
-        # print self.project.services[0].containers()[0].get('NetworkSettings')
-        self.assertEqual(len(network['Containers']), len(services))
 
         for service in services:
             containers = service.containers()
             self.assertEqual(len(containers), 1)
-            self.assertIn(containers[0].id, network['Containers'])
+
+            container = containers[0]
+            self.assertIn(container.id, network['Containers'])
+
+            networks = container.get('NetworkSettings.Networks').keys()
+            self.assertEqual(networks, [network['Name']])
 
     def test_up_with_networks(self):
         self.base_dir = 'tests/fixtures/networks'

From ca68c9faa4d4a4e217c948c2dd5abf25f595c8d7 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 14 Jan 2016 13:16:02 +0000
Subject: [PATCH 0662/1265] Services can join 'bridge' or 'host'

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py                            | 15 +++++++++------
 tests/acceptance/cli_test.py                  | 19 +++++++++++++++++++
 .../fixtures/networks/predefined-networks.yml | 17 +++++++++++++++++
 3 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 tests/fixtures/networks/predefined-networks.yml

diff --git a/compose/project.py b/compose/project.py
index 8606c11e..1b5d2eb9 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -172,13 +172,16 @@ class Project(object):
     def get_networks(self, service_dict, network_definitions):
         networks = []
         for name in service_dict.pop('networks', ['default']):
-            matches = [n for n in network_definitions if n.name == name]
-            if matches:
-                networks.append(matches[0].full_name)
+            if name in ['bridge', 'host']:
+                networks.append(name)
             else:
-                raise ConfigurationError(
-                    'Service "{}" uses an undefined network "{}"'
-                    .format(service_dict['name'], name))
+                matches = [n for n in network_definitions if n.name == name]
+                if matches:
+                    networks.append(matches[0].full_name)
+                else:
+                    raise ConfigurationError(
+                        'Service "{}" uses an undefined network "{}"'
+                        .format(service_dict['name'], name))
         return networks
 
     def get_links(self, service_dict):
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 8db9727b..90c50769 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -437,6 +437,25 @@ class CLITestCase(DockerClientTestCase):
 
         assert 'Service "web" uses an undefined network "foo"' in result.stderr
 
+    def test_up_predefined_networks(self):
+        filename = 'predefined-networks.yml'
+
+        self.base_dir = 'tests/fixtures/networks'
+        self._project = get_project(self.base_dir, [filename])
+
+        self.dispatch(['-f', filename, 'up', '-d'], None)
+
+        networks = [
+            n for n in self.client.networks()
+            if n['Name'].startswith('{}_'.format(self.project.name))
+        ]
+        assert not networks
+
+        for name in ['bridge', 'host', 'none']:
+            container = self.project.get_service(name).containers()[0]
+            assert container.get('NetworkSettings.Networks').keys() == [name]
+            assert container.get('HostConfig.NetworkMode') == name
+
     def test_up_no_services(self):
         self.base_dir = 'tests/fixtures/no-services'
         self.dispatch(['up', '-d'], None)
diff --git a/tests/fixtures/networks/predefined-networks.yml b/tests/fixtures/networks/predefined-networks.yml
new file mode 100644
index 00000000..d0fac377
--- /dev/null
+++ b/tests/fixtures/networks/predefined-networks.yml
@@ -0,0 +1,17 @@
+version: 2
+
+services:
+  bridge:
+    image: busybox
+    command: top
+    networks: ["bridge"]
+
+  host:
+    image: busybox
+    command: top
+    networks: ["host"]
+
+  none:
+    image: busybox
+    command: top
+    networks: []

From 73fbd01cfe7c1e8ad7d297d7f7cfb8704aeb501d Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 14 Jan 2016 13:39:44 +0000
Subject: [PATCH 0663/1265] Support the 'external' option for networks

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/network.py                            | 25 +++++++++++++++++--
 compose/project.py                            |  4 ++-
 tests/acceptance/cli_test.py                  | 23 +++++++++++++++++
 tests/fixtures/networks/external-networks.yml | 16 ++++++++++++
 4 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 tests/fixtures/networks/external-networks.yml

diff --git a/compose/network.py b/compose/network.py
index a8f7e918..b2ba2e9b 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -11,16 +11,35 @@ from .config import ConfigurationError
 log = logging.getLogger(__name__)
 
 
-# TODO: support external networks
 class Network(object):
-    def __init__(self, client, project, name, driver=None, driver_opts=None):
+    def __init__(self, client, project, name, driver=None, driver_opts=None,
+                 external_name=None):
         self.client = client
         self.project = project
         self.name = name
         self.driver = driver
         self.driver_opts = driver_opts
+        self.external_name = external_name
 
     def ensure(self):
+        if self.external_name:
+            try:
+                self.inspect()
+                log.debug(
+                    'Network {0} declared as external. No new '
+                    'network will be created.'.format(self.name)
+                )
+            except NotFound:
+                raise ConfigurationError(
+                    'Network {name} declared as external, but could'
+                    ' not be found. Please create the network manually'
+                    ' using `{command} {name}` and try again.'.format(
+                        name=self.external_name,
+                        command='docker network create'
+                    )
+                )
+            return
+
         try:
             data = self.inspect()
             if self.driver and data['Driver'] != self.driver:
@@ -55,4 +74,6 @@ class Network(object):
 
     @property
     def full_name(self):
+        if self.external_name:
+            return self.external_name
         return '{0}_{1}'.format(self.project, self.name)
diff --git a/compose/project.py b/compose/project.py
index 1b5d2eb9..6a171d51 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -64,7 +64,9 @@ class Project(object):
                 custom_networks.append(
                     Network(
                         client=client, project=name, name=network_name,
-                        driver=data.get('driver'), driver_opts=data.get('driver_opts')
+                        driver=data.get('driver'),
+                        driver_opts=data.get('driver_opts'),
+                        external_name=data.get('external_name'),
                     )
                 )
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 90c50769..a7d5dbaa 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -456,6 +456,29 @@ class CLITestCase(DockerClientTestCase):
             assert container.get('NetworkSettings.Networks').keys() == [name]
             assert container.get('HostConfig.NetworkMode') == name
 
+    def test_up_external_networks(self):
+        filename = 'external-networks.yml'
+
+        self.base_dir = 'tests/fixtures/networks'
+        self._project = get_project(self.base_dir, [filename])
+
+        result = self.dispatch(['-f', filename, 'up', '-d'], returncode=1)
+        assert 'declared as external, but could not be found' in result.stderr
+
+        networks = [
+            n['Name'] for n in self.client.networks()
+            if n['Name'].startswith('{}_'.format(self.project.name))
+        ]
+        assert not networks
+
+        network_names = ['{}_{}'.format(self.project.name, n) for n in ['foo', 'bar']]
+        for name in network_names:
+            self.client.create_network(name)
+
+        self.dispatch(['-f', filename, 'up', '-d'])
+        container = self.project.containers()[0]
+        assert sorted(container.get('NetworkSettings.Networks').keys()) == sorted(network_names)
+
     def test_up_no_services(self):
         self.base_dir = 'tests/fixtures/no-services'
         self.dispatch(['up', '-d'], None)
diff --git a/tests/fixtures/networks/external-networks.yml b/tests/fixtures/networks/external-networks.yml
new file mode 100644
index 00000000..644e3dda
--- /dev/null
+++ b/tests/fixtures/networks/external-networks.yml
@@ -0,0 +1,16 @@
+version: 2
+
+services:
+  web:
+    image: busybox
+    command: top
+    networks:
+      - networks_foo
+      - bar
+
+networks:
+  networks_foo:
+    external: true
+  bar:
+    external:
+      name: networks_bar

From 87326c00ebc8380729f1999d5f20eddc265164e8 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 14 Jan 2016 14:51:42 +0000
Subject: [PATCH 0664/1265] Python 3 fixes

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index a7d5dbaa..9c9ced8c 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -390,7 +390,7 @@ class CLITestCase(DockerClientTestCase):
             container = containers[0]
             self.assertIn(container.id, network['Containers'])
 
-            networks = container.get('NetworkSettings.Networks').keys()
+            networks = list(container.get('NetworkSettings.Networks'))
             self.assertEqual(networks, [network['Name']])
 
     def test_up_with_networks(self):
@@ -453,7 +453,7 @@ class CLITestCase(DockerClientTestCase):
 
         for name in ['bridge', 'host', 'none']:
             container = self.project.get_service(name).containers()[0]
-            assert container.get('NetworkSettings.Networks').keys() == [name]
+            assert list(container.get('NetworkSettings.Networks')) == [name]
             assert container.get('HostConfig.NetworkMode') == name
 
     def test_up_external_networks(self):
@@ -477,7 +477,7 @@ class CLITestCase(DockerClientTestCase):
 
         self.dispatch(['-f', filename, 'up', '-d'])
         container = self.project.containers()[0]
-        assert sorted(container.get('NetworkSettings.Networks').keys()) == sorted(network_names)
+        assert sorted(list(container.get('NetworkSettings.Networks'))) == sorted(network_names)
 
     def test_up_no_services(self):
         self.base_dir = 'tests/fixtures/no-services'

From 4e61377c6d912a4f5e454b6afcb7bde0416a83b3 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 14 Jan 2016 18:01:44 +0000
Subject: [PATCH 0665/1265] Move get_networks() out of Project class

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index 6a171d51..933849c2 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -72,7 +72,7 @@ class Project(object):
 
         for service_dict in config_data.services:
             if use_networking:
-                networks = project.get_networks(
+                networks = get_networks(
                     service_dict,
                     custom_networks + [project.default_network])
                 net = Net(networks[0]) if networks else Net("none")
@@ -171,21 +171,6 @@ class Project(object):
             service.remove_duplicate_containers()
         return services
 
-    def get_networks(self, service_dict, network_definitions):
-        networks = []
-        for name in service_dict.pop('networks', ['default']):
-            if name in ['bridge', 'host']:
-                networks.append(name)
-            else:
-                matches = [n for n in network_definitions if n.name == name]
-                if matches:
-                    networks.append(matches[0].full_name)
-                else:
-                    raise ConfigurationError(
-                        'Service "{}" uses an undefined network "{}"'
-                        .format(service_dict['name'], name))
-        return networks
-
     def get_links(self, service_dict):
         links = []
         if 'links' in service_dict:
@@ -474,6 +459,22 @@ class Project(object):
         return acc + dep_services
 
 
+def get_networks(service_dict, network_definitions):
+    networks = []
+    for name in service_dict.pop('networks', ['default']):
+        if name in ['bridge', 'host']:
+            networks.append(name)
+        else:
+            matches = [n for n in network_definitions if n.name == name]
+            if matches:
+                networks.append(matches[0].full_name)
+            else:
+                raise ConfigurationError(
+                    'Service "{}" uses an undefined network "{}"'
+                    .format(service_dict['name'], name))
+    return networks
+
+
 def get_volumes_from(project, service_dict):
     volumes_from = service_dict.pop('volumes_from', None)
     if not volumes_from:

From d98b64f6e7f75e801973e59a6723b5f75e724988 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 14 Jan 2016 18:09:45 +0000
Subject: [PATCH 0666/1265] Remove duplicated logic from initialize_networks()

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index 933849c2..12d52cc2 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -300,11 +300,7 @@ class Project(object):
         if not self.use_networking:
             return
 
-        networks = self.networks
-        if self.uses_default_network():
-            networks.append(self.default_network)
-
-        for network in networks:
+        for network in self.networks:
             network.ensure()
 
     def uses_default_network(self):

From a7be0afa5b3a1b62324e22b0d81c51dc939966d6 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Thu, 14 Jan 2016 10:32:06 -0800
Subject: [PATCH 0667/1265] bash completion for `docker-compose down`

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 3f672517..36d1ef27 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -129,6 +129,22 @@ _docker_compose_docker_compose() {
 }
 
 
+_docker_compose_down() {
+	case "$prev" in
+		--rmi)
+			COMPREPLY=( $( compgen -W "all local" -- "$cur" ) )
+			return
+			;;
+	esac
+
+	case "$cur" in
+		-*)
+			COMPREPLY=( $( compgen -W "--help --rmi --volumes -v" -- "$cur" ) )
+			;;
+	esac
+}
+
+
 _docker_compose_events() {
 	case "$prev" in
 		--json)
@@ -393,6 +409,7 @@ _docker_compose() {
 	local commands=(
 		build
 		config
+		down
 		events
 		help
 		kill

From fca3e47a7519844704c79dac4fc55b6ce79e4923 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Thu, 14 Jan 2016 10:43:53 -0800
Subject: [PATCH 0668/1265] bash completion for `docker-compose up
 --abort-on-container-exit`

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 3f672517..b3ed8411 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -368,7 +368,7 @@ _docker_compose_up() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "-d --help --no-build --no-color --no-deps --no-recreate --force-recreate --timeout -t" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--abort-on-container-exit -d --force-recreate --help --no-build --no-color --no-deps --no-recreate --timeout -t" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_all

From 79df2ebe1bbe81232acd84eeca7bf66af8e3004b Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 13 Jan 2016 15:19:02 -0500
Subject: [PATCH 0669/1265] Support variable interpolation for volumes and
 networks sections.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py                | 21 +++++---
 compose/config/interpolation.py         | 31 +++++------
 tests/unit/config/config_test.py        | 16 +++---
 tests/unit/config/interpolation_test.py | 69 +++++++++++++++++++++++++
 4 files changed, 104 insertions(+), 33 deletions(-)
 create mode 100644 tests/unit/config/interpolation_test.py

diff --git a/compose/config/config.py b/compose/config/config.py
index c8d93faf..f6df3d3b 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -138,6 +138,9 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
     def get_volumes(self):
         return {} if self.version == 1 else self.config.get('volumes', {})
 
+    def get_networks(self):
+        return {} if self.version == 1 else self.config.get('networks', {})
+
 
 class Config(namedtuple('_Config', 'version services volumes networks')):
     """
@@ -258,8 +261,8 @@ def load(config_details):
     config_details = config_details._replace(config_files=processed_files)
 
     main_file = config_details.config_files[0]
-    volumes = load_mapping(config_details.config_files, 'volumes', 'Volume')
-    networks = load_mapping(config_details.config_files, 'networks', 'Network')
+    volumes = load_mapping(config_details.config_files, 'get_volumes', 'Volume')
+    networks = load_mapping(config_details.config_files, 'get_networks', 'Network')
     service_dicts = load_services(
         config_details.working_dir,
         main_file.filename,
@@ -268,11 +271,11 @@ def load(config_details):
     return Config(main_file.version, service_dicts, volumes, networks)
 
 
-def load_mapping(config_files, key, entity_type):
+def load_mapping(config_files, get_func, entity_type):
     mapping = {}
 
     for config_file in config_files:
-        for name, config in config_file.config.get(key, {}).items():
+        for name, config in getattr(config_file, get_func)().items():
             mapping[name] = config or {}
             if not config:
                 continue
@@ -347,12 +350,16 @@ def process_config_file(config_file, service_name=None):
     service_dicts = config_file.get_service_dicts()
     validate_top_level_service_objects(config_file.filename, service_dicts)
 
-    # TODO: interpolate config in volumes/network sections as well
-    interpolated_config = interpolate_environment_variables(service_dicts)
+    interpolated_config = interpolate_environment_variables(service_dicts, 'service')
 
     if config_file.version == 2:
         processed_config = dict(config_file.config)
-        processed_config.update({'services': interpolated_config})
+        processed_config['services'] = interpolated_config
+        processed_config['volumes'] = interpolate_environment_variables(
+            config_file.get_volumes(), 'volume')
+        processed_config['networks'] = interpolate_environment_variables(
+            config_file.get_networks(), 'network')
+
     if config_file.version == 1:
         processed_config = interpolated_config
 
diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index 7a757644..e1c781fe 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -11,35 +11,32 @@ from .errors import ConfigurationError
 log = logging.getLogger(__name__)
 
 
-def interpolate_environment_variables(service_dicts):
+def interpolate_environment_variables(config, section):
     mapping = BlankDefaultDict(os.environ)
 
+    def process_item(name, config_dict):
+        return dict(
+            (key, interpolate_value(name, key, val, section, mapping))
+            for key, val in (config_dict or {}).items()
+        )
+
     return dict(
-        (service_name, process_service(service_name, service_dict, mapping))
-        for (service_name, service_dict) in service_dicts.items()
+        (name, process_item(name, config_dict))
+        for name, config_dict in config.items()
     )
 
 
-def process_service(service_name, service_dict, mapping):
-    return dict(
-        (key, interpolate_value(service_name, key, val, mapping))
-        for (key, val) in service_dict.items()
-    )
-
-
-def interpolate_value(service_name, config_key, value, mapping):
+def interpolate_value(name, config_key, value, section, mapping):
     try:
         return recursive_interpolate(value, mapping)
     except InvalidInterpolation as e:
         raise ConfigurationError(
             'Invalid interpolation format for "{config_key}" option '
-            'in service "{service_name}": "{string}"'
-            .format(
+            'in {section} "{name}": "{string}"'.format(
                 config_key=config_key,
-                service_name=service_name,
-                string=e.string,
-            )
-        )
+                name=name,
+                section=section,
+                string=e.string))
 
 
 def recursive_interpolate(obj, mapping):
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index f0d432d5..f8816643 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -686,8 +686,8 @@ class ConfigTest(unittest.TestCase):
             )
         )
 
-        self.assertTrue(mock_logging.warn.called)
-        self.assertTrue(expected_warning_msg in mock_logging.warn.call_args[0][0])
+        assert mock_logging.warn.called
+        assert expected_warning_msg in mock_logging.warn.call_args[0][0]
 
     def test_config_valid_environment_dict_key_contains_dashes(self):
         services = config.load(
@@ -1664,15 +1664,13 @@ class ExtendsTest(unittest.TestCase):
             load_from_filename('tests/fixtures/extends/invalid-net.yml')
 
     @mock.patch.dict(os.environ)
-    def test_valid_interpolation_in_extended_service(self):
-        os.environ.update(
-            HOSTNAME_VALUE="penguin",
-        )
+    def test_load_config_runs_interpolation_in_extended_service(self):
+        os.environ.update(HOSTNAME_VALUE="penguin")
         expected_interpolated_value = "host-penguin"
-
-        service_dicts = load_from_filename('tests/fixtures/extends/valid-interpolation.yml')
+        service_dicts = load_from_filename(
+            'tests/fixtures/extends/valid-interpolation.yml')
         for service in service_dicts:
-            self.assertTrue(service['hostname'], expected_interpolated_value)
+            assert service['hostname'] == expected_interpolated_value
 
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
     def test_volume_path(self):
diff --git a/tests/unit/config/interpolation_test.py b/tests/unit/config/interpolation_test.py
new file mode 100644
index 00000000..0691e886
--- /dev/null
+++ b/tests/unit/config/interpolation_test.py
@@ -0,0 +1,69 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import os
+
+import mock
+import pytest
+
+from compose.config.interpolation import interpolate_environment_variables
+
+
+@pytest.yield_fixture
+def mock_env():
+    with mock.patch.dict(os.environ):
+        os.environ['USER'] = 'jenny'
+        os.environ['FOO'] = 'bar'
+        yield
+
+
+def test_interpolate_environment_variables_in_services(mock_env):
+    services = {
+        'servivea': {
+            'image': 'example:${USER}',
+            'volumes': ['$FOO:/target'],
+            'logging': {
+                'driver': '${FOO}',
+                'options': {
+                    'user': '$USER',
+                }
+            }
+        }
+    }
+    expected = {
+        'servivea': {
+            'image': 'example:jenny',
+            'volumes': ['bar:/target'],
+            'logging': {
+                'driver': 'bar',
+                'options': {
+                    'user': 'jenny',
+                }
+            }
+        }
+    }
+    assert interpolate_environment_variables(services, 'service') == expected
+
+
+def test_interpolate_environment_variables_in_volumes(mock_env):
+    volumes = {
+        'data': {
+            'driver': '$FOO',
+            'driver_opts': {
+                'max': 2,
+                'user': '${USER}'
+            }
+        },
+        'other': None,
+    }
+    expected = {
+        'data': {
+            'driver': 'bar',
+            'driver_opts': {
+                'max': 2,
+                'user': 'jenny'
+            }
+        },
+        'other': {},
+    }
+    assert interpolate_environment_variables(volumes, 'volume') == expected

From 9cfa71ceee3cb164119b448edef8ac0bda63f751 Mon Sep 17 00:00:00 2001
From: Garrett Heel <garrett@runscope.com>
Date: Fri, 11 Dec 2015 15:19:51 -0800
Subject: [PATCH 0670/1265] Add support for build arguments

Allows 'build' configuration option to be specified as an
object and adds support for build args.

Signed-off-by: Garrett Heel <garrettheel@gmail.com>
---
 compose/config/config.py              | 112 +++++++++++++++++++++-----
 compose/config/service_schema_v2.json |  15 +++-
 compose/config/validation.py          |  17 +++-
 compose/service.py                    |   6 +-
 docs/compose-file.md                  |  67 ++++++++++++++-
 tests/integration/service_test.py     |  32 +++++---
 tests/integration/state_test.py       |   6 +-
 tests/unit/config/config_test.py      |  82 +++++++++++++++++--
 tests/unit/service_test.py            |   9 ++-
 9 files changed, 297 insertions(+), 49 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index c8d93faf..8200900f 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import codecs
+import functools
 import logging
 import operator
 import os
@@ -455,6 +456,12 @@ def resolve_environment(service_dict):
     return dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
 
 
+def resolve_build_args(build):
+    args = {}
+    args.update(parse_build_arguments(build.get('args')))
+    return dict(resolve_env_var(k, v) for k, v in six.iteritems(args))
+
+
 def validate_extended_service_dict(service_dict, filename, service):
     error_prefix = "Cannot extend service '%s' in %s:" % (service, filename)
 
@@ -492,12 +499,16 @@ def process_service(service_config):
             for path in to_list(service_dict['env_file'])
         ]
 
+    if 'build' in service_dict:
+        if isinstance(service_dict['build'], six.string_types):
+            service_dict['build'] = resolve_build_path(working_dir, service_dict['build'])
+        elif isinstance(service_dict['build'], dict) and 'context' in service_dict['build']:
+            path = service_dict['build']['context']
+            service_dict['build']['context'] = resolve_build_path(working_dir, path)
+
     if 'volumes' in service_dict and service_dict.get('volume_driver') is None:
         service_dict['volumes'] = resolve_volume_paths(working_dir, service_dict)
 
-    if 'build' in service_dict:
-        service_dict['build'] = resolve_build_path(working_dir, service_dict['build'])
-
     if 'labels' in service_dict:
         service_dict['labels'] = parse_labels(service_dict['labels'])
 
@@ -535,6 +546,8 @@ def finalize_service(service_config, service_names, version):
     if 'restart' in service_dict:
         service_dict['restart'] = parse_restart_spec(service_dict['restart'])
 
+    normalize_build(service_dict, service_config.working_dir)
+
     return normalize_v1_service_format(service_dict)
 
 
@@ -599,10 +612,31 @@ def merge_service_dicts(base, override, version):
 
     if version == 1:
         legacy_v1_merge_image_or_build(d, base, override)
+    else:
+        merge_build(d, base, override)
 
     return d
 
 
+def merge_build(output, base, override):
+    build = {}
+
+    if 'build' in base:
+        if isinstance(base['build'], six.string_types):
+            build['context'] = base['build']
+        else:
+            build.update(base['build'])
+
+    if 'build' in override:
+        if isinstance(override['build'], six.string_types):
+            build['context'] = override['build']
+        else:
+            build.update(override['build'])
+
+    if build:
+        output['build'] = build
+
+
 def legacy_v1_merge_image_or_build(output, base, override):
     output.pop('image', None)
     output.pop('build', None)
@@ -622,22 +656,6 @@ def merge_environment(base, override):
     return env
 
 
-def parse_environment(environment):
-    if not environment:
-        return {}
-
-    if isinstance(environment, list):
-        return dict(split_env(e) for e in environment)
-
-    if isinstance(environment, dict):
-        return dict(environment)
-
-    raise ConfigurationError(
-        "environment \"%s\" must be a list or mapping," %
-        environment
-    )
-
-
 def split_env(env):
     if isinstance(env, six.binary_type):
         env = env.decode('utf-8', 'replace')
@@ -647,6 +665,34 @@ def split_env(env):
         return env, None
 
 
+def split_label(label):
+    if '=' in label:
+        return label.split('=', 1)
+    else:
+        return label, ''
+
+
+def parse_dict_or_list(split_func, type_name, arguments):
+    if not arguments:
+        return {}
+
+    if isinstance(arguments, list):
+        return dict(split_func(e) for e in arguments)
+
+    if isinstance(arguments, dict):
+        return dict(arguments)
+
+    raise ConfigurationError(
+        "%s \"%s\" must be a list or mapping," %
+        (type_name, arguments)
+    )
+
+
+parse_build_arguments = functools.partial(parse_dict_or_list, split_env, 'build arguments')
+parse_environment = functools.partial(parse_dict_or_list, split_env, 'environment')
+parse_labels = functools.partial(parse_dict_or_list, split_label, 'labels')
+
+
 def resolve_env_var(key, val):
     if val is not None:
         return key, val
@@ -690,6 +736,26 @@ def resolve_volume_path(working_dir, volume):
         return container_path
 
 
+def normalize_build(service_dict, working_dir):
+    build = {}
+
+    # supported in V1 only
+    if 'dockerfile' in service_dict:
+        build['dockerfile'] = service_dict.pop('dockerfile')
+
+    if 'build' in service_dict:
+        # Shortcut where specifying a string is treated as the build context
+        if isinstance(service_dict['build'], six.string_types):
+            build['context'] = service_dict.pop('build')
+        else:
+            build.update(service_dict['build'])
+            if 'args' in build:
+                build['args'] = resolve_build_args(build)
+
+    if build:
+        service_dict['build'] = build
+
+
 def resolve_build_path(working_dir, build_path):
     if is_url(build_path):
         return build_path
@@ -702,7 +768,13 @@ def is_url(build_path):
 
 def validate_paths(service_dict):
     if 'build' in service_dict:
-        build_path = service_dict['build']
+        build = service_dict.get('build', {})
+
+        if isinstance(build, six.string_types):
+            build_path = build
+        elif isinstance(build, dict) and 'context' in build:
+            build_path = build['context']
+
         if (
             not is_url(build_path) and
             (not os.path.exists(build_path) or not os.access(build_path, os.R_OK))
diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
index 5f4e0478..23d0381c 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.json
@@ -15,7 +15,20 @@
       "type": "object",
 
       "properties": {
-        "build": {"type": "string"},
+        "build": {
+          "oneOf": [
+            {"type": "string"},
+            {
+              "type": "object",
+              "properties": {
+                "context": {"type": "string"},
+                "dockerfile": {"type": "string"},
+                "args": {"$ref": "#/definitions/list_or_dict"}
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
         "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "cgroup_parent": {"type": "string"},
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 0bf75691..639e8bed 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -150,18 +150,29 @@ def handle_error_for_schema_with_id(error, service_name):
             VALID_NAME_CHARS)
 
     if schema_id == '#/definitions/constraints':
+        # Build context could in 'build' or 'build.context' and dockerfile could be
+        # in 'dockerfile' or 'build.dockerfile'
+        context = False
+        dockerfile = 'dockerfile' in error.instance
+        if 'build' in error.instance:
+            if isinstance(error.instance['build'], six.string_types):
+                context = True
+            else:
+                context = 'context' in error.instance['build']
+                dockerfile = dockerfile or 'dockerfile' in error.instance['build']
+
         # TODO: only applies to v1
-        if 'image' in error.instance and 'build' in error.instance:
+        if 'image' in error.instance and context:
             return (
                 "Service '{}' has both an image and build path specified. "
                 "A service can either be built to image or use an existing "
                 "image, not both.".format(service_name))
-        if 'image' not in error.instance and 'build' not in error.instance:
+        if 'image' not in error.instance and not context:
             return (
                 "Service '{}' has neither an image nor a build path "
                 "specified. At least one must be provided.".format(service_name))
         # TODO: only applies to v1
-        if 'image' in error.instance and 'dockerfile' in error.instance:
+        if 'image' in error.instance and dockerfile:
             return (
                 "Service '{}' has both an image and alternate Dockerfile. "
                 "A service can either be built to image or use an existing "
diff --git a/compose/service.py b/compose/service.py
index 0a7f0d8e..c91c3a58 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -638,7 +638,8 @@ class Service(object):
     def build(self, no_cache=False, pull=False, force_rm=False):
         log.info('Building %s' % self.name)
 
-        path = self.options['build']
+        build_opts = self.options.get('build', {})
+        path = build_opts.get('context')
         # python2 os.path() doesn't support unicode, so we need to encode it to
         # a byte string
         if not six.PY3:
@@ -652,7 +653,8 @@ class Service(object):
             forcerm=force_rm,
             pull=pull,
             nocache=no_cache,
-            dockerfile=self.options.get('dockerfile', None),
+            dockerfile=build_opts.get('dockerfile', None),
+            buildargs=build_opts.get('args', None),
         )
 
         try:
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 4759cde0..a9e54014 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -37,7 +37,8 @@ those files, all the [services](#service-configuration-reference) are declared
 at the root of the document.
 
 Version 1 files do not support the declaration of
-named [volumes](#volume-configuration-reference)
+named [volumes](#volume-configuration-reference) or
+[build arguments](#args).
 
 Example:
 
@@ -89,6 +90,30 @@ definition.
 
 ### build
 
+Configuration options that are applied at build time.
+
+In version 1 this must be given as a string representing the context.
+
+  build: .
+
+In version 2 this can alternatively be given as an object with extra options.
+
+  version: 2
+  services:
+    web:
+      build: .
+
+    version: 2
+    services:
+      web:
+        build:
+          context: .
+          dockerfile: Dockerfile-alternate
+          args:
+            buildno: 1
+
+#### context
+
 Either a path to a directory containing a Dockerfile, or a url to a git repository.
 
 When the value supplied is a relative path, it is interpreted as relative to the
@@ -99,9 +124,46 @@ Compose will build and tag it with a generated name, and use that image thereaft
 
     build: /path/to/build/dir
 
-Using `build` together with `image` is not allowed. Attempting to do so results in
+    build:
+      context: /path/to/build/dir
+
+Using `context` together with `image` is not allowed. Attempting to do so results in
 an error.
 
+#### dockerfile
+
+Alternate Dockerfile.
+
+Compose will use an alternate file to build with. A build path must also be
+specified using the `build` key.
+
+    build:
+      context: /path/to/build/dir
+      dockerfile: Dockerfile-alternate
+
+Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
+
+#### args
+
+Add build arguments. You can use either an array or a dictionary. Any
+boolean values; true, false, yes, no, need to be enclosed in quotes to ensure
+they are not converted to True or False by the YML parser.
+
+Build arguments with only a key are resolved to their environment value on the
+machine Compose is running on.
+
+> **Note:** Introduced in version 2 of the compose file format.
+
+    build:
+      args:
+        buildno: 1
+        user: someuser
+
+    build:
+      args:
+        - buildno=1
+        - user=someuser
+
 ### cap_add, cap_drop
 
 Add or drop container capabilities.
@@ -194,6 +256,7 @@ The entrypoint can also be a list, in a manner similar to [dockerfile](https://d
         - memory_limit=-1
         - vendor/bin/phpunit
 
+
 ### env_file
 
 Add environment variables from a file. Can be a single value or a list.
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 37ceb65c..0e91dcf7 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -294,7 +294,7 @@ class ServiceTest(DockerClientTestCase):
             project='composetest',
             name='db',
             client=self.client,
-            build='tests/fixtures/dockerfile-with-volume',
+            build={'context': 'tests/fixtures/dockerfile-with-volume'},
         )
 
         old_container = create_and_start_container(service)
@@ -315,7 +315,7 @@ class ServiceTest(DockerClientTestCase):
     def test_execute_convergence_plan_when_image_volume_masks_config(self):
         service = self.create_service(
             'db',
-            build='tests/fixtures/dockerfile-with-volume',
+            build={'context': 'tests/fixtures/dockerfile-with-volume'},
         )
 
         old_container = create_and_start_container(service)
@@ -346,7 +346,7 @@ class ServiceTest(DockerClientTestCase):
     def test_execute_convergence_plan_without_start(self):
         service = self.create_service(
             'db',
-            build='tests/fixtures/dockerfile-with-volume'
+            build={'context': 'tests/fixtures/dockerfile-with-volume'}
         )
 
         containers = service.execute_convergence_plan(ConvergencePlan('create', []), start=False)
@@ -450,7 +450,7 @@ class ServiceTest(DockerClientTestCase):
         service = Service(
             name='test',
             client=self.client,
-            build='tests/fixtures/simple-dockerfile',
+            build={'context': 'tests/fixtures/simple-dockerfile'},
             project='composetest',
         )
         container = create_and_start_container(service)
@@ -463,7 +463,7 @@ class ServiceTest(DockerClientTestCase):
         service = Service(
             name='test',
             client=self.client,
-            build='this/does/not/exist/and/will/throw/error',
+            build={'context': 'this/does/not/exist/and/will/throw/error'},
             project='composetest',
         )
         container = create_and_start_container(service)
@@ -483,7 +483,7 @@ class ServiceTest(DockerClientTestCase):
         with open(os.path.join(base_dir, 'Dockerfile'), 'w') as f:
             f.write("FROM busybox\n")
 
-        self.create_service('web', build=base_dir).build()
+        self.create_service('web', build={'context': base_dir}).build()
         assert self.client.inspect_image('composetest_web')
 
     def test_build_non_ascii_filename(self):
@@ -496,7 +496,7 @@ class ServiceTest(DockerClientTestCase):
         with open(os.path.join(base_dir.encode('utf8'), b'foo\xE2bar'), 'w') as f:
             f.write("hello world\n")
 
-        self.create_service('web', build=text_type(base_dir)).build()
+        self.create_service('web', build={'context': text_type(base_dir)}).build()
         assert self.client.inspect_image('composetest_web')
 
     def test_build_with_image_name(self):
@@ -508,16 +508,30 @@ class ServiceTest(DockerClientTestCase):
 
         image_name = 'examples/composetest:latest'
         self.addCleanup(self.client.remove_image, image_name)
-        self.create_service('web', build=base_dir, image=image_name).build()
+        self.create_service('web', build={'context': base_dir}, image=image_name).build()
         assert self.client.inspect_image(image_name)
 
     def test_build_with_git_url(self):
         build_url = "https://github.com/dnephin/docker-build-from-url.git"
-        service = self.create_service('buildwithurl', build=build_url)
+        service = self.create_service('buildwithurl', build={'context': build_url})
         self.addCleanup(self.client.remove_image, service.image_name)
         service.build()
         assert service.image()
 
+    def test_build_with_build_args(self):
+        base_dir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, base_dir)
+
+        with open(os.path.join(base_dir, 'Dockerfile'), 'w') as f:
+            f.write("FROM busybox\n")
+            f.write("ARG build_version\n")
+
+        service = self.create_service('buildwithargs',
+                                      build={'context': text_type(base_dir),
+                                             'args': {"build_version": "1"}})
+        service.build()
+        assert service.image()
+
     def test_start_container_stays_unpriviliged(self):
         service = self.create_service('web')
         container = create_and_start_container(service).inspect()
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index 6e656c29..36099d2d 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -266,13 +266,13 @@ class ServiceStateTest(DockerClientTestCase):
         dockerfile = context.join('Dockerfile')
         dockerfile.write(base_image)
 
-        web = self.create_service('web', build=str(context))
+        web = self.create_service('web', build={'context': str(context)})
         container = web.create_container()
 
         dockerfile.write(base_image + 'CMD echo hello world\n')
         web.build()
 
-        web = self.create_service('web', build=str(context))
+        web = self.create_service('web', build={'context': str(context)})
         self.assertEqual(('recreate', [container]), web.convergence_plan())
 
     def test_image_changed_to_build(self):
@@ -286,7 +286,7 @@ class ServiceStateTest(DockerClientTestCase):
         web = self.create_service('web', image='busybox')
         container = web.create_container()
 
-        web = self.create_service('web', build=str(context))
+        web = self.create_service('web', build={'context': str(context)})
         plan = web.convergence_plan()
         self.assertEqual(('recreate', [container]), plan)
         containers = web.execute_convergence_plan(plan)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index f0d432d5..ddb992fd 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -12,6 +12,7 @@ import py
 import pytest
 
 from compose.config import config
+from compose.config.config import resolve_build_args
 from compose.config.config import resolve_environment
 from compose.config.errors import ConfigurationError
 from compose.config.types import VolumeSpec
@@ -284,7 +285,7 @@ class ConfigTest(unittest.TestCase):
         expected = [
             {
                 'name': 'web',
-                'build': os.path.abspath('/'),
+                'build': {'context': os.path.abspath('/')},
                 'volumes': [VolumeSpec.parse('/home/user/project:/code')],
                 'links': ['db'],
             },
@@ -414,6 +415,59 @@ class ConfigTest(unittest.TestCase):
         assert services[1]['name'] == 'db'
         assert services[2]['name'] == 'web'
 
+    def test_config_build_configuration(self):
+        service = config.load(
+            build_config_details(
+                {'web': {
+                    'build': '.',
+                    'dockerfile': 'Dockerfile-alt'
+                }},
+                'tests/fixtures/extends',
+                'filename.yml'
+            )
+        ).services
+        self.assertTrue('context' in service[0]['build'])
+        self.assertEqual(service[0]['build']['dockerfile'], 'Dockerfile-alt')
+
+    def test_config_build_configuration_v2(self):
+        service = config.load(
+            build_config_details(
+                {
+                    'version': 2,
+                    'services': {
+                        'web': {
+                            'build': '.',
+                            'dockerfile': 'Dockerfile-alt'
+                        }
+                    }
+                },
+                'tests/fixtures/extends',
+                'filename.yml'
+            )
+        ).services
+        self.assertTrue('context' in service[0]['build'])
+        self.assertEqual(service[0]['build']['dockerfile'], 'Dockerfile-alt')
+
+        service = config.load(
+            build_config_details(
+                {
+                    'version': 2,
+                    'services': {
+                        'web': {
+                            'build': {
+                                'context': '.',
+                                'dockerfile': 'Dockerfile-alt'
+                            }
+                        }
+                    }
+                },
+                'tests/fixtures/extends',
+                'filename.yml'
+            )
+        ).services
+        self.assertTrue('context' in service[0]['build'])
+        self.assertEqual(service[0]['build']['dockerfile'], 'Dockerfile-alt')
+
     def test_load_with_multiple_files_v2(self):
         base_file = config.ConfigFile(
             'base.yaml',
@@ -445,7 +499,7 @@ class ConfigTest(unittest.TestCase):
         expected = [
             {
                 'name': 'web',
-                'build': os.path.abspath('/'),
+                'build': {'context': os.path.abspath('/')},
                 'image': 'example/web',
                 'volumes': [VolumeSpec.parse('/home/user/project:/code')],
             },
@@ -1157,7 +1211,7 @@ class BuildOrImageMergeTest(unittest.TestCase):
 
         self.assertEqual(
             config.merge_service_dicts({'image': 'redis'}, {'build': '.'}, V1),
-            {'build': '.'},
+            {'build': '.'}
         )
 
 
@@ -1388,6 +1442,24 @@ class EnvTest(unittest.TestCase):
             },
         )
 
+    @mock.patch.dict(os.environ)
+    def test_resolve_build_args(self):
+        os.environ['env_arg'] = 'value2'
+
+        build = {
+            'context': '.',
+            'args': {
+                'arg1': 'value1',
+                'empty_arg': '',
+                'env_arg': None,
+                'no_env': None
+            }
+        }
+        self.assertEqual(
+            resolve_build_args(build),
+            {'arg1': 'value1', 'empty_arg': '', 'env_arg': 'value2', 'no_env': ''},
+        )
+
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
     @mock.patch.dict(os.environ)
     def test_resolve_path(self):
@@ -1873,7 +1945,7 @@ class BuildPathTest(unittest.TestCase):
 
     def test_from_file(self):
         service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml')
-        self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])
+        self.assertEquals(service_dict, [{'name': 'foo', 'build': {'context': self.abs_context_path}}])
 
     def test_valid_url_in_build_path(self):
         valid_urls = [
@@ -1888,7 +1960,7 @@ class BuildPathTest(unittest.TestCase):
             service_dict = config.load(build_config_details({
                 'validurl': {'build': valid_url},
             }, '.', None)).services
-            assert service_dict[0]['build'] == valid_url
+            assert service_dict[0]['build'] == {'context': valid_url}
 
     def test_invalid_url_in_build_path(self):
         invalid_urls = [
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 9a3e13b4..c9244a47 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -355,7 +355,7 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(parse_repository_tag("url:5000/repo@sha256:digest"), ("url:5000/repo", "sha256:digest", "@"))
 
     def test_create_container_with_build(self):
-        service = Service('foo', client=self.mock_client, build='.')
+        service = Service('foo', client=self.mock_client, build={'context': '.'})
         self.mock_client.inspect_image.side_effect = [
             NoSuchImageError,
             {'Id': 'abc123'},
@@ -374,17 +374,18 @@ class ServiceTest(unittest.TestCase):
             forcerm=False,
             nocache=False,
             rm=True,
+            buildargs=None,
         )
 
     def test_create_container_no_build(self):
-        service = Service('foo', client=self.mock_client, build='.')
+        service = Service('foo', client=self.mock_client, build={'context': '.'})
         self.mock_client.inspect_image.return_value = {'Id': 'abc123'}
 
         service.create_container(do_build=False)
         self.assertFalse(self.mock_client.build.called)
 
     def test_create_container_no_build_but_needs_build(self):
-        service = Service('foo', client=self.mock_client, build='.')
+        service = Service('foo', client=self.mock_client, build={'context': '.'})
         self.mock_client.inspect_image.side_effect = NoSuchImageError
         with self.assertRaises(NeedsBuildError):
             service.create_container(do_build=False)
@@ -394,7 +395,7 @@ class ServiceTest(unittest.TestCase):
             b'{"stream": "Successfully built 12345"}',
         ]
 
-        service = Service('foo', client=self.mock_client, build='.')
+        service = Service('foo', client=self.mock_client, build={'context': '.'})
         service.build()
 
         self.assertEqual(self.mock_client.build.call_count, 1)

From 13063a96cbbc7848a87b1b3137fedbadc8fef188 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 14 Jan 2016 12:10:42 -0800
Subject: [PATCH 0671/1265] Fix handling of service.dockerfile key

Made invalid in v2 format
Doesn't break build config anymore

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py              |  6 ++++
 compose/config/service_schema_v2.json |  1 -
 tests/unit/config/config_test.py      | 42 +++++++++++++++++----------
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 8200900f..86f0aa3b 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -562,6 +562,12 @@ def normalize_v1_service_format(service_dict):
             service_dict['logging']['options'] = service_dict['log_opt']
             del service_dict['log_opt']
 
+    if 'dockerfile' in service_dict:
+        service_dict['build'] = service_dict.get('build', {})
+        service_dict['build'].update({
+            'dockerfile': service_dict.pop('dockerfile')
+        })
+
     return service_dict
 
 
diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
index 23d0381c..8623507a 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.json
@@ -45,7 +45,6 @@
         "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "dns": {"$ref": "#/definitions/string_or_list"},
         "dns_search": {"$ref": "#/definitions/string_or_list"},
-        "dockerfile": {"type": "string"},
         "domainname": {"type": "string"},
         "entrypoint": {
           "oneOf": [
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index ddb992fd..5146df1e 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -430,23 +430,35 @@ class ConfigTest(unittest.TestCase):
         self.assertEqual(service[0]['build']['dockerfile'], 'Dockerfile-alt')
 
     def test_config_build_configuration_v2(self):
-        service = config.load(
-            build_config_details(
-                {
-                    'version': 2,
-                    'services': {
-                        'web': {
-                            'build': '.',
-                            'dockerfile': 'Dockerfile-alt'
+        # service.dockerfile is invalid in v2
+        with self.assertRaises(ConfigurationError):
+            config.load(
+                build_config_details(
+                    {
+                        'version': 2,
+                        'services': {
+                            'web': {
+                                'build': '.',
+                                'dockerfile': 'Dockerfile-alt'
+                            }
                         }
-                    }
-                },
-                'tests/fixtures/extends',
-                'filename.yml'
+                    },
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
             )
-        ).services
-        self.assertTrue('context' in service[0]['build'])
-        self.assertEqual(service[0]['build']['dockerfile'], 'Dockerfile-alt')
+
+        service = config.load(
+            build_config_details({
+                'version': 2,
+                'services': {
+                    'web': {
+                        'build': '.'
+                    }
+                }
+            }, 'tests/fixtures/extends', 'filename.yml')
+        ).services[0]
+        self.assertTrue('context' in service['build'])
 
         service = config.load(
             build_config_details(

From ce9f2681a2be99ed97915674de9dd26e441298d4 Mon Sep 17 00:00:00 2001
From: Clemens Gutweiler <cg@vioma.de>
Date: Thu, 7 Jan 2016 17:59:51 +0100
Subject: [PATCH 0672/1265] Fixes #1422: ipv6 addr contains colons, so we split
 only by the first char.

Signed-off-by: Clemens Gutweiler <cg@vioma.de>
---
 compose/config/types.py         | 2 +-
 tests/unit/config/types_test.py | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/compose/config/types.py b/compose/config/types.py
index cec1f6cf..437f4120 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -58,7 +58,7 @@ def parse_extra_hosts(extra_hosts_config):
         extra_hosts_dict = {}
         for extra_hosts_line in extra_hosts_config:
             # TODO: validate string contains ':' ?
-            host, ip = extra_hosts_line.split(':')
+            host, ip = extra_hosts_line.split(':', 1)
             extra_hosts_dict[host.strip()] = ip.strip()
         return extra_hosts_dict
 
diff --git a/tests/unit/config/types_test.py b/tests/unit/config/types_test.py
index 4df66548..702aa977 100644
--- a/tests/unit/config/types_test.py
+++ b/tests/unit/config/types_test.py
@@ -16,11 +16,13 @@ def test_parse_extra_hosts_list():
     assert parse_extra_hosts([
         "www.example.com: 192.168.0.17",
         "static.example.com:192.168.0.19",
-        "api.example.com: 192.168.0.18"
+        "api.example.com: 192.168.0.18",
+        "v6.example.com: ::1"
     ]) == {
         'www.example.com': '192.168.0.17',
         'static.example.com': '192.168.0.19',
-        'api.example.com': '192.168.0.18'
+        'api.example.com': '192.168.0.18',
+        'v6.example.com': '::1'
     }
 
 

From 1ae57d92d4081380759fc4f816975d1a3a4d459c Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 14 Jan 2016 13:12:39 -0800
Subject: [PATCH 0673/1265] Remove duplicate functions

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py | 44 +++++++++-------------------------------
 docs/compose-file.md     | 12 -----------
 2 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 86f0aa3b..58b73dbe 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -457,8 +457,7 @@ def resolve_environment(service_dict):
 
 
 def resolve_build_args(build):
-    args = {}
-    args.update(parse_build_arguments(build.get('args')))
+    args = parse_build_arguments(build.get('args'))
     return dict(resolve_env_var(k, v) for k, v in six.iteritems(args))
 
 
@@ -699,6 +698,14 @@ parse_environment = functools.partial(parse_dict_or_list, split_env, 'environmen
 parse_labels = functools.partial(parse_dict_or_list, split_label, 'labels')
 
 
+def parse_ulimits(ulimits):
+    if not ulimits:
+        return {}
+
+    if isinstance(ulimits, dict):
+        return dict(ulimits)
+
+
 def resolve_env_var(key, val):
     if val is not None:
         return key, val
@@ -743,13 +750,9 @@ def resolve_volume_path(working_dir, volume):
 
 
 def normalize_build(service_dict, working_dir):
-    build = {}
-
-    # supported in V1 only
-    if 'dockerfile' in service_dict:
-        build['dockerfile'] = service_dict.pop('dockerfile')
 
     if 'build' in service_dict:
+        build = {}
         # Shortcut where specifying a string is treated as the build context
         if isinstance(service_dict['build'], six.string_types):
             build['context'] = service_dict.pop('build')
@@ -758,7 +761,6 @@ def normalize_build(service_dict, working_dir):
             if 'args' in build:
                 build['args'] = resolve_build_args(build)
 
-    if build:
         service_dict['build'] = build
 
 
@@ -835,32 +837,6 @@ def join_path_mapping(pair):
         return ":".join((host, container))
 
 
-def parse_labels(labels):
-    if not labels:
-        return {}
-
-    if isinstance(labels, list):
-        return dict(split_label(e) for e in labels)
-
-    if isinstance(labels, dict):
-        return dict(labels)
-
-
-def split_label(label):
-    if '=' in label:
-        return label.split('=', 1)
-    else:
-        return label, ''
-
-
-def parse_ulimits(ulimits):
-    if not ulimits:
-        return {}
-
-    if isinstance(ulimits, dict):
-        return dict(ulimits)
-
-
 def expand_path(working_dir, path):
     return os.path.abspath(os.path.join(working_dir, os.path.expanduser(path)))
 
diff --git a/docs/compose-file.md b/docs/compose-file.md
index a9e54014..ecd135f1 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -228,18 +228,6 @@ Custom DNS search domains. Can be a single value or a list.
       - dc1.example.com
       - dc2.example.com
 
-### dockerfile
-
-Alternate Dockerfile.
-
-Compose will use an alternate file to build with. A build path must also be
-specified using the `build` key.
-
-    build: /path/to/build/dir
-    dockerfile: Dockerfile-alternate
-
-Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
-
 ### entrypoint
 
 Override the default entrypoint.

From b689c4a21888b751eb566630f6d441128d196cdd Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 14 Jan 2016 11:39:16 -0500
Subject: [PATCH 0674/1265] Move service validation to validate_service().

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 4684161e..a378f276 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -312,15 +312,11 @@ def load_services(working_dir, filename, service_configs, version):
         resolver = ServiceExtendsResolver(service_config, version)
         service_dict = process_service(resolver.run())
 
-        # TODO: move to validate_service()
-        validate_against_service_schema(service_dict, service_config.name, version)
-        validate_paths(service_dict)
-
+        validate_service(service_dict, service_config.name, version)
         service_dict = finalize_service(
             service_config._replace(config=service_dict),
             service_names,
             version)
-        service_dict['name'] = service_config.name
         return service_dict
 
     def build_services(service_config):
@@ -494,7 +490,14 @@ def validate_ulimits(ulimit_config):
                     "than 'hard' value".format(ulimit_config))
 
 
-# TODO: rename to normalize_service
+def validate_service(service_dict, service_name, version):
+    validate_against_service_schema(service_dict, service_name, version)
+    validate_paths(service_dict)
+
+    if 'ulimits' in service_dict:
+        validate_ulimits(service_dict['ulimits'])
+
+
 def process_service(service_config):
     working_dir = service_config.working_dir
     service_dict = dict(service_config.config)
@@ -525,10 +528,6 @@ def process_service(service_config):
         if field in service_dict:
             service_dict[field] = to_list(service_dict[field])
 
-    # TODO: move to a validate_service()
-    if 'ulimits' in service_dict:
-        validate_ulimits(service_dict['ulimits'])
-
     return service_dict
 
 
@@ -554,6 +553,7 @@ def finalize_service(service_config, service_names, version):
 
     normalize_build(service_dict, service_config.working_dir)
 
+    service_dict['name'] = service_config.name
     return normalize_v1_service_format(service_dict)
 
 

From b98e2169e6aebd786dab5554e91dce55c248abb9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 14 Jan 2016 13:28:53 -0500
Subject: [PATCH 0675/1265] Error when the project name is invalid for the
 image name.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         | 12 ++++++++++++
 tests/unit/config/config_test.py |  7 +++++++
 2 files changed, 19 insertions(+)

diff --git a/compose/config/config.py b/compose/config/config.py
index a378f276..b3894225 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -6,6 +6,7 @@ import functools
 import logging
 import operator
 import os
+import string
 import sys
 from collections import namedtuple
 
@@ -497,6 +498,13 @@ def validate_service(service_dict, service_name, version):
     if 'ulimits' in service_dict:
         validate_ulimits(service_dict['ulimits'])
 
+    if not service_dict.get('image') and has_uppercase(service_name):
+        raise ConfigurationError(
+            "Service '{name}' contains uppercase characters which are not valid "
+            "as part of an image name. Either use a lowercase service name or "
+            "use the `image` field to set a custom name for the service image."
+            .format(name=service_name))
+
 
 def process_service(service_config):
     working_dir = service_config.working_dir
@@ -861,6 +869,10 @@ def to_list(value):
         return value
 
 
+def has_uppercase(name):
+    return any(char in string.ascii_uppercase for char in name)
+
+
 def load_yaml(filename):
     try:
         with open(filename, 'r') as fh:
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 10c5bbb7..e24dc904 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -544,6 +544,13 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_load_errors_on_uppercase_with_no_image(self):
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(build_config_details({
+                'Foo': {'build': '.'},
+            }, 'tests/fixtures/build-ctx'))
+            assert "Service 'Foo' contains uppercase characters" in exc.exconly()
+
     def test_invalid_config_build_and_image_specified(self):
         expected_error_msg = "Service 'foo' has both an image and build path specified."
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):

From 0f234154c24da87d524e39255e659ae340227278 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 14 Jan 2016 14:35:02 -0500
Subject: [PATCH 0676/1265] Remove all non-external networks on down.

Also moves the shutdown test fixtures to be a more general v2-full fixture.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/network.py                            |  5 ++++-
 compose/project.py                            |  8 ++++----
 tests/acceptance/cli_test.py                  | 18 ++++++++++-------
 tests/fixtures/shutdown/docker-compose.yml    | 10 ----------
 .../fixtures/{shutdown => v2-full}/Dockerfile |  0
 tests/fixtures/v2-full/docker-compose.yml     | 20 +++++++++++++++++++
 6 files changed, 39 insertions(+), 22 deletions(-)
 delete mode 100644 tests/fixtures/shutdown/docker-compose.yml
 rename tests/fixtures/{shutdown => v2-full}/Dockerfile (100%)
 create mode 100644 tests/fixtures/v2-full/docker-compose.yml

diff --git a/compose/network.py b/compose/network.py
index b2ba2e9b..eaad770c 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -65,7 +65,10 @@ class Network(object):
             )
 
     def remove(self):
-        # TODO: don't remove external networks
+        if self.external_name:
+            log.info("Network %s is external, skipping", self.full_name)
+            return
+
         log.info("Removing network {}".format(self.full_name))
         self.client.remove_network(self.full_name)
 
diff --git a/compose/project.py b/compose/project.py
index 12d52cc2..1322c990 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -275,7 +275,7 @@ class Project(object):
     def down(self, remove_image_type, include_volumes):
         self.stop()
         self.remove_stopped(v=include_volumes)
-        self.remove_default_network()
+        self.remove_networks()
 
         if include_volumes:
             self.remove_volumes()
@@ -286,11 +286,11 @@ class Project(object):
         for service in self.get_services():
             service.remove_image(remove_image_type)
 
-    def remove_default_network(self):
+    def remove_networks(self):
         if not self.use_networking:
             return
-        if self.uses_default_network():
-            self.default_network.remove()
+        for network in self.networks:
+            network.remove()
 
     def remove_volumes(self):
         for volume in self.volumes:
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 9c9ced8c..548c6b93 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -340,16 +340,20 @@ class CLITestCase(DockerClientTestCase):
         assert '--rmi flag must be' in result.stderr
 
     def test_down(self):
-        self.base_dir = 'tests/fixtures/shutdown'
+        self.base_dir = 'tests/fixtures/v2-full'
         self.dispatch(['up', '-d'])
-        wait_on_condition(ContainerCountCondition(self.project, 1))
+        wait_on_condition(ContainerCountCondition(self.project, 2))
 
         result = self.dispatch(['down', '--rmi=local', '--volumes'])
-        assert 'Stopping shutdown_web_1' in result.stderr
-        assert 'Removing shutdown_web_1' in result.stderr
-        assert 'Removing volume shutdown_data' in result.stderr
-        assert 'Removing image shutdown_web' in result.stderr
-        assert 'Removing network shutdown_default' in result.stderr
+        assert 'Stopping v2full_web_1' in result.stderr
+        assert 'Stopping v2full_other_1' in result.stderr
+        assert 'Removing v2full_web_1' in result.stderr
+        assert 'Removing v2full_other_1' in result.stderr
+        assert 'Removing volume v2full_data' in result.stderr
+        assert 'Removing image v2full_web' in result.stderr
+        assert 'Removing image busybox' not in result.stderr
+        assert 'Removing network v2full_default' in result.stderr
+        assert 'Removing network v2full_front' in result.stderr
 
     def test_up_detached(self):
         self.dispatch(['up', '-d'])
diff --git a/tests/fixtures/shutdown/docker-compose.yml b/tests/fixtures/shutdown/docker-compose.yml
deleted file mode 100644
index c83c3d63..00000000
--- a/tests/fixtures/shutdown/docker-compose.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-version: 2
-
-volumes:
-  data:
-    driver: local
-
-services:
-  web:
-    build: .
diff --git a/tests/fixtures/shutdown/Dockerfile b/tests/fixtures/v2-full/Dockerfile
similarity index 100%
rename from tests/fixtures/shutdown/Dockerfile
rename to tests/fixtures/v2-full/Dockerfile
diff --git a/tests/fixtures/v2-full/docker-compose.yml b/tests/fixtures/v2-full/docker-compose.yml
new file mode 100644
index 00000000..86d1c2c2
--- /dev/null
+++ b/tests/fixtures/v2-full/docker-compose.yml
@@ -0,0 +1,20 @@
+
+version: 2
+
+volumes:
+  data:
+    driver: local
+
+networks:
+  front: {}
+
+services:
+  web:
+    build: .
+    networks:
+      - front
+      - default
+
+  other:
+    image: busybox:latest
+    command: top

From 3021ee12fe021092673930bd0ad578783a51dffa Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 14 Jan 2016 15:09:04 -0500
Subject: [PATCH 0677/1265] Fix `config` command to print the new sections of
 the config

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py                       |  2 +-
 tests/acceptance/cli_test.py              | 37 +++++++++++++++--------
 tests/fixtures/v2-full/docker-compose.yml |  4 +++
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 473c6d60..661c91f2 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -217,7 +217,7 @@ class TopLevelCommand(DocoptCommand):
 
         compose_config = dict(
             (service.pop('name'), service) for service in compose_config.services)
-        print(yaml.dump(
+        print(yaml.safe_dump(
             compose_config,
             default_flow_style=False,
             indent=2,
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 548c6b93..d9388199 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -10,8 +10,8 @@ import subprocess
 import time
 from collections import namedtuple
 from operator import attrgetter
-from textwrap import dedent
 
+import yaml
 from docker import errors
 
 from .. import mock
@@ -148,8 +148,9 @@ class CLITestCase(DockerClientTestCase):
         self.base_dir = None
 
     def test_config_list_services(self):
+        self.base_dir = 'tests/fixtures/v2-full'
         result = self.dispatch(['config', '--services'])
-        assert set(result.stdout.rstrip().split('\n')) == {'simple', 'another'}
+        assert set(result.stdout.rstrip().split('\n')) == {'web', 'other'}
 
     def test_config_quiet_with_error(self):
         self.base_dir = None
@@ -160,20 +161,32 @@ class CLITestCase(DockerClientTestCase):
         assert "'notaservice' doesn't have any configuration" in result.stderr
 
     def test_config_quiet(self):
+        self.base_dir = 'tests/fixtures/v2-full'
         assert self.dispatch(['config', '-q']).stdout == ''
 
     def test_config_default(self):
+        self.base_dir = 'tests/fixtures/v2-full'
         result = self.dispatch(['config'])
-        assert dedent("""
-            simple:
-              command: top
-              image: busybox:latest
-        """).lstrip() in result.stdout
-        assert dedent("""
-            another:
-              command: top
-              image: busybox:latest
-        """).lstrip() in result.stdout
+        # assert there are no python objects encoded in the output
+        assert '!!' not in result.stdout
+
+        output = yaml.load(result.stdout)
+        expected = {
+            'version': 2,
+            'volumes': {'data': {'driver': 'local'}},
+            'networks': {'front': {}},
+            'services': {
+                'web': {
+                    'build': os.path.abspath(self.base_dir),
+                    'networks': ['front', 'default'],
+                },
+                'other': {
+                    'image': 'busybox:latest',
+                    'command': 'top',
+                },
+            },
+        }
+        assert output == expected
 
     def test_ps(self):
         self.project.get_service('simple').create_container()
diff --git a/tests/fixtures/v2-full/docker-compose.yml b/tests/fixtures/v2-full/docker-compose.yml
index 86d1c2c2..725296c9 100644
--- a/tests/fixtures/v2-full/docker-compose.yml
+++ b/tests/fixtures/v2-full/docker-compose.yml
@@ -14,7 +14,11 @@ services:
     networks:
       - front
       - default
+    volumes_from:
+      - other
 
   other:
     image: busybox:latest
     command: top
+    volumes:
+      - /data

From 1bfbba36b27df69302f3a196834d32d3dc64987e Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 14 Jan 2016 17:30:48 -0500
Subject: [PATCH 0678/1265] Ensure that the config output by config command
 never contains python objects.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py          | 10 ++--------
 compose/config/serialize.py  | 30 ++++++++++++++++++++++++++++++
 compose/config/types.py      |  7 +++++++
 compose/service.py           | 20 +++++++++-----------
 tests/acceptance/cli_test.py |  6 +++++-
 5 files changed, 53 insertions(+), 20 deletions(-)
 create mode 100644 compose/config/serialize.py

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 661c91f2..4be8536f 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -9,7 +9,6 @@ import sys
 from inspect import getdoc
 from operator import attrgetter
 
-import yaml
 from docker.errors import APIError
 from requests.exceptions import ReadTimeout
 
@@ -18,6 +17,7 @@ from .. import __version__
 from ..config import config
 from ..config import ConfigurationError
 from ..config import parse_environment
+from ..config.serialize import serialize_config
 from ..const import DEFAULT_TIMEOUT
 from ..const import HTTP_TIMEOUT
 from ..const import IS_WINDOWS_PLATFORM
@@ -215,13 +215,7 @@ class TopLevelCommand(DocoptCommand):
             print('\n'.join(service['name'] for service in compose_config.services))
             return
 
-        compose_config = dict(
-            (service.pop('name'), service) for service in compose_config.services)
-        print(yaml.safe_dump(
-            compose_config,
-            default_flow_style=False,
-            indent=2,
-            width=80))
+        print(serialize_config(compose_config))
 
     def create(self, project, options):
         """
diff --git a/compose/config/serialize.py b/compose/config/serialize.py
new file mode 100644
index 00000000..06e0a027
--- /dev/null
+++ b/compose/config/serialize.py
@@ -0,0 +1,30 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import six
+import yaml
+
+from compose.config import types
+
+
+def serialize_config_type(dumper, data):
+    representer = dumper.represent_str if six.PY3 else dumper.represent_unicode
+    return representer(data.repr())
+
+
+yaml.SafeDumper.add_representer(types.VolumeFromSpec, serialize_config_type)
+yaml.SafeDumper.add_representer(types.VolumeSpec, serialize_config_type)
+
+
+def serialize_config(config):
+    output = {
+        'version': config.version,
+        'services': {service.pop('name'): service for service in config.services},
+        'networks': config.networks,
+        'volumes': config.volumes,
+    }
+    return yaml.safe_dump(
+        output,
+        default_flow_style=False,
+        indent=2,
+        width=80)
diff --git a/compose/config/types.py b/compose/config/types.py
index c0adca6c..b872cba9 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -67,6 +67,9 @@ class VolumeFromSpec(namedtuple('_VolumeFromSpec', 'source mode type')):
 
         return cls(source, mode, type)
 
+    def repr(self):
+        return '{v.type}:{v.source}:{v.mode}'.format(v=self)
+
 
 def parse_restart_spec(restart_config):
     if not restart_config:
@@ -156,3 +159,7 @@ class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
             mode = parts[2]
 
         return cls(external, internal, mode)
+
+    def repr(self):
+        external = self.external + ':' if self.external else ''
+        return '{ext}{v.internal}:{v.mode}'.format(ext=external, v=self)
diff --git a/compose/service.py b/compose/service.py
index c91c3a58..0866b83b 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -460,7 +460,8 @@ class Service(object):
             'links': self.get_link_names(),
             'net': self.net.id,
             'volumes_from': [
-                (v.source.name, v.mode) for v in self.volumes_from if isinstance(v.source, Service)
+                (v.source.name, v.mode)
+                for v in self.volumes_from if isinstance(v.source, Service)
             ],
         }
 
@@ -519,12 +520,7 @@ class Service(object):
         return links
 
     def _get_volumes_from(self):
-        volumes_from = []
-        for volume_from_spec in self.volumes_from:
-            volumes = build_volume_from(volume_from_spec)
-            volumes_from.extend(volumes)
-
-        return volumes_from
+        return [build_volume_from(spec) for spec in self.volumes_from]
 
     def _get_container_create_options(
             self,
@@ -927,7 +923,7 @@ def warn_on_masked_volume(volumes_option, container_volumes, service):
 
 
 def build_volume_binding(volume_spec):
-    return volume_spec.internal, "{}:{}:{}".format(*volume_spec)
+    return volume_spec.internal, volume_spec.repr()
 
 
 def build_volume_from(volume_from_spec):
@@ -938,12 +934,14 @@ def build_volume_from(volume_from_spec):
     if isinstance(volume_from_spec.source, Service):
         containers = volume_from_spec.source.containers(stopped=True)
         if not containers:
-            return ["{}:{}".format(volume_from_spec.source.create_container().id, volume_from_spec.mode)]
+            return "{}:{}".format(
+                volume_from_spec.source.create_container().id,
+                volume_from_spec.mode)
 
         container = containers[0]
-        return ["{}:{}".format(container.id, volume_from_spec.mode)]
+        return "{}:{}".format(container.id, volume_from_spec.mode)
     elif isinstance(volume_from_spec.source, Container):
-        return ["{}:{}".format(volume_from_spec.source.id, volume_from_spec.mode)]
+        return "{}:{}".format(volume_from_spec.source.id, volume_from_spec.mode)
 
 
 # Labels
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index d9388199..d910473a 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -177,12 +177,16 @@ class CLITestCase(DockerClientTestCase):
             'networks': {'front': {}},
             'services': {
                 'web': {
-                    'build': os.path.abspath(self.base_dir),
+                    'build': {
+                        'context': os.path.abspath(self.base_dir),
+                    },
                     'networks': ['front', 'default'],
+                    'volumes_from': ['service:other:rw'],
                 },
                 'other': {
                     'image': 'busybox:latest',
                     'command': 'top',
+                    'volumes': ['/data:rw'],
                 },
             },
         }

From abd031cb3d0c49ca933d24d2d03a982692cfc6c4 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 14 Jan 2016 18:33:35 +0000
Subject: [PATCH 0679/1265] Containers join each network aliased to their
 service's name

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/const.py             |  4 +---
 compose/service.py           | 12 +++++++++++-
 tests/acceptance/cli_test.py | 11 +++++------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/compose/const.py b/compose/const.py
index 331895b1..6ff108fb 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -18,7 +18,5 @@ COMPOSEFILE_VERSIONS = (1, 2)
 
 API_VERSIONS = {
     1: '1.21',
-
-    # TODO: update to 1.22 when there's a Docker 1.10 build to test against
-    2: '1.21',
+    2: '1.22',
 }
diff --git a/compose/service.py b/compose/service.py
index 0866b83b..4409f903 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -427,7 +427,9 @@ class Service(object):
     def connect_container_to_networks(self, container):
         for network in self.networks:
             log.debug('Connecting "{}" to "{}"'.format(container.name, network))
-            self.client.connect_container_to_network(container.id, network)
+            self.client.connect_container_to_network(
+                container.id, network,
+                aliases=[self.name])
 
     def remove_duplicate_containers(self, timeout=DEFAULT_TIMEOUT):
         for c in self.duplicate_containers():
@@ -597,6 +599,8 @@ class Service(object):
             override_options,
             one_off=one_off)
 
+        container_options['networking_config'] = self._get_container_networking_config()
+
         return container_options
 
     def _get_container_host_config(self, override_options, one_off=False):
@@ -631,6 +635,12 @@ class Service(object):
             cpu_quota=options.get('cpu_quota'),
         )
 
+    def _get_container_networking_config(self):
+        return self.client.create_networking_config({
+            network_name: self.client.create_endpoint_config(aliases=[self.name])
+            for network_name in self.networks
+        })
+
     def build(self, no_cache=False, pull=False, force_rm=False):
         log.info('Building %s' % self.name)
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index d910473a..8f3cdf50 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -133,12 +133,8 @@ class CLITestCase(DockerClientTestCase):
         self.client.exec_start(exc)
         return self.client.exec_inspect(exc)['ExitCode']
 
-    def lookup(self, container, service_name):
-        exit_code = self.execute(container, [
-            "nslookup",
-            "{}_{}_1".format(self.project.name, service_name)
-        ])
-        return exit_code == 0
+    def lookup(self, container, hostname):
+        return self.execute(container, ["nslookup", hostname]) == 0
 
     def test_help(self):
         self.base_dir = 'tests/fixtures/no-composefile'
@@ -414,6 +410,9 @@ class CLITestCase(DockerClientTestCase):
             networks = list(container.get('NetworkSettings.Networks'))
             self.assertEqual(networks, [network['Name']])
 
+            for service in services:
+                assert self.lookup(container, service.name)
+
     def test_up_with_networks(self):
         self.base_dir = 'tests/fixtures/networks'
         self.dispatch(['up', '-d'], None)

From 406b6b28f498d814e3517fdf66eecae137bcd985 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 15 Jan 2016 00:10:57 +0000
Subject: [PATCH 0680/1265] Tag v2-only tests

- Don't run them against Engine < 1.10
- Set the API version appropriately for the Engine version, so all tests
  use API version 1.22 against Engine 1.10

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py      |  9 +++++++++
 tests/integration/project_test.py | 10 ++++++++++
 tests/integration/testcases.py    | 31 ++++++++++++++++++++++++++++++-
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 8f3cdf50..5978dd5d 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -20,6 +20,7 @@ from compose.container import Container
 from tests.integration.testcases import DockerClientTestCase
 from tests.integration.testcases import get_links
 from tests.integration.testcases import pull_busybox
+from tests.integration.testcases import v2_only
 
 
 ProcessResult = namedtuple('ProcessResult', 'stdout stderr')
@@ -388,6 +389,7 @@ class CLITestCase(DockerClientTestCase):
         assert 'simple_1  | simple' in result.stdout
         assert 'another_1 | another' in result.stdout
 
+    @v2_only()
     def test_up(self):
         self.base_dir = 'tests/fixtures/v2-simple'
         self.dispatch(['up', '-d'], None)
@@ -413,6 +415,7 @@ class CLITestCase(DockerClientTestCase):
             for service in services:
                 assert self.lookup(container, service.name)
 
+    @v2_only()
     def test_up_with_networks(self):
         self.base_dir = 'tests/fixtures/networks'
         self.dispatch(['up', '-d'], None)
@@ -448,6 +451,7 @@ class CLITestCase(DockerClientTestCase):
         # app can see db
         assert self.lookup(app_container, "db")
 
+    @v2_only()
     def test_up_missing_network(self):
         self.base_dir = 'tests/fixtures/networks'
 
@@ -457,6 +461,7 @@ class CLITestCase(DockerClientTestCase):
 
         assert 'Service "web" uses an undefined network "foo"' in result.stderr
 
+    @v2_only()
     def test_up_predefined_networks(self):
         filename = 'predefined-networks.yml'
 
@@ -476,6 +481,7 @@ class CLITestCase(DockerClientTestCase):
             assert list(container.get('NetworkSettings.Networks')) == [name]
             assert container.get('HostConfig.NetworkMode') == name
 
+    @v2_only()
     def test_up_external_networks(self):
         filename = 'external-networks.yml'
 
@@ -499,6 +505,7 @@ class CLITestCase(DockerClientTestCase):
         container = self.project.containers()[0]
         assert sorted(list(container.get('NetworkSettings.Networks'))) == sorted(network_names)
 
+    @v2_only()
     def test_up_no_services(self):
         self.base_dir = 'tests/fixtures/no-services'
         self.dispatch(['up', '-d'], None)
@@ -513,6 +520,7 @@ class CLITestCase(DockerClientTestCase):
             for name in ['bar', 'foo']
         ]
 
+    @v2_only()
     def test_up_with_links_is_invalid(self):
         self.base_dir = 'tests/fixtures/v2-simple'
 
@@ -853,6 +861,7 @@ class CLITestCase(DockerClientTestCase):
         container, = service.containers(stopped=True, one_off=True)
         self.assertEqual(container.name, name)
 
+    @v2_only()
     def test_run_with_networking(self):
         self.base_dir = 'tests/fixtures/v2-simple'
         self.dispatch(['run', 'simple', 'true'], None)
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index ef8a084b..d29d9f1e 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -14,6 +14,7 @@ from compose.const import LABEL_PROJECT
 from compose.container import Container
 from compose.project import Project
 from compose.service import ConvergenceStrategy
+from tests.integration.testcases import v2_only
 
 
 def build_service_dicts(service_config):
@@ -482,6 +483,7 @@ class ProjectTest(DockerClientTestCase):
         service = project.get_service('web')
         self.assertEqual(len(service.containers()), 1)
 
+    @v2_only()
     def test_project_up_networks(self):
         config_data = config.Config(
             version=2,
@@ -514,6 +516,7 @@ class ProjectTest(DockerClientTestCase):
         foo_data = self.client.inspect_network('composetest_foo')
         self.assertEqual(foo_data['Driver'], 'bridge')
 
+    @v2_only()
     def test_project_up_volumes(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
@@ -539,6 +542,7 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(volume_data['Name'], full_vol_name)
         self.assertEqual(volume_data['Driver'], 'local')
 
+    @v2_only()
     def test_project_up_logging_with_multiple_files(self):
         base_file = config.ConfigFile(
             'base.yml',
@@ -590,6 +594,7 @@ class ProjectTest(DockerClientTestCase):
         self.assertTrue(log_config)
         self.assertEqual(log_config.get('Type'), 'none')
 
+    @v2_only()
     def test_initialize_volumes(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
@@ -614,6 +619,7 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(volume_data['Name'], full_vol_name)
         self.assertEqual(volume_data['Driver'], 'local')
 
+    @v2_only()
     def test_project_up_implicit_volume_driver(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
@@ -638,6 +644,7 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(volume_data['Name'], full_vol_name)
         self.assertEqual(volume_data['Driver'], 'local')
 
+    @v2_only()
     def test_initialize_volumes_invalid_volume_driver(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
 
@@ -659,6 +666,7 @@ class ProjectTest(DockerClientTestCase):
         with self.assertRaises(config.ConfigurationError):
             project.initialize_volumes()
 
+    @v2_only()
     def test_initialize_volumes_updated_driver(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
@@ -696,6 +704,7 @@ class ProjectTest(DockerClientTestCase):
             vol_name
         ) in str(e.exception)
 
+    @v2_only()
     def test_initialize_volumes_external_volumes(self):
         # Use composetest_ prefix so it gets garbage-collected in tearDown()
         vol_name = 'composetest_{0:x}'.format(random.getrandbits(32))
@@ -722,6 +731,7 @@ class ProjectTest(DockerClientTestCase):
         with self.assertRaises(NotFound):
             self.client.inspect_volume(full_vol_name)
 
+    @v2_only()
     def test_initialize_volumes_inexistent_external_volume(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
 
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 3002539e..5870946d 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -1,12 +1,16 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import functools
+import os
+
 from docker.utils import version_lt
 from pytest import skip
 
 from .. import unittest
 from compose.cli.docker_client import docker_client
 from compose.config.config import resolve_environment
+from compose.const import API_VERSIONS
 from compose.const import LABEL_PROJECT
 from compose.progress_stream import stream_output
 from compose.service import Service
@@ -26,10 +30,35 @@ def get_links(container):
     return [format_link(link) for link in links]
 
 
+def engine_version_too_low_for_v2():
+    if 'DOCKER_VERSION' not in os.environ:
+        return False
+    version = os.environ['DOCKER_VERSION'].partition('-')[0]
+    return version_lt(version, '1.10')
+
+
+def v2_only():
+    def decorator(f):
+        @functools.wraps(f)
+        def wrapper(self, *args, **kwargs):
+            if engine_version_too_low_for_v2():
+                skip("Engine version is too low")
+                return
+            return f(self, *args, **kwargs)
+        return wrapper
+
+    return decorator
+
+
 class DockerClientTestCase(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.client = docker_client()
+        if engine_version_too_low_for_v2():
+            version = API_VERSIONS[1]
+        else:
+            version = API_VERSIONS[2]
+
+        cls.client = docker_client(version)
 
     def tearDown(self):
         for c in self.client.containers(

From ab2d18851f9c42153d8460494c4020ea0ca5f079 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 15 Jan 2016 00:12:07 +0000
Subject: [PATCH 0681/1265] Test against a dev build of Engine 1.10

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/test-versions | 12 +++++++++---
 tox.ini              |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/script/test-versions b/script/test-versions
index 76e55e11..24412b91 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -18,8 +18,7 @@ get_versions="docker run --rm
 if [ "$DOCKER_VERSIONS" == "" ]; then
   DOCKER_VERSIONS="$($get_versions default)"
 elif [ "$DOCKER_VERSIONS" == "all" ]; then
-  # TODO: `-n 2` when engine 1.10 releases
-  DOCKER_VERSIONS="$($get_versions recent -n 1)"
+  DOCKER_VERSIONS="1.9.1 1.10.0-dev"
 fi
 
 
@@ -39,12 +38,18 @@ for version in $DOCKER_VERSIONS; do
 
   trap "on_exit" EXIT
 
+  if [[ $version == *"-dev" ]]; then
+    repo="dnephin/dind"
+  else
+    repo="dockerswarm/dind"
+  fi
+
   docker run \
     -d \
     --name "$daemon_container" \
     --privileged \
     --volume="/var/lib/docker" \
-    dockerswarm/dind:$version \
+    "$repo:$version" \
     docker daemon -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
     2>&1 | tail -n 10
 
@@ -52,6 +57,7 @@ for version in $DOCKER_VERSIONS; do
     --rm \
     --link="$daemon_container:docker" \
     --env="DOCKER_HOST=tcp://docker:2375" \
+    --env="DOCKER_VERSION=$version" \
     --entrypoint="tox" \
     "$TAG" \
     -e py27,py34 -- "$@"
diff --git a/tox.ini b/tox.ini
index 9d45b0c7..dc85bc6d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,7 @@ passenv =
     DOCKER_HOST
     DOCKER_CERT_PATH
     DOCKER_TLS_VERIFY
+    DOCKER_VERSION
 setenv =
     HOME=/tmp
 deps =

From cba75627e18adf80f66b6d090800b2204cfa97e0 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 15 Jan 2016 00:12:46 +0000
Subject: [PATCH 0682/1265] Fix error when joining host/bridge network

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/service.py b/compose/service.py
index 4409f903..f5db07fb 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -639,6 +639,7 @@ class Service(object):
         return self.client.create_networking_config({
             network_name: self.client.create_endpoint_config(aliases=[self.name])
             for network_name in self.networks
+            if network_name not in ['host', 'bridge']
         })
 
     def build(self, no_cache=False, pull=False, force_rm=False):

From fbc275e06b39a9fe02d57cd23aae23d25a5a73c9 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 15 Jan 2016 00:33:04 +0000
Subject: [PATCH 0683/1265] Work around error message change in Engine

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 5978dd5d..39e154ad 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -238,7 +238,8 @@ class CLITestCase(DockerClientTestCase):
 
         assert 'Pulling simple (busybox:latest)...' in result.stderr
         assert 'Pulling another (nonexisting-image:latest)...' in result.stderr
-        assert 'Error: image library/nonexisting-image:latest not found' in result.stderr
+        assert 'Error: image library/nonexisting-image' in result.stderr
+        assert 'not found' in result.stderr
 
     def test_build_plain(self):
         self.base_dir = 'tests/fixtures/simple-dockerfile'

From 4772815491e3fb1ae838f1e834cb160aedc1c19a Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 15 Jan 2016 00:33:44 +0000
Subject: [PATCH 0684/1265] Disable tests until Engine 1.10 change has been
 worked around

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/integration/service_test.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 0e91dcf7..bce3999b 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -7,6 +7,7 @@ import tempfile
 from os import path
 
 from docker.errors import APIError
+from pytest import mark
 from six import StringIO
 from six import text_type
 
@@ -371,6 +372,7 @@ class ServiceTest(DockerClientTestCase):
         create_and_start_container(db)
         self.assertEqual(db.containers()[0].environment['FOO'], 'BAR')
 
+    @mark.skipif(True, reason="Engine returns error - needs investigating")
     def test_start_container_creates_links(self):
         db = self.create_service('db')
         web = self.create_service('web', links=[(db, None)])
@@ -387,6 +389,7 @@ class ServiceTest(DockerClientTestCase):
                 'db'])
         )
 
+    @mark.skipif(True, reason="Engine returns error - needs investigating")
     def test_start_container_creates_links_with_names(self):
         db = self.create_service('db')
         web = self.create_service('web', links=[(db, 'custom_link_name')])
@@ -430,6 +433,7 @@ class ServiceTest(DockerClientTestCase):
         c = create_and_start_container(db)
         self.assertEqual(set(get_links(c)), set([]))
 
+    @mark.skipif(True, reason="Engine returns error - needs investigating")
     def test_start_one_off_container_creates_links_to_its_own_service(self):
         db = self.create_service('db')
 

From de6d6a42d7ea112342a5ea419fc93af0fb5ecad6 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 15 Jan 2016 01:49:54 +0000
Subject: [PATCH 0685/1265] Tag some more v2-dependent tests

Not clear why the config tests are v2-dependent; needs investigating

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 39e154ad..231b78db 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -144,11 +144,15 @@ class CLITestCase(DockerClientTestCase):
         # Prevent tearDown from trying to create a project
         self.base_dir = None
 
+    # TODO: this shouldn't be v2-dependent
+    @v2_only()
     def test_config_list_services(self):
         self.base_dir = 'tests/fixtures/v2-full'
         result = self.dispatch(['config', '--services'])
         assert set(result.stdout.rstrip().split('\n')) == {'web', 'other'}
 
+    # TODO: this shouldn't be v2-dependent
+    @v2_only()
     def test_config_quiet_with_error(self):
         self.base_dir = None
         result = self.dispatch([
@@ -157,10 +161,14 @@ class CLITestCase(DockerClientTestCase):
         ], returncode=1)
         assert "'notaservice' doesn't have any configuration" in result.stderr
 
+    # TODO: this shouldn't be v2-dependent
+    @v2_only()
     def test_config_quiet(self):
         self.base_dir = 'tests/fixtures/v2-full'
         assert self.dispatch(['config', '-q']).stdout == ''
 
+    # TODO: this shouldn't be v2-dependent
+    @v2_only()
     def test_config_default(self):
         self.base_dir = 'tests/fixtures/v2-full'
         result = self.dispatch(['config'])
@@ -354,6 +362,7 @@ class CLITestCase(DockerClientTestCase):
         result = self.dispatch(['down', '--rmi', 'bogus'], returncode=1)
         assert '--rmi flag must be' in result.stderr
 
+    @v2_only()
     def test_down(self):
         self.base_dir = 'tests/fixtures/v2-full'
         self.dispatch(['up', '-d'])
@@ -939,6 +948,7 @@ class CLITestCase(DockerClientTestCase):
         result = self.dispatch(['start'], returncode=1)
         assert 'No containers to start' in result.stderr
 
+    @v2_only()
     def test_up_logging(self):
         self.base_dir = 'tests/fixtures/logging-composefile'
         self.dispatch(['up', '-d'])

From dc1104649f1207cfc4bc0402b0aee1243442f6b9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 14 Jan 2016 22:28:20 -0500
Subject: [PATCH 0686/1265] Validate that an extended config file has the same
 version as the base.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         | 40 ++++++++++++++++----------------
 tests/unit/config/config_test.py | 37 +++++++++++++++++++++++------
 2 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index b3894225..ac5e8d17 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -188,10 +188,10 @@ def find(base_dir, filenames):
         [ConfigFile.from_filename(f) for f in filenames])
 
 
-def validate_config_version(config_details):
-    main_file = config_details.config_files[0]
+def validate_config_version(config_files):
+    main_file = config_files[0]
     validate_top_level_object(main_file)
-    for next_file in config_details.config_files[1:]:
+    for next_file in config_files[1:]:
         validate_top_level_object(next_file)
 
         if main_file.version != next_file.version:
@@ -254,7 +254,7 @@ def load(config_details):
 
     Return a fully interpolated, extended and validated configuration.
     """
-    validate_config_version(config_details)
+    validate_config_version(config_details.config_files)
 
     processed_files = [
         process_config_file(config_file)
@@ -267,9 +267,8 @@ def load(config_details):
     networks = load_mapping(config_details.config_files, 'get_networks', 'Network')
     service_dicts = load_services(
         config_details.working_dir,
-        main_file.filename,
-        [file.get_service_dicts() for file in config_details.config_files],
-        main_file.version)
+        main_file,
+        [file.get_service_dicts() for file in config_details.config_files])
     return Config(main_file.version, service_dicts, volumes, networks)
 
 
@@ -303,21 +302,21 @@ def load_mapping(config_files, get_func, entity_type):
     return mapping
 
 
-def load_services(working_dir, filename, service_configs, version):
+def load_services(working_dir, config_file, service_configs):
     def build_service(service_name, service_dict, service_names):
         service_config = ServiceConfig.with_abs_paths(
             working_dir,
-            filename,
+            config_file.filename,
             service_name,
             service_dict)
-        resolver = ServiceExtendsResolver(service_config, version)
+        resolver = ServiceExtendsResolver(service_config, config_file)
         service_dict = process_service(resolver.run())
 
-        validate_service(service_dict, service_config.name, version)
+        validate_service(service_dict, service_config.name, config_file.version)
         service_dict = finalize_service(
             service_config._replace(config=service_dict),
             service_names,
-            version)
+            config_file.version)
         return service_dict
 
     def build_services(service_config):
@@ -333,7 +332,7 @@ def load_services(working_dir, filename, service_configs, version):
             name: merge_service_dicts_from_files(
                 base.get(name, {}),
                 override.get(name, {}),
-                version)
+                config_file.version)
             for name in all_service_names
         }
 
@@ -373,11 +372,11 @@ def process_config_file(config_file, service_name=None):
 
 
 class ServiceExtendsResolver(object):
-    def __init__(self, service_config, version, already_seen=None):
+    def __init__(self, service_config, config_file, already_seen=None):
         self.service_config = service_config
         self.working_dir = service_config.working_dir
         self.already_seen = already_seen or []
-        self.version = version
+        self.config_file = config_file
 
     @property
     def signature(self):
@@ -404,8 +403,10 @@ class ServiceExtendsResolver(object):
         config_path = self.get_extended_config_path(extends)
         service_name = extends['service']
 
+        extends_file = ConfigFile.from_filename(config_path)
+        validate_config_version([self.config_file, extends_file])
         extended_file = process_config_file(
-            ConfigFile.from_filename(config_path),
+            extends_file,
             service_name=service_name)
         service_config = extended_file.config[service_name]
         return config_path, service_config, service_name
@@ -417,7 +418,7 @@ class ServiceExtendsResolver(object):
                 extended_config_path,
                 service_name,
                 service_dict),
-            self.version,
+            self.config_file,
             already_seen=self.already_seen + [self.signature])
 
         service_config = resolver.run()
@@ -425,13 +426,12 @@ class ServiceExtendsResolver(object):
         validate_extended_service_dict(
             other_service_dict,
             extended_config_path,
-            service_name,
-        )
+            service_name)
 
         return merge_service_dicts(
             other_service_dict,
             self.service_config.config,
-            self.version)
+            self.config_file.version)
 
     def get_extended_config_path(self, extends_options):
         """Service we are extending either has a value for 'file' set, which we
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index e24dc904..cc205136 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -25,14 +25,15 @@ V1 = 1
 
 
 def make_service_dict(name, service_dict, working_dir, filename=None):
+    """Test helper function to construct a ServiceExtendsResolver
     """
-    Test helper function to construct a ServiceExtendsResolver
-    """
-    resolver = config.ServiceExtendsResolver(config.ServiceConfig(
-        working_dir=working_dir,
-        filename=filename,
-        name=name,
-        config=service_dict), version=1)
+    resolver = config.ServiceExtendsResolver(
+        config.ServiceConfig(
+            working_dir=working_dir,
+            filename=filename,
+            name=name,
+            config=service_dict),
+        config.ConfigFile(filename=filename, config={}))
     return config.process_service(resolver.run())
 
 
@@ -1888,6 +1889,28 @@ class ExtendsTest(unittest.TestCase):
 
         assert config == expected
 
+    def test_extends_with_mixed_versions_is_error(self):
+        tmpdir = py.test.ensuretemp('test_extends_with_mixed_version')
+        self.addCleanup(tmpdir.remove)
+        tmpdir.join('docker-compose.yml').write("""
+            version: 2
+            services:
+              web:
+                extends:
+                  file: base.yml
+                  service: base
+                image: busybox
+        """)
+        tmpdir.join('base.yml').write("""
+            base:
+              volumes: ['/foo']
+              ports: ['3000:3000']
+        """)
+
+        with pytest.raises(ConfigurationError) as exc:
+            load_from_filename(str(tmpdir.join('docker-compose.yml')))
+        assert 'Version mismatch' in exc.exconly()
+
 
 @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class ExpandPathTest(unittest.TestCase):

From 0f1a798f28b124bd9d1d5b36c3c71bd7a9999edf Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 15 Jan 2016 10:14:55 -0500
Subject: [PATCH 0687/1265] Increase the timeout for all acceptance tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/acceptance/cli_test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index d910473a..2cce7803 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -47,7 +47,7 @@ def wait_on_process(proc, returncode=0):
     return ProcessResult(stdout.decode('utf-8'), stderr.decode('utf-8'))
 
 
-def wait_on_condition(condition, delay=0.1, timeout=20):
+def wait_on_condition(condition, delay=0.1, timeout=40):
     start_time = time.time()
     while not condition():
         if time.time() - start_time > timeout:
@@ -631,14 +631,14 @@ class CLITestCase(DockerClientTestCase):
         wait_on_condition(ContainerCountCondition(self.project, 2))
 
         os.kill(proc.pid, signal.SIGINT)
-        wait_on_condition(ContainerCountCondition(self.project, 0), timeout=30)
+        wait_on_condition(ContainerCountCondition(self.project, 0))
 
     def test_up_handles_sigterm(self):
         proc = start_process(self.base_dir, ['up', '-t', '2'])
         wait_on_condition(ContainerCountCondition(self.project, 2))
 
         os.kill(proc.pid, signal.SIGTERM)
-        wait_on_condition(ContainerCountCondition(self.project, 0), timeout=30)
+        wait_on_condition(ContainerCountCondition(self.project, 0))
 
     def test_run_service_without_links(self):
         self.base_dir = 'tests/fixtures/links-composefile'

From 82b288b25b4306157b3edc3dfc5fca8b8285044a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 15 Jan 2016 15:02:19 -0500
Subject: [PATCH 0688/1265] Fix linux master build.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/travis/build-binary | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/travis/build-binary b/script/travis/build-binary
index 0becee7f..7cc1092d 100755
--- a/script/travis/build-binary
+++ b/script/travis/build-binary
@@ -4,8 +4,8 @@ set -ex
 
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     script/build-linux
-    script/build-image master
-    # TODO: requires auth
+    # TODO: requires auth to push, so disable for now
+    # script/build-image master
     # docker push docker/compose:master
 else
     script/prepare-osx

From ab927b986fc5317a0ceb42de1546afe5326f942a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 15 Jan 2016 19:04:01 -0500
Subject: [PATCH 0689/1265] Test against 1.10rc1.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/test-versions | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/script/test-versions b/script/test-versions
index 24412b91..2e9c9167 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -18,7 +18,7 @@ get_versions="docker run --rm
 if [ "$DOCKER_VERSIONS" == "" ]; then
   DOCKER_VERSIONS="$($get_versions default)"
 elif [ "$DOCKER_VERSIONS" == "all" ]; then
-  DOCKER_VERSIONS="1.9.1 1.10.0-dev"
+  DOCKER_VERSIONS=$($get_versions -n 2 recent)
 fi
 
 
@@ -38,11 +38,7 @@ for version in $DOCKER_VERSIONS; do
 
   trap "on_exit" EXIT
 
-  if [[ $version == *"-dev" ]]; then
-    repo="dnephin/dind"
-  else
-    repo="dockerswarm/dind"
-  fi
+  repo="dockerswarm/dind"
 
   docker run \
     -d \

From e7180982aa0555f47c3e8f4a42c6f5d862465e86 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Sat, 16 Jan 2016 13:22:02 +0100
Subject: [PATCH 0690/1265] Add zsh completion for 'docker-compose up
 --abort-on-container-exit'

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 01e5f896..173666eb 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -298,12 +298,13 @@ __docker-compose_subcommand() {
         (up)
             _arguments \
                 $opts_help \
-                '-d[Detached mode: Run containers in the background, print new container names.]' \
+                '(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names.]' \
                 '--no-color[Produce monochrome output.]' \
                 "--no-deps[Don't start linked services.]" \
                 "--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
                 "--no-recreate[If containers already exist, don't recreate them.]" \
                 "--no-build[Don't build an image, even if it's missing]" \
+                "(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
                 '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;

From f6561f1290b16d4c438683f7bd78a2127529ed79 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Sat, 16 Jan 2016 13:47:48 +0100
Subject: [PATCH 0691/1265] Add zsh completion for 'docker-compose down'

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 01e5f896..bb9ffa8a 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -203,6 +203,12 @@ __docker-compose_subcommand() {
                 '(--quiet -q)'{--quiet,-q}"[Only validate the configuration, don't print anything.]" \
                 '--services[Print the service names, one per line.]' && ret=0
             ;;
+        (down)
+            _arguments \
+                $opts_help \
+                "--rmi[Remove images, type may be one of: 'all' to remove all images, or 'local' to remove only images that don't have an custom name set by the 'image' field]:type:(all local)" \
+                '(-v --volumes)'{-v,--volumes}"[Remove data volumes]" && ret=0
+            ;;
         (events)
             _arguments \
                 $opts_help \

From d54190167ac665ae2b56a5031a18bc210e40faa0 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Sat, 16 Jan 2016 13:53:16 +0100
Subject: [PATCH 0692/1265] Fix zsh completion to ensure we have enough
 commands to store in the cache

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 01e5f896..a8a60b59 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -179,7 +179,7 @@ __docker-compose_commands() {
         local -a lines
         lines=(${(f)"$(_call_program commands docker-compose 2>&1)"})
         _docker_compose_subcommands=(${${${lines[$((${lines[(i)Commands:]} + 1)),${lines[(I)  *]}]}## #}/ ##/:})
-        _store_cache docker_compose_subcommands _docker_compose_subcommands
+        (( $#_docker_compose_subcommands > 0 )) && _store_cache docker_compose_subcommands _docker_compose_subcommands
     fi
     _describe -t docker-compose-commands "docker-compose command" _docker_compose_subcommands
 }

From 53d56ea2456813c910a6500fbad5841286c94db1 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 18 Jan 2016 16:15:52 +0000
Subject: [PATCH 0693/1265] Quote network names in error messages

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/network.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose/network.py b/compose/network.py
index eaad770c..34159fd6 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -44,11 +44,11 @@ class Network(object):
             data = self.inspect()
             if self.driver and data['Driver'] != self.driver:
                 raise ConfigurationError(
-                    'Network {} needs to be recreated - driver has changed'
+                    'Network "{}" needs to be recreated - driver has changed'
                     .format(self.full_name))
             if data['Options'] != (self.driver_opts or {}):
                 raise ConfigurationError(
-                    'Network {} needs to be recreated - options have changed'
+                    'Network "{}" needs to be recreated - options have changed'
                     .format(self.full_name))
         except NotFound:
             driver_name = 'the default driver'

From e7673bf920162b63173631c6ede97e0e22cb4508 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 18 Jan 2016 16:16:24 +0000
Subject: [PATCH 0694/1265] Allow overriding of config for the default network

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py                            | 31 ++++++++++---------
 tests/acceptance/cli_test.py                  | 13 ++++++++
 .../networks/default-network-config.yml       | 13 ++++++++
 3 files changed, 42 insertions(+), 15 deletions(-)
 create mode 100644 tests/fixtures/networks/default-network-config.yml

diff --git a/compose/project.py b/compose/project.py
index 1322c990..777e8f82 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -58,23 +58,24 @@ class Project(object):
         use_networking = (config_data.version and config_data.version >= 2)
         project = cls(name, [], client, use_networking=use_networking)
 
-        custom_networks = []
-        if config_data.networks:
-            for network_name, data in config_data.networks.items():
-                custom_networks.append(
-                    Network(
-                        client=client, project=name, name=network_name,
-                        driver=data.get('driver'),
-                        driver_opts=data.get('driver_opts'),
-                        external_name=data.get('external_name'),
-                    )
-                )
+        network_config = config_data.networks or {}
+        custom_networks = [
+            Network(
+                client=client, project=name, name=network_name,
+                driver=data.get('driver'),
+                driver_opts=data.get('driver_opts'),
+                external_name=data.get('external_name'),
+            )
+            for network_name, data in network_config.items()
+        ]
+
+        all_networks = custom_networks[:]
+        if 'default' not in network_config:
+            all_networks.append(project.default_network)
 
         for service_dict in config_data.services:
             if use_networking:
-                networks = get_networks(
-                    service_dict,
-                    custom_networks + [project.default_network])
+                networks = get_networks(service_dict, all_networks)
                 net = Net(networks[0]) if networks else Net("none")
                 links = []
             else:
@@ -96,7 +97,7 @@ class Project(object):
                     **service_dict))
 
         project.networks += custom_networks
-        if project.uses_default_network():
+        if 'default' not in network_config and project.uses_default_network():
             project.networks.append(project.default_network)
 
         if config_data.volumes:
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 700e9cdf..f5c16380 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -409,6 +409,7 @@ class CLITestCase(DockerClientTestCase):
         networks = self.client.networks(names=[self.project.default_network.full_name])
         self.assertEqual(len(networks), 1)
         self.assertEqual(networks[0]['Driver'], 'bridge')
+        assert 'com.docker.network.bridge.enable_icc' not in networks[0]['Options']
 
         network = self.client.inspect_network(networks[0]['Id'])
 
@@ -425,6 +426,18 @@ class CLITestCase(DockerClientTestCase):
             for service in services:
                 assert self.lookup(container, service.name)
 
+    @v2_only()
+    def test_up_with_default_network_config(self):
+        filename = 'default-network-config.yml'
+
+        self.base_dir = 'tests/fixtures/networks'
+        self._project = get_project(self.base_dir, [filename])
+
+        self.dispatch(['-f', filename, 'up', '-d'], None)
+
+        networks = self.client.networks(names=[self.project.default_network.full_name])
+        assert networks[0]['Options']['com.docker.network.bridge.enable_icc'] == 'false'
+
     @v2_only()
     def test_up_with_networks(self):
         self.base_dir = 'tests/fixtures/networks'
diff --git a/tests/fixtures/networks/default-network-config.yml b/tests/fixtures/networks/default-network-config.yml
new file mode 100644
index 00000000..275fae98
--- /dev/null
+++ b/tests/fixtures/networks/default-network-config.yml
@@ -0,0 +1,13 @@
+version: 2
+services:
+  simple:
+    image: busybox:latest
+    command: top
+  another:
+    image: busybox:latest
+    command: top
+networks:
+  default:
+    driver: bridge
+    driver_opts:
+      "com.docker.network.bridge.enable_icc": "false"

From 6b105a6e9297f6ee8c16f331a9e8fa32c366902a Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 18 Jan 2016 15:04:10 +0000
Subject: [PATCH 0695/1265] Update networking docs

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/networking.md | 136 +++++++++++++++++++++++++++++----------------
 1 file changed, 89 insertions(+), 47 deletions(-)

diff --git a/docs/networking.md b/docs/networking.md
index 91ac0b73..f111f730 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -12,83 +12,125 @@ weight=6
 
 # Networking in Compose
 
-> **Note:** Compose's networking support is experimental, and must be explicitly enabled with the `docker-compose --x-networking` flag.
+> **Note:** This document only applies if you're using v2 of the [Compose file format](compose-file.md). Networking features are not supported for legacy Compose files.
 
-Compose sets up a single default
+By default Compose sets up a single
 [network](/engine/reference/commandline/network_create.md) for your app. Each
 container for a service joins the default network and is both *reachable* by
 other containers on that network, and *discoverable* by them at a hostname
 identical to the container name.
 
-> **Note:** Your app's network is given the same name as the "project name", which is based on the name of the directory it lives in. See the [Command line overview](reference/docker-compose.md) for how to override it.
+> **Note:** Your app's network is given a name based on the "project name", which is based on the name of the directory it lives in. You can override the project name with either the [`--project-name` flag](reference/docker-compose.md) or the [`COMPOSE_PROJECT_NAME` environment variable](reference/overview.md#compose-project-name).
 
 For example, suppose your app is in a directory called `myapp`, and your `docker-compose.yml` looks like this:
 
-    web:
-      build: .
-      ports:
-        - "8000:8000"
-    db:
-      image: postgres
+    version: 2
 
-When you run `docker-compose --x-networking up`, the following happens:
+    services:
+      web:
+        build: .
+        ports:
+          - "8000:8000"
+      db:
+        image: postgres
 
-1. A network called `myapp` is created.
-2. A container is created using `web`'s configuration. It joins the network
-`myapp` under the name `myapp_web_1`.
-3. A container is created using `db`'s configuration. It joins the network
-`myapp` under the name `myapp_db_1`.
+When you run `docker-compose up`, the following happens:
 
-Each container can now look up the hostname `myapp_web_1` or `myapp_db_1` and
+1.  A network called `myapp_default` is created.
+2.  A container is created using `web`'s configuration. It joins the network
+    `myapp_default` under the name `web`.
+3.  A container is created using `db`'s configuration. It joins the network
+    `myapp_default` under the name `db`.
+
+Each container can now look up the hostname `web` or `db` and
 get back the appropriate container's IP address. For example, `web`'s
-application code could connect to the URL `postgres://myapp_db_1:5432` and start
+application code could connect to the URL `postgres://db:5432` and start
 using the Postgres database.
 
 Because `web` explicitly maps a port, it's also accessible from the outside world via port 8000 on your Docker host's network interface.
 
-> **Note:** in the next release there will be additional aliases for the
-> container, including a short name without the project name and container
-> index. The full container name will remain as one of the alias for backwards
-> compatibility.
-
 ## Updating containers
 
 If you make a configuration change to a service and run `docker-compose up` to update it, the old container will be removed and the new one will join the network under a different IP address but the same name. Running containers will be able to look up that name and connect to the new address, but the old address will stop working.
 
 If any containers have connections open to the old container, they will be closed. It is a container's responsibility to detect this condition, look up the name again and reconnect.
 
-## Configure how services are published
-
-By default, containers for each service are published on the network with the
-container name. If you want to change the name, or stop containers from being
-discoverable at all, you can use the `container_name` option:
-
-    web:
-      build: .
-      container_name: "my-web-application"
-
 ## Links
 
-Docker links are a one-way, single-host communication system. They should now be considered deprecated, and you should update your app to use networking instead. In the majority of cases, this will simply involve removing the `links` sections from your `docker-compose.yml`.
+Docker links are a one-way, single-host communication system. They should now be considered deprecated, and as part of upgrading your app to the v2 format, you must remove any `links` sections from your `docker-compose.yml` and use service names (e.g. `web`, `db`) as the hostnames to connect to.
 
-## Specifying the network driver
-
-By default, Compose uses the `bridge` driver when creating the app’s network. The Docker Engine provides one other driver out-of-the-box: `overlay`, which implements secure communication between containers on different hosts (see the next section for how to set up and use the `overlay` driver). Docker also allows you to install [custom network drivers](/engine/extend/plugins_network.md).
-
-You can specify which one to use with the `--x-network-driver` flag:
-
-    $ docker-compose --x-networking --x-network-driver=overlay up
-
-<!--[metadata]>
 ## Multi-host networking
 
-(TODO: talk about Swarm and the overlay driver)
-<![end-metadata]-->
+When deploying a Compose application to a Swarm cluster, you can make use of the built-in `overlay` driver to enable multi-host communication between containers with no changes to application code. Consult the [Getting started with multi-host networking](/engine/userguide/networking/get-started-overlay.md) to see how to set up the overlay driver, and then specify `driver: overlay` in your networking config (see the sections below for how to do this).
+
+## Specifying custom networks
+
+Instead of just using the default app network, you can specify your own networks with the top-level `networks` key. This lets you create more complex topologies and specify [custom network drivers](/engine/extend/plugins_network.md) and options. You can also use it to connect services to externally-created networks which aren't managed by Compose.
+
+Each service can specify what networks to connect to with the *service-level* `networks` key, which is a list of names referencing entries under the *top-level* `networks` key.
+
+Here's an example Compose file defining several networks. The `proxy` service is the gateway to the outside world, via a network called `outside` which is expected to already exist. `proxy` is isolated from the `db` service, because they do not share a network in common - only `app` can talk to both.
+
+    version: 2
+
+    services:
+      proxy:
+        build: ./proxy
+        networks:
+          - outside
+          - front
+      app:
+        build: ./app
+        networks:
+          - front
+          - back
+      db:
+        image: postgres
+        networks:
+          - back
+
+    networks:
+      front:
+        # Use the overlay driver for multi-host communication
+        driver: overlay
+      back:
+        # Use a custom driver which takes special options
+        driver: my-custom-driver
+        options:
+          foo: "1"
+          bar: "2"
+      outside:
+        # The 'outside' network is expected to already exist - Compose will not
+        # attempt to create it
+        external: true
+
+## Configuring the default network
+
+Instead of (or as well as) specifying your own networks, you can also change the settings of the app-wide default network by defining an entry under `networks` named `default`:
+
+    version: 2
+
+    services:
+      web:
+        build: .
+        ports:
+          - "8000:8000"
+      db:
+        image: postgres
+
+    networks:
+      default:
+        # Use the overlay driver for multi-host communication
+        driver: overlay
 
 ## Custom container network modes
 
-Compose allows you to specify a custom network mode for a service with the `net` option - for example, `net: "host"` specifies that its containers should use the same network namespace as the Docker host, and `net: "none"` specifies that they should have no networking capabilities.
+The `docker` CLI command allows you to specify a custom network mode for a container with the `--net` option - for example, `--net=host` specifies that the container should use the same network namespace as the Docker host, and `--net=none` specifies that it should have no networking capabilities.
 
-If a service specifies the `net` option, its containers will *not* join the app’s network and will not be able to communicate with other services in the app.
+To make use of this in Compose, specify a `networks` list with a single item `host`, `bridge` or `none`:
 
-If *all* services in an app specify the `net` option, a network will not be created at all.
+    app:
+      build: ./app
+      networks: ["host"]
+
+There is no equivalent to `--net=container:CONTAINER_NAME` in the v2 Compose file format. You should instead use networks to enable communication.

From afae3650508f8643f77065cdf7fd160119f07d3b Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 18 Jan 2016 17:08:50 +0000
Subject: [PATCH 0696/1265] Allow custom ipam config

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/network.py                | 28 +++++++++++++--
 compose/project.py                |  1 +
 tests/integration/project_test.py | 57 +++++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/compose/network.py b/compose/network.py
index 34159fd6..4f4f5522 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -4,6 +4,8 @@ from __future__ import unicode_literals
 import logging
 
 from docker.errors import NotFound
+from docker.utils import create_ipam_config
+from docker.utils import create_ipam_pool
 
 from .config import ConfigurationError
 
@@ -13,12 +15,13 @@ log = logging.getLogger(__name__)
 
 class Network(object):
     def __init__(self, client, project, name, driver=None, driver_opts=None,
-                 external_name=None):
+                 ipam=None, external_name=None):
         self.client = client
         self.project = project
         self.name = name
         self.driver = driver
         self.driver_opts = driver_opts
+        self.ipam = create_ipam_config_from_dict(ipam)
         self.external_name = external_name
 
     def ensure(self):
@@ -61,7 +64,10 @@ class Network(object):
             )
 
             self.client.create_network(
-                self.full_name, self.driver, self.driver_opts
+                name=self.full_name,
+                driver=self.driver,
+                options=self.driver_opts,
+                ipam=self.ipam,
             )
 
     def remove(self):
@@ -80,3 +86,21 @@ class Network(object):
         if self.external_name:
             return self.external_name
         return '{0}_{1}'.format(self.project, self.name)
+
+
+def create_ipam_config_from_dict(ipam_dict):
+    if not ipam_dict:
+        return None
+
+    return create_ipam_config(
+        driver=ipam_dict.get('driver'),
+        pool_configs=[
+            create_ipam_pool(
+                subnet=config.get('subnet'),
+                iprange=config.get('ip_range'),
+                gateway=config.get('gateway'),
+                aux_addresses=config.get('aux_addresses'),
+            )
+            for config in ipam_dict.get('config', [])
+        ],
+    )
diff --git a/compose/project.py b/compose/project.py
index 777e8f82..080c4c49 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -64,6 +64,7 @@ class Project(object):
                 client=client, project=name, name=network_name,
                 driver=data.get('driver'),
                 driver_opts=data.get('driver_opts'),
+                ipam=data.get('ipam'),
                 external_name=data.get('external_name'),
             )
             for network_name, data in network_config.items()
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index d29d9f1e..d3fbb71e 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -516,6 +516,63 @@ class ProjectTest(DockerClientTestCase):
         foo_data = self.client.inspect_network('composetest_foo')
         self.assertEqual(foo_data['Driver'], 'bridge')
 
+    @v2_only()
+    def test_up_with_ipam_config(self):
+        config_data = config.Config(
+            version=2,
+            services=[],
+            volumes={},
+            networks={
+                'front': {
+                    'driver': 'bridge',
+                    'driver_opts': {
+                        "com.docker.network.bridge.enable_icc": "false",
+                    },
+                    'ipam': {
+                        'driver': 'default',
+                        'config': [{
+                            "subnet": "172.28.0.0/16",
+                            "ip_range": "172.28.5.0/24",
+                            "gateway": "172.28.5.254",
+                            "aux_addresses": {
+                                "a": "172.28.1.5",
+                                "b": "172.28.1.6",
+                                "c": "172.28.1.7",
+                            },
+                        }],
+                    },
+                },
+            },
+        )
+
+        project = Project.from_config(
+            client=self.client,
+            name='composetest',
+            config_data=config_data,
+        )
+        project.up()
+
+        network = self.client.networks(names=['composetest_front'])[0]
+
+        assert network['Options'] == {
+            "com.docker.network.bridge.enable_icc": "false"
+        }
+
+        assert network['IPAM'] == {
+            'Driver': 'default',
+            'Options': None,
+            'Config': [{
+                'Subnet': "172.28.0.0/16",
+                'IPRange': "172.28.5.0/24",
+                'Gateway': "172.28.5.254",
+                'AuxiliaryAddresses': {
+                    'a': '172.28.1.5',
+                    'b': '172.28.1.6',
+                    'c': '172.28.1.7',
+                },
+            }],
+        }
+
     @v2_only()
     def test_project_up_volumes(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))

From 66dd9ae9a49bb4483601a161adf7f45e73fb5710 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 18 Jan 2016 15:55:30 -0500
Subject: [PATCH 0697/1265] Fix some bugs in release scripts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/release/contributors | 11 +++++++----
 script/release/push-release |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/script/release/contributors b/script/release/contributors
index bb9fe871..1e69b143 100755
--- a/script/release/contributors
+++ b/script/release/contributors
@@ -18,10 +18,13 @@ PREV_RELEASE=$1
 VERSION=HEAD
 URL="https://api.github.com/repos/docker/compose/compare"
 
-curl -sf "$URL/$PREV_RELEASE...$VERSION" | \
+contribs=$(curl -sf "$URL/$PREV_RELEASE...$VERSION" | \
     jq -r '.commits[].author.login' | \
     sort | \
     uniq -c | \
-    sort -nr | \
-    awk '{print "@"$2","}' | \
-    xargs echo
+    sort -nr)
+
+echo "Contributions by user: "
+echo "$contribs"
+echo
+echo "$contribs" | awk '{print "@"$2","}' | xargs
diff --git a/script/release/push-release b/script/release/push-release
index b754d40f..7d9ec0a2 100755
--- a/script/release/push-release
+++ b/script/release/push-release
@@ -60,7 +60,7 @@ sed -i -e 's/logo.png?raw=true/https:\/\/github.com\/docker\/compose\/raw\/maste
 ./script/write-git-sha
 python setup.py sdist
 if [ "$(command -v twine 2> /dev/null)" ]; then
-    twine upload ./dist/docker-compose-${VERSION}.tar.gz
+    twine upload ./dist/docker-compose-${VERSION/-/}.tar.gz
 else
     python setup.py upload
 fi

From 9ccef1ea916a55d87102f1fba7b3ff5e484882ed Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 18 Jan 2016 19:22:04 +0000
Subject: [PATCH 0698/1265] Catch TLSParameterErrors from docker-py

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/docker_client.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 611997df..b680616e 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -5,9 +5,11 @@ import logging
 import os
 
 from docker import Client
+from docker.errors import TLSParameterError
 from docker.utils import kwargs_from_env
 
 from ..const import HTTP_TIMEOUT
+from .errors import UserError
 
 log = logging.getLogger(__name__)
 
@@ -20,8 +22,16 @@ def docker_client(version=None):
     if 'DOCKER_CLIENT_TIMEOUT' in os.environ:
         log.warn('The DOCKER_CLIENT_TIMEOUT environment variable is deprecated. Please use COMPOSE_HTTP_TIMEOUT instead.')
 
-    kwargs = kwargs_from_env(assert_hostname=False)
+    try:
+        kwargs = kwargs_from_env(assert_hostname=False)
+    except TLSParameterError:
+        raise UserError(
+            'TLS configuration is invalid - make sure your DOCKER_TLS_VERIFY and DOCKER_CERT_PATH are set correctly.\n'
+            'You might need to run `eval "$(docker-machine env default)"`')
+
     if version:
         kwargs['version'] = version
+
     kwargs['timeout'] = HTTP_TIMEOUT
+
     return Client(**kwargs)

From 746033ed9dd631b1bac68d409c32d17c5be8944f Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 19 Jan 2016 10:57:12 +0000
Subject: [PATCH 0699/1265] Test that you can set the default network to be
 external

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py                 | 23 ++++++++++++++++++++
 tests/fixtures/networks/external-default.yml | 12 ++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 tests/fixtures/networks/external-default.yml

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index f5c16380..4c278aa4 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -528,6 +528,29 @@ class CLITestCase(DockerClientTestCase):
         container = self.project.containers()[0]
         assert sorted(list(container.get('NetworkSettings.Networks'))) == sorted(network_names)
 
+    @v2_only()
+    def test_up_with_external_default_network(self):
+        filename = 'external-default.yml'
+
+        self.base_dir = 'tests/fixtures/networks'
+        self._project = get_project(self.base_dir, [filename])
+
+        result = self.dispatch(['-f', filename, 'up', '-d'], returncode=1)
+        assert 'declared as external, but could not be found' in result.stderr
+
+        networks = [
+            n['Name'] for n in self.client.networks()
+            if n['Name'].startswith('{}_'.format(self.project.name))
+        ]
+        assert not networks
+
+        network_name = 'composetest_external_network'
+        self.client.create_network(network_name)
+
+        self.dispatch(['-f', filename, 'up', '-d'])
+        container = self.project.containers()[0]
+        assert list(container.get('NetworkSettings.Networks')) == [network_name]
+
     @v2_only()
     def test_up_no_services(self):
         self.base_dir = 'tests/fixtures/no-services'
diff --git a/tests/fixtures/networks/external-default.yml b/tests/fixtures/networks/external-default.yml
new file mode 100644
index 00000000..7b0797e5
--- /dev/null
+++ b/tests/fixtures/networks/external-default.yml
@@ -0,0 +1,12 @@
+version: 2
+services:
+  simple:
+    image: busybox:latest
+    command: top
+  another:
+    image: busybox:latest
+    command: top
+networks:
+  default:
+    external:
+      name: composetest_external_network

From 2106481c23429eaf59e653b1bd107c8a809c3cec Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 19 Jan 2016 11:27:27 +0000
Subject: [PATCH 0700/1265] Fix "name is reserved" with Engine 1.10 RC1

Ensure link aliases are unique (this deduping was previously performed
on the server).

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py                | 25 ++++++++++++++++---------
 tests/integration/service_test.py |  4 ----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index f5db07fb..f72863c9 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -502,24 +502,31 @@ class Service(object):
         if self.use_networking:
             return []
 
-        links = []
+        links = {}
+
         for service, link_name in self.links:
             for container in service.containers():
-                links.append((container.name, link_name or service.name))
-                links.append((container.name, container.name))
-                links.append((container.name, container.name_without_project))
+                links[link_name or service.name] = container.name
+                links[container.name] = container.name
+                links[container.name_without_project] = container.name
+
         if link_to_self:
             for container in self.containers():
-                links.append((container.name, self.name))
-                links.append((container.name, container.name))
-                links.append((container.name, container.name_without_project))
+                links[self.name] = container.name
+                links[container.name] = container.name
+                links[container.name_without_project] = container.name
+
         for external_link in self.options.get('external_links') or []:
             if ':' not in external_link:
                 link_name = external_link
             else:
                 external_link, link_name = external_link.split(':')
-            links.append((external_link, link_name))
-        return links
+            links[link_name] = external_link
+
+        return [
+            (alias, container_name)
+            for (container_name, alias) in links.items()
+        ]
 
     def _get_volumes_from(self):
         return [build_volume_from(spec) for spec in self.volumes_from]
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index bce3999b..0e91dcf7 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -7,7 +7,6 @@ import tempfile
 from os import path
 
 from docker.errors import APIError
-from pytest import mark
 from six import StringIO
 from six import text_type
 
@@ -372,7 +371,6 @@ class ServiceTest(DockerClientTestCase):
         create_and_start_container(db)
         self.assertEqual(db.containers()[0].environment['FOO'], 'BAR')
 
-    @mark.skipif(True, reason="Engine returns error - needs investigating")
     def test_start_container_creates_links(self):
         db = self.create_service('db')
         web = self.create_service('web', links=[(db, None)])
@@ -389,7 +387,6 @@ class ServiceTest(DockerClientTestCase):
                 'db'])
         )
 
-    @mark.skipif(True, reason="Engine returns error - needs investigating")
     def test_start_container_creates_links_with_names(self):
         db = self.create_service('db')
         web = self.create_service('web', links=[(db, 'custom_link_name')])
@@ -433,7 +430,6 @@ class ServiceTest(DockerClientTestCase):
         c = create_and_start_container(db)
         self.assertEqual(set(get_links(c)), set([]))
 
-    @mark.skipif(True, reason="Engine returns error - needs investigating")
     def test_start_one_off_container_creates_links_to_its_own_service(self):
         db = self.create_service('db')
 

From c39489f540a0ee3d027768729fc3895dbd7ecae8 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 19 Jan 2016 14:41:21 -0500
Subject: [PATCH 0701/1265] Don't copy over volumes that were previously host
 volumes, and are now container volumes.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py                |  4 ++++
 tests/integration/service_test.py | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/compose/service.py b/compose/service.py
index f72863c9..ebbb20cf 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -911,6 +911,10 @@ def get_container_data_volumes(container, volumes_option):
         if not mount:
             continue
 
+        # Volume was previously a host volume, now it's a container volume
+        if not mount.get('Name'):
+            continue
+
         # Copy existing volume from old container
         volume = volume._replace(external=mount['Source'])
         volumes.append(volume)
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 0e91dcf7..1847c3af 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -343,6 +343,31 @@ class ServiceTest(DockerClientTestCase):
         )
         self.assertEqual(new_container.get_mount('/data')['Source'], volume_path)
 
+    def test_execute_convergence_plan_when_host_volume_is_removed(self):
+        host_path = '/tmp/host-path'
+        service = self.create_service(
+            'db',
+            build={'context': 'tests/fixtures/dockerfile-with-volume'},
+            volumes=[VolumeSpec(host_path, '/data', 'rw')])
+
+        old_container = create_and_start_container(service)
+        assert (
+            [mount['Destination'] for mount in old_container.get('Mounts')] ==
+            ['/data']
+        )
+        service.options['volumes'] = []
+
+        with mock.patch('compose.service.log', autospec=True) as mock_log:
+            new_container, = service.execute_convergence_plan(
+                ConvergencePlan('recreate', [old_container]))
+
+        assert not mock_log.warn.called
+        assert (
+            [mount['Destination'] for mount in new_container.get('Mounts')],
+            ['/data']
+        )
+        assert new_container.get_mount('/data')['Source'] != host_path
+
     def test_execute_convergence_plan_without_start(self):
         service = self.create_service(
             'db',

From 85619842be6a5c1d5a8068aeb28e158ec32c41ca Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 18 Jan 2016 14:02:25 -0500
Subject: [PATCH 0702/1265] Add migration script.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 .../migrate-compose-file-v1-to-v2.py          | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100755 contrib/migration/migrate-compose-file-v1-to-v2.py

diff --git a/contrib/migration/migrate-compose-file-v1-to-v2.py b/contrib/migration/migrate-compose-file-v1-to-v2.py
new file mode 100755
index 00000000..a961b0bd
--- /dev/null
+++ b/contrib/migration/migrate-compose-file-v1-to-v2.py
@@ -0,0 +1,99 @@
+#!/usr/bin/env python
+"""
+Migrate a Compose file from the V1 format in Compose 1.5 to the V2 format
+supported by Compose 1.6+
+"""
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import argparse
+import logging
+import sys
+
+import ruamel.yaml
+
+
+log = logging.getLogger('migrate')
+
+
+def migrate(content):
+    data = ruamel.yaml.load(content, ruamel.yaml.RoundTripLoader)
+
+    service_names = data.keys()
+    for name, service in data.items():
+        # remove links and external links
+        service.pop('links', None)
+        external_links = service.pop('external_links', None)
+        if external_links:
+            log.warn(
+                "Service {name} has external_links: {ext}, which are no longer "
+                "supported. See https://docs.docker.com/compose/networking/ "
+                "for options on how to connect external containers to the "
+                "compose network.".format(name=name, ext=external_links))
+
+        # net is now networks
+        if 'net' in service:
+            service['networks'] = [service.pop('net')]
+
+        # create build section
+        if 'dockerfile' in service:
+            service['build'] = {
+                'context': service.pop('build'),
+                'dockerfile': service.pop('dockerfile'),
+            }
+
+        # create logging section
+        if 'log_driver' in service:
+            service['logging'] = {'driver': service.pop('log_driver')}
+            if 'log_opt' in service:
+                service['logging']['options'] = service.pop('log_opt')
+
+        # volumes_from prefix with 'container:'
+        for idx, volume_from in enumerate(service.get('volumes_from', [])):
+            if volume_from.split(':', 1)[0] not in service_names:
+                service['volumes_from'][idx] = 'container:%s' % volume_from
+
+    data['services'] = {name: data.pop(name) for name in data.keys()}
+    data['version'] = 2
+    return data
+
+
+def write(stream, new_format, indent, width):
+    ruamel.yaml.dump(
+        new_format,
+        stream,
+        Dumper=ruamel.yaml.RoundTripDumper,
+        indent=indent,
+        width=width)
+
+
+def parse_opts(args):
+    parser = argparse.ArgumentParser()
+    parser.add_argument("filename", help="Compose file filename.")
+    parser.add_argument("-i", "--in-place", action='store_true')
+    parser.add_argument(
+        "--indent", type=int, default=2,
+        help="Number of spaces used to indent the output yaml.")
+    parser.add_argument(
+        "--width", type=int, default=80,
+        help="Number of spaces used as the output width.")
+    return parser.parse_args()
+
+
+def main(args):
+    logging.basicConfig()
+
+    opts = parse_opts(args)
+
+    with open(opts.filename, 'r') as fh:
+        new_format = migrate(fh.read())
+
+    if opts.in_place:
+        output = open(opts.filename, 'w')
+    else:
+        output = sys.stdout
+    write(output, new_format, opts.indent, opts.width)
+
+
+if __name__ == "__main__":
+    main(sys.argv)

From 0bce467782c83b9065a9efaadc1405ba8862116a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 19 Jan 2016 15:41:45 -0500
Subject: [PATCH 0703/1265] Implement depends_on to define an order for
 services in the v2 format.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py                | 15 ++++++++++---
 compose/config/service_schema_v2.json   |  1 +
 compose/config/sort_services.py         |  9 +++++---
 compose/config/validation.py            |  8 +++++++
 compose/service.py                      |  3 ++-
 tests/unit/config/config_test.py        | 28 ++++++++++++++++++++++++-
 tests/unit/config/sort_services_test.py | 14 +++++++++++++
 7 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index ac5e8d17..6bba53b8 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -27,6 +27,7 @@ from .types import VolumeFromSpec
 from .types import VolumeSpec
 from .validation import validate_against_fields_schema
 from .validation import validate_against_service_schema
+from .validation import validate_depends_on
 from .validation import validate_extends_file_path
 from .validation import validate_top_level_object
 from .validation import validate_top_level_service_objects
@@ -312,9 +313,10 @@ def load_services(working_dir, config_file, service_configs):
         resolver = ServiceExtendsResolver(service_config, config_file)
         service_dict = process_service(resolver.run())
 
-        validate_service(service_dict, service_config.name, config_file.version)
+        service_config = service_config._replace(config=service_dict)
+        validate_service(service_config, service_names, config_file.version)
         service_dict = finalize_service(
-            service_config._replace(config=service_dict),
+            service_config,
             service_names,
             config_file.version)
         return service_dict
@@ -481,6 +483,10 @@ def validate_extended_service_dict(service_dict, filename, service):
             raise ConfigurationError(
                 "%s services with 'net: container' cannot be extended" % error_prefix)
 
+    if 'depends_on' in service_dict:
+        raise ConfigurationError(
+            "%s services with 'depends_on' cannot be extended" % error_prefix)
+
 
 def validate_ulimits(ulimit_config):
     for limit_name, soft_hard_values in six.iteritems(ulimit_config):
@@ -491,13 +497,16 @@ def validate_ulimits(ulimit_config):
                     "than 'hard' value".format(ulimit_config))
 
 
-def validate_service(service_dict, service_name, version):
+def validate_service(service_config, service_names, version):
+    service_dict, service_name = service_config.config, service_config.name
     validate_against_service_schema(service_dict, service_name, version)
     validate_paths(service_dict)
 
     if 'ulimits' in service_dict:
         validate_ulimits(service_dict['ulimits'])
 
+    validate_depends_on(service_config, service_names)
+
     if not service_dict.get('image') and has_uppercase(service_name):
         raise ConfigurationError(
             "Service '{name}' contains uppercase characters which are not valid "
diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
index 8623507a..d4ec575a 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.json
@@ -42,6 +42,7 @@
         "cpu_shares": {"type": ["number", "string"]},
         "cpu_quota": {"type": ["number", "string"]},
         "cpuset": {"type": "string"},
+        "depends_on": {"$ref": "#/definitions/list_of_strings"},
         "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "dns": {"$ref": "#/definitions/string_or_list"},
         "dns_search": {"$ref": "#/definitions/string_or_list"},
diff --git a/compose/config/sort_services.py b/compose/config/sort_services.py
index 05552122..ac0fa458 100644
--- a/compose/config/sort_services.py
+++ b/compose/config/sort_services.py
@@ -33,7 +33,8 @@ def sort_service_dicts(services):
             service for service in services
             if (name in get_service_names(service.get('links', [])) or
                 name in get_service_names_from_volumes_from(service.get('volumes_from', [])) or
-                name == get_service_name_from_net(service.get('net')))
+                name == get_service_name_from_net(service.get('net')) or
+                name in service.get('depends_on', []))
         ]
 
     def visit(n):
@@ -42,8 +43,10 @@ def sort_service_dicts(services):
                 raise DependencyError('A service can not link to itself: %s' % n['name'])
             if n['name'] in n.get('volumes_from', []):
                 raise DependencyError('A service can not mount itself as volume: %s' % n['name'])
-            else:
-                raise DependencyError('Circular import between %s' % ' and '.join(temporary_marked))
+            if n['name'] in n.get('depends_on', []):
+                raise DependencyError('A service can not depend on itself: %s' % n['name'])
+            raise DependencyError('Circular dependency between %s' % ' and '.join(temporary_marked))
+
         if n in unmarked:
             temporary_marked.add(n['name'])
             for m in get_service_dependents(n, services):
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 639e8bed..6cce1105 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -123,6 +123,14 @@ def validate_extends_file_path(service_name, extends_options, filename):
         )
 
 
+def validate_depends_on(service_config, service_names):
+    for dependency in service_config.config.get('depends_on', []):
+        if dependency not in service_names:
+            raise ConfigurationError(
+                "Service '{s.name}' depends on service '{dep}' which is "
+                "undefined.".format(s=service_config, dep=dependency))
+
+
 def get_unsupported_config_msg(service_name, error_key):
     msg = "Unsupported config option for '{}' service: '{}'".format(service_name, error_key)
     if error_key in DOCKER_CONFIG_HINTS:
diff --git a/compose/service.py b/compose/service.py
index f72863c9..1dfda06a 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -471,7 +471,8 @@ class Service(object):
         net_name = self.net.service_name
         return (self.get_linked_service_names() +
                 self.get_volumes_from_names() +
-                ([net_name] if net_name else []))
+                ([net_name] if net_name else []) +
+                self.options.get('depends_on', []))
 
     def get_linked_service_names(self):
         return [service.name for (service, _) in self.links]
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index cc205136..0416d5b7 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -894,9 +894,35 @@ class ConfigTest(unittest.TestCase):
                 'ext': {'external': True, 'driver': 'foo'}
             }
         })
-        with self.assertRaises(ConfigurationError):
+        with pytest.raises(ConfigurationError):
             config.load(config_details)
 
+    def test_depends_on_orders_services(self):
+        config_details = build_config_details({
+            'version': 2,
+            'services': {
+                'one': {'image': 'busybox', 'depends_on': ['three', 'two']},
+                'two': {'image': 'busybox', 'depends_on': ['three']},
+                'three': {'image': 'busybox'},
+            },
+        })
+        actual = config.load(config_details)
+        assert (
+            [service['name'] for service in actual.services] ==
+            ['three', 'two', 'one']
+        )
+
+    def test_depends_on_unknown_service_errors(self):
+        config_details = build_config_details({
+            'version': 2,
+            'services': {
+                'one': {'image': 'busybox', 'depends_on': ['three']},
+            },
+        })
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(config_details)
+        assert "Service 'one' depends on service 'three'" in exc.exconly()
+
 
 class PortsTest(unittest.TestCase):
     INVALID_PORTS_TYPES = [
diff --git a/tests/unit/config/sort_services_test.py b/tests/unit/config/sort_services_test.py
index ebe444fe..3279ece4 100644
--- a/tests/unit/config/sort_services_test.py
+++ b/tests/unit/config/sort_services_test.py
@@ -1,6 +1,8 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import pytest
+
 from compose.config.errors import DependencyError
 from compose.config.sort_services import sort_service_dicts
 from compose.config.types import VolumeFromSpec
@@ -240,3 +242,15 @@ class SortServiceTest(unittest.TestCase):
             self.assertIn('web', e.msg)
         else:
             self.fail('Should have thrown an DependencyError')
+
+    def test_sort_service_dicts_depends_on_self(self):
+        services = [
+            {
+                'depends_on': ['web'],
+                'name': 'web'
+            },
+        ]
+
+        with pytest.raises(DependencyError) as exc:
+            sort_service_dicts(services)
+        assert 'A service can not depend on itself: web' in exc.exconly()

From 146587643c32c076b93b1fa67cd531b5b2003227 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 19 Jan 2016 15:47:57 -0500
Subject: [PATCH 0704/1265] Move ulimits validation to validation.py and
 improve the error message.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         | 14 ++------------
 compose/config/validation.py     | 12 ++++++++++++
 tests/unit/config/config_test.py |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 6bba53b8..72ad50af 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -31,6 +31,7 @@ from .validation import validate_depends_on
 from .validation import validate_extends_file_path
 from .validation import validate_top_level_object
 from .validation import validate_top_level_service_objects
+from .validation import validate_ulimits
 
 
 DOCKER_CONFIG_KEYS = [
@@ -488,23 +489,12 @@ def validate_extended_service_dict(service_dict, filename, service):
             "%s services with 'depends_on' cannot be extended" % error_prefix)
 
 
-def validate_ulimits(ulimit_config):
-    for limit_name, soft_hard_values in six.iteritems(ulimit_config):
-        if isinstance(soft_hard_values, dict):
-            if not soft_hard_values['soft'] <= soft_hard_values['hard']:
-                raise ConfigurationError(
-                    "ulimit_config \"{}\" cannot contain a 'soft' value higher "
-                    "than 'hard' value".format(ulimit_config))
-
-
 def validate_service(service_config, service_names, version):
     service_dict, service_name = service_config.config, service_config.name
     validate_against_service_schema(service_dict, service_name, version)
     validate_paths(service_dict)
 
-    if 'ulimits' in service_dict:
-        validate_ulimits(service_dict['ulimits'])
-
+    validate_ulimits(service_config)
     validate_depends_on(service_config, service_names)
 
     if not service_dict.get('image') and has_uppercase(service_name):
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 6cce1105..ecf8d4f9 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -110,6 +110,18 @@ def validate_top_level_object(config_file):
                 type(config_file.config)))
 
 
+def validate_ulimits(service_config):
+    ulimit_config = service_config.config.get('ulimits', {})
+    for limit_name, soft_hard_values in six.iteritems(ulimit_config):
+        if isinstance(soft_hard_values, dict):
+            if not soft_hard_values['soft'] <= soft_hard_values['hard']:
+                raise ConfigurationError(
+                    "Service '{s.name}' has invalid ulimit '{ulimit}'. "
+                    "'soft' value can not be greater than 'hard' value ".format(
+                        s=service_config,
+                        ulimit=ulimit_config))
+
+
 def validate_extends_file_path(service_name, extends_options, filename):
     """
     The service to be extended must either be defined in the config key 'file',
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 0416d5b7..3c3c6326 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -700,7 +700,7 @@ class ConfigTest(unittest.TestCase):
         assert "'hard' is a required property" in exc.exconly()
 
     def test_config_ulimits_soft_greater_than_hard_error(self):
-        expected = "cannot contain a 'soft' value higher than 'hard' value"
+        expected = "'soft' value can not be greater than 'hard' value"
 
         with pytest.raises(ConfigurationError) as exc:
             config.load(build_config_details(

From 5aadf5a187b436ddb81772058dbedeaeea804d95 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 19 Jan 2016 15:52:17 -0500
Subject: [PATCH 0705/1265] Update tests in sort_services_test.py to use
 pytest.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/unit/config/sort_services_test.py | 95 +++++++++++--------------
 1 file changed, 41 insertions(+), 54 deletions(-)

diff --git a/tests/unit/config/sort_services_test.py b/tests/unit/config/sort_services_test.py
index 3279ece4..f5990664 100644
--- a/tests/unit/config/sort_services_test.py
+++ b/tests/unit/config/sort_services_test.py
@@ -6,10 +6,9 @@ import pytest
 from compose.config.errors import DependencyError
 from compose.config.sort_services import sort_service_dicts
 from compose.config.types import VolumeFromSpec
-from tests import unittest
 
 
-class SortServiceTest(unittest.TestCase):
+class TestSortService(object):
     def test_sort_service_dicts_1(self):
         services = [
             {
@@ -25,10 +24,10 @@ class SortServiceTest(unittest.TestCase):
         ]
 
         sorted_services = sort_service_dicts(services)
-        self.assertEqual(len(sorted_services), 3)
-        self.assertEqual(sorted_services[0]['name'], 'grunt')
-        self.assertEqual(sorted_services[1]['name'], 'redis')
-        self.assertEqual(sorted_services[2]['name'], 'web')
+        assert len(sorted_services) == 3
+        assert sorted_services[0]['name'] == 'grunt'
+        assert sorted_services[1]['name'] == 'redis'
+        assert sorted_services[2]['name'] == 'web'
 
     def test_sort_service_dicts_2(self):
         services = [
@@ -46,10 +45,10 @@ class SortServiceTest(unittest.TestCase):
         ]
 
         sorted_services = sort_service_dicts(services)
-        self.assertEqual(len(sorted_services), 3)
-        self.assertEqual(sorted_services[0]['name'], 'redis')
-        self.assertEqual(sorted_services[1]['name'], 'postgres')
-        self.assertEqual(sorted_services[2]['name'], 'web')
+        assert len(sorted_services) == 3
+        assert sorted_services[0]['name'] == 'redis'
+        assert sorted_services[1]['name'] == 'postgres'
+        assert sorted_services[2]['name'] == 'web'
 
     def test_sort_service_dicts_3(self):
         services = [
@@ -67,10 +66,10 @@ class SortServiceTest(unittest.TestCase):
         ]
 
         sorted_services = sort_service_dicts(services)
-        self.assertEqual(len(sorted_services), 3)
-        self.assertEqual(sorted_services[0]['name'], 'child')
-        self.assertEqual(sorted_services[1]['name'], 'parent')
-        self.assertEqual(sorted_services[2]['name'], 'grandparent')
+        assert len(sorted_services) == 3
+        assert sorted_services[0]['name'] == 'child'
+        assert sorted_services[1]['name'] == 'parent'
+        assert sorted_services[2]['name'] == 'grandparent'
 
     def test_sort_service_dicts_4(self):
         services = [
@@ -88,10 +87,10 @@ class SortServiceTest(unittest.TestCase):
         ]
 
         sorted_services = sort_service_dicts(services)
-        self.assertEqual(len(sorted_services), 3)
-        self.assertEqual(sorted_services[0]['name'], 'child')
-        self.assertEqual(sorted_services[1]['name'], 'parent')
-        self.assertEqual(sorted_services[2]['name'], 'grandparent')
+        assert len(sorted_services) == 3
+        assert sorted_services[0]['name'] == 'child'
+        assert sorted_services[1]['name'] == 'parent'
+        assert sorted_services[2]['name'] == 'grandparent'
 
     def test_sort_service_dicts_5(self):
         services = [
@@ -109,10 +108,10 @@ class SortServiceTest(unittest.TestCase):
         ]
 
         sorted_services = sort_service_dicts(services)
-        self.assertEqual(len(sorted_services), 3)
-        self.assertEqual(sorted_services[0]['name'], 'child')
-        self.assertEqual(sorted_services[1]['name'], 'parent')
-        self.assertEqual(sorted_services[2]['name'], 'grandparent')
+        assert len(sorted_services) == 3
+        assert sorted_services[0]['name'] == 'child'
+        assert sorted_services[1]['name'] == 'parent'
+        assert sorted_services[2]['name'] == 'grandparent'
 
     def test_sort_service_dicts_6(self):
         services = [
@@ -130,10 +129,10 @@ class SortServiceTest(unittest.TestCase):
         ]
 
         sorted_services = sort_service_dicts(services)
-        self.assertEqual(len(sorted_services), 3)
-        self.assertEqual(sorted_services[0]['name'], 'child')
-        self.assertEqual(sorted_services[1]['name'], 'parent')
-        self.assertEqual(sorted_services[2]['name'], 'grandparent')
+        assert len(sorted_services) == 3
+        assert sorted_services[0]['name'] == 'child'
+        assert sorted_services[1]['name'] == 'parent'
+        assert sorted_services[2]['name'] == 'grandparent'
 
     def test_sort_service_dicts_7(self):
         services = [
@@ -155,11 +154,11 @@ class SortServiceTest(unittest.TestCase):
         ]
 
         sorted_services = sort_service_dicts(services)
-        self.assertEqual(len(sorted_services), 4)
-        self.assertEqual(sorted_services[0]['name'], 'one')
-        self.assertEqual(sorted_services[1]['name'], 'two')
-        self.assertEqual(sorted_services[2]['name'], 'three')
-        self.assertEqual(sorted_services[3]['name'], 'four')
+        assert len(sorted_services) == 4
+        assert sorted_services[0]['name'] == 'one'
+        assert sorted_services[1]['name'] == 'two'
+        assert sorted_services[2]['name'] == 'three'
+        assert sorted_services[3]['name'] == 'four'
 
     def test_sort_service_dicts_circular_imports(self):
         services = [
@@ -173,13 +172,10 @@ class SortServiceTest(unittest.TestCase):
             },
         ]
 
-        try:
+        with pytest.raises(DependencyError) as exc:
             sort_service_dicts(services)
-        except DependencyError as e:
-            self.assertIn('redis', e.msg)
-            self.assertIn('web', e.msg)
-        else:
-            self.fail('Should have thrown an DependencyError')
+        assert 'redis' in exc.exconly()
+        assert 'web' in exc.exconly()
 
     def test_sort_service_dicts_circular_imports_2(self):
         services = [
@@ -196,13 +192,10 @@ class SortServiceTest(unittest.TestCase):
             }
         ]
 
-        try:
+        with pytest.raises(DependencyError) as exc:
             sort_service_dicts(services)
-        except DependencyError as e:
-            self.assertIn('redis', e.msg)
-            self.assertIn('web', e.msg)
-        else:
-            self.fail('Should have thrown an DependencyError')
+        assert 'redis' in exc.exconly()
+        assert 'web' in exc.exconly()
 
     def test_sort_service_dicts_circular_imports_3(self):
         services = [
@@ -220,13 +213,10 @@ class SortServiceTest(unittest.TestCase):
             }
         ]
 
-        try:
+        with pytest.raises(DependencyError) as exc:
             sort_service_dicts(services)
-        except DependencyError as e:
-            self.assertIn('a', e.msg)
-            self.assertIn('b', e.msg)
-        else:
-            self.fail('Should have thrown an DependencyError')
+        assert 'a' in exc.exconly()
+        assert 'b' in exc.exconly()
 
     def test_sort_service_dicts_self_imports(self):
         services = [
@@ -236,12 +226,9 @@ class SortServiceTest(unittest.TestCase):
             },
         ]
 
-        try:
+        with pytest.raises(DependencyError) as exc:
             sort_service_dicts(services)
-        except DependencyError as e:
-            self.assertIn('web', e.msg)
-        else:
-            self.fail('Should have thrown an DependencyError')
+        assert 'web' in exc.exconly()
 
     def test_sort_service_dicts_depends_on_self(self):
         services = [

From 3b1a0e6fc931dcef6147b2370b1b7779fd13d2e4 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 19 Jan 2016 15:03:41 -0500
Subject: [PATCH 0706/1265] Add stop signal to the docs.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/compose-file.md | 32 ++++++++++++++++++++------------
 docs/index.md        |  3 +--
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index ecd135f1..a13b39e4 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -469,9 +469,17 @@ port (a random host port will be chosen).
 
 Override the default labeling scheme for each container.
 
-      security_opt:
-        - label:user:USER
-        - label:role:ROLE
+    security_opt:
+      - label:user:USER
+      - label:role:ROLE
+
+### stop_signal
+
+Sets an alternative signal to stop the container. By default `stop` uses
+SIGTERM. Setting an alternative signal using `stop_signal` will cause
+`stop` to send that signal instead.
+
+    stop_signal: SIGUSR1
 
 ### ulimits
 
@@ -479,11 +487,11 @@ Override the default ulimits for a container. You can either specify a single
 limit as an integer or soft/hard limits as a mapping.
 
 
-      ulimits:
-        nproc: 65535
-        nofile:
-          soft: 20000
-          hard: 40000
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 20000
+        hard: 40000
 
 ### volumes, volume\_driver
 
@@ -564,7 +572,7 @@ subcommand documentation for more information.
 Specify which volume driver should be used for this volume. Defaults to
 `local`. An exception will be raised if the driver is not available.
 
-      driver: foobar
+     driver: foobar
 
 ### driver_opts
 
@@ -572,9 +580,9 @@ Specify a list of options as key-value pairs to pass to the driver for this
 volume. Those options are driver dependent - consult the driver's
 documentation for more information. Optional.
 
-      driver_opts:
-        foo: "bar"
-        baz: 1
+     driver_opts:
+       foo: "bar"
+       baz: 1
 
 
 ## Variable substitution
diff --git a/docs/index.md b/docs/index.md
index 887df99d..9cb594a7 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -45,8 +45,7 @@ A `docker-compose.yml` looks like this:
       redis:
         image: redis
     volumes:
-      logvolume01:
-        driver: default
+      logvolume01: {}
 
 For more information about the Compose file, see the
 [Compose file reference](compose-file.md)

From 907c3ce42b6f1033546e1cb6cd17aa801b035463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jure=20=C5=BDvelc?= <jure.zvelc@dlabs.si>
Date: Wed, 20 Jan 2016 13:01:04 +0100
Subject: [PATCH 0707/1265] =?UTF-8?q?Fix=20for=20extending=20services=20wr?=
 =?UTF-8?q?itten=20in=20v2=20format.=20Signed-off-by:=20Jure=20=C5=BDvelc?=
 =?UTF-8?q?=20<jzvelc@gmail.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose/config/config.py         | 12 ++++++++----
 tests/unit/config/config_test.py | 24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index ac5e8d17..2f513fb5 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -134,6 +134,9 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
             return 1
         return version
 
+    def get_service(self, name):
+        return self.get_service_dicts()[name]
+
     def get_service_dicts(self):
         return self.config if self.version == 1 else self.config.get('services', {})
 
@@ -351,19 +354,19 @@ def process_config_file(config_file, service_name=None):
 
     if config_file.version == 2:
         processed_config = dict(config_file.config)
-        processed_config['services'] = interpolated_config
+        processed_config['services'] = services = interpolated_config
         processed_config['volumes'] = interpolate_environment_variables(
             config_file.get_volumes(), 'volume')
         processed_config['networks'] = interpolate_environment_variables(
             config_file.get_networks(), 'network')
 
     if config_file.version == 1:
-        processed_config = interpolated_config
+        processed_config = services = interpolated_config
 
     config_file = config_file._replace(config=processed_config)
     validate_against_fields_schema(config_file)
 
-    if service_name and service_name not in processed_config:
+    if service_name and service_name not in services:
         raise ConfigurationError(
             "Cannot extend service '{}' in {}: Service not found".format(
                 service_name, config_file.filename))
@@ -408,7 +411,8 @@ class ServiceExtendsResolver(object):
         extended_file = process_config_file(
             extends_file,
             service_name=service_name)
-        service_config = extended_file.config[service_name]
+        service_config = extended_file.get_service(service_name)
+
         return config_path, service_config, service_name
 
     def resolve_extends(self, extended_config_path, service_dict, service_name):
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index cc205136..b5164ade 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1911,6 +1911,30 @@ class ExtendsTest(unittest.TestCase):
             load_from_filename(str(tmpdir.join('docker-compose.yml')))
         assert 'Version mismatch' in exc.exconly()
 
+    def test_extends_with_defined_version_passes(self):
+        tmpdir = py.test.ensuretemp('test_extends_with_defined_version')
+        self.addCleanup(tmpdir.remove)
+        tmpdir.join('docker-compose.yml').write("""
+            version: 2
+            services:
+              web:
+                extends:
+                  file: base.yml
+                  service: base
+                image: busybox
+        """)
+        tmpdir.join('base.yml').write("""
+            version: 2
+            services:
+                base:
+                  volumes: ['/foo']
+                  ports: ['3000:3000']
+                  command: top
+        """)
+
+        service = load_from_filename(str(tmpdir.join('docker-compose.yml')))
+        self.assertEquals(service[0]['command'], "top")
+
 
 @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class ExpandPathTest(unittest.TestCase):

From 5a249bd9f52ab28600564ff4753b17163268cbb5 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 21 Jan 2016 11:38:01 +0000
Subject: [PATCH 0708/1265] Fix Windows build failures when installing
 dependencies from git

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/build-windows.ps1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/script/build-windows.ps1 b/script/build-windows.ps1
index 28011b1d..4a2bc1f7 100644
--- a/script/build-windows.ps1
+++ b/script/build-windows.ps1
@@ -41,6 +41,9 @@ Get-ChildItem -Recurse -Include *.pyc | foreach ($_) { Remove-Item $_.FullName }
 # Create virtualenv
 virtualenv .\venv
 
+# pip and pyinstaller generate lots of warnings, so we need to ignore them
+$ErrorActionPreference = "Continue"
+
 # Install dependencies
 .\venv\Scripts\pip install pypiwin32==219
 .\venv\Scripts\pip install -r requirements.txt
@@ -50,8 +53,6 @@ virtualenv .\venv
 git rev-parse --short HEAD | out-file -encoding ASCII compose\GITSHA
 
 # Build binary
-# pyinstaller has lots of warnings, so we need to run with ErrorAction = Continue
-$ErrorActionPreference = "Continue"
 .\venv\Scripts\pyinstaller .\docker-compose.spec
 $ErrorActionPreference = "Stop"
 

From ee63075a347d89ef2afe3ae5c76357cf8ba46e08 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 20 Jan 2016 17:08:24 +0000
Subject: [PATCH 0709/1265] Support links in v2 files

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/service_schema_v2.json      |  1 +
 compose/project.py                         |  3 +--
 compose/service.py                         | 13 +++++++------
 tests/acceptance/cli_test.py               | 19 +++++++------------
 tests/fixtures/networks/docker-compose.yml |  2 ++
 tests/unit/service_test.py                 |  8 --------
 6 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
index d4ec575a..94046d5b 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.json
@@ -88,6 +88,7 @@
         "image": {"type": "string"},
         "ipc": {"type": "string"},
         "labels": {"$ref": "#/definitions/list_or_dict"},
+        "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
 
         "logging": {
             "type": "object",
diff --git a/compose/project.py b/compose/project.py
index 080c4c49..0fea875a 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -78,12 +78,11 @@ class Project(object):
             if use_networking:
                 networks = get_networks(service_dict, all_networks)
                 net = Net(networks[0]) if networks else Net("none")
-                links = []
             else:
                 networks = []
                 net = project.get_net(service_dict)
-                links = project.get_links(service_dict)
 
+            links = project.get_links(service_dict)
             volumes_from = get_volumes_from(project, service_dict)
 
             project.services.append(
diff --git a/compose/service.py b/compose/service.py
index 1dfda06a..ea4e57d0 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -426,10 +426,11 @@ class Service(object):
 
     def connect_container_to_networks(self, container):
         for network in self.networks:
-            log.debug('Connecting "{}" to "{}"'.format(container.name, network))
             self.client.connect_container_to_network(
                 container.id, network,
-                aliases=[self.name])
+                aliases=[self.name],
+                links=self._get_links(False),
+            )
 
     def remove_duplicate_containers(self, timeout=DEFAULT_TIMEOUT):
         for c in self.duplicate_containers():
@@ -500,9 +501,6 @@ class Service(object):
         return 1 if not numbers else max(numbers) + 1
 
     def _get_links(self, link_to_self):
-        if self.use_networking:
-            return []
-
         links = {}
 
         for service, link_name in self.links:
@@ -645,7 +643,10 @@ class Service(object):
 
     def _get_container_networking_config(self):
         return self.client.create_networking_config({
-            network_name: self.client.create_endpoint_config(aliases=[self.name])
+            network_name: self.client.create_endpoint_config(
+                aliases=[self.name],
+                links=self._get_links(False),
+            )
             for network_name in self.networks
             if network_name not in ['host', 'bridge']
         })
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 4c278aa4..1806e707 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -461,6 +461,10 @@ class CLITestCase(DockerClientTestCase):
         app_container = self.project.get_service('app').containers()[0]
         db_container = self.project.get_service('db').containers()[0]
 
+        for net_name in [front_name, back_name]:
+            links = app_container.get('NetworkSettings.Networks.{}.Links'.format(net_name))
+            assert '{}:database'.format(db_container.name) in links
+
         # db and app joined the back network
         assert sorted(back_network['Containers']) == sorted([db_container.id, app_container.id])
 
@@ -474,6 +478,9 @@ class CLITestCase(DockerClientTestCase):
         # app can see db
         assert self.lookup(app_container, "db")
 
+        # app has aliased db to "database"
+        assert self.lookup(app_container, "database")
+
     @v2_only()
     def test_up_missing_network(self):
         self.base_dir = 'tests/fixtures/networks'
@@ -566,18 +573,6 @@ class CLITestCase(DockerClientTestCase):
             for name in ['bar', 'foo']
         ]
 
-    @v2_only()
-    def test_up_with_links_is_invalid(self):
-        self.base_dir = 'tests/fixtures/v2-simple'
-
-        result = self.dispatch(
-            ['-f', 'links-invalid.yml', 'up', '-d'],
-            returncode=1)
-
-        # TODO: fix validation error messages for v2 files
-        # assert "Unsupported config option for service 'simple': 'links'" in result.stderr
-        assert "Unsupported config option" in result.stderr
-
     def test_up_with_links_v1(self):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['up', '-d', 'web'], None)
diff --git a/tests/fixtures/networks/docker-compose.yml b/tests/fixtures/networks/docker-compose.yml
index f1b79df0..5351c0f0 100644
--- a/tests/fixtures/networks/docker-compose.yml
+++ b/tests/fixtures/networks/docker-compose.yml
@@ -9,6 +9,8 @@ services:
     image: busybox
     command: top
     networks: ["front", "back"]
+    links:
+      - "db:database"
   db:
     image: busybox
     command: top
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index c9244a47..4d9aec65 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -536,14 +536,6 @@ class ServiceTest(unittest.TestCase):
             ports=["127.0.0.1:1000-2000:2000-3000"])
         self.assertEqual(service.specifies_host_port(), True)
 
-    def test_get_links_with_networking(self):
-        service = Service(
-            'foo',
-            image='foo',
-            links=[(Service('one'), 'one')],
-            use_networking=True)
-        self.assertEqual(service._get_links(link_to_self=True), [])
-
     def test_image_name_from_config(self):
         image_name = 'example/web:latest'
         service = Service('foo', image=image_name)

From 755c49b5000d7be2990a11a54a16ca05b2dbf5f5 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 21 Jan 2016 15:19:55 +0000
Subject: [PATCH 0710/1265] Fix scale when containers exit immediately

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py                | 8 +++-----
 tests/integration/service_test.py | 5 +++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 1dfda06a..bc155cb3 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -228,11 +228,9 @@ class Service(object):
             sorted_running_containers = sorted(
                 running_containers,
                 key=attrgetter('number'))
-            parallel_stop(
-                sorted_running_containers[-num_to_stop:],
-                dict(timeout=timeout))
-
-        parallel_remove(self.containers(stopped=True), {})
+            containers_to_stop = sorted_running_containers[-num_to_stop:]
+            parallel_stop(containers_to_stop, dict(timeout=timeout))
+            parallel_remove(containers_to_stop, {})
 
     def create_container(self,
                          one_off=False,
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 0e91dcf7..379e51ea 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -746,6 +746,11 @@ class ServiceTest(DockerClientTestCase):
         for container in containers:
             self.assertEqual(list(container.inspect()['HostConfig']['PortBindings'].keys()), ['8000/tcp'])
 
+    def test_scale_with_immediate_exit(self):
+        service = self.create_service('web', image='busybox', command='true')
+        service.scale(2)
+        assert len(service.containers(stopped=True)) == 2
+
     def test_network_mode_none(self):
         service = self.create_service('web', net=Net('none'))
         container = create_and_start_container(service)

From 642e71b4c7b16a7175bd95e4989004ccb9f73d08 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 21 Jan 2016 15:28:40 +0000
Subject: [PATCH 0711/1265] Stop and remove containers in parallel when scaling
 down

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index bc155cb3..7859db76 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -27,9 +27,7 @@ from .const import LABEL_SERVICE
 from .const import LABEL_VERSION
 from .container import Container
 from .parallel import parallel_execute
-from .parallel import parallel_remove
 from .parallel import parallel_start
-from .parallel import parallel_stop
 from .progress_stream import stream_output
 from .progress_stream import StreamOutputError
 from .utils import json_hash
@@ -180,6 +178,10 @@ class Service(object):
             service.start_container(container)
             return container
 
+        def stop_and_remove(container):
+            container.stop(timeout=timeout)
+            container.remove()
+
         running_containers = self.containers(stopped=False)
         num_running = len(running_containers)
 
@@ -225,12 +227,17 @@ class Service(object):
 
         if desired_num < num_running:
             num_to_stop = num_running - desired_num
+
             sorted_running_containers = sorted(
                 running_containers,
                 key=attrgetter('number'))
-            containers_to_stop = sorted_running_containers[-num_to_stop:]
-            parallel_stop(containers_to_stop, dict(timeout=timeout))
-            parallel_remove(containers_to_stop, {})
+
+            parallel_execute(
+                sorted_running_containers[-num_to_stop:],
+                stop_and_remove,
+                lambda c: c.name,
+                "Stopping and removing",
+            )
 
     def create_container(self,
                          one_off=False,

From a14906fd35f5c12b33631456bb7bc3dfd0a0be36 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 21 Jan 2016 16:49:50 +0000
Subject: [PATCH 0712/1265] Fix 'run' behaviour with networks

- Test that one-off containers join all networks
- Don't set any aliases

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py           | 17 ++++++++++---
 tests/acceptance/cli_test.py | 49 ++++++++++++++++++++++++++++++------
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 8afc59c1..ebe7978c 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -430,10 +430,12 @@ class Service(object):
         return container
 
     def connect_container_to_networks(self, container):
+        one_off = (container.labels.get(LABEL_ONE_OFF) == "True")
+
         for network in self.networks:
             self.client.connect_container_to_network(
                 container.id, network,
-                aliases=[self.name],
+                aliases=self._get_aliases(one_off=one_off),
                 links=self._get_links(False),
             )
 
@@ -505,6 +507,12 @@ class Service(object):
         numbers = [c.number for c in containers]
         return 1 if not numbers else max(numbers) + 1
 
+    def _get_aliases(self, one_off):
+        if one_off:
+            return []
+
+        return [self.name]
+
     def _get_links(self, link_to_self):
         links = {}
 
@@ -610,7 +618,8 @@ class Service(object):
             override_options,
             one_off=one_off)
 
-        container_options['networking_config'] = self._get_container_networking_config()
+        container_options['networking_config'] = self._get_container_networking_config(
+            one_off=one_off)
 
         return container_options
 
@@ -646,10 +655,10 @@ class Service(object):
             cpu_quota=options.get('cpu_quota'),
         )
 
-    def _get_container_networking_config(self):
+    def _get_container_networking_config(self, one_off=False):
         return self.client.create_networking_config({
             network_name: self.client.create_endpoint_config(
-                aliases=[self.name],
+                aliases=self._get_aliases(one_off=one_off),
                 links=self._get_links(False),
             )
             for network_name in self.networks
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 1806e707..6ae04ee5 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -903,14 +903,47 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(container.name, name)
 
     @v2_only()
-    def test_run_with_networking(self):
-        self.base_dir = 'tests/fixtures/v2-simple'
-        self.dispatch(['run', 'simple', 'true'], None)
-        service = self.project.get_service('simple')
-        container, = service.containers(stopped=True, one_off=True)
-        networks = self.client.networks(names=[self.project.default_network.full_name])
-        self.assertEqual(len(networks), 1)
-        self.assertEqual(container.human_readable_command, u'true')
+    def test_run_interactive_connects_to_network(self):
+        self.base_dir = 'tests/fixtures/networks'
+
+        self.dispatch(['up', '-d'])
+        self.dispatch(['run', 'app', 'nslookup', 'app'])
+        self.dispatch(['run', 'app', 'nslookup', 'db'])
+
+        containers = self.project.get_service('app').containers(
+            stopped=True, one_off=True)
+        assert len(containers) == 2
+
+        for container in containers:
+            networks = container.get('NetworkSettings.Networks')
+
+            assert sorted(list(networks)) == [
+                '{}_{}'.format(self.project.name, name)
+                for name in ['back', 'front']
+            ]
+
+            for _, config in networks.items():
+                assert not config['Aliases']
+
+    @v2_only()
+    def test_run_detached_connects_to_network(self):
+        self.base_dir = 'tests/fixtures/networks'
+        self.dispatch(['up', '-d'])
+        self.dispatch(['run', '-d', 'app', 'top'])
+
+        container = self.project.get_service('app').containers(one_off=True)[0]
+        networks = container.get('NetworkSettings.Networks')
+
+        assert sorted(list(networks)) == [
+            '{}_{}'.format(self.project.name, name)
+            for name in ['back', 'front']
+        ]
+
+        for _, config in networks.items():
+            assert not config['Aliases']
+
+        assert self.lookup(container, 'app')
+        assert self.lookup(container, 'db')
 
     def test_run_handles_sigint(self):
         proc = start_process(self.base_dir, ['run', '-T', 'simple', 'top'])

From 09dbc7b4cbbd27a36838bd60f62d6ff740da97f6 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 21 Jan 2016 18:04:50 +0000
Subject: [PATCH 0713/1265] Stop connecting to all networks on container
 creation

This relies on an Engine behaviour which is a bug, not an intentional
feature - we have to connect to networks one at a time

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index ebe7978c..18322846 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -656,13 +656,17 @@ class Service(object):
         )
 
     def _get_container_networking_config(self, one_off=False):
+        if self.net.mode in ['host', 'bridge']:
+            return None
+
+        if self.net.mode not in self.networks:
+            return None
+
         return self.client.create_networking_config({
-            network_name: self.client.create_endpoint_config(
+            self.net.mode: self.client.create_endpoint_config(
                 aliases=self._get_aliases(one_off=one_off),
                 links=self._get_links(False),
             )
-            for network_name in self.networks
-            if network_name not in ['host', 'bridge']
         })
 
     def build(self, no_cache=False, pull=False, force_rm=False):

From f3e55568d1a7c111398876bec84da8ed8b42da7f Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 21 Jan 2016 18:34:18 +0000
Subject: [PATCH 0714/1265] Fix interactive run with networking

Make sure we connect the container to all required networks *after*
starting the container and *before* hijacking the terminal.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py    | 8 +++++---
 requirements.txt       | 2 +-
 tests/unit/cli_test.py | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 4be8536f..7409107d 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -41,7 +41,7 @@ from .utils import yesno
 
 
 if not IS_WINDOWS_PLATFORM:
-    import dockerpty
+    from dockerpty.pty import PseudoTerminal
 
 log = logging.getLogger(__name__)
 console_handler = logging.StreamHandler(sys.stderr)
@@ -709,8 +709,10 @@ def run_one_off_container(container_options, project, service, options):
     signals.set_signal_handler_to_shutdown()
     try:
         try:
-            dockerpty.start(project.client, container.id, interactive=not options['-T'])
-            service.connect_container_to_networks(container)
+            pty = PseudoTerminal(project.client, container.id, interactive=not options['-T'])
+            sockets = pty.sockets()
+            service.start_container(container)
+            pty.start(sockets)
             exit_code = container.wait()
         except signals.ShutdownException:
             project.client.stop(container.id)
diff --git a/requirements.txt b/requirements.txt
index 563baa10..45e18528 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 PyYAML==3.11
 cached-property==1.2.0
-dockerpty==0.3.4
 docopt==0.6.1
 enum34==1.0.4
+git+https://github.com/d11wtq/dockerpty.git@29b1394108b017ef3e3deaf00604a9eb99880d5e#egg=dockerpty
 git+https://github.com/docker/docker-py.git@master#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index a5767097..f9e3fb8f 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -72,8 +72,8 @@ class CLITestCase(unittest.TestCase):
             TopLevelCommand().dispatch(['help', 'nonexistent'], None)
 
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason="requires dockerpty")
-    @mock.patch('compose.cli.main.dockerpty', autospec=True)
-    def test_run_with_environment_merged_with_options_list(self, mock_dockerpty):
+    @mock.patch('compose.cli.main.PseudoTerminal', autospec=True)
+    def test_run_with_environment_merged_with_options_list(self, mock_pseudo_terminal):
         command = TopLevelCommand()
         mock_client = mock.create_autospec(docker.Client)
         mock_project = mock.Mock(client=mock_client)

From 0554c6e6fd04b670a7ffbc00b5d9f259e80f3482 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 19 Jan 2016 13:23:25 +0000
Subject: [PATCH 0715/1265] Update Compose file documentation for version 2

- Explain each version in its own section
- Explain how to upgrade from version 1 to 2
- Note which keys are restricted to particular versions
- A few corrections to the docs for version-specific keys

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/compose-file.md | 518 ++++++++++++++++++++++++++++++++++---------
 docs/networking.md   |  20 +-
 2 files changed, 422 insertions(+), 116 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index ecd135f1..ba6b4cb4 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -12,79 +12,33 @@ parent="smn_compose_ref"
 
 # Compose file reference
 
-The compose file is a [YAML](http://yaml.org/) file where all the top level
-keys are the name of a service, and the values are the service definition.
-The default path for a compose file is `./docker-compose.yml`.
+The Compose file is a [YAML](http://yaml.org/) file defining
+[services](#service-configuration-reference),
+[networks](#network-configuration-reference) and
+[volumes](#volume-configuration-reference).
+The default path for a Compose file is `./docker-compose.yml`.
 
-Each service defined in `docker-compose.yml` must specify exactly one of
-`image` or `build`. Other keys are optional, and are analogous to their
-`docker run` command-line counterparts.
+A service definition contains configuration which will be applied to each
+container started for that service, much like passing command-line parameters to
+`docker run`. Likewise, network and volume definitions are analogous to
+`docker network create` and `docker volume create`.
 
 As with `docker run`, options specified in the Dockerfile (e.g., `CMD`,
 `EXPOSE`, `VOLUME`, `ENV`) are respected by default - you don't need to
 specify them again in `docker-compose.yml`.
 
-## Versioning
-
-It is possible to use different versions of the `compose.yml` format.
-Below are the formats currently supported by compose.
-
-
-### Version 1
-
-Compose files that do not declare a version are considered "version 1". In
-those files, all the [services](#service-configuration-reference) are declared
-at the root of the document.
-
-Version 1 files do not support the declaration of
-named [volumes](#volume-configuration-reference) or
-[build arguments](#args).
-
-Example:
-
-    web:
-      build: .
-      ports:
-       - "5000:5000"
-      volumes:
-       - .:/code
-       - logvolume01:/var/log
-      links:
-       - redis
-    redis:
-      image: redis
-
-
-### Version 2
-
-Compose files using the version 2 syntax must indicate the version number at
-the root of the document. All [services](#service-configuration-reference)
-must be declared under the `services` key.
-Named [volumes](#volume-configuration-reference) must be declared under the
-`volumes` key.
-
-Example:
-
-    version: 2
-    services:
-      web:
-        build: .
-        ports:
-         - "5000:5000"
-        volumes:
-         - .:/code
-         - logvolume01:/var/log
-        links:
-         - redis
-      redis:
-        image: redis
-    volumes:
-      logvolume01:
-        driver: default
+You can use environment variables in configuration values with a Bash-like
+`${VARIABLE}` syntax - see [variable substitution](#variable-substitution) for
+full details.
 
 
 ## Service configuration reference
 
+> **Note:** There are two versions of the Compose file format – version 1 (the
+> legacy format, which does not support volumes or networks) and version 2 (the
+> most up-to-date). For more information, see the [Versioning](#versioning)
+> section.
+
 This section contains a list of all configuration options supported by a service
 definition.
 
@@ -92,28 +46,30 @@ definition.
 
 Configuration options that are applied at build time.
 
-In version 1 this must be given as a string representing the context.
+`build` can be specified either as a string containing a path to the build
+context, or an object with the path specified under [context](#context) and
+optionally [dockerfile](#dockerfile) and [args](#args).
 
-  build: .
+    build: ./dir
 
-In version 2 this can alternatively be given as an object with extra options.
+    build:
+      context: ./dir
+      dockerfile: Dockerfile-alternate
+      args:
+        buildno: 1
 
-  version: 2
-  services:
-    web:
-      build: .
-
-    version: 2
-    services:
-      web:
-        build:
-          context: .
-          dockerfile: Dockerfile-alternate
-          args:
-            buildno: 1
+> **Note**: In the [version 1 file format](#version-1), `build` is different in
+> two ways:
+>
+> -   Only the string form (`build: .`) is allowed - not the object form.
+> -   Using `build` together with `image` is not allowed. Attempting to do so
+>     results in an error.
 
 #### context
 
+> [Version 2 file format](#version-2) only. In version 1, just use
+> [build](#build).
+
 Either a path to a directory containing a Dockerfile, or a url to a git repository.
 
 When the value supplied is a relative path, it is interpreted as relative to the
@@ -122,29 +78,34 @@ sent to the Docker daemon.
 
 Compose will build and tag it with a generated name, and use that image thereafter.
 
-    build: /path/to/build/dir
-
     build:
-      context: /path/to/build/dir
-
-Using `context` together with `image` is not allowed. Attempting to do so results in
-an error.
+      context: ./dir
 
 #### dockerfile
 
 Alternate Dockerfile.
 
 Compose will use an alternate file to build with. A build path must also be
-specified using the `build` key.
+specified.
 
     build:
-      context: /path/to/build/dir
+      context: .
       dockerfile: Dockerfile-alternate
 
-Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
+> **Note**: In the [version 1 file format](#version-1), `dockerfile` is
+> different in two ways:
+>
+> -   It appears alongside `build`, not as a sub-option:
+>
+>         build: .
+>         dockerfile: Dockerfile-alternate
+> -   Using `dockerfile` together with `image` is not allowed. Attempting to do
+>     so results in an error.
 
 #### args
 
+> [Version 2 file format](#version-2) only.
+
 Add build arguments. You can use either an array or a dictionary. Any
 boolean values; true, false, yes, no, need to be enclosed in quotes to ensure
 they are not converted to True or False by the YML parser.
@@ -152,8 +113,6 @@ they are not converted to True or False by the YML parser.
 Build arguments with only a key are resolved to their environment value on the
 machine Compose is running on.
 
-> **Note:** Introduced in version 2 of the compose file format.
-
     build:
       args:
         buildno: 1
@@ -376,6 +335,9 @@ It's recommended that you use reverse-DNS notation to prevent your labels from c
 
 ### links
 
+> [Version 1 file format](#version-1) only. In version 2 files, use
+> [networking](networking.md) for communication between containers.
+
 Link to containers in another service. Either specify both the service name and
 the link alias (`SERVICE:ALIAS`), or just the service name (which will also be
 used for the alias).
@@ -397,13 +359,15 @@ reference](env.md) for details.
 
 ### logging
 
-Logging configuration for the service. This configuration replaces the previous
-`log_driver` and `log_opt` keys.
+> [Version 2 file format](#version-2) only. In version 1, use
+> [log_driver](#log_driver) and [log_opt](#log_opt).
+
+Logging configuration for the service.
 
     logging:
-        driver: log_driver
-        options:
-            syslog-address: "tcp://192.168.0.42:123"
+      driver: syslog
+      options:
+        syslog-address: "tcp://192.168.0.42:123"
 
 The `driver`  name specifies a logging driver for the service's
 containers, as with the ``--log-driver`` option for docker run
@@ -421,15 +385,36 @@ The default value is json-file.
 
 Specify logging options for the logging driver with the ``options`` key, as with the ``--log-opt`` option for `docker run`.
 
-
-Logging options are key value pairs. An example of `syslog` options:
+Logging options are key-value pairs. An example of `syslog` options:
 
     driver: "syslog"
     options:
       syslog-address: "tcp://192.168.0.42:123"
 
+### log_driver
+
+> [Version 1 file format](#version-1) only. In version 2, use
+> [logging](#logging).
+
+Specify a log driver. The default is `json-file`.
+
+    log_driver: syslog
+
+### log_opt
+
+> [Version 1 file format](#version-1) only. In version 2, use
+> [logging](#logging).
+
+Specify logging options as key-value pairs. An example of `syslog` options:
+
+    log_opt:
+      syslog-address: "tcp://192.168.0.42:123"
+
 ### net
 
+> [Version 1 file format](#version-1) only. In version 2, use
+> [networks](#networks).
+
 Networking mode. Use the same values as the docker client `--net` parameter.
 
     net: "bridge"
@@ -437,6 +422,22 @@ Networking mode. Use the same values as the docker client `--net` parameter.
     net: "container:[name or id]"
     net: "host"
 
+### networks
+
+> [Version 2 file format](#version-2) only. In version 1, use [net](#net).
+
+Networks to join, referencing entries under the
+[top-level `networks` key](#network-configuration-reference).
+
+    networks:
+      - some-network
+      - other-network
+
+The values `bridge`, `host` and `none` can also be used, and are equivalent to
+`net: "bridge"`, `net: "host"` or `net: "none"` in version 1.
+
+There is no equivalent to `net: "container:[name or id]"`.
+
 ### pid
 
     pid: "host"
@@ -487,24 +488,37 @@ limit as an integer or soft/hard limits as a mapping.
 
 ### volumes, volume\_driver
 
-Mount paths as volumes, optionally specifying a path on the host machine
-(`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`).
-
-    volumes:
-     - /var/lib/mysql
-     - ./cache:/tmp/cache
-     - ~/configs:/etc/configs/:ro
+Mount paths or named volumes, optionally specifying a path on the host machine
+(`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`). Named volumes can
+be specified with the
+[top-level `volumes` key](#volume-configuration-reference), but this is
+optional - the Docker Engine will create the volume if it doesn't exist.
 
 You can mount a relative path on the host, which will expand relative to
 the directory of the Compose configuration file being used. Relative paths
 should always begin with `.` or `..`.
 
+    volumes:
+      # Just specify a path and let the Engine create a volume
+      - /var/lib/mysql
+
+      # Specify an absolute path mapping
+      - /opt/data:/var/lib/mysql
+
+      # Path on the host, relative to the Compose file
+      - ./cache:/tmp/cache
+
+      # User-relative path
+      - ~/configs:/etc/configs/:ro
+
+      # Named volume
+      - datavolume:/var/lib/mysql
+
 If you use a volume name (instead of a volume path), you may also specify
 a `volume_driver`.
 
     volume_driver: mydriver
 
-
 > Note: No path expansion will be done if you have also specified a
 > `volume_driver`.
 
@@ -519,8 +533,18 @@ specifying read-only access(``ro``) or read-write(``rw``).
 
     volumes_from:
      - service_name
-     - container_name
-     - service_name:rw
+     - service_name:ro
+     - container:container_name
+     - container:container_name:rw
+
+> **Note:** The `container:...` formats are only supported in the
+> [version 2 file format](#version-2). In [version 1](#version-1), you can use
+> container names without marking them as such:
+>
+>     - service_name
+>     - service_name:ro
+>     - container_name
+>     - container_name:rw
 
 ### cpu\_shares, cpu\_quota, cpuset, domainname, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, stdin\_open, tty, user, working\_dir
 
@@ -562,20 +586,296 @@ subcommand documentation for more information.
 ### driver
 
 Specify which volume driver should be used for this volume. Defaults to
-`local`. An exception will be raised if the driver is not available.
+`local`. The Docker Engine will return an error if the driver is not available.
 
       driver: foobar
 
 ### driver_opts
 
 Specify a list of options as key-value pairs to pass to the driver for this
-volume. Those options are driver dependent - consult the driver's
+volume. Those options are driver-dependent - consult the driver's
 documentation for more information. Optional.
 
       driver_opts:
         foo: "bar"
         baz: 1
 
+## external
+
+If set to `true`, specifies that this volume has been created outside of
+Compose.
+
+In the example below, instead of attemping to create a volume called
+`[projectname]_data`, Compose will look for an existing volume simply
+called `data` and mount it into the `db` service's containers.
+
+    version: 2
+
+    services:
+      db:
+        image: postgres
+        volumes:
+          - data:/var/lib/postgres/data
+
+    volumes:
+      data:
+        external: true
+
+You can also specify the name of the volume separately from the name used to
+refer to it within the Compose file:
+
+    volumes
+      data:
+        external:
+          name: actual-name-of-volume
+
+
+## Network configuration reference
+
+The top-level `networks` key lets you specify networks to be created. For a full
+explanation of Compose's use of Docker networking features, see the
+[Networking guide](networking.md).
+
+### driver
+
+Specify which driver should be used for this network.
+
+The default driver depends on how the Docker Engine you're using is configured,
+but in most instances it will be `bridge` on a single host and `overlay` on a
+Swarm.
+
+The Docker Engine will return an error if the driver is not available.
+
+    driver: overlay
+
+### driver_opts
+
+Specify a list of options as key-value pairs to pass to the driver for this
+network. Those options are driver-dependent - consult the driver's
+documentation for more information. Optional.
+
+      driver_opts:
+        foo: "bar"
+        baz: 1
+
+### ipam
+
+Specify custom IPAM config. This is an object with several properties, each of
+which is optional:
+
+-   `driver`: Custom IPAM driver, instead of the default.
+-   `config`: A list with zero or more config blocks, each containing any of
+    the following keys:
+    - `subnet`: Subnet in CIDR format that represents a network segment
+    - `ip_range`: Range of IPs from which to allocate container IPs
+    - `gateway`: IPv4 or IPv6 gateway for the master subnet
+    - `aux_addresses`: Auxiliary IPv4 or IPv6 addresses used by Network driver,
+      as a mapping from hostname to IP
+
+A full example:
+
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.28.0.0/16
+          ip_range: 172.28.5.0/24
+          gateway: 172.28.5.254
+          aux_addresses:
+            host1: 172.28.1.5
+            host2: 172.28.1.6
+            host3: 172.28.1.7
+
+### external
+
+If set to `true`, specifies that this network has been created outside of
+Compose.
+
+In the example below, `proxy` is the gateway to the outside world. Instead of
+attemping to create a network called `[projectname]_outside`, Compose will
+look for an existing network simply called `outside` and connect the `proxy`
+service's containers to it.
+
+    version: 2
+
+    services:
+      proxy:
+        build: ./proxy
+        networks:
+          - outside
+          - default
+      app:
+        build: ./app
+        networks:
+          - default
+
+    networks
+      outside:
+        external: true
+
+You can also specify the name of the network separately from the name used to
+refer to it within the Compose file:
+
+    networks
+      outside:
+        external:
+          name: actual-name-of-network
+
+
+## Versioning
+
+There are two versions of the Compose file format:
+
+- Version 1, the legacy format. This is specified by omitting a `version` key at
+  the root of the YAML.
+- Version 2, the recommended format. This is specified with a `version: 2` entry
+  at the root of the YAML.
+
+To move your project from version 1 to 2, see the [Upgrading](#upgrading)
+section.
+
+> **Note:** If you're using
+> [multiple Compose files](extends.md#different-environments) or
+> [extending services](extends.md#extending-services), each file must be of the
+> same version - you cannot mix version 1 and 2 in a single project.
+
+Several things differ depending on which version you use:
+
+- The structure and permitted configuration keys
+- The minimum Docker Engine version you must be running
+- Compose's behaviour with regards to networking
+
+These differences are explained below.
+
+
+### Version 1
+
+Compose files that do not declare a version are considered "version 1". In
+those files, all the [services](#service-configuration-reference) are declared
+at the root of the document.
+
+Version 1 is supported by **Compose up to 1.6.x**. It will be deprecated in a
+future Compose release.
+
+Version 1 files cannot declare named
+[volumes](#volume-configuration-reference), [networks](networking.md) or
+[build arguments](#args). They *can*, however, define [links](#links).
+
+Example:
+
+    web:
+      build: .
+      ports:
+       - "5000:5000"
+      volumes:
+       - .:/code
+      links:
+       - redis
+    redis:
+      image: redis
+
+
+### Version 2
+
+Compose files using the version 2 syntax must indicate the version number at
+the root of the document. All [services](#service-configuration-reference)
+must be declared under the `services` key.
+
+Version 2 files are supported by **Compose 1.6.0+** and require a Docker Engine
+of version **1.10.0+**.
+
+Named [volumes](#volume-configuration-reference) can be declared under the
+`volumes` key, and [networks](#network-configuration-reference) can be declared
+under the `networks` key.
+
+You cannot define links when using version 2. Instead, you should use
+[networking](networking.md) for communication between containers. In most cases,
+this will involve less configuration than links.
+
+Simple example:
+
+    version: 2
+    services:
+      web:
+        build: .
+        ports:
+         - "5000:5000"
+        volumes:
+         - .:/code
+      redis:
+        image: redis
+
+A more extended example, defining volumes and networks:
+
+    version: 2
+    services:
+      web:
+        build: .
+        ports:
+         - "5000:5000"
+        volumes:
+         - .:/code
+        networks:
+          - front
+          - back
+      redis:
+        image: redis
+        volumes:
+          - data:/var/lib/redis
+        networks:
+          - back
+    volumes:
+      data:
+        driver: local
+    networks:
+      front:
+        driver: bridge
+      back:
+        driver: bridge
+
+
+### Upgrading
+
+In the majority of cases, moving from version 1 to 2 is a very simple process:
+
+1. Indent the whole file by one level and put a `services:` key at the top.
+2. Add a `version: 2` line at the top of the file.
+3. Delete all `links` entries.
+
+It's more complicated if you're using particular configuration features:
+
+-   `dockerfile`: This now lives under the `build` key:
+
+        build:
+          context: .
+          dockerfile: Dockerfile-alternate
+
+-   `log_driver`, `log_opt`: These now live under the `logging` key:
+
+        logging:
+          driver: syslog
+          options:
+            syslog-address: "tcp://192.168.0.42:123"
+
+-   `links` with aliases: If you've defined a link with an alias such as
+    `myservice:db`, there's currently no equivalent to this in version 2. You
+    will have to refer to the service using its name (in this example,
+    `myservice`).
+
+-   `external_links`: Links are deprecated, so you should use
+    [external networks](networking.md#using-externally-created-networks) to
+    communicate with containers outside the app.
+
+-   `net`: If you're using `host`, `bridge` or `none`, this is now replaced by
+    `networks`:
+
+        net: host    ->  networks: ["host"]
+        net: bridge  ->  networks: ["bridge"]
+        net: none    ->  networks: ["none"]
+
+    If you're using `net: "container:<name>"`, there is no equivalent to this in
+    version 2 - you should use [Docker networks](networking.md) for
+    communication instead.
+
 
 ## Variable substitution
 
diff --git a/docs/networking.md b/docs/networking.md
index f111f730..a5b49c1f 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -12,7 +12,7 @@ weight=6
 
 # Networking in Compose
 
-> **Note:** This document only applies if you're using v2 of the [Compose file format](compose-file.md). Networking features are not supported for legacy Compose files.
+> **Note:** This document only applies if you're using [version 2 of the Compose file format](compose-file.md#versioning). Networking features are not supported for version 1 (legacy) Compose files.
 
 By default Compose sets up a single
 [network](/engine/reference/commandline/network_create.md) for your app. Each
@@ -69,7 +69,7 @@ Instead of just using the default app network, you can specify your own networks
 
 Each service can specify what networks to connect to with the *service-level* `networks` key, which is a list of names referencing entries under the *top-level* `networks` key.
 
-Here's an example Compose file defining several networks. The `proxy` service is the gateway to the outside world, via a network called `outside` which is expected to already exist. `proxy` is isolated from the `db` service, because they do not share a network in common - only `app` can talk to both.
+Here's an example Compose file defining two custom networks. The `proxy` service is isolated from the `db` service, because they do not share a network in common - only `app` can talk to both.
 
     version: 2
 
@@ -77,7 +77,6 @@ Here's an example Compose file defining several networks. The `proxy` service is
       proxy:
         build: ./proxy
         networks:
-          - outside
           - front
       app:
         build: ./app
@@ -99,10 +98,6 @@ Here's an example Compose file defining several networks. The `proxy` service is
         options:
           foo: "1"
           bar: "2"
-      outside:
-        # The 'outside' network is expected to already exist - Compose will not
-        # attempt to create it
-        external: true
 
 ## Configuring the default network
 
@@ -123,6 +118,17 @@ Instead of (or as well as) specifying your own networks, you can also change the
         # Use the overlay driver for multi-host communication
         driver: overlay
 
+## Using a pre-existing network
+
+If you want your containers to join a pre-existing network, use the [`external` option](compose-file.md#network-configuration-reference):
+
+    networks:
+      default:
+        external:
+          name: my-pre-existing-network
+
+Instead of attemping to create a network called `[projectname]_default`, Compose will look for a network called `my-pre-existing-network` and connect your app's containers to it.
+
 ## Custom container network modes
 
 The `docker` CLI command allows you to specify a custom network mode for a container with the `--net` option - for example, `--net=host` specifies that the container should use the same network namespace as the Docker host, and `--net=none` specifies that it should have no networking capabilities.

From 9a3378930f81c71c0c3b4d3cdc112043b558cba5 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 21 Jan 2016 13:55:40 +0000
Subject: [PATCH 0716/1265] Document depends_on

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/compose-file.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index ba6b4cb4..d1c4f36f 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -169,6 +169,29 @@ client create option.
     devices:
       - "/dev/ttyUSB0:/dev/ttyUSB0"
 
+### depends_on
+
+Express dependency between services, which has two effects:
+
+- `docker-compose up` will start services in dependency order. In the following
+  example, `db` and `redis` will be started before `web`.
+
+- `docker-compose up SERVICE` will automatically include `SERVICE`'s
+  dependencies. In the following example, `docker-compose up web` will also
+  create and start `db` and `redis`.
+
+    version: 2
+    services:
+      web:
+        build: .
+        depends_on:
+          - db
+          - redis
+      redis:
+        image: redis
+      db:
+        image: postgres
+
 ### dns
 
 Custom DNS servers. Can be a single value or a list.

From 2f41f3aa7ec1d5cce60b5b0d0a474110bf23e74d Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 21 Jan 2016 13:55:54 +0000
Subject: [PATCH 0717/1265] Update documentation for links

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/compose-file.md | 62 +++++++++++++++++++++++++++-----------------
 docs/env.md          |  4 ++-
 docs/networking.md   | 13 +++++++++-
 3 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index d1c4f36f..5969b855 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -318,6 +318,10 @@ container name and the link alias (`CONTAINER:ALIAS`).
      - project_db_1:mysql
      - project_db_1:postgresql
 
+> **Note:** If you're using the [version 2 file format](#version-2), the
+> externally-created containers must be connected to at least one of the same
+> networks as the service which is linking to them.
+
 ### extra_hosts
 
 Add hostname mappings. Use the same values as the docker client `--add-host` parameter.
@@ -358,27 +362,24 @@ It's recommended that you use reverse-DNS notation to prevent your labels from c
 
 ### links
 
-> [Version 1 file format](#version-1) only. In version 2 files, use
-> [networking](networking.md) for communication between containers.
-
 Link to containers in another service. Either specify both the service name and
-the link alias (`SERVICE:ALIAS`), or just the service name (which will also be
-used for the alias).
+a link alias (`SERVICE:ALIAS`), or just the service name.
 
-    links:
-     - db
-     - db:database
-     - redis
+    web:
+      links:
+       - db
+       - db:database
+       - redis
 
-An entry with the alias' name will be created in `/etc/hosts` inside containers
-for this service, e.g:
+Containers for the linked service will be reachable at a hostname identical to
+the alias, or the service name if no alias was specified.
 
-    172.17.2.186  db
-    172.17.2.186  database
-    172.17.2.187  redis
+Links also express dependency between services in the same way as
+[depends_on](#depends-on), so they determine the order of service startup.
 
-Environment variables will also be created - see the [environment variable
-reference](env.md) for details.
+> **Note:** If you define both links and [networks](#networks), services with
+> links between them must share at least one network in common in order to
+> communicate.
 
 ### logging
 
@@ -862,7 +863,6 @@ In the majority of cases, moving from version 1 to 2 is a very simple process:
 
 1. Indent the whole file by one level and put a `services:` key at the top.
 2. Add a `version: 2` line at the top of the file.
-3. Delete all `links` entries.
 
 It's more complicated if you're using particular configuration features:
 
@@ -879,14 +879,28 @@ It's more complicated if you're using particular configuration features:
           options:
             syslog-address: "tcp://192.168.0.42:123"
 
--   `links` with aliases: If you've defined a link with an alias such as
-    `myservice:db`, there's currently no equivalent to this in version 2. You
-    will have to refer to the service using its name (in this example,
-    `myservice`).
+-   `links` with environment variables: As documented in the
+    [environment variables reference](env.md), environment variables created by
+    links have been deprecated for some time. In the new Docker network system,
+    they have been removed. You should either connect directly to the
+    appropriate hostname or set the relevant environment variable yourself,
+    using the link hostname:
 
--   `external_links`: Links are deprecated, so you should use
-    [external networks](networking.md#using-externally-created-networks) to
-    communicate with containers outside the app.
+        web:
+          links:
+            - db
+          environment:
+            - DB_PORT=tcp://db:5432
+
+-   `external_links`: Compose uses Docker networks when running version 2
+    projects, so links behave slightly differently. In particular, two
+    containers must be connected to at least one network in common in order to
+    communicate, even if explicitly linked together.
+
+    Either connect the external container to your app's
+    [default network](networking.md), or connect both the external container and
+    your service's containers to an
+    [external network](networking.md#using-a-pre-existing-network).
 
 -   `net`: If you're using `host`, `bridge` or `none`, this is now replaced by
     `networks`:
diff --git a/docs/env.md b/docs/env.md
index c0e03a4e..7b7e1bc7 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -11,7 +11,9 @@ weight=3
 
 # Compose environment variables reference
 
-**Note:** Environment variables are no longer the recommended method for connecting to linked services. Instead, you should use the link name (by default, the name of the linked service) as the hostname to connect to. See the [docker-compose.yml documentation](compose-file.md#links) for details.
+> **Note:** Environment variables are no longer the recommended method for connecting to linked services. Instead, you should use the link name (by default, the name of the linked service) as the hostname to connect to. See the [docker-compose.yml documentation](compose-file.md#links) for details.
+>
+> Environment variables will only be populated if you're using the [legacy version 1 Compose file format](compose-file.md#versioning).
 
 Compose uses [Docker links] to expose services' containers to one another. Each linked container injects a set of environment variables, each of which begins with the uppercase name of the container.
 
diff --git a/docs/networking.md b/docs/networking.md
index a5b49c1f..1bdd7fe0 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -57,7 +57,18 @@ If any containers have connections open to the old container, they will be close
 
 ## Links
 
-Docker links are a one-way, single-host communication system. They should now be considered deprecated, and as part of upgrading your app to the v2 format, you must remove any `links` sections from your `docker-compose.yml` and use service names (e.g. `web`, `db`) as the hostnames to connect to.
+Links allow you to define extra aliases by which a service is reachable from another service. They are not required to enable services to communicate - by default, any service can reach any other service at that service's name. In the following example, `db` is reachable from `web` at the hostnames `db` and `database`:
+
+    version: 2
+    services:
+      web:
+        build: .
+        links:
+          - "db:database"
+      db:
+        image: postgres
+
+See the [links reference](compose-file.md#links) for more information.
 
 ## Multi-host networking
 

From 59493dd7aadc119a2e45bf632a66152931097fd2 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 21 Jan 2016 13:58:01 +0000
Subject: [PATCH 0718/1265] Add links to networks key references

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/networking.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/networking.md b/docs/networking.md
index 1bdd7fe0..bcfd39e5 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -110,6 +110,11 @@ Here's an example Compose file defining two custom networks. The `proxy` service
           foo: "1"
           bar: "2"
 
+For full details of the network configuration options available, see the following references:
+
+- [Top-level `networks` key](compose-file.md#network-configuration-reference)
+- [Service-level `networks` key](compose-file.md#networks)
+
 ## Configuring the default network
 
 Instead of (or as well as) specifying your own networks, you can also change the settings of the app-wide default network by defining an entry under `networks` named `default`:

From fec8cc9f8029534e3efdeed5fe5152c8d5814f18 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 20 Jan 2016 11:07:28 -0800
Subject: [PATCH 0719/1265] Update documentation for `external` param

Signed-off-by: Joffrey F <joffrey@docker.com>

Conflicts:
	docs/compose-file.md
---
 docs/compose-file.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 5969b855..67adeb82 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -627,7 +627,11 @@ documentation for more information. Optional.
 ## external
 
 If set to `true`, specifies that this volume has been created outside of
-Compose.
+Compose. `docker-compose up` will not attempt to create it, and will raise
+an error if it doesn't exist.
+
+`external` cannot be used in conjunction with other volume configuration keys
+(`driver`, `driver_opts`).
 
 In the example below, instead of attemping to create a volume called
 `[projectname]_data`, Compose will look for an existing volume simply
@@ -712,7 +716,11 @@ A full example:
 ### external
 
 If set to `true`, specifies that this network has been created outside of
-Compose.
+Compose. `docker-compose up` will not attempt to create it, and will raise
+an error if it doesn't exist.
+
+`external` cannot be used in conjunction with other network configuration keys
+(`driver`, `driver_opts`, `ipam`).
 
 In the example below, `proxy` is the gateway to the outside world. Instead of
 attemping to create a network called `[projectname]_outside`, Compose will

From 6e73fb38ea55ec6280c3ca5478f879770ab9907b Mon Sep 17 00:00:00 2001
From: Alf Lervag <alf.lervag@bouvet.no>
Date: Tue, 22 Dec 2015 11:43:48 +0100
Subject: [PATCH 0720/1265] Fixes #2448

Signed-off-by: Alf Lervag <alf.lervag@bouvet.no>

Conflicts:
	compose/cli/main.py
	requirements.txt
---
 compose/cli/main.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 7409107d..14febe25 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -709,7 +709,12 @@ def run_one_off_container(container_options, project, service, options):
     signals.set_signal_handler_to_shutdown()
     try:
         try:
-            pty = PseudoTerminal(project.client, container.id, interactive=not options['-T'])
+            pty = PseudoTerminal(
+                project.client,
+                container.id,
+                interactive=not options['-T'],
+                logs=False,
+            )
             sockets = pty.sockets()
             service.start_container(container)
             pty.start(sockets)

From da2b6329ae0f1b3c42055b4a25b9fbe03cc1a560 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 21 Jan 2016 19:15:15 +0000
Subject: [PATCH 0721/1265] Add test for logs=False

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/main.py
---
 tests/unit/cli_test.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index f9e3fb8f..fd52a3c1 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -71,6 +71,37 @@ class CLITestCase(unittest.TestCase):
         with self.assertRaises(NoSuchCommand):
             TopLevelCommand().dispatch(['help', 'nonexistent'], None)
 
+    @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason="requires dockerpty")
+    @mock.patch('compose.cli.main.PseudoTerminal', autospec=True)
+    def test_run_interactive_passes_logs_false(self, mock_pseudo_terminal):
+        command = TopLevelCommand()
+        mock_client = mock.create_autospec(docker.Client)
+        mock_project = mock.Mock(client=mock_client)
+        mock_project.get_service.return_value = Service(
+            'service',
+            client=mock_client,
+            environment=['FOO=ONE', 'BAR=TWO'],
+            image='someimage')
+
+        with pytest.raises(SystemExit):
+            command.run(mock_project, {
+                'SERVICE': 'service',
+                'COMMAND': None,
+                '-e': ['BAR=NEW', 'OTHER=bär'.encode('utf-8')],
+                '--user': None,
+                '--no-deps': None,
+                '-d': False,
+                '-T': None,
+                '--entrypoint': None,
+                '--service-ports': None,
+                '--publish': [],
+                '--rm': None,
+                '--name': None,
+            })
+
+        _, _, call_kwargs = mock_pseudo_terminal.mock_calls[0]
+        assert call_kwargs['logs'] is False
+
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason="requires dockerpty")
     @mock.patch('compose.cli.main.PseudoTerminal', autospec=True)
     def test_run_with_environment_merged_with_options_list(self, mock_pseudo_terminal):

From 77b435f4fe9a8d02a6aab60d5264274ec59756fd Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 21 Jan 2016 18:07:14 -0800
Subject: [PATCH 0722/1265] Use latest docker-py rc

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 45e18528..ed3b8686 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 PyYAML==3.11
 cached-property==1.2.0
+docker-py==1.7.0rc2
 docopt==0.6.1
 enum34==1.0.4
 git+https://github.com/d11wtq/dockerpty.git@29b1394108b017ef3e3deaf00604a9eb99880d5e#egg=dockerpty
-git+https://github.com/docker/docker-py.git@master#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3

From 9e67eae311324fb4f9d307e6b4158caff0b32d3e Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 21 Jan 2016 18:03:58 -0800
Subject: [PATCH 0723/1265] Match named volumes in service definitions with
 declared volumes

Raise ConfigurationError for undeclared named volumes
Test new behavior

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/types.py           |  6 +++++
 compose/project.py                | 45 ++++++++++++++++++++++---------
 tests/integration/project_test.py | 36 +++++++++++++++++++++++++
 tests/unit/project_test.py        | 43 +++++++++++++++++++++++++++++
 4 files changed, 118 insertions(+), 12 deletions(-)

diff --git a/compose/config/types.py b/compose/config/types.py
index b872cba9..2bb2519d 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -163,3 +163,9 @@ class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
     def repr(self):
         external = self.external + ':' if self.external else ''
         return '{ext}{v.internal}:{v.mode}'.format(ext=external, v=self)
+
+    @property
+    def is_named_volume(self):
+        return self.external and not (
+            self.external.startswith('.') or self.external.startswith('/')
+        )
diff --git a/compose/project.py b/compose/project.py
index 080c4c49..7415e824 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -74,6 +74,17 @@ class Project(object):
         if 'default' not in network_config:
             all_networks.append(project.default_network)
 
+        if config_data.volumes:
+            for vol_name, data in config_data.volumes.items():
+                project.volumes.append(
+                    Volume(
+                        client=client, project=name, name=vol_name,
+                        driver=data.get('driver'),
+                        driver_opts=data.get('driver_opts'),
+                        external_name=data.get('external_name')
+                    )
+                )
+
         for service_dict in config_data.services:
             if use_networking:
                 networks = get_networks(service_dict, all_networks)
@@ -86,6 +97,9 @@ class Project(object):
 
             volumes_from = get_volumes_from(project, service_dict)
 
+            if config_data.version == 2:
+                match_named_volumes(service_dict, project.volumes)
+
             project.services.append(
                 Service(
                     client=client,
@@ -95,23 +109,13 @@ class Project(object):
                     links=links,
                     net=net,
                     volumes_from=volumes_from,
-                    **service_dict))
+                    **service_dict)
+            )
 
         project.networks += custom_networks
         if 'default' not in network_config and project.uses_default_network():
             project.networks.append(project.default_network)
 
-        if config_data.volumes:
-            for vol_name, data in config_data.volumes.items():
-                project.volumes.append(
-                    Volume(
-                        client=client, project=name, name=vol_name,
-                        driver=data.get('driver'),
-                        driver_opts=data.get('driver_opts'),
-                        external_name=data.get('external_name')
-                    )
-                )
-
         return project
 
     @property
@@ -473,6 +477,23 @@ def get_networks(service_dict, network_definitions):
     return networks
 
 
+def match_named_volumes(service_dict, project_volumes):
+    for volume_spec in service_dict.get('volumes', []):
+        if volume_spec.is_named_volume:
+            declared_volume = next(
+                (v for v in project_volumes if v.name == volume_spec.external),
+                None
+            )
+            if not declared_volume:
+                raise ConfigurationError(
+                    'Named volume "{0}" is used in service "{1}" but no'
+                    ' declaration was found in the volumes section.'.format(
+                        volume_spec.repr(), service_dict.get('name')
+                    )
+                )
+            volume_spec._replace(external=declared_volume.full_name)
+
+
 def get_volumes_from(project, service_dict):
     volumes_from = service_dict.pop('volumes_from', None)
     if not volumes_from:
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index d3fbb71e..aa0dd33f 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -813,3 +813,39 @@ class ProjectTest(DockerClientTestCase):
         assert 'Volume {0} declared as external'.format(
             vol_name
         ) in str(e.exception)
+
+    @v2_only()
+    def test_project_up_named_volumes_in_binds(self):
+        vol_name = '{0:x}'.format(random.getrandbits(32))
+        full_vol_name = 'composetest_{0}'.format(vol_name)
+
+        base_file = config.ConfigFile(
+            'base.yml',
+            {
+                'version': 2,
+                'services': {
+                    'simple': {
+                        'image': 'busybox:latest',
+                        'command': 'top',
+                        'volumes': ['{0}:/data'.format(vol_name)]
+                    },
+                },
+                'volumes': {
+                    vol_name: {'driver': 'local'}
+                }
+
+            })
+        config_details = config.ConfigDetails('.', [base_file])
+        config_data = config.load(config_details)
+        project = Project.from_config(
+            name='composetest', config_data=config_data, client=self.client
+        )
+        service = project.services[0]
+        self.assertEqual(service.name, 'simple')
+        volumes = service.options.get('volumes')
+        self.assertEqual(len(volumes), 1)
+        self.assertEqual(volumes[0].external, full_vol_name)
+        project.up()
+        engine_volumes = self.client.volumes()
+        self.assertIsNone(next(v for v in engine_volumes if v['Name'] == vol_name))
+        self.assertIsNotNone(next(v for v in engine_volumes if v['Name'] == full_vol_name))
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index ffd4455f..f587d697 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -7,8 +7,10 @@ import docker
 
 from .. import mock
 from .. import unittest
+from compose.config import ConfigurationError
 from compose.config.config import Config
 from compose.config.types import VolumeFromSpec
+from compose.config.types import VolumeSpec
 from compose.const import LABEL_SERVICE
 from compose.container import Container
 from compose.project import Project
@@ -476,3 +478,44 @@ class ProjectTest(unittest.TestCase):
             ),
         )
         self.assertEqual([c.id for c in project.containers()], ['1'])
+
+    def test_undeclared_volume_v2(self):
+        config = Config(
+            version=2,
+            services=[
+                {
+                    'name': 'web',
+                    'image': 'busybox:latest',
+                    'volumes': [VolumeSpec.parse('data0028:/data:ro')],
+                },
+            ],
+            networks=None,
+            volumes=None,
+        )
+        with self.assertRaises(ConfigurationError):
+            Project.from_config('composetest', config, None)
+
+        config = Config(
+            version=2,
+            services=[
+                {
+                    'name': 'web',
+                    'image': 'busybox:latest',
+                    'volumes': [VolumeSpec.parse('./data0028:/data:ro')],
+                },
+            ], networks=None, volumes=None,
+        )
+        Project.from_config('composetest', config, None)
+
+    def test_undeclared_volume_v1(self):
+        config = Config(
+            version=1,
+            services=[
+                {
+                    'name': 'web',
+                    'image': 'busybox:latest',
+                    'volumes': [VolumeSpec.parse('data0028:/data:ro')],
+                },
+            ], networks=None, volumes=None,
+        )
+        Project.from_config('composetest', config, None)

From 3a72edb906e165410d566d37408e9ff569b382a7 Mon Sep 17 00:00:00 2001
From: Dimitar Bonev <dimitar.bonev@gmail.com>
Date: Fri, 22 Jan 2016 01:18:15 +0200
Subject: [PATCH 0724/1265] Network fields schema validation

Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
---
 compose/config/fields_schema_v2.json | 29 +++++++++++++++++++-
 docs/networking.md                   |  2 +-
 tests/unit/config/config_test.py     | 41 ++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/compose/config/fields_schema_v2.json b/compose/config/fields_schema_v2.json
index b0f304e8..c001df68 100644
--- a/compose/config/fields_schema_v2.json
+++ b/compose/config/fields_schema_v2.json
@@ -41,7 +41,34 @@
   "definitions": {
     "network": {
       "id": "#/definitions/network",
-      "type": "object"
+      "type": "object",
+      "properties": {
+        "driver": {"type": "string"},
+        "driver_opts": {
+          "type": "object",
+          "patternProperties": {
+            "^.+$": {"type": ["string", "number"]}
+          }
+        },
+        "ipam": {
+            "type": "object",
+            "properties": {
+                "driver": {"type": "string"},
+                "config": {
+                    "type": "array"
+                }
+            },
+            "additionalProperties": false
+        },
+        "external": {
+          "type": ["boolean", "object"],
+          "properties": {
+            "name": {"type": "string"}
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
     },
     "volume": {
       "id": "#/definitions/volume",
diff --git a/docs/networking.md b/docs/networking.md
index bcfd39e5..1e662dd2 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -106,7 +106,7 @@ Here's an example Compose file defining two custom networks. The `proxy` service
       back:
         # Use a custom driver which takes special options
         driver: my-custom-driver
-        options:
+        driver_opts:
           foo: "1"
           bar: "2"
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index eb8ed2c7..fe609820 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -88,11 +88,26 @@ class ConfigTest(unittest.TestCase):
                         'driver': 'default',
                         'driver_opts': {'beep': 'boop'}
                     }
+                },
+                'networks': {
+                    'default': {
+                        'driver': 'bridge',
+                        'driver_opts': {'beep': 'boop'}
+                    },
+                    'with_ipam': {
+                        'ipam': {
+                            'driver': 'default',
+                            'config': [
+                                {'subnet': '172.28.0.0/16'}
+                            ]
+                        }
+                    }
                 }
             }, 'working_dir', 'filename.yml')
         )
         service_dicts = config_data.services
         volume_dict = config_data.volumes
+        networks_dict = config_data.networks
         self.assertEqual(
             service_sort(service_dicts),
             service_sort([
@@ -113,6 +128,20 @@ class ConfigTest(unittest.TestCase):
                 'driver_opts': {'beep': 'boop'}
             }
         })
+        self.assertEqual(networks_dict, {
+            'default': {
+                'driver': 'bridge',
+                'driver_opts': {'beep': 'boop'}
+            },
+            'with_ipam': {
+                'ipam': {
+                    'driver': 'default',
+                    'config': [
+                        {'subnet': '172.28.0.0/16'}
+                    ]
+                }
+            }
+        })
 
     def test_named_volume_config_empty(self):
         config_details = build_config_details({
@@ -191,6 +220,18 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_load_throws_error_with_invalid_network_fields(self):
+        with self.assertRaises(ConfigurationError):
+            config.load(
+                build_config_details({
+                    'version': 2,
+                    'services': {'web': 'busybox:latest'},
+                    'networks': {
+                        'invalid': {'foo', 'bar'}
+                    }
+                }, 'working_dir', 'filename.yml')
+            )
+
     def test_load_config_invalid_service_names(self):
         for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
             with pytest.raises(ConfigurationError) as exc:

From 48377a354f7527a60a8be3efb9ca17ec23816acd Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 22 Jan 2016 16:05:21 -0800
Subject: [PATCH 0725/1265] is_named_volume also tests for home paths ~

Fix bug with VolumeSpec not being updated
Fix integration test

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/types.py           | 4 +---
 compose/project.py                | 7 +++++--
 tests/integration/project_test.py | 7 ++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/compose/config/types.py b/compose/config/types.py
index 2bb2519d..2e648e5a 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -166,6 +166,4 @@ class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
 
     @property
     def is_named_volume(self):
-        return self.external and not (
-            self.external.startswith('.') or self.external.startswith('/')
-        )
+        return self.external and not self.external.startswith(('.', '/', '~'))
diff --git a/compose/project.py b/compose/project.py
index 7415e824..bed55925 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -478,7 +478,8 @@ def get_networks(service_dict, network_definitions):
 
 
 def match_named_volumes(service_dict, project_volumes):
-    for volume_spec in service_dict.get('volumes', []):
+    service_volumes = service_dict.get('volumes', [])
+    for volume_spec in service_volumes:
         if volume_spec.is_named_volume:
             declared_volume = next(
                 (v for v in project_volumes if v.name == volume_spec.external),
@@ -491,7 +492,9 @@ def match_named_volumes(service_dict, project_volumes):
                         volume_spec.repr(), service_dict.get('name')
                     )
                 )
-            volume_spec._replace(external=declared_volume.full_name)
+            service_volumes[service_volumes.index(volume_spec)] = (
+                volume_spec._replace(external=declared_volume.full_name)
+            )
 
 
 def get_volumes_from(project, service_dict):
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index aa0dd33f..586f9444 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -846,6 +846,7 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(volumes), 1)
         self.assertEqual(volumes[0].external, full_vol_name)
         project.up()
-        engine_volumes = self.client.volumes()
-        self.assertIsNone(next(v for v in engine_volumes if v['Name'] == vol_name))
-        self.assertIsNotNone(next(v for v in engine_volumes if v['Name'] == full_vol_name))
+        engine_volumes = self.client.volumes()['Volumes']
+        container = service.get_container()
+        assert [mount['Name'] for mount in container.get('Mounts')] == [full_vol_name]
+        assert next((v for v in engine_volumes if v['Name'] == vol_name), None) is None

From 139c7f7830ede9ea66b0b12750ff7555ab4dca91 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 22 Jan 2016 17:42:24 -0800
Subject: [PATCH 0726/1265] Move named volumes matching to config validation
 phase

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py         |  6 ++++
 compose/config/validation.py     | 12 ++++++++
 compose/project.py               | 46 ++++++++++-------------------
 tests/unit/config/config_test.py | 50 ++++++++++++++++++++++++++++++++
 tests/unit/project_test.py       | 43 ---------------------------
 5 files changed, 83 insertions(+), 74 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 72ad50af..62e9929f 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -25,6 +25,7 @@ from .types import parse_extra_hosts
 from .types import parse_restart_spec
 from .types import VolumeFromSpec
 from .types import VolumeSpec
+from .validation import match_named_volumes
 from .validation import validate_against_fields_schema
 from .validation import validate_against_service_schema
 from .validation import validate_depends_on
@@ -271,6 +272,11 @@ def load(config_details):
         config_details.working_dir,
         main_file,
         [file.get_service_dicts() for file in config_details.config_files])
+
+    if main_file.version >= 2:
+        for service_dict in service_dicts:
+            match_named_volumes(service_dict, volumes)
+
     return Config(main_file.version, service_dicts, volumes, networks)
 
 
diff --git a/compose/config/validation.py b/compose/config/validation.py
index ecf8d4f9..5c2d69ec 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -77,6 +77,18 @@ def format_boolean_in_environment(instance):
     return True
 
 
+def match_named_volumes(service_dict, project_volumes):
+    service_volumes = service_dict.get('volumes', [])
+    for volume_spec in service_volumes:
+        if volume_spec.is_named_volume and volume_spec.external not in project_volumes:
+            raise ConfigurationError(
+                'Named volume "{0}" is used in service "{1}" but no'
+                ' declaration was found in the volumes section.'.format(
+                    volume_spec.repr(), service_dict.get('name')
+                )
+            )
+
+
 def validate_top_level_service_objects(filename, service_dicts):
     """Perform some high level validation of the service name and value.
 
diff --git a/compose/project.py b/compose/project.py
index bed55925..48947eaf 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -42,7 +42,7 @@ class Project(object):
         self.use_networking = use_networking
         self.network_driver = network_driver
         self.networks = networks or []
-        self.volumes = volumes or []
+        self.volumes = volumes or {}
 
     def labels(self, one_off=False):
         return [
@@ -76,13 +76,11 @@ class Project(object):
 
         if config_data.volumes:
             for vol_name, data in config_data.volumes.items():
-                project.volumes.append(
-                    Volume(
-                        client=client, project=name, name=vol_name,
-                        driver=data.get('driver'),
-                        driver_opts=data.get('driver_opts'),
-                        external_name=data.get('external_name')
-                    )
+                project.volumes[vol_name] = Volume(
+                    client=client, project=name, name=vol_name,
+                    driver=data.get('driver'),
+                    driver_opts=data.get('driver_opts'),
+                    external_name=data.get('external_name')
                 )
 
         for service_dict in config_data.services:
@@ -98,7 +96,13 @@ class Project(object):
             volumes_from = get_volumes_from(project, service_dict)
 
             if config_data.version == 2:
-                match_named_volumes(service_dict, project.volumes)
+                service_volumes = service_dict.get('volumes', [])
+                for volume_spec in service_volumes:
+                    if volume_spec.is_named_volume:
+                        declared_volume = project.volumes[volume_spec.external]
+                        service_volumes[service_volumes.index(volume_spec)] = (
+                            volume_spec._replace(external=declared_volume.full_name)
+                        )
 
             project.services.append(
                 Service(
@@ -244,7 +248,7 @@ class Project(object):
 
     def initialize_volumes(self):
         try:
-            for volume in self.volumes:
+            for volume in self.volumes.values():
                 if volume.external:
                     log.debug(
                         'Volume {0} declared as external. No new '
@@ -299,7 +303,7 @@ class Project(object):
             network.remove()
 
     def remove_volumes(self):
-        for volume in self.volumes:
+        for volume in self.volumes.values():
             volume.remove()
 
     def initialize_networks(self):
@@ -477,26 +481,6 @@ def get_networks(service_dict, network_definitions):
     return networks
 
 
-def match_named_volumes(service_dict, project_volumes):
-    service_volumes = service_dict.get('volumes', [])
-    for volume_spec in service_volumes:
-        if volume_spec.is_named_volume:
-            declared_volume = next(
-                (v for v in project_volumes if v.name == volume_spec.external),
-                None
-            )
-            if not declared_volume:
-                raise ConfigurationError(
-                    'Named volume "{0}" is used in service "{1}" but no'
-                    ' declaration was found in the volumes section.'.format(
-                        volume_spec.repr(), service_dict.get('name')
-                    )
-                )
-            service_volumes[service_volumes.index(volume_spec)] = (
-                volume_spec._replace(external=declared_volume.full_name)
-            )
-
-
 def get_volumes_from(project, service_dict):
     volumes_from = service_dict.pop('volumes_from', None)
     if not volumes_from:
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 3c3c6326..10f6aad8 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -523,6 +523,56 @@ class ConfigTest(unittest.TestCase):
         ]
         assert service_sort(service_dicts) == service_sort(expected)
 
+    def test_undeclared_volume_v2(self):
+        base_file = config.ConfigFile(
+            'base.yaml',
+            {
+                'version': 2,
+                'services': {
+                    'web': {
+                        'image': 'busybox:latest',
+                        'volumes': ['data0028:/data:ro'],
+                    },
+                },
+            }
+        )
+        details = config.ConfigDetails('.', [base_file])
+        with self.assertRaises(ConfigurationError):
+            config.load(details)
+
+        base_file = config.ConfigFile(
+            'base.yaml',
+            {
+                'version': 2,
+                'services': {
+                    'web': {
+                        'image': 'busybox:latest',
+                        'volumes': ['./data0028:/data:ro'],
+                    },
+                },
+            }
+        )
+        details = config.ConfigDetails('.', [base_file])
+        config_data = config.load(details)
+        volume = config_data.services[0].get('volumes')[0]
+        assert not volume.is_named_volume
+
+    def test_undeclared_volume_v1(self):
+        base_file = config.ConfigFile(
+            'base.yaml',
+            {
+                'web': {
+                    'image': 'busybox:latest',
+                    'volumes': ['data0028:/data:ro'],
+                },
+            }
+        )
+        details = config.ConfigDetails('.', [base_file])
+        config_data = config.load(details)
+        volume = config_data.services[0].get('volumes')[0]
+        assert volume.external == 'data0028'
+        assert volume.is_named_volume
+
     def test_config_valid_service_names(self):
         for valid_name in ['_', '-', '.__.', '_what-up.', 'what_.up----', 'whatup']:
             services = config.load(
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index f587d697..ffd4455f 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -7,10 +7,8 @@ import docker
 
 from .. import mock
 from .. import unittest
-from compose.config import ConfigurationError
 from compose.config.config import Config
 from compose.config.types import VolumeFromSpec
-from compose.config.types import VolumeSpec
 from compose.const import LABEL_SERVICE
 from compose.container import Container
 from compose.project import Project
@@ -478,44 +476,3 @@ class ProjectTest(unittest.TestCase):
             ),
         )
         self.assertEqual([c.id for c in project.containers()], ['1'])
-
-    def test_undeclared_volume_v2(self):
-        config = Config(
-            version=2,
-            services=[
-                {
-                    'name': 'web',
-                    'image': 'busybox:latest',
-                    'volumes': [VolumeSpec.parse('data0028:/data:ro')],
-                },
-            ],
-            networks=None,
-            volumes=None,
-        )
-        with self.assertRaises(ConfigurationError):
-            Project.from_config('composetest', config, None)
-
-        config = Config(
-            version=2,
-            services=[
-                {
-                    'name': 'web',
-                    'image': 'busybox:latest',
-                    'volumes': [VolumeSpec.parse('./data0028:/data:ro')],
-                },
-            ], networks=None, volumes=None,
-        )
-        Project.from_config('composetest', config, None)
-
-    def test_undeclared_volume_v1(self):
-        config = Config(
-            version=1,
-            services=[
-                {
-                    'name': 'web',
-                    'image': 'busybox:latest',
-                    'volumes': [VolumeSpec.parse('data0028:/data:ro')],
-                },
-            ], networks=None, volumes=None,
-        )
-        Project.from_config('composetest', config, None)

From 6540efb3d380e7ae50dd94493a43382f31e1e004 Mon Sep 17 00:00:00 2001
From: jrabbit <jackjrabbit@gmail.com>
Date: Sat, 23 Jan 2016 15:58:06 -0500
Subject: [PATCH 0727/1265] If an env var is passthrough but not defined on the
 host don't set it. This doesn't change too much code and keeps the
 generators.

Signed-off-by: jrabbit <jackjrabbit@gmail.com>
---
 compose/config/config.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 961d36bb..2e4e036c 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -464,12 +464,18 @@ def resolve_environment(service_dict):
         env.update(env_vars_from_file(env_file))
 
     env.update(parse_environment(service_dict.get('environment')))
-    return dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
+    d = dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
+    if '_' in d.keys():
+        del d['_']
+    return d
 
 
 def resolve_build_args(build):
     args = parse_build_arguments(build.get('args'))
-    return dict(resolve_env_var(k, v) for k, v in six.iteritems(args))
+    d = dict(resolve_env_var(k, v) for k, v in six.iteritems(args))
+    if '_' in d.keys():
+        del d['_']
+    return d
 
 
 def validate_extended_service_dict(service_dict, filename, service):
@@ -730,7 +736,7 @@ def resolve_env_var(key, val):
     elif key in os.environ:
         return key, os.environ[key]
     else:
-        return key, ''
+        return "_", None
 
 
 def env_vars_from_file(filename):

From 7ab9509ce65167dc81dd14f34cddfb5ecff1329d Mon Sep 17 00:00:00 2001
From: jrabbit <jackjrabbit@gmail.com>
Date: Sat, 23 Jan 2016 16:19:17 -0500
Subject: [PATCH 0728/1265] Mangle the tests. They pass for better or worse!

Signed-off-by: jrabbit <jackjrabbit@gmail.com>
---
 tests/unit/config/config_test.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index eb8ed2c7..b4f92d76 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1443,7 +1443,7 @@ class EnvTest(unittest.TestCase):
         }
         self.assertEqual(
             resolve_environment(service_dict),
-            {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''},
+            {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3'},
         )
 
     def test_resolve_environment_from_env_file(self):
@@ -1484,7 +1484,6 @@ class EnvTest(unittest.TestCase):
                 'FILE_DEF': u'bär',
                 'FILE_DEF_EMPTY': '',
                 'ENV_DEF': 'E3',
-                'NO_DEF': ''
             },
         )
 
@@ -1503,7 +1502,7 @@ class EnvTest(unittest.TestCase):
         }
         self.assertEqual(
             resolve_build_args(build),
-            {'arg1': 'value1', 'empty_arg': '', 'env_arg': 'value2', 'no_env': ''},
+            {'arg1': 'value1', 'empty_arg': '', 'env_arg': 'value2'},
         )
 
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')

From 001903771260069c475738efbbcb830dd9cf8227 Mon Sep 17 00:00:00 2001
From: jrabbit <jackjrabbit@gmail.com>
Date: Sun, 24 Jan 2016 15:25:06 -0500
Subject: [PATCH 0729/1265] Modify
 service_test.py::ServiceTest::test_resolve_env to reflect new behavior

Signed-off-by: jrabbit <jackjrabbit@gmail.com>
---
 tests/integration/service_test.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 379e51ea..bf3ff610 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -860,7 +860,6 @@ class ServiceTest(DockerClientTestCase):
             'FILE_DEF': 'F1',
             'FILE_DEF_EMPTY': '',
             'ENV_DEF': 'E3',
-            'NO_DEF': ''
         }.items():
             self.assertEqual(env[k], v)
 

From 7f3a319ecc2c110730753bb2799c5151b5731111 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Mon, 25 Jan 2016 10:15:14 +0100
Subject: [PATCH 0730/1265] bash completion for `docker-compose create`

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 2b020c37..8ba9548f 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -107,6 +107,18 @@ _docker_compose_config() {
 }
 
 
+_docker_compose_create() {
+	case "$cur" in
+		-*)
+			COMPREPLY=( $( compgen -W "--force-recreate --help --no-build --no-recreate" -- "$cur" ) )
+			;;
+		*)
+			__docker_compose_services_all
+			;;
+	esac
+}
+
+
 _docker_compose_docker_compose() {
 	case "$prev" in
 		--file|-f)
@@ -409,6 +421,7 @@ _docker_compose() {
 	local commands=(
 		build
 		config
+		create
 		down
 		events
 		help

From 381d58bc661e013041a354de70b1464c4eecc79b Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Mon, 25 Jan 2016 10:27:21 +0100
Subject: [PATCH 0731/1265] Add zsh completion for 'docker-compose create'

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 43017022..f67bc9f6 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -203,6 +203,14 @@ __docker-compose_subcommand() {
                 '(--quiet -q)'{--quiet,-q}"[Only validate the configuration, don't print anything.]" \
                 '--services[Print the service names, one per line.]' && ret=0
             ;;
+        (create)
+            _arguments \
+                $opts_help \
+                "(--no-recreate --no-build)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
+                "(--force-recreate)--no-build[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
+                "(--force-recreate)--no-recreate[Don't build an image, even if it's missing]" \
+                '*:services:__docker-compose_services_all' && ret=0
+            ;;
         (down)
             _arguments \
                 $opts_help \

From 73a0d8307596bfe5954729d71672436024c54589 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Mon, 25 Jan 2016 10:34:29 +0100
Subject: [PATCH 0732/1265] Fix computation of service list in bash completion

The previous approach assumed that the service list could be extracted
from a single file. It did not follow extends and overrides.

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 2b020c37..2c18bc04 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -17,6 +17,10 @@
 #    . ~/.docker-compose-completion.sh
 
 
+__docker_compose_q() {
+	docker-compose 2>/dev/null ${compose_file:+-f $compose_file} ${compose_project:+-p $compose_project} "$@"
+}
+
 # suppress trailing whitespace
 __docker_compose_nospace() {
 	# compopt is not available in ancient bash versions
@@ -39,7 +43,7 @@ __docker_compose_compose_file() {
 
 # Extracts all service names from the compose file.
 ___docker_compose_all_services_in_compose_file() {
-	awk -F: '/^[a-zA-Z0-9]/{print $1}' "${compose_file:-$(__docker_compose_compose_file)}" 2>/dev/null
+	__docker_compose_q config --services
 }
 
 # All services, even those without an existing container
@@ -49,8 +53,12 @@ __docker_compose_services_all() {
 
 # All services that have an entry with the given key in their compose_file section
 ___docker_compose_services_with_key() {
-	# flatten sections to one line, then filter lines containing the key and return section name.
-	awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' "${compose_file:-$(__docker_compose_compose_file)}" 2>/dev/null | awk -F: -v key=": +$1:" '$0 ~ key {print $1}'
+	# flatten sections under "services" to one line, then filter lines containing the key and return section name
+	__docker_compose_q config \
+		| sed -n -e '/^services:/,/^[^ ]/p' \
+		| sed -n 's/^  //p' \
+		| awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' \
+		| awk -F: -v key=": +$1:" '$0 ~ key {print $1}'
 }
 
 # All services that are defined by a Dockerfile reference
@@ -67,11 +75,9 @@ __docker_compose_services_from_image() {
 # by a boolean expression passed in as argument.
 __docker_compose_services_with() {
 	local containers names
-	containers="$(docker-compose 2>/dev/null ${compose_file:+-f $compose_file} ${compose_project:+-p $compose_project} ps -q)"
-	names=( $(docker 2>/dev/null inspect --format "{{if ${1:-true}}} {{ .Name }} {{end}}" $containers) )
-	names=( ${names[@]%_*} )  # strip trailing numbers
-	names=( ${names[@]#*_} )  # strip project name
-	COMPREPLY=( $(compgen -W "${names[*]}" -- "$cur") )
+	containers="$(__docker_compose_q ps -q)"
+	names=$(docker 2>/dev/null inspect -f "{{if ${1:-true}}}{{range \$k, \$v := .Config.Labels}}{{if eq \$k \"com.docker.compose.service\"}}{{\$v}}{{end}}{{end}}{{end}}" $containers)
+	COMPREPLY=( $(compgen -W "$names" -- "$cur") )
 }
 
 # The services for which at least one paused container exists

From 313c584185f3999eb7a9ad0b7792a251b0afcbf8 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 25 Jan 2016 16:14:21 +0000
Subject: [PATCH 0733/1265] Alias containers by short id

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py           | 31 +++++++++----------------------
 tests/acceptance/cli_test.py |  8 ++++++--
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 18322846..166fb0b2 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -430,12 +430,16 @@ class Service(object):
         return container
 
     def connect_container_to_networks(self, container):
-        one_off = (container.labels.get(LABEL_ONE_OFF) == "True")
+        connected_networks = container.get('NetworkSettings.Networks')
 
         for network in self.networks:
+            if network in connected_networks:
+                self.client.disconnect_container_from_network(
+                    container.id, network)
+
             self.client.connect_container_to_network(
                 container.id, network,
-                aliases=self._get_aliases(one_off=one_off),
+                aliases=self._get_aliases(container),
                 links=self._get_links(False),
             )
 
@@ -507,11 +511,11 @@ class Service(object):
         numbers = [c.number for c in containers]
         return 1 if not numbers else max(numbers) + 1
 
-    def _get_aliases(self, one_off):
-        if one_off:
+    def _get_aliases(self, container):
+        if container.labels.get(LABEL_ONE_OFF) == "True":
             return []
 
-        return [self.name]
+        return [self.name, container.short_id]
 
     def _get_links(self, link_to_self):
         links = {}
@@ -618,9 +622,6 @@ class Service(object):
             override_options,
             one_off=one_off)
 
-        container_options['networking_config'] = self._get_container_networking_config(
-            one_off=one_off)
-
         return container_options
 
     def _get_container_host_config(self, override_options, one_off=False):
@@ -655,20 +656,6 @@ class Service(object):
             cpu_quota=options.get('cpu_quota'),
         )
 
-    def _get_container_networking_config(self, one_off=False):
-        if self.net.mode in ['host', 'bridge']:
-            return None
-
-        if self.net.mode not in self.networks:
-            return None
-
-        return self.client.create_networking_config({
-            self.net.mode: self.client.create_endpoint_config(
-                aliases=self._get_aliases(one_off=one_off),
-                links=self._get_links(False),
-            )
-        })
-
     def build(self, no_cache=False, pull=False, force_rm=False):
         log.info('Building %s' % self.name)
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 6ae04ee5..7bc72305 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -420,8 +420,12 @@ class CLITestCase(DockerClientTestCase):
             container = containers[0]
             self.assertIn(container.id, network['Containers'])
 
-            networks = list(container.get('NetworkSettings.Networks'))
-            self.assertEqual(networks, [network['Name']])
+            networks = container.get('NetworkSettings.Networks')
+            self.assertEqual(list(networks), [network['Name']])
+
+            self.assertEqual(
+                sorted(networks[network['Name']]['Aliases']),
+                sorted([service.name, container.short_id]))
 
             for service in services:
                 assert self.lookup(container, service.name)

From 5fe0b57e5c078e7ba3c7dd8605e4968559c6fa24 Mon Sep 17 00:00:00 2001
From: Tobias Munk <schmunk@usrbin.de>
Date: Mon, 25 Jan 2016 19:04:03 +0100
Subject: [PATCH 0734/1265] fixed documentation about traversing yml files

Signed-off-by: Tobias Munk <schmunk@usrbin.de>
---
 docs/reference/docker-compose.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/reference/docker-compose.md b/docs/reference/docker-compose.md
index c19e4284..44a466e3 100644
--- a/docs/reference/docker-compose.md
+++ b/docs/reference/docker-compose.md
@@ -85,12 +85,12 @@ stdin. When stdin is used all paths in the configuration are
 relative to the current working directory.
 
 The `-f` flag is optional. If you don't provide this flag on the command line,
-Compose traverses the working directory and its subdirectories looking for a
+Compose traverses the working directory and its parent directories looking for a
 `docker-compose.yml` and a `docker-compose.override.yml` file. You must
-supply at least the `docker-compose.yml` file. If both files are present,
-Compose combines the two files into a single configuration. The configuration
-in the `docker-compose.override.yml` file is applied over and in addition to
-the values in the `docker-compose.yml` file.
+supply at least the `docker-compose.yml` file. If both files are present on the 
+same directory level, Compose combines the two files into a single configuration. 
+The configuration in the `docker-compose.override.yml` file is applied over and 
+in addition to the values in the `docker-compose.yml` file.
 
 See also the `COMPOSE_FILE` [environment variable](overview.md#compose-file).
 

From e566a4dc1c722b997890c2ab83bb5ad1e8b8f852 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 25 Jan 2016 12:45:30 +0000
Subject: [PATCH 0735/1265] Implement network_mode in v2

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py                      |  18 ++-
 compose/config/service_schema_v2.json         |   1 +
 compose/config/sort_services.py               |  12 +-
 compose/config/validation.py                  |  19 +++
 compose/project.py                            |  43 +++---
 docs/compose-file.md                          |  49 +++++--
 docs/networking.md                            |  12 --
 tests/acceptance/cli_test.py                  |  35 ++++-
 tests/fixtures/extends/invalid-net-v2.yml     |  12 ++
 tests/fixtures/networks/bridge.yml            |   9 ++
 tests/fixtures/networks/network-mode.yml      |  27 ++++
 .../fixtures/networks/predefined-networks.yml |  17 ---
 tests/integration/project_test.py             |  99 +++++++++++--
 tests/unit/config/config_test.py              | 131 +++++++++++++++++-
 tests/unit/config/sort_services_test.py       |   4 +-
 tests/unit/project_test.py                    |   4 +-
 16 files changed, 405 insertions(+), 87 deletions(-)
 create mode 100644 tests/fixtures/extends/invalid-net-v2.yml
 create mode 100644 tests/fixtures/networks/bridge.yml
 create mode 100644 tests/fixtures/networks/network-mode.yml
 delete mode 100644 tests/fixtures/networks/predefined-networks.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 8e7d96e2..c1391c2f 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -19,6 +19,7 @@ from .errors import CircularReference
 from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
 from .interpolation import interpolate_environment_variables
+from .sort_services import get_container_name_from_net
 from .sort_services import get_service_name_from_net
 from .sort_services import sort_service_dicts
 from .types import parse_extra_hosts
@@ -30,6 +31,7 @@ from .validation import validate_against_fields_schema
 from .validation import validate_against_service_schema
 from .validation import validate_depends_on
 from .validation import validate_extends_file_path
+from .validation import validate_network_mode
 from .validation import validate_top_level_object
 from .validation import validate_top_level_service_objects
 from .validation import validate_ulimits
@@ -490,10 +492,15 @@ def validate_extended_service_dict(service_dict, filename, service):
             "%s services with 'volumes_from' cannot be extended" % error_prefix)
 
     if 'net' in service_dict:
-        if get_service_name_from_net(service_dict['net']) is not None:
+        if get_container_name_from_net(service_dict['net']):
             raise ConfigurationError(
                 "%s services with 'net: container' cannot be extended" % error_prefix)
 
+    if 'network_mode' in service_dict:
+        if get_service_name_from_net(service_dict['network_mode']):
+            raise ConfigurationError(
+                "%s services with 'network_mode: service' cannot be extended" % error_prefix)
+
     if 'depends_on' in service_dict:
         raise ConfigurationError(
             "%s services with 'depends_on' cannot be extended" % error_prefix)
@@ -505,6 +512,7 @@ def validate_service(service_config, service_names, version):
     validate_paths(service_dict)
 
     validate_ulimits(service_config)
+    validate_network_mode(service_config, service_names)
     validate_depends_on(service_config, service_names)
 
     if not service_dict.get('image') and has_uppercase(service_name):
@@ -565,6 +573,14 @@ def finalize_service(service_config, service_names, version):
         service_dict['volumes'] = [
             VolumeSpec.parse(v) for v in service_dict['volumes']]
 
+    if 'net' in service_dict:
+        network_mode = service_dict.pop('net')
+        container_name = get_container_name_from_net(network_mode)
+        if container_name and container_name in service_names:
+            service_dict['network_mode'] = 'service:{}'.format(container_name)
+        else:
+            service_dict['network_mode'] = network_mode
+
     if 'restart' in service_dict:
         service_dict['restart'] = parse_restart_spec(service_dict['restart'])
 
diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
index 94046d5b..56c0cbf5 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.json
@@ -103,6 +103,7 @@
         "mac_address": {"type": "string"},
         "mem_limit": {"type": ["number", "string"]},
         "memswap_limit": {"type": ["number", "string"]},
+        "network_mode": {"type": "string"},
 
         "networks": {
           "type": "array",
diff --git a/compose/config/sort_services.py b/compose/config/sort_services.py
index ac0fa458..cf38a603 100644
--- a/compose/config/sort_services.py
+++ b/compose/config/sort_services.py
@@ -5,10 +5,18 @@ from compose.config.errors import DependencyError
 
 
 def get_service_name_from_net(net_config):
+    return get_source_name_from_net(net_config, 'service')
+
+
+def get_container_name_from_net(net_config):
+    return get_source_name_from_net(net_config, 'container')
+
+
+def get_source_name_from_net(net_config, source_type):
     if not net_config:
         return
 
-    if not net_config.startswith('container:'):
+    if not net_config.startswith(source_type+':'):
         return
 
     _, net_name = net_config.split(':', 1)
@@ -33,7 +41,7 @@ def sort_service_dicts(services):
             service for service in services
             if (name in get_service_names(service.get('links', [])) or
                 name in get_service_names_from_volumes_from(service.get('volumes_from', [])) or
-                name == get_service_name_from_net(service.get('net')) or
+                name == get_service_name_from_net(service.get('network_mode')) or
                 name in service.get('depends_on', []))
         ]
 
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 5c2d69ec..dfc34d57 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -15,6 +15,7 @@ from jsonschema import RefResolver
 from jsonschema import ValidationError
 
 from .errors import ConfigurationError
+from .sort_services import get_service_name_from_net
 
 
 log = logging.getLogger(__name__)
@@ -147,6 +148,24 @@ def validate_extends_file_path(service_name, extends_options, filename):
         )
 
 
+def validate_network_mode(service_config, service_names):
+    network_mode = service_config.config.get('network_mode')
+    if not network_mode:
+        return
+
+    if 'networks' in service_config.config:
+        raise ConfigurationError("'network_mode' and 'networks' cannot be combined")
+
+    dependency = get_service_name_from_net(network_mode)
+    if not dependency:
+        return
+
+    if dependency not in service_names:
+        raise ConfigurationError(
+            "Service '{s.name}' uses the network stack of service '{dep}' which "
+            "is undefined.".format(s=service_config, dep=dependency))
+
+
 def validate_depends_on(service_config, service_names):
     for dependency in service_config.config.get('depends_on', []):
         if dependency not in service_names:
diff --git a/compose/project.py b/compose/project.py
index b51fcd7e..ef913d63 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -10,6 +10,7 @@ from docker.errors import NotFound
 
 from . import parallel
 from .config import ConfigurationError
+from .config.sort_services import get_container_name_from_net
 from .config.sort_services import get_service_name_from_net
 from .const import DEFAULT_TIMEOUT
 from .const import IMAGE_EVENTS
@@ -86,12 +87,11 @@ class Project(object):
         for service_dict in config_data.services:
             if use_networking:
                 networks = get_networks(service_dict, all_networks)
-                net = Net(networks[0]) if networks else Net("none")
             else:
                 networks = []
-                net = project.get_net(service_dict)
 
             links = project.get_links(service_dict)
+            net = project.get_net(service_dict, networks)
             volumes_from = get_volumes_from(project, service_dict)
 
             if config_data.version == 2:
@@ -197,27 +197,27 @@ class Project(object):
             del service_dict['links']
         return links
 
-    def get_net(self, service_dict):
-        net = service_dict.pop('net', None)
+    def get_net(self, service_dict, networks):
+        net = service_dict.pop('network_mode', None)
         if not net:
+            if self.use_networking:
+                return Net(networks[0]) if networks else Net('none')
             return Net(None)
 
-        net_name = get_service_name_from_net(net)
-        if not net_name:
-            return Net(net)
+        service_name = get_service_name_from_net(net)
+        if service_name:
+            return ServiceNet(self.get_service(service_name))
 
-        try:
-            return ServiceNet(self.get_service(net_name))
-        except NoSuchService:
-            pass
-        try:
-            return ContainerNet(Container.from_id(self.client, net_name))
-        except APIError:
-            raise ConfigurationError(
-                'Service "%s" is trying to use the network of "%s", '
-                'which is not the name of a service or container.' % (
-                    service_dict['name'],
-                    net_name))
+        container_name = get_container_name_from_net(net)
+        if container_name:
+            try:
+                return ContainerNet(Container.from_id(self.client, container_name))
+            except APIError:
+                raise ConfigurationError(
+                    "Service '{name}' uses the network stack of container '{dep}' which "
+                    "does not exist.".format(name=service_dict['name'], dep=container_name))
+
+        return Net(net)
 
     def start(self, service_names=None, **options):
         containers = []
@@ -465,9 +465,12 @@ class Project(object):
 
 
 def get_networks(service_dict, network_definitions):
+    if 'network_mode' in service_dict:
+        return []
+
     networks = []
     for name in service_dict.pop('networks', ['default']):
-        if name in ['bridge', 'host']:
+        if name in ['bridge']:
             networks.append(name)
         else:
             matches = [n for n in network_definitions if n.name == name]
diff --git a/docs/compose-file.md b/docs/compose-file.md
index b2675ac9..6b61755f 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -437,14 +437,29 @@ Specify logging options as key-value pairs. An example of `syslog` options:
 ### net
 
 > [Version 1 file format](#version-1) only. In version 2, use
-> [networks](#networks).
+> [network_mode](#network_mode).
 
-Networking mode. Use the same values as the docker client `--net` parameter.
+Network mode. Use the same values as the docker client `--net` parameter.
+The `container:...` form can take a service name instead of a container name or
+id.
 
     net: "bridge"
-    net: "none"
-    net: "container:[name or id]"
     net: "host"
+    net: "none"
+    net: "container:[service name or container name/id]"
+
+### network_mode
+
+> [Version 2 file format](#version-1) only. In version 1, use [net](#net).
+
+Network mode. Use the same values as the docker client `--net` parameter, plus
+the special form `service:[service name]`.
+
+    network_mode: "bridge"
+    network_mode: "host"
+    network_mode: "none"
+    network_mode: "service:[service name]"
+    network_mode: "container:[container name/id]"
 
 ### networks
 
@@ -457,8 +472,8 @@ Networks to join, referencing entries under the
       - some-network
       - other-network
 
-The values `bridge`, `host` and `none` can also be used, and are equivalent to
-`net: "bridge"`, `net: "host"` or `net: "none"` in version 1.
+The value `bridge` can also be used to make containers join the pre-defined
+`bridge` network.
 
 There is no equivalent to `net: "container:[name or id]"`.
 
@@ -918,16 +933,22 @@ It's more complicated if you're using particular configuration features:
     your service's containers to an
     [external network](networking.md#using-a-pre-existing-network).
 
--   `net`: If you're using `host`, `bridge` or `none`, this is now replaced by
-    `networks`:
+-   `net`: This is now replaced by [network_mode](#network_mode):
 
-        net: host    ->  networks: ["host"]
-        net: bridge  ->  networks: ["bridge"]
-        net: none    ->  networks: ["none"]
+        net: host    ->  network_mode: host
+        net: bridge  ->  network_mode: bridge
+        net: none    ->  network_mode: none
 
-    If you're using `net: "container:<name>"`, there is no equivalent to this in
-    version 2 - you should use [Docker networks](networking.md) for
-    communication instead.
+    If you're using `net: "container:[service name]"`, you must now use
+    `network_mode: "service:[service name]"` instead.
+
+        net: "container:web"  ->  network_mode: "service:web"
+
+    If you're using `net: "container:[container name/id]"`, the value does not
+    need to change.
+
+        net: "container:cont-name"  ->  network_mode: "container:cont-name"
+        net: "container:abc12345"   ->  network_mode: "container:abc12345"
 
 
 ## Variable substitution
diff --git a/docs/networking.md b/docs/networking.md
index 1e662dd2..93533e9d 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -144,15 +144,3 @@ If you want your containers to join a pre-existing network, use the [`external`
           name: my-pre-existing-network
 
 Instead of attemping to create a network called `[projectname]_default`, Compose will look for a network called `my-pre-existing-network` and connect your app's containers to it.
-
-## Custom container network modes
-
-The `docker` CLI command allows you to specify a custom network mode for a container with the `--net` option - for example, `--net=host` specifies that the container should use the same network namespace as the Docker host, and `--net=none` specifies that it should have no networking capabilities.
-
-To make use of this in Compose, specify a `networks` list with a single item `host`, `bridge` or `none`:
-
-    app:
-      build: ./app
-      networks: ["host"]
-
-There is no equivalent to `--net=container:CONTAINER_NAME` in the v2 Compose file format. You should instead use networks to enable communication.
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 7bc72305..4b560efa 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -496,8 +496,29 @@ class CLITestCase(DockerClientTestCase):
         assert 'Service "web" uses an undefined network "foo"' in result.stderr
 
     @v2_only()
-    def test_up_predefined_networks(self):
-        filename = 'predefined-networks.yml'
+    def test_up_with_bridge_network_plus_default(self):
+        filename = 'bridge.yml'
+
+        self.base_dir = 'tests/fixtures/networks'
+        self._project = get_project(self.base_dir, [filename])
+
+        self.dispatch(['-f', filename, 'up', '-d'], None)
+
+        container = self.project.containers()[0]
+
+        assert sorted(list(container.get('NetworkSettings.Networks'))) == sorted([
+            'bridge',
+            self.project.default_network.full_name,
+        ])
+
+    @v2_only()
+    def test_up_with_network_mode(self):
+        c = self.client.create_container('busybox', 'top', name='composetest_network_mode_container')
+        self.addCleanup(self.client.remove_container, c, force=True)
+        self.client.start(c)
+        container_mode_source = 'container:{}'.format(c['Id'])
+
+        filename = 'network-mode.yml'
 
         self.base_dir = 'tests/fixtures/networks'
         self._project = get_project(self.base_dir, [filename])
@@ -515,6 +536,16 @@ class CLITestCase(DockerClientTestCase):
             assert list(container.get('NetworkSettings.Networks')) == [name]
             assert container.get('HostConfig.NetworkMode') == name
 
+        service_mode_source = 'container:{}'.format(
+            self.project.get_service('bridge').containers()[0].id)
+        service_mode_container = self.project.get_service('service').containers()[0]
+        assert not service_mode_container.get('NetworkSettings.Networks')
+        assert service_mode_container.get('HostConfig.NetworkMode') == service_mode_source
+
+        container_mode_container = self.project.get_service('container').containers()[0]
+        assert not container_mode_container.get('NetworkSettings.Networks')
+        assert container_mode_container.get('HostConfig.NetworkMode') == container_mode_source
+
     @v2_only()
     def test_up_external_networks(self):
         filename = 'external-networks.yml'
diff --git a/tests/fixtures/extends/invalid-net-v2.yml b/tests/fixtures/extends/invalid-net-v2.yml
new file mode 100644
index 00000000..0a04f468
--- /dev/null
+++ b/tests/fixtures/extends/invalid-net-v2.yml
@@ -0,0 +1,12 @@
+version: 2
+services:
+  myweb:
+    build: '.'
+    extends:
+      service: web
+    command: top
+  web:
+    build: '.'
+    network_mode: "service:net"
+  net:
+    build: '.'
diff --git a/tests/fixtures/networks/bridge.yml b/tests/fixtures/networks/bridge.yml
new file mode 100644
index 00000000..95098372
--- /dev/null
+++ b/tests/fixtures/networks/bridge.yml
@@ -0,0 +1,9 @@
+version: 2
+
+services:
+  web:
+    image: busybox
+    command: top
+    networks:
+      - bridge
+      - default
diff --git a/tests/fixtures/networks/network-mode.yml b/tests/fixtures/networks/network-mode.yml
new file mode 100644
index 00000000..7ab63df8
--- /dev/null
+++ b/tests/fixtures/networks/network-mode.yml
@@ -0,0 +1,27 @@
+version: 2
+
+services:
+  bridge:
+    image: busybox
+    command: top
+    network_mode: bridge
+
+  service:
+    image: busybox
+    command: top
+    network_mode: "service:bridge"
+
+  container:
+    image: busybox
+    command: top
+    network_mode: "container:composetest_network_mode_container"
+
+  host:
+    image: busybox
+    command: top
+    network_mode: host
+
+  none:
+    image: busybox
+    command: top
+    network_mode: none
diff --git a/tests/fixtures/networks/predefined-networks.yml b/tests/fixtures/networks/predefined-networks.yml
deleted file mode 100644
index d0fac377..00000000
--- a/tests/fixtures/networks/predefined-networks.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: 2
-
-services:
-  bridge:
-    image: busybox
-    command: top
-    networks: ["bridge"]
-
-  host:
-    image: busybox
-    command: top
-    networks: ["host"]
-
-  none:
-    image: busybox
-    command: top
-    networks: []
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 586f9444..0945ebb8 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -4,10 +4,12 @@ from __future__ import unicode_literals
 import random
 
 import py
+import pytest
 from docker.errors import NotFound
 
 from .testcases import DockerClientTestCase
 from compose.config import config
+from compose.config import ConfigurationError
 from compose.config.types import VolumeFromSpec
 from compose.config.types import VolumeSpec
 from compose.const import LABEL_PROJECT
@@ -104,7 +106,71 @@ class ProjectTest(DockerClientTestCase):
         db = project.get_service('db')
         self.assertEqual(db._get_volumes_from(), [data_container.id + ':rw'])
 
-    def test_net_from_service(self):
+    @v2_only()
+    def test_network_mode_from_service(self):
+        project = Project.from_config(
+            name='composetest',
+            client=self.client,
+            config_data=build_service_dicts({
+                'version': 2,
+                'services': {
+                    'net': {
+                        'image': 'busybox:latest',
+                        'command': ["top"]
+                    },
+                    'web': {
+                        'image': 'busybox:latest',
+                        'network_mode': 'service:net',
+                        'command': ["top"]
+                    },
+                },
+            }),
+        )
+
+        project.up()
+
+        web = project.get_service('web')
+        net = project.get_service('net')
+        self.assertEqual(web.net.mode, 'container:' + net.containers()[0].id)
+
+    @v2_only()
+    def test_network_mode_from_container(self):
+        def get_project():
+            return Project.from_config(
+                name='composetest',
+                config_data=build_service_dicts({
+                    'version': 2,
+                    'services': {
+                        'web': {
+                            'image': 'busybox:latest',
+                            'network_mode': 'container:composetest_net_container'
+                        },
+                    },
+                }),
+                client=self.client,
+            )
+
+        with pytest.raises(ConfigurationError) as excinfo:
+            get_project()
+
+        assert "container 'composetest_net_container' which does not exist" in excinfo.exconly()
+
+        net_container = Container.create(
+            self.client,
+            image='busybox:latest',
+            name='composetest_net_container',
+            command='top',
+            labels={LABEL_PROJECT: 'composetest'},
+        )
+        net_container.start()
+
+        project = get_project()
+        project.up()
+
+        web = project.get_service('web')
+        self.assertEqual(web.net.mode, 'container:' + net_container.id)
+
+    def test_net_from_service_v1(self):
         project = Project.from_config(
             name='composetest',
             config_data=build_service_dicts({
@@ -127,7 +193,24 @@ class ProjectTest(DockerClientTestCase):
         net = project.get_service('net')
         self.assertEqual(web.net.mode, 'container:' + net.containers()[0].id)
 
-    def test_net_from_container(self):
+    def test_net_from_container_v1(self):
+        def get_project():
+            return Project.from_config(
+                name='composetest',
+                config_data=build_service_dicts({
+                    'web': {
+                        'image': 'busybox:latest',
+                        'net': 'container:composetest_net_container'
+                    },
+                }),
+                client=self.client,
+            )
+
+        with pytest.raises(ConfigurationError) as excinfo:
+            get_project()
+
+        assert "container 'composetest_net_container' which does not exist" in excinfo.exconly()
+
         net_container = Container.create(
             self.client,
             image='busybox:latest',
@@ -137,17 +220,7 @@ class ProjectTest(DockerClientTestCase):
         )
         net_container.start()
 
-        project = Project.from_config(
-            name='composetest',
-            config_data=build_service_dicts({
-                'web': {
-                    'image': 'busybox:latest',
-                    'net': 'container:composetest_net_container'
-                },
-            }),
-            client=self.client,
-        )
-
+        project = get_project()
         project.up()
 
         web = project.get_service('web')
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 98fe7758..0d8f7224 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1015,6 +1015,126 @@ class ConfigTest(unittest.TestCase):
         assert "Service 'one' depends on service 'three'" in exc.exconly()
 
 
+class NetworkModeTest(unittest.TestCase):
+    def test_network_mode_standard(self):
+        config_data = config.load(build_config_details({
+            'version': 2,
+            'services': {
+                'web': {
+                    'image': 'busybox',
+                    'command': "top",
+                    'network_mode': 'bridge',
+                },
+            },
+        }))
+
+        assert config_data.services[0]['network_mode'] == 'bridge'
+
+    def test_network_mode_standard_v1(self):
+        config_data = config.load(build_config_details({
+            'web': {
+                'image': 'busybox',
+                'command': "top",
+                'net': 'bridge',
+            },
+        }))
+
+        assert config_data.services[0]['network_mode'] == 'bridge'
+        assert 'net' not in config_data.services[0]
+
+    def test_network_mode_container(self):
+        config_data = config.load(build_config_details({
+            'version': 2,
+            'services': {
+                'web': {
+                    'image': 'busybox',
+                    'command': "top",
+                    'network_mode': 'container:foo',
+                },
+            },
+        }))
+
+        assert config_data.services[0]['network_mode'] == 'container:foo'
+
+    def test_network_mode_container_v1(self):
+        config_data = config.load(build_config_details({
+            'web': {
+                'image': 'busybox',
+                'command': "top",
+                'net': 'container:foo',
+            },
+        }))
+
+        assert config_data.services[0]['network_mode'] == 'container:foo'
+
+    def test_network_mode_service(self):
+        config_data = config.load(build_config_details({
+            'version': 2,
+            'services': {
+                'web': {
+                    'image': 'busybox',
+                    'command': "top",
+                    'network_mode': 'service:foo',
+                },
+                'foo': {
+                    'image': 'busybox',
+                    'command': "top",
+                },
+            },
+        }))
+
+        assert config_data.services[1]['network_mode'] == 'service:foo'
+
+    def test_network_mode_service_v1(self):
+        config_data = config.load(build_config_details({
+            'web': {
+                'image': 'busybox',
+                'command': "top",
+                'net': 'container:foo',
+            },
+            'foo': {
+                'image': 'busybox',
+                'command': "top",
+            },
+        }))
+
+        assert config_data.services[1]['network_mode'] == 'service:foo'
+
+    def test_network_mode_service_nonexistent(self):
+        with pytest.raises(ConfigurationError) as excinfo:
+            config.load(build_config_details({
+                'version': 2,
+                'services': {
+                    'web': {
+                        'image': 'busybox',
+                        'command': "top",
+                        'network_mode': 'service:foo',
+                    },
+                },
+            }))
+
+        assert "service 'foo' which is undefined" in excinfo.exconly()
+
+    def test_network_mode_plus_networks_is_invalid(self):
+        with pytest.raises(ConfigurationError) as excinfo:
+            config.load(build_config_details({
+                'version': 2,
+                'services': {
+                    'web': {
+                        'image': 'busybox',
+                        'command': "top",
+                        'network_mode': 'bridge',
+                        'networks': ['front'],
+                    },
+                },
+                'networks': {
+                    'front': None,
+                }
+            }))
+
+        assert "'network_mode' and 'networks' cannot be combined" in excinfo.exconly()
+
+
 class PortsTest(unittest.TestCase):
     INVALID_PORTS_TYPES = [
         {"1": "8000"},
@@ -1867,11 +1987,18 @@ class ExtendsTest(unittest.TestCase):
             load_from_filename('tests/fixtures/extends/invalid-volumes.yml')
 
     def test_invalid_net_in_extended_service(self):
-        expected_error_msg = "services with 'net: container' cannot be extended"
+        with pytest.raises(ConfigurationError) as excinfo:
+            load_from_filename('tests/fixtures/extends/invalid-net-v2.yml')
 
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+        assert 'network_mode: service' in excinfo.exconly()
+        assert 'cannot be extended' in excinfo.exconly()
+
+        with pytest.raises(ConfigurationError) as excinfo:
             load_from_filename('tests/fixtures/extends/invalid-net.yml')
 
+        assert 'net: container' in excinfo.exconly()
+        assert 'cannot be extended' in excinfo.exconly()
+
     @mock.patch.dict(os.environ)
     def test_load_config_runs_interpolation_in_extended_service(self):
         os.environ.update(HOSTNAME_VALUE="penguin")
diff --git a/tests/unit/config/sort_services_test.py b/tests/unit/config/sort_services_test.py
index f5990664..c39ac022 100644
--- a/tests/unit/config/sort_services_test.py
+++ b/tests/unit/config/sort_services_test.py
@@ -100,7 +100,7 @@ class TestSortService(object):
             },
             {
                 'name': 'parent',
-                'net': 'container:child'
+                'network_mode': 'service:child'
             },
             {
                 'name': 'child'
@@ -137,7 +137,7 @@ class TestSortService(object):
     def test_sort_service_dicts_7(self):
         services = [
             {
-                'net': 'container:three',
+                'network_mode': 'service:three',
                 'name': 'four'
             },
             {
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index ffd4455f..3ad131f3 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -365,7 +365,7 @@ class ProjectTest(unittest.TestCase):
                     {
                         'name': 'test',
                         'image': 'busybox:latest',
-                        'net': 'container:aaa'
+                        'network_mode': 'container:aaa'
                     },
                 ],
                 networks=None,
@@ -398,7 +398,7 @@ class ProjectTest(unittest.TestCase):
                     {
                         'name': 'test',
                         'image': 'busybox:latest',
-                        'net': 'container:aaa'
+                        'network_mode': 'service:aaa'
                     },
                 ],
                 networks=None,

From a9c623fdf2e36531d3811c676f41317daf9c7b34 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 25 Jan 2016 14:26:36 +0000
Subject: [PATCH 0736/1265] Test that net can be extended

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/fixtures/extends/common.yml         | 1 +
 tests/fixtures/extends/docker-compose.yml | 1 +
 tests/unit/config/config_test.py          | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/tests/fixtures/extends/common.yml b/tests/fixtures/extends/common.yml
index 358ef5bc..b2d86aa4 100644
--- a/tests/fixtures/extends/common.yml
+++ b/tests/fixtures/extends/common.yml
@@ -1,6 +1,7 @@
 web:
   image: busybox
   command: /bin/true
+  net: host
   environment:
     - FOO=1
     - BAR=1
diff --git a/tests/fixtures/extends/docker-compose.yml b/tests/fixtures/extends/docker-compose.yml
index c51be49e..8e37d404 100644
--- a/tests/fixtures/extends/docker-compose.yml
+++ b/tests/fixtures/extends/docker-compose.yml
@@ -11,6 +11,7 @@ myweb:
     BAR: "2"
     # add BAZ
     BAZ: "2"
+  net: bridge
 mydb:
   image: busybox
   command: top
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 0d8f7224..5f8b097b 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1762,6 +1762,7 @@ class ExtendsTest(unittest.TestCase):
                 'name': 'myweb',
                 'image': 'busybox',
                 'command': 'top',
+                'network_mode': 'bridge',
                 'links': ['mydb:db'],
                 'environment': {
                     "FOO": "1",
@@ -1779,6 +1780,7 @@ class ExtendsTest(unittest.TestCase):
                 'name': 'web',
                 'image': 'busybox',
                 'command': '/bin/true',
+                'network_mode': 'host',
                 'environment': {
                     "FOO": "2",
                     "BAR": "1",
@@ -1797,6 +1799,7 @@ class ExtendsTest(unittest.TestCase):
                 'name': 'myweb',
                 'image': 'busybox',
                 'command': '/bin/true',
+                'network_mode': 'host',
                 'environment': {
                     "FOO": "2",
                     "BAR": "2",

From ed1b2048040680ecfde8c5be4c3a66671d5cb068 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 25 Jan 2016 14:27:12 +0000
Subject: [PATCH 0737/1265] Rename 'net' to 'network mode' in various
 classes/methods

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py          | 10 +++---
 compose/config/sort_services.py   | 18 +++++------
 compose/config/validation.py      |  4 +--
 compose/project.py                | 34 ++++++++++----------
 compose/service.py                | 23 +++++++-------
 tests/integration/project_test.py |  8 ++---
 tests/integration/service_test.py |  8 ++---
 tests/unit/project_test.py        |  6 ++--
 tests/unit/service_test.py        | 52 +++++++++++++++----------------
 9 files changed, 81 insertions(+), 82 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index c1391c2f..ffd805ad 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -19,8 +19,8 @@ from .errors import CircularReference
 from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
 from .interpolation import interpolate_environment_variables
-from .sort_services import get_container_name_from_net
-from .sort_services import get_service_name_from_net
+from .sort_services import get_container_name_from_network_mode
+from .sort_services import get_service_name_from_network_mode
 from .sort_services import sort_service_dicts
 from .types import parse_extra_hosts
 from .types import parse_restart_spec
@@ -492,12 +492,12 @@ def validate_extended_service_dict(service_dict, filename, service):
             "%s services with 'volumes_from' cannot be extended" % error_prefix)
 
     if 'net' in service_dict:
-        if get_container_name_from_net(service_dict['net']):
+        if get_container_name_from_network_mode(service_dict['net']):
             raise ConfigurationError(
                 "%s services with 'net: container' cannot be extended" % error_prefix)
 
     if 'network_mode' in service_dict:
-        if get_service_name_from_net(service_dict['network_mode']):
+        if get_service_name_from_network_mode(service_dict['network_mode']):
             raise ConfigurationError(
                 "%s services with 'network_mode: service' cannot be extended" % error_prefix)
 
@@ -575,7 +575,7 @@ def finalize_service(service_config, service_names, version):
 
     if 'net' in service_dict:
         network_mode = service_dict.pop('net')
-        container_name = get_container_name_from_net(network_mode)
+        container_name = get_container_name_from_network_mode(network_mode)
         if container_name and container_name in service_names:
             service_dict['network_mode'] = 'service:{}'.format(container_name)
         else:
diff --git a/compose/config/sort_services.py b/compose/config/sort_services.py
index cf38a603..9d29f329 100644
--- a/compose/config/sort_services.py
+++ b/compose/config/sort_services.py
@@ -4,22 +4,22 @@ from __future__ import unicode_literals
 from compose.config.errors import DependencyError
 
 
-def get_service_name_from_net(net_config):
-    return get_source_name_from_net(net_config, 'service')
+def get_service_name_from_network_mode(network_mode):
+    return get_source_name_from_network_mode(network_mode, 'service')
 
 
-def get_container_name_from_net(net_config):
-    return get_source_name_from_net(net_config, 'container')
+def get_container_name_from_network_mode(network_mode):
+    return get_source_name_from_network_mode(network_mode, 'container')
 
 
-def get_source_name_from_net(net_config, source_type):
-    if not net_config:
+def get_source_name_from_network_mode(network_mode, source_type):
+    if not network_mode:
         return
 
-    if not net_config.startswith(source_type+':'):
+    if not network_mode.startswith(source_type+':'):
         return
 
-    _, net_name = net_config.split(':', 1)
+    _, net_name = network_mode.split(':', 1)
     return net_name
 
 
@@ -41,7 +41,7 @@ def sort_service_dicts(services):
             service for service in services
             if (name in get_service_names(service.get('links', [])) or
                 name in get_service_names_from_volumes_from(service.get('volumes_from', [])) or
-                name == get_service_name_from_net(service.get('network_mode')) or
+                name == get_service_name_from_network_mode(service.get('network_mode')) or
                 name in service.get('depends_on', []))
         ]
 
diff --git a/compose/config/validation.py b/compose/config/validation.py
index dfc34d57..05982020 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -15,7 +15,7 @@ from jsonschema import RefResolver
 from jsonschema import ValidationError
 
 from .errors import ConfigurationError
-from .sort_services import get_service_name_from_net
+from .sort_services import get_service_name_from_network_mode
 
 
 log = logging.getLogger(__name__)
@@ -156,7 +156,7 @@ def validate_network_mode(service_config, service_names):
     if 'networks' in service_config.config:
         raise ConfigurationError("'network_mode' and 'networks' cannot be combined")
 
-    dependency = get_service_name_from_net(network_mode)
+    dependency = get_service_name_from_network_mode(network_mode)
     if not dependency:
         return
 
diff --git a/compose/project.py b/compose/project.py
index ef913d63..e5b6faef 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -10,8 +10,8 @@ from docker.errors import NotFound
 
 from . import parallel
 from .config import ConfigurationError
-from .config.sort_services import get_container_name_from_net
-from .config.sort_services import get_service_name_from_net
+from .config.sort_services import get_container_name_from_network_mode
+from .config.sort_services import get_service_name_from_network_mode
 from .const import DEFAULT_TIMEOUT
 from .const import IMAGE_EVENTS
 from .const import LABEL_ONE_OFF
@@ -19,11 +19,11 @@ from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
 from .container import Container
 from .network import Network
-from .service import ContainerNet
+from .service import ContainerNetworkMode
 from .service import ConvergenceStrategy
-from .service import Net
+from .service import NetworkMode
 from .service import Service
-from .service import ServiceNet
+from .service import ServiceNetworkMode
 from .utils import microseconds_from_time_nano
 from .volume import Volume
 
@@ -91,7 +91,7 @@ class Project(object):
                 networks = []
 
             links = project.get_links(service_dict)
-            net = project.get_net(service_dict, networks)
+            network_mode = project.get_network_mode(service_dict, networks)
             volumes_from = get_volumes_from(project, service_dict)
 
             if config_data.version == 2:
@@ -110,7 +110,7 @@ class Project(object):
                     use_networking=use_networking,
                     networks=networks,
                     links=links,
-                    net=net,
+                    network_mode=network_mode,
                     volumes_from=volumes_from,
                     **service_dict)
             )
@@ -197,27 +197,27 @@ class Project(object):
             del service_dict['links']
         return links
 
-    def get_net(self, service_dict, networks):
-        net = service_dict.pop('network_mode', None)
-        if not net:
+    def get_network_mode(self, service_dict, networks):
+        network_mode = service_dict.pop('network_mode', None)
+        if not network_mode:
             if self.use_networking:
-                return Net(networks[0]) if networks else Net('none')
-            return Net(None)
+                return NetworkMode(networks[0]) if networks else NetworkMode('none')
+            return NetworkMode(None)
 
-        service_name = get_service_name_from_net(net)
+        service_name = get_service_name_from_network_mode(network_mode)
         if service_name:
-            return ServiceNet(self.get_service(service_name))
+            return ServiceNetworkMode(self.get_service(service_name))
 
-        container_name = get_container_name_from_net(net)
+        container_name = get_container_name_from_network_mode(network_mode)
         if container_name:
             try:
-                return ContainerNet(Container.from_id(self.client, container_name))
+                return ContainerNetworkMode(Container.from_id(self.client, container_name))
             except APIError:
                 raise ConfigurationError(
                     "Service '{name}' uses the network stack of container '{dep}' which "
                     "does not exist.".format(name=service_dict['name'], dep=container_name))
 
-        return Net(net)
+        return NetworkMode(network_mode)
 
     def start(self, service_names=None, **options):
         containers = []
diff --git a/compose/service.py b/compose/service.py
index 166fb0b2..106d5b26 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -47,7 +47,6 @@ DOCKER_START_KEYS = [
     'extra_hosts',
     'ipc',
     'read_only',
-    'net',
     'log_driver',
     'log_opt',
     'mem_limit',
@@ -113,7 +112,7 @@ class Service(object):
         use_networking=False,
         links=None,
         volumes_from=None,
-        net=None,
+        network_mode=None,
         networks=None,
         **options
     ):
@@ -123,7 +122,7 @@ class Service(object):
         self.use_networking = use_networking
         self.links = links or []
         self.volumes_from = volumes_from or []
-        self.net = net or Net(None)
+        self.network_mode = network_mode or NetworkMode(None)
         self.networks = networks or []
         self.options = options
 
@@ -472,7 +471,7 @@ class Service(object):
             'options': self.options,
             'image_id': self.image()['Id'],
             'links': self.get_link_names(),
-            'net': self.net.id,
+            'net': self.network_mode.id,
             'volumes_from': [
                 (v.source.name, v.mode)
                 for v in self.volumes_from if isinstance(v.source, Service)
@@ -480,7 +479,7 @@ class Service(object):
         }
 
     def get_dependency_names(self):
-        net_name = self.net.service_name
+        net_name = self.network_mode.service_name
         return (self.get_linked_service_names() +
                 self.get_volumes_from_names() +
                 ([net_name] if net_name else []) +
@@ -636,7 +635,7 @@ class Service(object):
             binds=options.get('binds'),
             volumes_from=self._get_volumes_from(),
             privileged=options.get('privileged', False),
-            network_mode=self.net.mode,
+            network_mode=self.network_mode.mode,
             devices=options.get('devices'),
             dns=options.get('dns'),
             dns_search=options.get('dns_search'),
@@ -774,22 +773,22 @@ class Service(object):
                 log.error(six.text_type(e))
 
 
-class Net(object):
+class NetworkMode(object):
     """A `standard` network mode (ex: host, bridge)"""
 
     service_name = None
 
-    def __init__(self, net):
-        self.net = net
+    def __init__(self, network_mode):
+        self.network_mode = network_mode
 
     @property
     def id(self):
-        return self.net
+        return self.network_mode
 
     mode = id
 
 
-class ContainerNet(object):
+class ContainerNetworkMode(object):
     """A network mode that uses a container's network stack."""
 
     service_name = None
@@ -806,7 +805,7 @@ class ContainerNet(object):
         return 'container:' + self.container.id
 
 
-class ServiceNet(object):
+class ServiceNetworkMode(object):
     """A network mode that uses a service's network stack."""
 
     def __init__(self, service):
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 0945ebb8..0c8c9a6a 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -131,7 +131,7 @@ class ProjectTest(DockerClientTestCase):
 
         web = project.get_service('web')
         net = project.get_service('net')
-        self.assertEqual(web.net.mode, 'container:' + net.containers()[0].id)
+        self.assertEqual(web.network_mode.mode, 'container:' + net.containers()[0].id)
 
     @v2_only()
     def test_network_mode_from_container(self):
@@ -168,7 +168,7 @@ class ProjectTest(DockerClientTestCase):
         project.up()
 
         web = project.get_service('web')
-        self.assertEqual(web.net.mode, 'container:' + net_container.id)
+        self.assertEqual(web.network_mode.mode, 'container:' + net_container.id)
 
     def test_net_from_service_v1(self):
         project = Project.from_config(
@@ -191,7 +191,7 @@ class ProjectTest(DockerClientTestCase):
 
         web = project.get_service('web')
         net = project.get_service('net')
-        self.assertEqual(web.net.mode, 'container:' + net.containers()[0].id)
+        self.assertEqual(web.network_mode.mode, 'container:' + net.containers()[0].id)
 
     def test_net_from_container_v1(self):
         def get_project():
@@ -224,7 +224,7 @@ class ProjectTest(DockerClientTestCase):
         project.up()
 
         web = project.get_service('web')
-        self.assertEqual(web.net.mode, 'container:' + net_container.id)
+        self.assertEqual(web.network_mode.mode, 'container:' + net_container.id)
 
     def test_start_pause_unpause_stop_kill_remove(self):
         web = self.create_service('web')
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 379e51ea..cde50b10 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -26,7 +26,7 @@ from compose.const import LABEL_VERSION
 from compose.container import Container
 from compose.service import ConvergencePlan
 from compose.service import ConvergenceStrategy
-from compose.service import Net
+from compose.service import NetworkMode
 from compose.service import Service
 
 
@@ -752,17 +752,17 @@ class ServiceTest(DockerClientTestCase):
         assert len(service.containers(stopped=True)) == 2
 
     def test_network_mode_none(self):
-        service = self.create_service('web', net=Net('none'))
+        service = self.create_service('web', network_mode=NetworkMode('none'))
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.NetworkMode'), 'none')
 
     def test_network_mode_bridged(self):
-        service = self.create_service('web', net=Net('bridge'))
+        service = self.create_service('web', network_mode=NetworkMode('bridge'))
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.NetworkMode'), 'bridge')
 
     def test_network_mode_host(self):
-        service = self.create_service('web', net=Net('host'))
+        service = self.create_service('web', network_mode=NetworkMode('host'))
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.NetworkMode'), 'host')
 
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 3ad131f3..21c6be47 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -349,7 +349,7 @@ class ProjectTest(unittest.TestCase):
             ),
         )
         service = project.get_service('test')
-        self.assertEqual(service.net.id, None)
+        self.assertEqual(service.network_mode.id, None)
         self.assertNotIn('NetworkMode', service._get_container_host_config({}))
 
     def test_use_net_from_container(self):
@@ -373,7 +373,7 @@ class ProjectTest(unittest.TestCase):
             ),
         )
         service = project.get_service('test')
-        self.assertEqual(service.net.mode, 'container:' + container_id)
+        self.assertEqual(service.network_mode.mode, 'container:' + container_id)
 
     def test_use_net_from_service(self):
         container_name = 'test_aaa_1'
@@ -407,7 +407,7 @@ class ProjectTest(unittest.TestCase):
         )
 
         service = project.get_service('test')
-        self.assertEqual(service.net.mode, 'container:' + container_name)
+        self.assertEqual(service.network_mode.mode, 'container:' + container_name)
 
     def test_uses_default_network_true(self):
         project = Project.from_config(
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 4d9aec65..74e9f0f5 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -15,16 +15,16 @@ from compose.const import LABEL_SERVICE
 from compose.container import Container
 from compose.service import build_ulimits
 from compose.service import build_volume_binding
-from compose.service import ContainerNet
+from compose.service import ContainerNetworkMode
 from compose.service import get_container_data_volumes
 from compose.service import ImageType
 from compose.service import merge_volume_bindings
 from compose.service import NeedsBuildError
-from compose.service import Net
+from compose.service import NetworkMode
 from compose.service import NoSuchImageError
 from compose.service import parse_repository_tag
 from compose.service import Service
-from compose.service import ServiceNet
+from compose.service import ServiceNetworkMode
 from compose.service import warn_on_masked_volume
 
 
@@ -407,7 +407,7 @@ class ServiceTest(unittest.TestCase):
             'foo',
             image='example.com/foo',
             client=self.mock_client,
-            net=ServiceNet(Service('other')),
+            network_mode=ServiceNetworkMode(Service('other')),
             links=[(Service('one'), 'one')],
             volumes_from=[VolumeFromSpec(Service('two'), 'rw', 'service')])
 
@@ -421,7 +421,7 @@ class ServiceTest(unittest.TestCase):
         }
         self.assertEqual(config_dict, expected)
 
-    def test_config_dict_with_net_from_container(self):
+    def test_config_dict_with_network_mode_from_container(self):
         self.mock_client.inspect_image.return_value = {'Id': 'abcd'}
         container = Container(
             self.mock_client,
@@ -430,7 +430,7 @@ class ServiceTest(unittest.TestCase):
             'foo',
             image='example.com/foo',
             client=self.mock_client,
-            net=container)
+            network_mode=ContainerNetworkMode(container))
 
         config_dict = service.config_dict()
         expected = {
@@ -589,20 +589,20 @@ class BuildUlimitsTestCase(unittest.TestCase):
 
 class NetTestCase(unittest.TestCase):
 
-    def test_net(self):
-        net = Net('host')
-        self.assertEqual(net.id, 'host')
-        self.assertEqual(net.mode, 'host')
-        self.assertEqual(net.service_name, None)
+    def test_network_mode(self):
+        network_mode = NetworkMode('host')
+        self.assertEqual(network_mode.id, 'host')
+        self.assertEqual(network_mode.mode, 'host')
+        self.assertEqual(network_mode.service_name, None)
 
-    def test_net_container(self):
+    def test_network_mode_container(self):
         container_id = 'abcd'
-        net = ContainerNet(Container(None, {'Id': container_id}))
-        self.assertEqual(net.id, container_id)
-        self.assertEqual(net.mode, 'container:' + container_id)
-        self.assertEqual(net.service_name, None)
+        network_mode = ContainerNetworkMode(Container(None, {'Id': container_id}))
+        self.assertEqual(network_mode.id, container_id)
+        self.assertEqual(network_mode.mode, 'container:' + container_id)
+        self.assertEqual(network_mode.service_name, None)
 
-    def test_net_service(self):
+    def test_network_mode_service(self):
         container_id = 'bbbb'
         service_name = 'web'
         mock_client = mock.create_autospec(docker.Client)
@@ -611,23 +611,23 @@ class NetTestCase(unittest.TestCase):
         ]
 
         service = Service(name=service_name, client=mock_client)
-        net = ServiceNet(service)
+        network_mode = ServiceNetworkMode(service)
 
-        self.assertEqual(net.id, service_name)
-        self.assertEqual(net.mode, 'container:' + container_id)
-        self.assertEqual(net.service_name, service_name)
+        self.assertEqual(network_mode.id, service_name)
+        self.assertEqual(network_mode.mode, 'container:' + container_id)
+        self.assertEqual(network_mode.service_name, service_name)
 
-    def test_net_service_no_containers(self):
+    def test_network_mode_service_no_containers(self):
         service_name = 'web'
         mock_client = mock.create_autospec(docker.Client)
         mock_client.containers.return_value = []
 
         service = Service(name=service_name, client=mock_client)
-        net = ServiceNet(service)
+        network_mode = ServiceNetworkMode(service)
 
-        self.assertEqual(net.id, service_name)
-        self.assertEqual(net.mode, None)
-        self.assertEqual(net.service_name, service_name)
+        self.assertEqual(network_mode.id, service_name)
+        self.assertEqual(network_mode.mode, None)
+        self.assertEqual(network_mode.service_name, service_name)
 
 
 def build_mount(destination, source, mode='rw'):

From c39d5a3f06eb92fbdd5a79de7ec6707683962024 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Jan 2016 15:51:09 +0000
Subject: [PATCH 0738/1265] Add note about named volumes to upgrade guide

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/compose-file.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 6b61755f..b2097e06 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -950,6 +950,27 @@ It's more complicated if you're using particular configuration features:
         net: "container:cont-name"  ->  network_mode: "container:cont-name"
         net: "container:abc12345"   ->  network_mode: "container:abc12345"
 
+-   `volumes` with named volumes: these must now be explicitly declared in a
+    top-level `volumes` section of your Compose file. If a service mounts a
+    named volume called `data`, you must declare a `data` volume in your
+    top-level `volumes` section. The whole file might look like this:
+
+        version: 2
+        services:
+          db:
+            image: postgres
+            volumes:
+              - data:/var/lib/postgresql/data
+        volumes:
+          data: {}
+
+    By default, Compose creates a volume whose name is prefixed with your
+    project name. If you want it to just be called `data`, declared it as
+    external:
+
+        volumes:
+          data:
+            external: true
 
 ## Variable substitution
 

From 4736b4409a6b752bb11f5f66611305531328909f Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Jan 2016 15:53:02 +0000
Subject: [PATCH 0739/1265] Update for links, external_links, network_mode

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 .../migrate-compose-file-v1-to-v2.py          | 43 +++++++++++++++----
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/contrib/migration/migrate-compose-file-v1-to-v2.py b/contrib/migration/migrate-compose-file-v1-to-v2.py
index a961b0bd..011ce338 100755
--- a/contrib/migration/migrate-compose-file-v1-to-v2.py
+++ b/contrib/migration/migrate-compose-file-v1-to-v2.py
@@ -20,20 +20,45 @@ def migrate(content):
     data = ruamel.yaml.load(content, ruamel.yaml.RoundTripLoader)
 
     service_names = data.keys()
+
     for name, service in data.items():
-        # remove links and external links
-        service.pop('links', None)
-        external_links = service.pop('external_links', None)
+        links = service.get('links')
+        if links:
+            example_service = links[0].partition(':')[0]
+            log.warn(
+                "Service {name} has links, which no longer create environment "
+                "variables such as {example_service_upper}_PORT. "
+                "If you are using those in your application code, you should "
+                "instead connect directly to the hostname, e.g. "
+                "'{example_service}'."
+                .format(name=name, example_service=example_service,
+                        example_service_upper=example_service.upper()))
+
+        external_links = service.get('external_links')
         if external_links:
             log.warn(
-                "Service {name} has external_links: {ext}, which are no longer "
-                "supported. See https://docs.docker.com/compose/networking/ "
-                "for options on how to connect external containers to the "
-                "compose network.".format(name=name, ext=external_links))
+                "Service {name} has external_links: {ext}, which now work "
+                "slightly differently. In particular, two containers must be "
+                "connected to at least one network in common in order to "
+                "communicate, even if explicitly linked together.\n\n"
+                "Either connect the external container to your app's default "
+                "network, or connect both the external container and your "
+                "service's containers to a pre-existing network. See "
+                "https://docs.docker.com/compose/networking/ "
+                "for more on how to do this."
+                .format(name=name, ext=external_links))
 
-        # net is now networks
+        # net is now network_mode
         if 'net' in service:
-            service['networks'] = [service.pop('net')]
+            network_mode = service.pop('net')
+
+            # "container:<service name>" is now "service:<service name>"
+            if network_mode.startswith('container:'):
+                name = network_mode.partition(':')[2]
+                if name in service_names:
+                    network_mode = 'service:{}'.format(name)
+
+            service['network_mode'] = network_mode
 
         # create build section
         if 'dockerfile' in service:

From 47b22e90f95c3aeac56f42083154c327449761c3 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Jan 2016 15:53:25 +0000
Subject: [PATCH 0740/1265] Make warnings a bit more readable

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 contrib/migration/migrate-compose-file-v1-to-v2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/migration/migrate-compose-file-v1-to-v2.py b/contrib/migration/migrate-compose-file-v1-to-v2.py
index 011ce338..e156d9e1 100755
--- a/contrib/migration/migrate-compose-file-v1-to-v2.py
+++ b/contrib/migration/migrate-compose-file-v1-to-v2.py
@@ -106,7 +106,7 @@ def parse_opts(args):
 
 
 def main(args):
-    logging.basicConfig()
+    logging.basicConfig(format='\033[33m%(levelname)s:\033[37m %(message)s\n')
 
     opts = parse_opts(args)
 

From f86fe118250fbb32ad4167c50965389763f75c01 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Jan 2016 15:54:18 +0000
Subject: [PATCH 0741/1265] Make sure version line is at the top of the file

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 contrib/migration/migrate-compose-file-v1-to-v2.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/migration/migrate-compose-file-v1-to-v2.py b/contrib/migration/migrate-compose-file-v1-to-v2.py
index e156d9e1..fb73811c 100755
--- a/contrib/migration/migrate-compose-file-v1-to-v2.py
+++ b/contrib/migration/migrate-compose-file-v1-to-v2.py
@@ -78,8 +78,11 @@ def migrate(content):
             if volume_from.split(':', 1)[0] not in service_names:
                 service['volumes_from'][idx] = 'container:%s' % volume_from
 
-    data['services'] = {name: data.pop(name) for name in data.keys()}
+    services = {name: data.pop(name) for name in data.keys()}
+
     data['version'] = 2
+    data['services'] = services
+
     return data
 
 

From aa4d43af0b40d5c38052ec4f5015aad5d3618e89 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Jan 2016 16:01:43 +0000
Subject: [PATCH 0742/1265] Create declarations for named volumes

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 .../migrate-compose-file-v1-to-v2.py          | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/contrib/migration/migrate-compose-file-v1-to-v2.py b/contrib/migration/migrate-compose-file-v1-to-v2.py
index fb73811c..23f6be3b 100755
--- a/contrib/migration/migrate-compose-file-v1-to-v2.py
+++ b/contrib/migration/migrate-compose-file-v1-to-v2.py
@@ -12,6 +12,8 @@ import sys
 
 import ruamel.yaml
 
+from compose.config.types import VolumeSpec
+
 
 log = logging.getLogger('migrate')
 
@@ -82,10 +84,39 @@ def migrate(content):
 
     data['version'] = 2
     data['services'] = services
+    create_volumes_section(data)
 
     return data
 
 
+def create_volumes_section(data):
+    named_volumes = get_named_volumes(data['services'])
+    if named_volumes:
+        log.warn(
+            "Named volumes ({names}) must be explicitly declared. Creating a "
+            "'volumes' section with declarations.\n\n"
+            "For backwards-compatibility, they've been declared as external. "
+            "If you don't mind the volume names being prefixed with the "
+            "project name, you can remove the 'external' option from each one."
+            .format(names=', '.join(list(named_volumes))))
+
+        data['volumes'] = named_volumes
+
+
+def get_named_volumes(services):
+    volume_specs = [
+        VolumeSpec.parse(volume)
+        for service in services.values()
+        for volume in service.get('volumes', [])
+    ]
+    names = {
+        spec.external
+        for spec in volume_specs
+        if spec.is_named_volume
+    }
+    return {name: {'external': True} for name in names}
+
+
 def write(stream, new_format, indent, width):
     ruamel.yaml.dump(
         new_format,

From 7d403d09cf27dbca10b6b5cc1bd8f047cc21f1e4 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Jan 2016 16:08:34 +0000
Subject: [PATCH 0743/1265] Extract helper methods

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 .../migrate-compose-file-v1-to-v2.py          | 125 ++++++++++--------
 1 file changed, 70 insertions(+), 55 deletions(-)

diff --git a/contrib/migration/migrate-compose-file-v1-to-v2.py b/contrib/migration/migrate-compose-file-v1-to-v2.py
index 23f6be3b..4f9be97f 100755
--- a/contrib/migration/migrate-compose-file-v1-to-v2.py
+++ b/contrib/migration/migrate-compose-file-v1-to-v2.py
@@ -24,61 +24,12 @@ def migrate(content):
     service_names = data.keys()
 
     for name, service in data.items():
-        links = service.get('links')
-        if links:
-            example_service = links[0].partition(':')[0]
-            log.warn(
-                "Service {name} has links, which no longer create environment "
-                "variables such as {example_service_upper}_PORT. "
-                "If you are using those in your application code, you should "
-                "instead connect directly to the hostname, e.g. "
-                "'{example_service}'."
-                .format(name=name, example_service=example_service,
-                        example_service_upper=example_service.upper()))
-
-        external_links = service.get('external_links')
-        if external_links:
-            log.warn(
-                "Service {name} has external_links: {ext}, which now work "
-                "slightly differently. In particular, two containers must be "
-                "connected to at least one network in common in order to "
-                "communicate, even if explicitly linked together.\n\n"
-                "Either connect the external container to your app's default "
-                "network, or connect both the external container and your "
-                "service's containers to a pre-existing network. See "
-                "https://docs.docker.com/compose/networking/ "
-                "for more on how to do this."
-                .format(name=name, ext=external_links))
-
-        # net is now network_mode
-        if 'net' in service:
-            network_mode = service.pop('net')
-
-            # "container:<service name>" is now "service:<service name>"
-            if network_mode.startswith('container:'):
-                name = network_mode.partition(':')[2]
-                if name in service_names:
-                    network_mode = 'service:{}'.format(name)
-
-            service['network_mode'] = network_mode
-
-        # create build section
-        if 'dockerfile' in service:
-            service['build'] = {
-                'context': service.pop('build'),
-                'dockerfile': service.pop('dockerfile'),
-            }
-
-        # create logging section
-        if 'log_driver' in service:
-            service['logging'] = {'driver': service.pop('log_driver')}
-            if 'log_opt' in service:
-                service['logging']['options'] = service.pop('log_opt')
-
-        # volumes_from prefix with 'container:'
-        for idx, volume_from in enumerate(service.get('volumes_from', [])):
-            if volume_from.split(':', 1)[0] not in service_names:
-                service['volumes_from'][idx] = 'container:%s' % volume_from
+        warn_for_links(name, service)
+        warn_for_external_links(name, service)
+        rewrite_net(service, service_names)
+        rewrite_build(service)
+        rewrite_logging(service)
+        rewrite_volumes_from(service, service_names)
 
     services = {name: data.pop(name) for name in data.keys()}
 
@@ -89,6 +40,70 @@ def migrate(content):
     return data
 
 
+def warn_for_links(name, service):
+    links = service.get('links')
+    if links:
+        example_service = links[0].partition(':')[0]
+        log.warn(
+            "Service {name} has links, which no longer create environment "
+            "variables such as {example_service_upper}_PORT. "
+            "If you are using those in your application code, you should "
+            "instead connect directly to the hostname, e.g. "
+            "'{example_service}'."
+            .format(name=name, example_service=example_service,
+                    example_service_upper=example_service.upper()))
+
+
+def warn_for_external_links(name, service):
+    external_links = service.get('external_links')
+    if external_links:
+        log.warn(
+            "Service {name} has external_links: {ext}, which now work "
+            "slightly differently. In particular, two containers must be "
+            "connected to at least one network in common in order to "
+            "communicate, even if explicitly linked together.\n\n"
+            "Either connect the external container to your app's default "
+            "network, or connect both the external container and your "
+            "service's containers to a pre-existing network. See "
+            "https://docs.docker.com/compose/networking/ "
+            "for more on how to do this."
+            .format(name=name, ext=external_links))
+
+
+def rewrite_net(service, service_names):
+    if 'net' in service:
+        network_mode = service.pop('net')
+
+        # "container:<service name>" is now "service:<service name>"
+        if network_mode.startswith('container:'):
+            name = network_mode.partition(':')[2]
+            if name in service_names:
+                network_mode = 'service:{}'.format(name)
+
+        service['network_mode'] = network_mode
+
+
+def rewrite_build(service):
+    if 'dockerfile' in service:
+        service['build'] = {
+            'context': service.pop('build'),
+            'dockerfile': service.pop('dockerfile'),
+        }
+
+
+def rewrite_logging(service):
+    if 'log_driver' in service:
+        service['logging'] = {'driver': service.pop('log_driver')}
+        if 'log_opt' in service:
+            service['logging']['options'] = service.pop('log_opt')
+
+
+def rewrite_volumes_from(service, service_names):
+    for idx, volume_from in enumerate(service.get('volumes_from', [])):
+        if volume_from.split(':', 1)[0] not in service_names:
+            service['volumes_from'][idx] = 'container:%s' % volume_from
+
+
 def create_volumes_section(data):
     named_volumes = get_named_volumes(data['services'])
     if named_volumes:

From e40a46349f348efec11bd607f10ace62313a3152 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Jan 2016 17:41:26 +0000
Subject: [PATCH 0744/1265] Fix rebase-bump-commit script

Trim whitespace from wc's output before constructing arguments to `git rebase`

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/release/rebase-bump-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/release/rebase-bump-commit b/script/release/rebase-bump-commit
index 23877bb5..3c2ae72b 100755
--- a/script/release/rebase-bump-commit
+++ b/script/release/rebase-bump-commit
@@ -32,7 +32,7 @@ if [[ "$sha" == "$(git rev-parse HEAD)" ]]; then
     exit 0
 fi
 
-commits=$(git log --format="%H" "$sha..HEAD" | wc -l)
+commits=$(git log --format="%H" "$sha..HEAD" | wc -l | xargs echo)
 
 git rebase --onto $sha~1 HEAD~$commits $BRANCH
 git cherry-pick $sha

From 0ba02b4a185d75343c0790bfff746f23f4c209a9 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Jan 2016 18:48:43 +0000
Subject: [PATCH 0745/1265] Add back external links in v2

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/service_schema_v2.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
index 56c0cbf5..ca9bb671 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.json
@@ -83,6 +83,7 @@
           ]
         },
 
+        "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
         "hostname": {"type": "string"},
         "image": {"type": "string"},

From b84da7c78bacb28b62ec0b1ad34edd3330320e5b Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Jan 2016 23:22:21 +0000
Subject: [PATCH 0746/1265] Fix trailing whitespace in docker-compose.md

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/reference/docker-compose.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/reference/docker-compose.md b/docs/reference/docker-compose.md
index 44a466e3..6e7e4901 100644
--- a/docs/reference/docker-compose.md
+++ b/docs/reference/docker-compose.md
@@ -87,9 +87,9 @@ relative to the current working directory.
 The `-f` flag is optional. If you don't provide this flag on the command line,
 Compose traverses the working directory and its parent directories looking for a
 `docker-compose.yml` and a `docker-compose.override.yml` file. You must
-supply at least the `docker-compose.yml` file. If both files are present on the 
-same directory level, Compose combines the two files into a single configuration. 
-The configuration in the `docker-compose.override.yml` file is applied over and 
+supply at least the `docker-compose.yml` file. If both files are present on the
+same directory level, Compose combines the two files into a single configuration.
+The configuration in the `docker-compose.override.yml` file is applied over and
 in addition to the values in the `docker-compose.yml` file.
 
 See also the `COMPOSE_FILE` [environment variable](overview.md#compose-file).

From e69ef1c456e509b3b6e967974360b5ef7a0262a4 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 26 Jan 2016 11:12:35 -0800
Subject: [PATCH 0747/1265] Bump docker-py version to latest RC

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index ed3b8686..68ef9f35 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 PyYAML==3.11
 cached-property==1.2.0
-docker-py==1.7.0rc2
+docker-py==1.7.0rc3
 docopt==0.6.1
 enum34==1.0.4
 git+https://github.com/d11wtq/dockerpty.git@29b1394108b017ef3e3deaf00604a9eb99880d5e#egg=dockerpty

From 650b0cec384e115c66c9b66e401f4ca37fc10490 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 27 Jan 2016 00:42:04 +0000
Subject: [PATCH 0748/1265] Remove ability to join bridge network +
 user-defined networks

Containers connected to the bridge network can't have aliases, so it's
simpler to rule that they can *either* be connected to the bridge
network (via `network_mode: bridge`) *or* be connected to user-defined
networks (via `networks` or the default network).

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py           | 15 ++++++---------
 docs/compose-file.md         |  5 -----
 tests/acceptance/cli_test.py | 16 ----------------
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index e5b6faef..d2787ecf 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -470,16 +470,13 @@ def get_networks(service_dict, network_definitions):
 
     networks = []
     for name in service_dict.pop('networks', ['default']):
-        if name in ['bridge']:
-            networks.append(name)
+        matches = [n for n in network_definitions if n.name == name]
+        if matches:
+            networks.append(matches[0].full_name)
         else:
-            matches = [n for n in network_definitions if n.name == name]
-            if matches:
-                networks.append(matches[0].full_name)
-            else:
-                raise ConfigurationError(
-                    'Service "{}" uses an undefined network "{}"'
-                    .format(service_dict['name'], name))
+            raise ConfigurationError(
+                'Service "{}" uses an undefined network "{}"'
+                .format(service_dict['name'], name))
     return networks
 
 
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 6b61755f..afef0b1a 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -472,11 +472,6 @@ Networks to join, referencing entries under the
       - some-network
       - other-network
 
-The value `bridge` can also be used to make containers join the pre-defined
-`bridge` network.
-
-There is no equivalent to `net: "container:[name or id]"`.
-
 ### pid
 
     pid: "host"
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 4b560efa..30589bad 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -495,22 +495,6 @@ class CLITestCase(DockerClientTestCase):
 
         assert 'Service "web" uses an undefined network "foo"' in result.stderr
 
-    @v2_only()
-    def test_up_with_bridge_network_plus_default(self):
-        filename = 'bridge.yml'
-
-        self.base_dir = 'tests/fixtures/networks'
-        self._project = get_project(self.base_dir, [filename])
-
-        self.dispatch(['-f', filename, 'up', '-d'], None)
-
-        container = self.project.containers()[0]
-
-        assert sorted(list(container.get('NetworkSettings.Networks'))) == sorted([
-            'bridge',
-            self.project.default_network.full_name,
-        ])
-
     @v2_only()
     def test_up_with_network_mode(self):
         c = self.client.create_container('busybox', 'top', name='composetest_network_mode_container')

From d3a1cea1709143feb0f2b490dadcf50090dbffc1 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 27 Jan 2016 02:34:59 +0000
Subject: [PATCH 0749/1265] Remove outdated warnings about links from docs

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/compose-file.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index afef0b1a..28fedf42 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -808,7 +808,7 @@ future Compose release.
 
 Version 1 files cannot declare named
 [volumes](#volume-configuration-reference), [networks](networking.md) or
-[build arguments](#args). They *can*, however, define [links](#links).
+[build arguments](#args).
 
 Example:
 
@@ -837,10 +837,6 @@ Named [volumes](#volume-configuration-reference) can be declared under the
 `volumes` key, and [networks](#network-configuration-reference) can be declared
 under the `networks` key.
 
-You cannot define links when using version 2. Instead, you should use
-[networking](networking.md) for communication between containers. In most cases,
-this will involve less configuration than links.
-
 Simple example:
 
     version: 2

From 3547c55523f67b31f8f54936c0ac743f55b22036 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 27 Jan 2016 13:26:32 +0000
Subject: [PATCH 0750/1265] Default to vim if EDITOR is not set

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/release/make-branch | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/script/release/make-branch b/script/release/make-branch
index 48fa771b..82b6ada0 100755
--- a/script/release/make-branch
+++ b/script/release/make-branch
@@ -63,15 +63,17 @@ git merge --strategy=ours --no-edit $REMOTE/release
 git config "branch.${BRANCH}.release" $VERSION
 
 
+editor=${EDITOR:-vim}
+
 echo "Update versions in docs/install.md, compose/__init__.py, script/run.sh"
-$EDITOR docs/install.md
-$EDITOR compose/__init__.py
-$EDITOR script/run.sh
+$editor docs/install.md
+$editor compose/__init__.py
+$editor script/run.sh
 
 
 echo "Write release notes in CHANGELOG.md"
 browser "https://github.com/docker/compose/issues?q=milestone%3A$VERSION+is%3Aclosed"
-$EDITOR CHANGELOG.md
+$editor CHANGELOG.md
 
 
 git diff

From 634ae7daa59a8f2fe3410ff8b538651fcb9a6662 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 27 Jan 2016 13:27:12 +0000
Subject: [PATCH 0751/1265] Let the user specify any repo as their fork

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/release/make-branch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/script/release/make-branch b/script/release/make-branch
index 82b6ada0..46ba6bbc 100755
--- a/script/release/make-branch
+++ b/script/release/make-branch
@@ -86,10 +86,10 @@ echo "Push branch to user remote"
 GITHUB_USER=$USER
 USER_REMOTE="$(find_remote $GITHUB_USER/compose)"
 if [ -z "$USER_REMOTE" ]; then
-    echo "No user remote found for $GITHUB_USER"
-    read -r -p "Enter the name of your github user: " GITHUB_USER
+    echo "$GITHUB_USER/compose not found"
+    read -r -p "Enter the name of your GitHub fork (username/repo): " GITHUB_REPO
     # assumes there is already a user remote somewhere
-    USER_REMOTE=$(find_remote $GITHUB_USER/compose)
+    USER_REMOTE=$(find_remote $GITHUB_REPO)
 fi
 if [ -z "$USER_REMOTE" ]; then
     >&2 echo "No user remote found. You need to 'git push' your branch."

From 3fc72038c56482e63dbb2e1341f8475cf6bb5350 Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Sun, 24 Jan 2016 12:03:44 -0800
Subject: [PATCH 0752/1265] New navigation for 1.10 release Updating with
 Joffrey's comments

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/README.md          |   4 +-
 docs/completion.md      |   4 +-
 docs/compose-file.md    |   3 +-
 docs/django.md          |   6 +-
 docs/env.md             |   6 +-
 docs/extends.md         |   2 +-
 docs/faq.md             |   4 +-
 docs/gettingstarted.md  |   4 +-
 docs/index.md           | 175 ++----------------------------------
 docs/install.md         |   6 +-
 docs/networking.md      |   3 +-
 docs/overview.md        | 191 ++++++++++++++++++++++++++++++++++++++++
 docs/production.md      |   2 +-
 docs/rails.md           |   6 +-
 docs/reference/index.md |   7 +-
 docs/wordpress.md       |   6 +-
 16 files changed, 230 insertions(+), 199 deletions(-)
 create mode 100644 docs/overview.md

diff --git a/docs/README.md b/docs/README.md
index d8ab7c3e..e60fa48c 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -58,7 +58,7 @@ The top of each Docker Compose documentation file contains TOML metadata. The me
     description = "How to use Docker Compose's extends keyword to share configuration between files and projects"
     keywords = ["fig, composition, compose, docker, orchestration, documentation, docs"]
     [menu.main]
-    parent="smn_workw_compose"
+    parent="workw_compose"
     weight=2
     +++
     <![end-metadata]-->
@@ -70,7 +70,7 @@ The metadata alone has this structure:
     description = "How to use Docker Compose's extends keyword to share configuration between files and projects"
     keywords = ["fig, composition, compose, docker, orchestration, documentation, docs"]
     [menu.main]
-    parent="smn_workw_compose"
+    parent="workw_compose"
     weight=2
     +++
 
diff --git a/docs/completion.md b/docs/completion.md
index cac0d1a6..2076d512 100644
--- a/docs/completion.md
+++ b/docs/completion.md
@@ -4,8 +4,8 @@ title = "Command-line Completion"
 description = "Compose CLI reference"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
 [menu.main]
-parent="smn_workw_compose"
-weight=10
+parent="workw_compose"
+weight=88
 +++
 <![end-metadata]-->
 
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 5b72cc28..cc21bd8a 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -5,7 +5,8 @@ description = "Compose file reference"
 keywords = ["fig, composition, compose, docker"]
 aliases = ["/compose/yml"]
 [menu.main]
-parent="smn_compose_ref"
+parent="workw_compose"
+weight=70
 +++
 <![end-metadata]-->
 
diff --git a/docs/django.md b/docs/django.md
index 2d4fdaf9..573ea3d9 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -1,16 +1,16 @@
 <!--[metadata]>
 +++
-title = "Quickstart Guide: Compose and Django"
+title = "Quickstart: Compose and Django"
 description = "Getting started with Docker Compose and Django"
 keywords = ["documentation, docs,  docker, compose, orchestration, containers"]
 [menu.main]
-parent="smn_workw_compose"
+parent="workw_compose"
 weight=4
 +++
 <![end-metadata]-->
 
 
-# Quickstart Guide: Compose and Django
+# Quickstart: Compose and Django
 
 This quick-start guide demonstrates how to use Compose to set up and run a
 simple Django/PostgreSQL app. Before starting, you'll need to have
diff --git a/docs/env.md b/docs/env.md
index 7b7e1bc7..c7b93c77 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -1,11 +1,11 @@
 <!--[metadata]>
 +++
-title = "Compose environment variables reference"
+title = "Environment variables reference"
 description = "Compose CLI reference"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
 [menu.main]
-parent="smn_compose_ref"
-weight=3
+parent="workw_compose"
+weight=89
 +++
 <![end-metadata]-->
 
diff --git a/docs/extends.md b/docs/extends.md
index 011a7350..c9b65db8 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -4,7 +4,7 @@ title = "Extending services in Compose"
 description = "How to use Docker Compose's extends keyword to share configuration between files and projects"
 keywords = ["fig, composition, compose, docker, orchestration, documentation, docs"]
 [menu.main]
-parent="smn_workw_compose"
+parent="workw_compose"
 weight=2
 +++
 <![end-metadata]-->
diff --git a/docs/faq.md b/docs/faq.md
index b36eb5ac..264a27ee 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -4,8 +4,8 @@ title = "Frequently Asked Questions"
 description = "Docker Compose FAQ"
 keywords = "documentation, docs,  docker, compose, faq"
 [menu.main]
-parent="smn_workw_compose"
-weight=9
+parent="workw_compose"
+weight=90
 +++
 <![end-metadata]-->
 
diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md
index bb3d51e9..1939500c 100644
--- a/docs/gettingstarted.md
+++ b/docs/gettingstarted.md
@@ -4,8 +4,8 @@ title = "Getting Started"
 description = "Getting started with Docker Compose"
 keywords = ["documentation, docs,  docker, compose, orchestration, containers"]
 [menu.main]
-parent="smn_workw_compose"
-weight=3
+parent="workw_compose"
+weight=-85
 +++
 <![end-metadata]-->
 
diff --git a/docs/index.md b/docs/index.md
index 9cb594a7..61bc41ee 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,65 +1,21 @@
 <!--[metadata]>
 +++
-title = "Overview of Docker Compose"
+title = "Compose"
 description = "Introduction and Overview of Compose"
 keywords = ["documentation, docs,  docker, compose, orchestration,  containers"]
 [menu.main]
-parent="smn_workw_compose"
+identifier="workw_compose"
+weight=-70
 +++
 <![end-metadata]-->
 
 
-# Overview of Docker Compose
+# Docker Compose
 
-Compose is a tool for defining and running multi-container Docker applications.
-With Compose, you use a Compose file to configure your application's services.
-Then, using a single command, you create and start all the services
-from your configuration. To learn more about all the features of Compose
-see [the list of features](#features).
+Compose is a tool for defining and running multi-container Docker applications. To learn more about Compose refer to the following documentation:
 
-Compose is great for development, testing, and staging environments, as well as
-CI workflows. You can learn more about each case in
-[Common Use Cases](#common-use-cases).
-
-Using Compose is basically a three-step process.
-
-1. Define your app's environment with a `Dockerfile` so it can be
-reproduced anywhere.
-2. Define the services that make up your app in `docker-compose.yml` so
-they can be run together in an isolated environment.
-3. Lastly, run `docker-compose up` and Compose will start and run your entire app.
-
-A `docker-compose.yml` looks like this:
-
-    version: 2
-    services:
-      web:
-        build: .
-        ports:
-         - "5000:5000"
-        volumes:
-         - .:/code
-         - logvolume01:/var/log
-        links:
-         - redis
-      redis:
-        image: redis
-    volumes:
-      logvolume01: {}
-
-For more information about the Compose file, see the
-[Compose file reference](compose-file.md)
-
-Compose has commands for managing the whole lifecycle of your application:
-
- * Start, stop and rebuild services
- * View the status of running services
- * Stream the log output of running services
- * Run a one-off command on a service
-
-## Compose documentation
-
-- [Installing Compose](install.md)
+- [Compose Overview](overview.md)
+- [Install Compose](install.md)
 - [Getting Started](gettingstarted.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
@@ -68,123 +24,6 @@ Compose has commands for managing the whole lifecycle of your application:
 - [Command line reference](./reference/index.md)
 - [Compose file reference](compose-file.md)
 
-## Features
-
-The features of Compose that make it effective are:
-
-* [Multiple isolated environments on a single host](#Multiple-isolated-environments-on-a-single-host)
-* [Preserve volume data when containers are created](#preserve-volume-data-when-containers-are-created)
-* [Only recreate containers that have changed](#only-recreate-containers-that-have-changed)
-* [Variables and moving a composition between environments](#variables-and-moving-a-composition-between-environments)
-
-#### Multiple isolated environments on a single host
-
-Compose uses a project name to isolate environments from each other. You can use
-this project name to:
-
-* on a dev host, to create multiple copies of a single environment (ex: you want
-  to run a stable copy for each feature branch of a project)
-* on a CI server, to keep builds from interfering with each other, you can set
-  the project name to a unique build number
-* on a shared host or dev host, to prevent different projects which may use the
-  same service names, from interfering with each other
-
-The default project name is the basename of the project directory. You can set
-a custom project name by using the
-[`-p` command line option](./reference/docker-compose.md) or the
-[`COMPOSE_PROJECT_NAME` environment variable](./reference/overview.md#compose-project-name).
-
-#### Preserve volume data when containers are created
-
-Compose preserves all volumes used by your services. When `docker-compose up`
-runs, if it finds any containers from previous runs, it copies the volumes from
-the old container to the new container. This process ensures that any data
-you've created in volumes isn't lost.
-
-
-#### Only recreate containers that have changed
-
-Compose caches the configuration used to create a container. When you
-restart a service that has not changed, Compose re-uses the existing
-containers. Re-using containers means that you can make changes to your
-environment very quickly.
-
-
-#### Variables and moving a composition between environments
-
-Compose supports variables in the Compose file. You can use these variables
-to customize your composition for different environments, or different users.
-See [Variable substitution](compose-file.md#variable-substitution) for more
-details.
-
-You can extend a Compose file using the `extends` field or by creating multiple
-Compose files. See [extends](extends.md) for more details.
-
-
-## Common Use Cases
-
-Compose can be used in many different ways. Some common use cases are outlined
-below.
-
-### Development environments
-
-When you're developing software, the ability to run an application in an
-isolated environment and interact with it is crucial.  The Compose command
-line tool can be used to create the environment and interact with it.
-
-The [Compose file](compose-file.md) provides a way to document and configure
-all of the application's service dependencies (databases, queues, caches,
-web service APIs, etc). Using the Compose command line tool you can create
-and start one or more containers for each dependency with a single command
-(`docker-compose up`).
-
-Together, these features provide a convenient way for developers to get
-started on a project.  Compose can reduce a multi-page "developer getting
-started guide" to a single machine readable Compose file and a few commands.
-
-### Automated testing environments
-
-An important part of any Continuous Deployment or Continuous Integration process
-is the automated test suite. Automated end-to-end testing requires an
-environment in which to run tests. Compose provides a convenient way to create
-and destroy isolated testing environments for your test suite. By defining the full
-environment in a [Compose file](compose-file.md) you can create and destroy these
-environments in just a few commands:
-
-    $ docker-compose up -d
-    $ ./run_tests
-    $ docker-compose down
-
-### Single host deployments
-
-Compose has traditionally been focused on development and testing workflows,
-but with each release we're making progress on more production-oriented features.
-You can use Compose to deploy to a remote Docker Engine. The Docker Engine may
-be a single instance provisioned with
-[Docker Machine](https://docs.docker.com/machine/) or an entire
-[Docker Swarm](https://docs.docker.com/swarm/) cluster.
-
-For details on using production-oriented features, see
-[compose in production](production.md) in this documentation.
-
-
-## Release Notes
-
 To see a detailed list of changes for past and current releases of Docker
 Compose, please refer to the
 [CHANGELOG](https://github.com/docker/compose/blob/master/CHANGELOG.md).
-
-## Getting help
-
-Docker Compose is under active development. If you need help, would like to
-contribute, or simply want to talk about the project with like-minded
-individuals, we have a number of open channels for communication.
-
-* To report bugs or file feature requests: please use the [issue tracker on Github](https://github.com/docker/compose/issues).
-
-* To talk about the project with people in real time: please join the
-  `#docker-compose` channel on freenode IRC.
-
-* To contribute code or documentation changes: please submit a [pull request on Github](https://github.com/docker/compose/pulls).
-
-For more information and resources, please visit the [Getting Help project page](https://docs.docker.com/opensource/get-help/).
diff --git a/docs/install.md b/docs/install.md
index 417a48c1..3aaca8fa 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -1,11 +1,11 @@
 <!--[metadata]>
 +++
-title = "Docker Compose"
+title = "Install Compose"
 description = "How to install Docker Compose"
 keywords = ["compose, orchestration, install, installation, docker, documentation"]
 [menu.main]
-parent="mn_install"
-weight=4
+parent="workw_compose"
+weight=-90
 +++
 <![end-metadata]-->
 
diff --git a/docs/networking.md b/docs/networking.md
index 93533e9d..fb34e3de 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -4,8 +4,7 @@ title = "Networking in Compose"
 description = "How Compose sets up networking between containers"
 keywords = ["documentation, docs,  docker, compose, orchestration, containers, networking"]
 [menu.main]
-parent="smn_workw_compose"
-weight=6
+parent="workw_compose"
 +++
 <![end-metadata]-->
 
diff --git a/docs/overview.md b/docs/overview.md
new file mode 100644
index 00000000..19f51ab4
--- /dev/null
+++ b/docs/overview.md
@@ -0,0 +1,191 @@
+<!--[metadata]>
++++
+title = "Overview of Docker Compose"
+description = "Introduction and Overview of Compose"
+keywords = ["documentation, docs,  docker, compose, orchestration,  containers"]
+[menu.main]
+parent="workw_compose"
+weight=-99
++++
+<![end-metadata]-->
+
+
+# Overview of Docker Compose
+
+Compose is a tool for defining and running multi-container Docker applications.
+With Compose, you use a Compose file to configure your application's services.
+Then, using a single command, you create and start all the services
+from your configuration. To learn more about all the features of Compose
+see [the list of features](#features).
+
+Compose is great for development, testing, and staging environments, as well as
+CI workflows. You can learn more about each case in
+[Common Use Cases](#common-use-cases).
+
+Using Compose is basically a three-step process.
+
+1. Define your app's environment with a `Dockerfile` so it can be
+reproduced anywhere.
+2. Define the services that make up your app in `docker-compose.yml` so
+they can be run together in an isolated environment.
+3. Lastly, run `docker-compose up` and Compose will start and run your entire app.
+
+A `docker-compose.yml` looks like this:
+
+    version: 2
+    services:
+      web:
+        build: .
+        ports:
+         - "5000:5000"
+        volumes:
+         - .:/code
+         - logvolume01:/var/log
+        links:
+         - redis
+      redis:
+        image: redis
+    volumes:
+      logvolume01: {}
+
+For more information about the Compose file, see the
+[Compose file reference](compose-file.md)
+
+Compose has commands for managing the whole lifecycle of your application:
+
+ * Start, stop and rebuild services
+ * View the status of running services
+ * Stream the log output of running services
+ * Run a one-off command on a service
+
+## Compose documentation
+
+- [Installing Compose](install.md)
+- [Getting Started](gettingstarted.md)
+- [Get started with Django](django.md)
+- [Get started with Rails](rails.md)
+- [Get started with WordPress](wordpress.md)
+- [Frequently asked questions](faq.md)
+- [Command line reference](./reference/index.md)
+- [Compose file reference](compose-file.md)
+
+## Features
+
+The features of Compose that make it effective are:
+
+* [Multiple isolated environments on a single host](#Multiple-isolated-environments-on-a-single-host)
+* [Preserve volume data when containers are created](#preserve-volume-data-when-containers-are-created)
+* [Only recreate containers that have changed](#only-recreate-containers-that-have-changed)
+* [Variables and moving a composition between environments](#variables-and-moving-a-composition-between-environments)
+
+### Multiple isolated environments on a single host
+
+Compose uses a project name to isolate environments from each other. You can use
+this project name to:
+
+* on a dev host, to create multiple copies of a single environment (ex: you want
+  to run a stable copy for each feature branch of a project)
+* on a CI server, to keep builds from interfering with each other, you can set
+  the project name to a unique build number
+* on a shared host or dev host, to prevent different projects which may use the
+  same service names, from interfering with each other
+
+The default project name is the basename of the project directory. You can set
+a custom project name by using the
+[`-p` command line option](./reference/docker-compose.md) or the
+[`COMPOSE_PROJECT_NAME` environment variable](./reference/overview.md#compose-project-name).
+
+### Preserve volume data when containers are created
+
+Compose preserves all volumes used by your services. When `docker-compose up`
+runs, if it finds any containers from previous runs, it copies the volumes from
+the old container to the new container. This process ensures that any data
+you've created in volumes isn't lost.
+
+
+### Only recreate containers that have changed
+
+Compose caches the configuration used to create a container. When you
+restart a service that has not changed, Compose re-uses the existing
+containers. Re-using containers means that you can make changes to your
+environment very quickly.
+
+
+### Variables and moving a composition between environments
+
+Compose supports variables in the Compose file. You can use these variables
+to customize your composition for different environments, or different users.
+See [Variable substitution](compose-file.md#variable-substitution) for more
+details.
+
+You can extend a Compose file using the `extends` field or by creating multiple
+Compose files. See [extends](extends.md) for more details.
+
+
+## Common Use Cases
+
+Compose can be used in many different ways. Some common use cases are outlined
+below.
+
+### Development environments
+
+When you're developing software, the ability to run an application in an
+isolated environment and interact with it is crucial.  The Compose command
+line tool can be used to create the environment and interact with it.
+
+The [Compose file](compose-file.md) provides a way to document and configure
+all of the application's service dependencies (databases, queues, caches,
+web service APIs, etc). Using the Compose command line tool you can create
+and start one or more containers for each dependency with a single command
+(`docker-compose up`).
+
+Together, these features provide a convenient way for developers to get
+started on a project.  Compose can reduce a multi-page "developer getting
+started guide" to a single machine readable Compose file and a few commands.
+
+### Automated testing environments
+
+An important part of any Continuous Deployment or Continuous Integration process
+is the automated test suite. Automated end-to-end testing requires an
+environment in which to run tests. Compose provides a convenient way to create
+and destroy isolated testing environments for your test suite. By defining the full
+environment in a [Compose file](compose-file.md) you can create and destroy these
+environments in just a few commands:
+
+    $ docker-compose up -d
+    $ ./run_tests
+    $ docker-compose down
+
+### Single host deployments
+
+Compose has traditionally been focused on development and testing workflows,
+but with each release we're making progress on more production-oriented features.
+You can use Compose to deploy to a remote Docker Engine. The Docker Engine may
+be a single instance provisioned with
+[Docker Machine](https://docs.docker.com/machine/) or an entire
+[Docker Swarm](https://docs.docker.com/swarm/) cluster.
+
+For details on using production-oriented features, see
+[compose in production](production.md) in this documentation.
+
+
+## Release Notes
+
+To see a detailed list of changes for past and current releases of Docker
+Compose, please refer to the
+[CHANGELOG](https://github.com/docker/compose/blob/master/CHANGELOG.md).
+
+## Getting help
+
+Docker Compose is under active development. If you need help, would like to
+contribute, or simply want to talk about the project with like-minded
+individuals, we have a number of open channels for communication.
+
+* To report bugs or file feature requests: please use the [issue tracker on Github](https://github.com/docker/compose/issues).
+
+* To talk about the project with people in real time: please join the
+  `#docker-compose` channel on freenode IRC.
+
+* To contribute code or documentation changes: please submit a [pull request on Github](https://github.com/docker/compose/pulls).
+
+For more information and resources, please visit the [Getting Help project page](https://docs.docker.com/opensource/get-help/).
diff --git a/docs/production.md b/docs/production.md
index 46e221bb..d51ca549 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -4,7 +4,7 @@ title = "Using Compose in production"
 description = "Guide to using Docker Compose in production"
 keywords = ["documentation, docs,  docker, compose, orchestration, containers,  production"]
 [menu.main]
-parent="smn_workw_compose"
+parent="workw_compose"
 weight=1
 +++
 <![end-metadata]-->
diff --git a/docs/rails.md b/docs/rails.md
index e3daff25..f7634a6d 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -1,15 +1,15 @@
 <!--[metadata]>
 +++
-title = "Quickstart Guide: Compose and Rails"
+title = "Quickstart: Compose and Rails"
 description = "Getting started with Docker Compose and Rails"
 keywords = ["documentation, docs,  docker, compose, orchestration, containers"]
 [menu.main]
-parent="smn_workw_compose"
+parent="workw_compose"
 weight=5
 +++
 <![end-metadata]-->
 
-## Quickstart Guide: Compose and Rails
+## Quickstart: Compose and Rails
 
 This Quickstart guide will show you how to use Compose to set up and run a Rails/PostgreSQL app. Before starting, you'll need to have [Compose installed](install.md).
 
diff --git a/docs/reference/index.md b/docs/reference/index.md
index 5406b9c7..d1bd61c2 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -1,15 +1,16 @@
 <!--[metadata]>
 +++
-title = "Compose CLI reference"
+title = "Command line reference"
 description = "Compose CLI reference"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
 [menu.main]
 identifier = "smn_compose_cli"
-parent = "smn_compose_ref"
+parent = "workw_compose"
+weight=80
 +++
 <![end-metadata]-->
 
-## Compose CLI reference
+## Compose command-line reference
 
 The following pages describe the usage information for the [docker-compose](docker-compose.md) subcommands. You can also see this information by running `docker-compose [SUBCOMMAND] --help` from the command line.
 
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 84010491..50362253 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -1,16 +1,16 @@
 <!--[metadata]>
 +++
-title = "Quickstart Guide: Compose and WordPress"
+title = "Quickstart: Compose and WordPress"
 description = "Getting started with Compose and WordPress"
 keywords = ["documentation, docs,  docker, compose, orchestration, containers"]
 [menu.main]
-parent="smn_workw_compose"
+parent="workw_compose"
 weight=6
 +++
 <![end-metadata]-->
 
 
-# Quickstart Guide: Compose and WordPress
+# Quickstart: Compose and WordPress
 
 You can use Compose to easily run WordPress in an isolated environment built
 with Docker containers.

From b4868d02593925f3d179f6f17c5e6e25fe6d6ef0 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 29 Jan 2016 12:50:52 -0500
Subject: [PATCH 0753/1265] Fix race condition with up and setting signal
 handlers.

Also print stdout on wait_for_container().

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py                           | 36 +++++++++++--------
 tests/acceptance/cli_test.py                  | 15 ++++++--
 .../sleeps-composefile/docker-compose.yml     | 10 ++++++
 tests/unit/cli/main_test.py                   | 18 ----------
 4 files changed, 44 insertions(+), 35 deletions(-)
 create mode 100644 tests/fixtures/sleeps-composefile/docker-compose.yml

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 14febe25..93c4729f 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import contextlib
 import json
 import logging
 import re
@@ -53,7 +54,7 @@ def main():
         command = TopLevelCommand()
         command.sys_dispatch()
     except KeyboardInterrupt:
-        log.error("\nAborting.")
+        log.error("Aborting.")
         sys.exit(1)
     except (UserError, NoSuchService, ConfigurationError) as e:
         log.error(e.msg)
@@ -629,18 +630,20 @@ class TopLevelCommand(DocoptCommand):
         if detached and cascade_stop:
             raise UserError("--abort-on-container-exit and -d cannot be combined.")
 
-        to_attach = project.up(
-            service_names=service_names,
-            start_deps=start_deps,
-            strategy=convergence_strategy_from_opts(options),
-            do_build=not options['--no-build'],
-            timeout=timeout,
-            detached=detached
-        )
+        with up_shutdown_context(project, service_names, timeout, detached):
+            to_attach = project.up(
+                service_names=service_names,
+                start_deps=start_deps,
+                strategy=convergence_strategy_from_opts(options),
+                do_build=not options['--no-build'],
+                timeout=timeout,
+                detached=detached)
 
-        if not detached:
+            if detached:
+                return
             log_printer = build_log_printer(to_attach, service_names, monochrome, cascade_stop)
-            attach_to_logs(project, log_printer, service_names, timeout)
+            print("Attaching to", list_containers(log_printer.containers))
+            log_printer.run()
 
     def version(self, project, options):
         """
@@ -740,13 +743,16 @@ def build_log_printer(containers, service_names, monochrome, cascade_stop):
     return LogPrinter(containers, monochrome=monochrome, cascade_stop=cascade_stop)
 
 
-def attach_to_logs(project, log_printer, service_names, timeout):
-    print("Attaching to", list_containers(log_printer.containers))
-    signals.set_signal_handler_to_shutdown()
+@contextlib.contextmanager
+def up_shutdown_context(project, service_names, timeout, detached):
+    if detached:
+        yield
+        return
 
+    signals.set_signal_handler_to_shutdown()
     try:
         try:
-            log_printer.run()
+            yield
         except signals.ShutdownException:
             print("Gracefully stopping... (press Ctrl+C again to force)")
             project.stop(service_names=service_names, timeout=timeout)
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 30589bad..b69ce8aa 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -43,7 +43,8 @@ def start_process(base_dir, options):
 def wait_on_process(proc, returncode=0):
     stdout, stderr = proc.communicate()
     if proc.returncode != returncode:
-        print(stderr.decode('utf-8'))
+        print("Stderr: {}".format(stderr))
+        print("Stdout: {}".format(stdout))
         assert proc.returncode == returncode
     return ProcessResult(stdout.decode('utf-8'), stderr.decode('utf-8'))
 
@@ -81,7 +82,6 @@ class ContainerStateCondition(object):
         self.name = name
         self.running = running
 
-    # State.Running == true
     def __call__(self):
         try:
             container = self.client.inspect_container(self.name)
@@ -707,6 +707,17 @@ class CLITestCase(DockerClientTestCase):
         os.kill(proc.pid, signal.SIGTERM)
         wait_on_condition(ContainerCountCondition(self.project, 0))
 
+    @v2_only()
+    def test_up_handles_force_shutdown(self):
+        self.base_dir = 'tests/fixtures/sleeps-composefile'
+        proc = start_process(self.base_dir, ['up', '-t', '200'])
+        wait_on_condition(ContainerCountCondition(self.project, 2))
+
+        os.kill(proc.pid, signal.SIGTERM)
+        time.sleep(0.1)
+        os.kill(proc.pid, signal.SIGTERM)
+        wait_on_condition(ContainerCountCondition(self.project, 0))
+
     def test_run_service_without_links(self):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['run', 'console', '/bin/true'])
diff --git a/tests/fixtures/sleeps-composefile/docker-compose.yml b/tests/fixtures/sleeps-composefile/docker-compose.yml
new file mode 100644
index 00000000..1eff7b73
--- /dev/null
+++ b/tests/fixtures/sleeps-composefile/docker-compose.yml
@@ -0,0 +1,10 @@
+
+version: 2
+
+services:
+  simple:
+    image: busybox:latest
+    command: sleep 200
+  another:
+    image: busybox:latest
+    command: sleep 200
diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py
index 6f5dd3ca..fd6c5002 100644
--- a/tests/unit/cli/main_test.py
+++ b/tests/unit/cli/main_test.py
@@ -6,12 +6,9 @@ import logging
 from compose import container
 from compose.cli.errors import UserError
 from compose.cli.formatter import ConsoleWarningFormatter
-from compose.cli.log_printer import LogPrinter
-from compose.cli.main import attach_to_logs
 from compose.cli.main import build_log_printer
 from compose.cli.main import convergence_strategy_from_opts
 from compose.cli.main import setup_console_handler
-from compose.project import Project
 from compose.service import ConvergenceStrategy
 from tests import mock
 from tests import unittest
@@ -49,21 +46,6 @@ class CLIMainTestCase(unittest.TestCase):
         log_printer = build_log_printer(containers, service_names, True, False)
         self.assertEqual(log_printer.containers, containers)
 
-    def test_attach_to_logs(self):
-        project = mock.create_autospec(Project)
-        log_printer = mock.create_autospec(LogPrinter, containers=[])
-        service_names = ['web', 'db']
-        timeout = 12
-
-        with mock.patch('compose.cli.main.signals.signal', autospec=True) as mock_signal:
-            attach_to_logs(project, log_printer, service_names, timeout)
-
-        assert mock_signal.signal.mock_calls == [
-            mock.call(mock_signal.SIGINT, mock.ANY),
-            mock.call(mock_signal.SIGTERM, mock.ANY),
-        ]
-        log_printer.run.assert_called_once_with()
-
 
 class SetupConsoleHandlerTestCase(unittest.TestCase):
 

From 34ccb90d7e12965b2a2e531ad633ac0afbdee4f1 Mon Sep 17 00:00:00 2001
From: Dimitar Bonev <dimitar.bonev@gmail.com>
Date: Fri, 29 Jan 2016 14:15:38 +0200
Subject: [PATCH 0754/1265] Falling back to default project name when
 COMPOSE_PROJECT_NAME is set to empty

Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
---
 compose/cli/command.py | 2 +-
 tests/unit/cli_test.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index c1681ffc..2a0d8698 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -92,7 +92,7 @@ def get_project_name(working_dir, project_name=None):
         return re.sub(r'[^a-z0-9]', '', name.lower())
 
     project_name = project_name or os.environ.get('COMPOSE_PROJECT_NAME')
-    if project_name is not None:
+    if project_name:
         return normalize_name(project_name)
 
     project = os.path.basename(os.path.abspath(working_dir))
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index fd52a3c1..fec7cdba 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -49,6 +49,13 @@ class CLITestCase(unittest.TestCase):
             project_name = get_project_name(None)
         self.assertEquals(project_name, name)
 
+    def test_project_name_with_empty_environment_var(self):
+        base_dir = 'tests/fixtures/simple-composefile'
+        with mock.patch.dict(os.environ):
+            os.environ['COMPOSE_PROJECT_NAME'] = ''
+            project_name = get_project_name(base_dir)
+        self.assertEquals('simplecomposefile', project_name)
+
     def test_get_project(self):
         base_dir = 'tests/fixtures/longer-filename-composefile'
         project = get_project(base_dir)

From 0b7877d82a62fdbddec27dcb030a4af54558850f Mon Sep 17 00:00:00 2001
From: Mustafa Ulu <mustafau@sabanciuniv.edu>
Date: Mon, 1 Feb 2016 00:09:44 +0200
Subject: [PATCH 0755/1265] Update link to "Common Use Cases" title

It is now under overview.md

Signed-off-by: Mustafa Ulu <mustafau@sabanciuniv.edu>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b60a7eee..595ff1e1 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ see [the list of features](docs/index.md#features).
 
 Compose is great for development, testing, and staging environments, as well as
 CI workflows. You can learn more about each case in
-[Common Use Cases](docs/index.md#common-use-cases).
+[Common Use Cases](docs/overview.md#common-use-cases).
 
 Using Compose is basically a three-step process.
 

From 6928c24323af38fcce54078e51272be0951ca350 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 1 Feb 2016 16:30:39 -0500
Subject: [PATCH 0756/1265] Deploying to bintray from appveyor using the new
 bintray support.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 appveyor.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b162db1e..489be021 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,20 +9,16 @@ install:
 # Build the binary after tests
 build: false
 
-environment:
-  BINTRAY_USER: "docker-compose-roleuser"
-  BINTRAY_PATH: "docker-compose/master/windows/master/docker-compose-Windows-x86_64.exe"
-
 test_script:
   - "tox -e py27,py34 -- tests/unit"
   - ps: ".\\script\\build-windows.ps1"
 
-deploy_script:
-  - "curl -sS
-        -u \"%BINTRAY_USER%:%BINTRAY_API_KEY%\"
-        -X PUT \"https://api.bintray.com/content/%BINTRAY_PATH%?override=1&publish=1\"
-        --data-binary @dist\\docker-compose-Windows-x86_64.exe"
-
 artifacts:
   - path: .\dist\docker-compose-Windows-x86_64.exe
     name: "Compose Windows binary"
+
+deploy:
+  - provider: Environment
+    name: master-builds
+    on:
+      branch: master

From e8756905ba41b53ad92cd9dea8f64853e1c5ac77 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 2 Feb 2016 13:31:28 +0000
Subject: [PATCH 0757/1265] Run test containers in TTY mode

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/test-versions | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/script/test-versions b/script/test-versions
index 2e9c9167..14a3e6e4 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -6,6 +6,7 @@ set -e
 
 >&2 echo "Running lint checks"
 docker run --rm \
+  --tty \
   ${GIT_VOLUME} \
   --entrypoint="tox" \
   "$TAG" -e pre-commit
@@ -51,6 +52,7 @@ for version in $DOCKER_VERSIONS; do
 
   docker run \
     --rm \
+    --tty \
     --link="$daemon_container:docker" \
     --env="DOCKER_HOST=tcp://docker:2375" \
     --env="DOCKER_VERSION=$version" \

From d40bc6e4a04f9ba39d8c9d167357b0358ab09469 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 28 Jan 2016 14:44:51 +0000
Subject: [PATCH 0758/1265] Convert validation error tests to pytest style

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/unit/config/config_test.py | 139 +++++++++++++++++--------------
 1 file changed, 76 insertions(+), 63 deletions(-)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 5f8b097b..87f10afb 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -274,9 +274,7 @@ class ConfigTest(unittest.TestCase):
         assert error_msg in exc.exconly()
 
     def test_config_integer_service_name_raise_validation_error(self):
-        expected_error_msg = ("In file 'filename.yml' service name: 1 needs to "
-                              "be a string, eg '1'")
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {1: {'image': 'busybox'}},
@@ -285,11 +283,11 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-    def test_config_integer_service_name_raise_validation_error_v2(self):
-        expected_error_msg = ("In file 'filename.yml' service name: 1 needs to "
-                              "be a string, eg '1'")
+        assert "In file 'filename.yml' service name: 1 needs to be a string, eg '1'" \
+            in excinfo.exconly()
 
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+    def test_config_integer_service_name_raise_validation_error_v2(self):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {
@@ -301,6 +299,9 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+        assert "In file 'filename.yml' service name: 1 needs to be a string, eg '1'" \
+            in excinfo.exconly()
+
     def test_load_with_multiple_files_v1(self):
         base_file = config.ConfigFile(
             'base.yaml',
@@ -624,8 +625,7 @@ class ConfigTest(unittest.TestCase):
             assert services[0]['name'] == valid_name
 
     def test_config_hint(self):
-        expected_error_msg = "(did you mean 'privileged'?)"
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {
@@ -636,6 +636,8 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+        assert "(did you mean 'privileged'?)" in excinfo.exconly()
+
     def test_load_errors_on_uppercase_with_no_image(self):
         with pytest.raises(ConfigurationError) as exc:
             config.load(build_config_details({
@@ -643,9 +645,8 @@ class ConfigTest(unittest.TestCase):
             }, 'tests/fixtures/build-ctx'))
             assert "Service 'Foo' contains uppercase characters" in exc.exconly()
 
-    def test_invalid_config_build_and_image_specified(self):
-        expected_error_msg = "Service 'foo' has both an image and build path specified."
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+    def test_invalid_config_build_and_image_specified_v1(self):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {
@@ -656,9 +657,10 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+        assert "Service 'foo' has both an image and build path specified." in excinfo.exconly()
+
     def test_invalid_config_type_should_be_an_array(self):
-        expected_error_msg = "Service 'foo' configuration key 'links' contains an invalid type, it should be an array"
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {
@@ -669,10 +671,11 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+        assert "Service 'foo' configuration key 'links' contains an invalid type, it should be an array" \
+            in excinfo.exconly()
+
     def test_invalid_config_not_a_dictionary(self):
-        expected_error_msg = ("Top level object in 'filename.yml' needs to be "
-                              "an object.")
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     ['foo', 'lol'],
@@ -681,9 +684,11 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+        assert "Top level object in 'filename.yml' needs to be an object" \
+            in excinfo.exconly()
+
     def test_invalid_config_not_unique_items(self):
-        expected_error_msg = "has non-unique elements"
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {
@@ -694,10 +699,10 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+        assert "has non-unique elements" in excinfo.exconly()
+
     def test_invalid_list_of_strings_format(self):
-        expected_error_msg = "Service 'web' configuration key 'command' contains 1"
-        expected_error_msg += ", which is an invalid type, it should be a string"
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {
@@ -708,7 +713,10 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-    def test_load_config_dockerfile_without_build_raises_error(self):
+        assert "Service 'web' configuration key 'command' contains 1, which is an invalid type, it should be a string" \
+            in excinfo.exconly()
+
+    def test_load_config_dockerfile_without_build_raises_error_v1(self):
         with pytest.raises(ConfigurationError) as exc:
             config.load(build_config_details({
                 'web': {
@@ -716,12 +724,11 @@ class ConfigTest(unittest.TestCase):
                     'dockerfile': 'Dockerfile.alt'
                 }
             }))
+
         assert "Service 'web' has both an image and alternate Dockerfile." in exc.exconly()
 
     def test_config_extra_hosts_string_raises_validation_error(self):
-        expected_error_msg = "Service 'web' configuration key 'extra_hosts' contains an invalid type"
-
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {'web': {
@@ -733,12 +740,11 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-    def test_config_extra_hosts_list_of_dicts_validation_error(self):
-        expected_error_msg = (
-            "key 'extra_hosts' contains {\"somehost\": \"162.242.195.82\"}, "
-            "which is an invalid type, it should be a string")
+        assert "Service 'web' configuration key 'extra_hosts' contains an invalid type" \
+            in excinfo.exconly()
 
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+    def test_config_extra_hosts_list_of_dicts_validation_error(self):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {'web': {
@@ -753,10 +759,11 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-    def test_config_ulimits_invalid_keys_validation_error(self):
-        expected = ("Service 'web' configuration key 'ulimits' 'nofile' contains "
-                    "unsupported option: 'not_soft_or_hard'")
+        assert "key 'extra_hosts' contains {\"somehost\": \"162.242.195.82\"}, " \
+               "which is an invalid type, it should be a string" \
+            in excinfo.exconly()
 
+    def test_config_ulimits_invalid_keys_validation_error(self):
         with pytest.raises(ConfigurationError) as exc:
             config.load(build_config_details(
                 {
@@ -773,10 +780,11 @@ class ConfigTest(unittest.TestCase):
                 },
                 'working_dir',
                 'filename.yml'))
-        assert expected in exc.exconly()
+
+        assert "Service 'web' configuration key 'ulimits' 'nofile' contains unsupported option: 'not_soft_or_hard'" \
+            in exc.exconly()
 
     def test_config_ulimits_required_keys_validation_error(self):
-
         with pytest.raises(ConfigurationError) as exc:
             config.load(build_config_details(
                 {
@@ -1574,11 +1582,7 @@ class MemoryOptionsTest(unittest.TestCase):
         When you set a 'memswap_limit' it is invalid config unless you also set
         a mem_limit
         """
-        expected_error_msg = (
-            "Service 'foo' configuration key 'memswap_limit' is invalid: when "
-            "defining 'memswap_limit' you must set 'mem_limit' as well"
-        )
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {
@@ -1589,6 +1593,10 @@ class MemoryOptionsTest(unittest.TestCase):
                 )
             )
 
+        assert "Service 'foo' configuration key 'memswap_limit' is invalid: when defining " \
+               "'memswap_limit' you must set 'mem_limit' as well" \
+            in excinfo.exconly()
+
     def test_validation_with_correct_memswap_values(self):
         service_dict = config.load(
             build_config_details(
@@ -1851,7 +1859,7 @@ class ExtendsTest(unittest.TestCase):
         self.assertEqual(path, expected)
 
     def test_extends_validation_empty_dictionary(self):
-        with self.assertRaisesRegexp(ConfigurationError, 'service'):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {
@@ -1862,8 +1870,10 @@ class ExtendsTest(unittest.TestCase):
                 )
             )
 
+        assert 'service' in excinfo.exconly()
+
     def test_extends_validation_missing_service_key(self):
-        with self.assertRaisesRegexp(ConfigurationError, "'service' is a required property"):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {
@@ -1874,12 +1884,10 @@ class ExtendsTest(unittest.TestCase):
                 )
             )
 
+        assert "'service' is a required property" in excinfo.exconly()
+
     def test_extends_validation_invalid_key(self):
-        expected_error_msg = (
-            "Service 'web' configuration key 'extends' "
-            "contains unsupported option: 'rogue_key'"
-        )
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {
@@ -1897,12 +1905,11 @@ class ExtendsTest(unittest.TestCase):
                 )
             )
 
+        assert "Service 'web' configuration key 'extends' contains unsupported option: 'rogue_key'" \
+            in excinfo.exconly()
+
     def test_extends_validation_sub_property_key(self):
-        expected_error_msg = (
-            "Service 'web' configuration key 'extends' 'file' contains 1, "
-            "which is an invalid type, it should be a string"
-        )
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {
@@ -1919,13 +1926,16 @@ class ExtendsTest(unittest.TestCase):
                 )
             )
 
+        assert "Service 'web' configuration key 'extends' 'file' contains 1, which is an invalid type, it should be a string" \
+            in excinfo.exconly()
+
     def test_extends_validation_no_file_key_no_filename_set(self):
         dictionary = {'extends': {'service': 'web'}}
 
-        def load_config():
-            return make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
+        with pytest.raises(ConfigurationError) as excinfo:
+            make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
 
-        self.assertRaisesRegexp(ConfigurationError, 'file', load_config)
+        assert 'file' in excinfo.exconly()
 
     def test_extends_validation_valid_config(self):
         service = config.load(
@@ -1979,16 +1989,17 @@ class ExtendsTest(unittest.TestCase):
         ]))
 
     def test_invalid_links_in_extended_service(self):
-        expected_error_msg = "services with 'links' cannot be extended"
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+        with pytest.raises(ConfigurationError) as excinfo:
             load_from_filename('tests/fixtures/extends/invalid-links.yml')
 
-    def test_invalid_volumes_from_in_extended_service(self):
-        expected_error_msg = "services with 'volumes_from' cannot be extended"
+        assert "services with 'links' cannot be extended" in excinfo.exconly()
 
-        with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
+    def test_invalid_volumes_from_in_extended_service(self):
+        with pytest.raises(ConfigurationError) as excinfo:
             load_from_filename('tests/fixtures/extends/invalid-volumes.yml')
 
+        assert "services with 'volumes_from' cannot be extended" in excinfo.exconly()
+
     def test_invalid_net_in_extended_service(self):
         with pytest.raises(ConfigurationError) as excinfo:
             load_from_filename('tests/fixtures/extends/invalid-net-v2.yml')
@@ -2044,10 +2055,12 @@ class ExtendsTest(unittest.TestCase):
         ])
 
     def test_load_throws_error_when_base_service_does_not_exist(self):
-        err_msg = r'''Cannot extend service 'foo' in .*: Service not found'''
-        with self.assertRaisesRegexp(ConfigurationError, err_msg):
+        with pytest.raises(ConfigurationError) as excinfo:
             load_from_filename('tests/fixtures/extends/nonexistent-service.yml')
 
+        assert "Cannot extend service 'foo'" in excinfo.exconly()
+        assert "Service not found" in excinfo.exconly()
+
     def test_partial_service_config_in_extends_is_still_valid(self):
         dicts = load_from_filename('tests/fixtures/extends/valid-common-config.yml')
         self.assertEqual(dicts[0]['environment'], {'FOO': '1'})

From 4ac004059a59c0ffb4e80dec8295d507ab54ef2d Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 28 Jan 2016 15:20:46 +0000
Subject: [PATCH 0759/1265] Normalise/fix config field designators in
 validation messages

- Instead of "Service 'web' configuration key 'image'", just say
  "web.image"

- Fix the "Service 'services'" bug in the v2 file format

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/validation.py     | 96 +++++++++++++++++---------------
 tests/unit/config/config_test.py | 91 +++++++++++++++++++++++-------
 2 files changed, 121 insertions(+), 66 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 05982020..ba1ac521 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -174,8 +174,8 @@ def validate_depends_on(service_config, service_names):
                 "undefined.".format(s=service_config, dep=dependency))
 
 
-def get_unsupported_config_msg(service_name, error_key):
-    msg = "Unsupported config option for '{}' service: '{}'".format(service_name, error_key)
+def get_unsupported_config_msg(path, error_key):
+    msg = "Unsupported config option for {}: '{}'".format(path_string(path), error_key)
     if error_key in DOCKER_CONFIG_HINTS:
         msg += " (did you mean '{}'?)".format(DOCKER_CONFIG_HINTS[error_key])
     return msg
@@ -191,7 +191,7 @@ def is_service_dict_schema(schema_id):
     return schema_id == 'fields_schema_v1.json' or schema_id == '#/properties/services'
 
 
-def handle_error_for_schema_with_id(error, service_name):
+def handle_error_for_schema_with_id(error, path):
     schema_id = error.schema['id']
 
     if is_service_dict_schema(schema_id) and error.validator == 'additionalProperties':
@@ -215,62 +215,64 @@ def handle_error_for_schema_with_id(error, service_name):
         # TODO: only applies to v1
         if 'image' in error.instance and context:
             return (
-                "Service '{}' has both an image and build path specified. "
+                "{} has both an image and build path specified. "
                 "A service can either be built to image or use an existing "
-                "image, not both.".format(service_name))
+                "image, not both.".format(path_string(path)))
         if 'image' not in error.instance and not context:
             return (
-                "Service '{}' has neither an image nor a build path "
-                "specified. At least one must be provided.".format(service_name))
+                "{} has neither an image nor a build path specified. "
+                "At least one must be provided.".format(path_string(path)))
         # TODO: only applies to v1
         if 'image' in error.instance and dockerfile:
             return (
-                "Service '{}' has both an image and alternate Dockerfile. "
+                "{} has both an image and alternate Dockerfile. "
                 "A service can either be built to image or use an existing "
-                "image, not both.".format(service_name))
+                "image, not both.".format(path_string(path)))
 
     if schema_id == '#/definitions/service':
         if error.validator == 'additionalProperties':
             invalid_config_key = parse_key_from_error_msg(error)
-            return get_unsupported_config_msg(service_name, invalid_config_key)
+            return get_unsupported_config_msg(path, invalid_config_key)
 
 
-def handle_generic_service_error(error, service_name):
-    config_key = " ".join("'%s'" % k for k in error.path)
+def handle_generic_service_error(error, path):
     msg_format = None
     error_msg = error.message
 
     if error.validator == 'oneOf':
-        msg_format = "Service '{}' configuration key {} {}"
-        error_msg = _parse_oneof_validator(error)
+        msg_format = "{path} {msg}"
+        config_key, error_msg = _parse_oneof_validator(error)
+        if config_key:
+            path.append(config_key)
 
     elif error.validator == 'type':
-        msg_format = ("Service '{}' configuration key {} contains an invalid "
-                      "type, it should be {}")
+        msg_format = "{path} contains an invalid type, it should be {msg}"
         error_msg = _parse_valid_types_from_validator(error.validator_value)
 
     # TODO: no test case for this branch, there are no config options
     # which exercise this branch
     elif error.validator == 'required':
-        msg_format = "Service '{}' configuration key '{}' is invalid, {}"
+        msg_format = "{path} is invalid, {msg}"
 
     elif error.validator == 'dependencies':
-        msg_format = "Service '{}' configuration key '{}' is invalid: {}"
         config_key = list(error.validator_value.keys())[0]
         required_keys = ",".join(error.validator_value[config_key])
+
+        msg_format = "{path} is invalid: {msg}"
+        path.append(config_key)
         error_msg = "when defining '{}' you must set '{}' as well".format(
             config_key,
             required_keys)
 
     elif error.cause:
         error_msg = six.text_type(error.cause)
-        msg_format = "Service '{}' configuration key {} is invalid: {}"
+        msg_format = "{path} is invalid: {msg}"
 
     elif error.path:
-        msg_format = "Service '{}' configuration key {} value {}"
+        msg_format = "{path} value {msg}"
 
     if msg_format:
-        return msg_format.format(service_name, config_key, error_msg)
+        return msg_format.format(path=path_string(path), msg=error_msg)
 
     return error.message
 
@@ -279,6 +281,10 @@ def parse_key_from_error_msg(error):
     return error.message.split("'")[1]
 
 
+def path_string(path):
+    return ".".join(c for c in path if isinstance(c, six.string_types))
+
+
 def _parse_valid_types_from_validator(validator):
     """A validator value can be either an array of valid types or a string of
     a valid type. Parse the valid types and prefix with the correct article.
@@ -304,52 +310,52 @@ def _parse_oneof_validator(error):
     for context in error.context:
 
         if context.validator == 'required':
-            return context.message
+            return (None, context.message)
 
         if context.validator == 'additionalProperties':
             invalid_config_key = parse_key_from_error_msg(context)
-            return "contains unsupported option: '{}'".format(invalid_config_key)
+            return (None, "contains unsupported option: '{}'".format(invalid_config_key))
 
         if context.path:
-            invalid_config_key = " ".join(
-                "'{}' ".format(fragment) for fragment in context.path
-                if isinstance(fragment, six.string_types)
+            return (
+                path_string(context.path),
+                "contains {}, which is an invalid type, it should be {}".format(
+                    json.dumps(context.instance),
+                    _parse_valid_types_from_validator(context.validator_value)),
             )
-            return "{}contains {}, which is an invalid type, it should be {}".format(
-                invalid_config_key,
-                # Always print the json repr of the invalid value
-                json.dumps(context.instance),
-                _parse_valid_types_from_validator(context.validator_value))
 
         if context.validator == 'uniqueItems':
-            return "contains non unique items, please remove duplicates from {}".format(
-                context.instance)
+            return (
+                None,
+                "contains non unique items, please remove duplicates from {}".format(
+                    context.instance),
+            )
 
         if context.validator == 'type':
             types.append(context.validator_value)
 
     valid_types = _parse_valid_types_from_validator(types)
-    return "contains an invalid type, it should be {}".format(valid_types)
+    return (None, "contains an invalid type, it should be {}".format(valid_types))
 
 
-def process_errors(errors, service_name=None):
+def process_errors(errors, path_prefix=None):
     """jsonschema gives us an error tree full of information to explain what has
     gone wrong. Process each error and pull out relevant information and re-write
     helpful error messages that are relevant.
     """
-    def format_error_message(error, service_name):
-        if not service_name and error.path:
-            # field_schema errors will have service name on the path
-            service_name = error.path.popleft()
+    path_prefix = path_prefix or []
+
+    def format_error_message(error):
+        path = path_prefix + list(error.path)
 
         if 'id' in error.schema:
-            error_msg = handle_error_for_schema_with_id(error, service_name)
+            error_msg = handle_error_for_schema_with_id(error, path)
             if error_msg:
                 return error_msg
 
-        return handle_generic_service_error(error, service_name)
+        return handle_generic_service_error(error, path)
 
-    return '\n'.join(format_error_message(error, service_name) for error in errors)
+    return '\n'.join(format_error_message(error) for error in errors)
 
 
 def validate_against_fields_schema(config_file):
@@ -366,14 +372,14 @@ def validate_against_service_schema(config, service_name, version):
         config,
         "service_schema_v{0}.json".format(version),
         format_checker=["ports"],
-        service_name=service_name)
+        path_prefix=[service_name])
 
 
 def _validate_against_schema(
         config,
         schema_filename,
         format_checker=(),
-        service_name=None,
+        path_prefix=None,
         filename=None):
     config_source_dir = os.path.dirname(os.path.abspath(__file__))
 
@@ -399,7 +405,7 @@ def _validate_against_schema(
     if not errors:
         return
 
-    error_msg = process_errors(errors, service_name)
+    error_msg = process_errors(errors, path_prefix=path_prefix)
     file_msg = " in file '{}'".format(filename) if filename else ''
     raise ConfigurationError("Validation failed{}, reason(s):\n{}".format(
         file_msg,
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 87f10afb..44f5c684 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -253,15 +253,31 @@ class ConfigTest(unittest.TestCase):
             assert 'Invalid service name \'%s\'' % invalid_name in exc.exconly()
 
     def test_load_with_invalid_field_name(self):
-        config_details = build_config_details(
-            {'web': {'image': 'busybox', 'name': 'bogus'}},
-            'working_dir',
-            'filename.yml')
         with pytest.raises(ConfigurationError) as exc:
-            config.load(config_details)
-        error_msg = "Unsupported config option for 'web' service: 'name'"
-        assert error_msg in exc.exconly()
-        assert "Validation failed in file 'filename.yml'" in exc.exconly()
+            config.load(build_config_details(
+                {
+                    'version': 2,
+                    'services': {
+                        'web': {'image': 'busybox', 'name': 'bogus'},
+                    }
+                },
+                'working_dir',
+                'filename.yml',
+            ))
+
+        assert "Unsupported config option for services.web: 'name'" in exc.exconly()
+
+    def test_load_with_invalid_field_name_v1(self):
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(build_config_details(
+                {
+                    'web': {'image': 'busybox', 'name': 'bogus'},
+                },
+                'working_dir',
+                'filename.yml',
+            ))
+
+        assert "Unsupported config option for web: 'name'" in exc.exconly()
 
     def test_load_invalid_service_definition(self):
         config_details = build_config_details(
@@ -645,6 +661,39 @@ class ConfigTest(unittest.TestCase):
             }, 'tests/fixtures/build-ctx'))
             assert "Service 'Foo' contains uppercase characters" in exc.exconly()
 
+    def test_invalid_config_v1(self):
+        with pytest.raises(ConfigurationError) as excinfo:
+            config.load(
+                build_config_details(
+                    {
+                        'foo': {'image': 1},
+                    },
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
+            )
+
+        assert "foo.image contains an invalid type, it should be a string" \
+            in excinfo.exconly()
+
+    def test_invalid_config_v2(self):
+        with pytest.raises(ConfigurationError) as excinfo:
+            config.load(
+                build_config_details(
+                    {
+                        'version': 2,
+                        'services': {
+                            'foo': {'image': 1},
+                        },
+                    },
+                    'tests/fixtures/extends',
+                    'filename.yml'
+                )
+            )
+
+        assert "services.foo.image contains an invalid type, it should be a string" \
+            in excinfo.exconly()
+
     def test_invalid_config_build_and_image_specified_v1(self):
         with pytest.raises(ConfigurationError) as excinfo:
             config.load(
@@ -657,7 +706,7 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-        assert "Service 'foo' has both an image and build path specified." in excinfo.exconly()
+        assert "foo has both an image and build path specified." in excinfo.exconly()
 
     def test_invalid_config_type_should_be_an_array(self):
         with pytest.raises(ConfigurationError) as excinfo:
@@ -671,7 +720,7 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-        assert "Service 'foo' configuration key 'links' contains an invalid type, it should be an array" \
+        assert "foo.links contains an invalid type, it should be an array" \
             in excinfo.exconly()
 
     def test_invalid_config_not_a_dictionary(self):
@@ -713,7 +762,7 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-        assert "Service 'web' configuration key 'command' contains 1, which is an invalid type, it should be a string" \
+        assert "web.command contains 1, which is an invalid type, it should be a string" \
             in excinfo.exconly()
 
     def test_load_config_dockerfile_without_build_raises_error_v1(self):
@@ -725,7 +774,7 @@ class ConfigTest(unittest.TestCase):
                 }
             }))
 
-        assert "Service 'web' has both an image and alternate Dockerfile." in exc.exconly()
+        assert "web has both an image and alternate Dockerfile." in exc.exconly()
 
     def test_config_extra_hosts_string_raises_validation_error(self):
         with pytest.raises(ConfigurationError) as excinfo:
@@ -740,7 +789,7 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-        assert "Service 'web' configuration key 'extra_hosts' contains an invalid type" \
+        assert "web.extra_hosts contains an invalid type" \
             in excinfo.exconly()
 
     def test_config_extra_hosts_list_of_dicts_validation_error(self):
@@ -759,7 +808,7 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-        assert "key 'extra_hosts' contains {\"somehost\": \"162.242.195.82\"}, " \
+        assert "web.extra_hosts contains {\"somehost\": \"162.242.195.82\"}, " \
                "which is an invalid type, it should be a string" \
             in excinfo.exconly()
 
@@ -781,7 +830,7 @@ class ConfigTest(unittest.TestCase):
                 'working_dir',
                 'filename.yml'))
 
-        assert "Service 'web' configuration key 'ulimits' 'nofile' contains unsupported option: 'not_soft_or_hard'" \
+        assert "web.ulimits.nofile contains unsupported option: 'not_soft_or_hard'" \
             in exc.exconly()
 
     def test_config_ulimits_required_keys_validation_error(self):
@@ -795,7 +844,7 @@ class ConfigTest(unittest.TestCase):
                 },
                 'working_dir',
                 'filename.yml'))
-        assert "Service 'web' configuration key 'ulimits' 'nofile'" in exc.exconly()
+        assert "web.ulimits.nofile" in exc.exconly()
         assert "'hard' is a required property" in exc.exconly()
 
     def test_config_ulimits_soft_greater_than_hard_error(self):
@@ -896,7 +945,7 @@ class ConfigTest(unittest.TestCase):
                     'extra_hosts': "www.example.com: 192.168.0.17",
                 }
             }))
-        assert "'extra_hosts' contains an invalid type" in exc.exconly()
+        assert "web.extra_hosts contains an invalid type" in exc.exconly()
 
     def test_validate_extra_hosts_invalid_list(self):
         with pytest.raises(ConfigurationError) as exc:
@@ -1593,7 +1642,7 @@ class MemoryOptionsTest(unittest.TestCase):
                 )
             )
 
-        assert "Service 'foo' configuration key 'memswap_limit' is invalid: when defining " \
+        assert "foo.memswap_limit is invalid: when defining " \
                "'memswap_limit' you must set 'mem_limit' as well" \
             in excinfo.exconly()
 
@@ -1905,7 +1954,7 @@ class ExtendsTest(unittest.TestCase):
                 )
             )
 
-        assert "Service 'web' configuration key 'extends' contains unsupported option: 'rogue_key'" \
+        assert "web.extends contains unsupported option: 'rogue_key'" \
             in excinfo.exconly()
 
     def test_extends_validation_sub_property_key(self):
@@ -1926,7 +1975,7 @@ class ExtendsTest(unittest.TestCase):
                 )
             )
 
-        assert "Service 'web' configuration key 'extends' 'file' contains 1, which is an invalid type, it should be a string" \
+        assert "web.extends.file contains 1, which is an invalid type, it should be a string" \
             in excinfo.exconly()
 
     def test_extends_validation_no_file_key_no_filename_set(self):
@@ -1956,7 +2005,7 @@ class ExtendsTest(unittest.TestCase):
         with pytest.raises(ConfigurationError) as exc:
             load_from_filename('tests/fixtures/extends/service-with-invalid-schema.yml')
         assert (
-            "Service 'myweb' has neither an image nor a build path specified" in
+            "myweb has neither an image nor a build path specified" in
             exc.exconly()
         )
 

From a8de582425f0ab3b9ec2a36ef20300dbabc05052 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 28 Jan 2016 16:26:25 +0000
Subject: [PATCH 0760/1265] Remove redundant check - self.config should never
 be None

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index ffd805ad..34168df5 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -129,8 +129,6 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
 
     @cached_property
     def version(self):
-        if self.config is None:
-            return 1
         version = self.config.get('version', 1)
         if isinstance(version, dict):
             log.warn("Unexpected type for field 'version', in file {} assuming "

From aeef61fcd8b9fc23f62238e9839a72d280ac2738 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 29 Jan 2016 15:58:38 +0000
Subject: [PATCH 0761/1265] Make 'version' a string

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py                      |  33 +++---
 ...schema_v2.json => fields_schema_v2.0.json} |   6 +-
 ...chema_v2.json => service_schema_v2.0.json} |   2 +-
 compose/config/types.py                       |   3 +-
 compose/const.py                              |   9 +-
 compose/project.py                            |   5 +-
 docker-compose.spec                           |   8 +-
 tests/acceptance/cli_test.py                  |   2 +-
 tests/fixtures/extends/invalid-net-v2.yml     |   2 +-
 .../logging-composefile/docker-compose.yml    |   2 +-
 tests/fixtures/net-container/v2-invalid.yml   |   2 +-
 tests/fixtures/networks/bridge.yml            |   2 +-
 .../networks/default-network-config.yml       |   2 +-
 tests/fixtures/networks/docker-compose.yml    |   2 +-
 tests/fixtures/networks/external-default.yml  |   2 +-
 tests/fixtures/networks/external-networks.yml |   2 +-
 tests/fixtures/networks/missing-network.yml   |   2 +-
 tests/fixtures/networks/network-mode.yml      |   2 +-
 tests/fixtures/no-services/docker-compose.yml |   2 +-
 .../sleeps-composefile/docker-compose.yml     |   2 +-
 tests/fixtures/v2-full/docker-compose.yml     |   2 +-
 tests/fixtures/v2-simple/docker-compose.yml   |   2 +-
 tests/fixtures/v2-simple/links-invalid.yml    |   2 +-
 tests/integration/project_test.py             |  29 ++---
 tests/integration/testcases.py                |   6 +-
 tests/unit/config/config_test.py              | 109 +++++++++++++-----
 tests/unit/config/types_test.py               |  16 +--
 27 files changed, 160 insertions(+), 98 deletions(-)
 rename compose/config/{fields_schema_v2.json => fields_schema_v2.0.json} (94%)
 rename compose/config/{service_schema_v2.json => service_schema_v2.0.json} (99%)

diff --git a/compose/config/config.py b/compose/config/config.py
index 34168df5..bda086b9 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -14,6 +14,8 @@ import six
 import yaml
 from cached_property import cached_property
 
+from ..const import COMPOSEFILE_V1 as V1
+from ..const import COMPOSEFILE_V2_0 as V2_0
 from ..const import COMPOSEFILE_VERSIONS
 from .errors import CircularReference
 from .errors import ComposeFileNotFound
@@ -129,25 +131,34 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
 
     @cached_property
     def version(self):
-        version = self.config.get('version', 1)
+        version = self.config.get('version', V1)
+
         if isinstance(version, dict):
             log.warn("Unexpected type for field 'version', in file {} assuming "
                      "version is the name of a service, and defaulting to "
                      "Compose file version 1".format(self.filename))
-            return 1
+            return V1
+
+        if version == '2':
+            version = V2_0
+
+        if version not in COMPOSEFILE_VERSIONS:
+            raise ConfigurationError(
+                'Invalid Compose file version: {0}'.format(version))
+
         return version
 
     def get_service(self, name):
         return self.get_service_dicts()[name]
 
     def get_service_dicts(self):
-        return self.config if self.version == 1 else self.config.get('services', {})
+        return self.config if self.version == V1 else self.config.get('services', {})
 
     def get_volumes(self):
-        return {} if self.version == 1 else self.config.get('volumes', {})
+        return {} if self.version == V1 else self.config.get('volumes', {})
 
     def get_networks(self):
-        return {} if self.version == 1 else self.config.get('networks', {})
+        return {} if self.version == V1 else self.config.get('networks', {})
 
 
 class Config(namedtuple('_Config', 'version services volumes networks')):
@@ -209,10 +220,6 @@ def validate_config_version(config_files):
                     next_file.filename,
                     next_file.version))
 
-    if main_file.version not in COMPOSEFILE_VERSIONS:
-        raise ConfigurationError(
-            'Invalid Compose file version: {0}'.format(main_file.version))
-
 
 def get_default_config_files(base_dir):
     (candidates, path) = find_candidates_in_parent_dirs(SUPPORTED_FILENAMES, base_dir)
@@ -276,7 +283,7 @@ def load(config_details):
         main_file,
         [file.get_service_dicts() for file in config_details.config_files])
 
-    if main_file.version >= 2:
+    if main_file.version != V1:
         for service_dict in service_dicts:
             match_named_volumes(service_dict, volumes)
 
@@ -361,7 +368,7 @@ def process_config_file(config_file, service_name=None):
 
     interpolated_config = interpolate_environment_variables(service_dicts, 'service')
 
-    if config_file.version == 2:
+    if config_file.version == V2_0:
         processed_config = dict(config_file.config)
         processed_config['services'] = services = interpolated_config
         processed_config['volumes'] = interpolate_environment_variables(
@@ -369,7 +376,7 @@ def process_config_file(config_file, service_name=None):
         processed_config['networks'] = interpolate_environment_variables(
             config_file.get_networks(), 'network')
 
-    if config_file.version == 1:
+    if config_file.version == V1:
         processed_config = services = interpolated_config
 
     config_file = config_file._replace(config=processed_config)
@@ -653,7 +660,7 @@ def merge_service_dicts(base, override, version):
         if field in base or field in override:
             d[field] = override.get(field, base.get(field))
 
-    if version == 1:
+    if version == V1:
         legacy_v1_merge_image_or_build(d, base, override)
     else:
         merge_build(d, base, override)
diff --git a/compose/config/fields_schema_v2.json b/compose/config/fields_schema_v2.0.json
similarity index 94%
rename from compose/config/fields_schema_v2.json
rename to compose/config/fields_schema_v2.0.json
index c001df68..7703adcd 100644
--- a/compose/config/fields_schema_v2.json
+++ b/compose/config/fields_schema_v2.0.json
@@ -1,18 +1,18 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
-  "id": "fields_schema_v2.json",
+  "id": "fields_schema_v2.0.json",
 
   "properties": {
     "version": {
-      "enum": [2]
+      "type": "string"
     },
     "services": {
       "id": "#/properties/services",
       "type": "object",
       "patternProperties": {
         "^[a-zA-Z0-9._-]+$": {
-          "$ref": "service_schema_v2.json#/definitions/service"
+          "$ref": "service_schema_v2.0.json#/definitions/service"
         }
       },
       "additionalProperties": false
diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.0.json
similarity index 99%
rename from compose/config/service_schema_v2.json
rename to compose/config/service_schema_v2.0.json
index ca9bb671..8dd4faf5 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.0.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "service_schema_v2.json",
+  "id": "service_schema_v2.0.json",
 
   "type": "object",
 
diff --git a/compose/config/types.py b/compose/config/types.py
index 2e648e5a..9bda7180 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -7,6 +7,7 @@ from __future__ import unicode_literals
 import os
 from collections import namedtuple
 
+from compose.config.config import V1
 from compose.config.errors import ConfigurationError
 from compose.const import IS_WINDOWS_PLATFORM
 
@@ -16,7 +17,7 @@ class VolumeFromSpec(namedtuple('_VolumeFromSpec', 'source mode type')):
     # TODO: drop service_names arg when v1 is removed
     @classmethod
     def parse(cls, volume_from_config, service_names, version):
-        func = cls.parse_v1 if version == 1 else cls.parse_v2
+        func = cls.parse_v1 if version == V1 else cls.parse_v2
         return func(service_names, volume_from_config)
 
     @classmethod
diff --git a/compose/const.py b/compose/const.py
index 6ff108fb..d78a5fa7 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -14,9 +14,12 @@ LABEL_PROJECT = 'com.docker.compose.project'
 LABEL_SERVICE = 'com.docker.compose.service'
 LABEL_VERSION = 'com.docker.compose.version'
 LABEL_CONFIG_HASH = 'com.docker.compose.config-hash'
-COMPOSEFILE_VERSIONS = (1, 2)
+
+COMPOSEFILE_V1 = '1'
+COMPOSEFILE_V2_0 = '2.0'
+COMPOSEFILE_VERSIONS = (COMPOSEFILE_V1, COMPOSEFILE_V2_0)
 
 API_VERSIONS = {
-    1: '1.21',
-    2: '1.22',
+    COMPOSEFILE_V1: '1.21',
+    COMPOSEFILE_V2_0: '1.22',
 }
diff --git a/compose/project.py b/compose/project.py
index d2787ecf..6411f7cc 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -10,6 +10,7 @@ from docker.errors import NotFound
 
 from . import parallel
 from .config import ConfigurationError
+from .config.config import V1
 from .config.sort_services import get_container_name_from_network_mode
 from .config.sort_services import get_service_name_from_network_mode
 from .const import DEFAULT_TIMEOUT
@@ -56,7 +57,7 @@ class Project(object):
         """
         Construct a Project from a config.Config object.
         """
-        use_networking = (config_data.version and config_data.version >= 2)
+        use_networking = (config_data.version and config_data.version != V1)
         project = cls(name, [], client, use_networking=use_networking)
 
         network_config = config_data.networks or {}
@@ -94,7 +95,7 @@ class Project(object):
             network_mode = project.get_network_mode(service_dict, networks)
             volumes_from = get_volumes_from(project, service_dict)
 
-            if config_data.version == 2:
+            if config_data.version != V1:
                 service_volumes = service_dict.get('volumes', [])
                 for volume_spec in service_volumes:
                     if volume_spec.is_named_volume:
diff --git a/docker-compose.spec b/docker-compose.spec
index f7f2059f..b3d8db39 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -23,8 +23,8 @@ exe = EXE(pyz,
                 'DATA'
             ),
             (
-                'compose/config/fields_schema_v2.json',
-                'compose/config/fields_schema_v2.json',
+                'compose/config/fields_schema_v2.0.json',
+                'compose/config/fields_schema_v2.0.json',
                 'DATA'
             ),
             (
@@ -33,8 +33,8 @@ exe = EXE(pyz,
                 'DATA'
             ),
             (
-                'compose/config/service_schema_v2.json',
-                'compose/config/service_schema_v2.json',
+                'compose/config/service_schema_v2.0.json',
+                'compose/config/service_schema_v2.0.json',
                 'DATA'
             ),
             (
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index b69ce8aa..447b1e32 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -177,7 +177,7 @@ class CLITestCase(DockerClientTestCase):
 
         output = yaml.load(result.stdout)
         expected = {
-            'version': 2,
+            'version': '2.0',
             'volumes': {'data': {'driver': 'local'}},
             'networks': {'front': {}},
             'services': {
diff --git a/tests/fixtures/extends/invalid-net-v2.yml b/tests/fixtures/extends/invalid-net-v2.yml
index 0a04f468..7ba714e8 100644
--- a/tests/fixtures/extends/invalid-net-v2.yml
+++ b/tests/fixtures/extends/invalid-net-v2.yml
@@ -1,4 +1,4 @@
-version: 2
+version: "2"
 services:
   myweb:
     build: '.'
diff --git a/tests/fixtures/logging-composefile/docker-compose.yml b/tests/fixtures/logging-composefile/docker-compose.yml
index 0a73030a..466d13e5 100644
--- a/tests/fixtures/logging-composefile/docker-compose.yml
+++ b/tests/fixtures/logging-composefile/docker-compose.yml
@@ -1,4 +1,4 @@
-version: 2
+version: "2"
 services:
   simple:
     image: busybox:latest
diff --git a/tests/fixtures/net-container/v2-invalid.yml b/tests/fixtures/net-container/v2-invalid.yml
index eac4b5f1..9b846295 100644
--- a/tests/fixtures/net-container/v2-invalid.yml
+++ b/tests/fixtures/net-container/v2-invalid.yml
@@ -1,4 +1,4 @@
-version: 2
+version: "2"
 
 services:
   foo:
diff --git a/tests/fixtures/networks/bridge.yml b/tests/fixtures/networks/bridge.yml
index 95098372..9fa7db82 100644
--- a/tests/fixtures/networks/bridge.yml
+++ b/tests/fixtures/networks/bridge.yml
@@ -1,4 +1,4 @@
-version: 2
+version: "2"
 
 services:
   web:
diff --git a/tests/fixtures/networks/default-network-config.yml b/tests/fixtures/networks/default-network-config.yml
index 275fae98..4bd0989b 100644
--- a/tests/fixtures/networks/default-network-config.yml
+++ b/tests/fixtures/networks/default-network-config.yml
@@ -1,4 +1,4 @@
-version: 2
+version: "2"
 services:
   simple:
     image: busybox:latest
diff --git a/tests/fixtures/networks/docker-compose.yml b/tests/fixtures/networks/docker-compose.yml
index 5351c0f0..c11fa682 100644
--- a/tests/fixtures/networks/docker-compose.yml
+++ b/tests/fixtures/networks/docker-compose.yml
@@ -1,4 +1,4 @@
-version: 2
+version: "2"
 
 services:
   web:
diff --git a/tests/fixtures/networks/external-default.yml b/tests/fixtures/networks/external-default.yml
index 7b0797e5..5c9426b8 100644
--- a/tests/fixtures/networks/external-default.yml
+++ b/tests/fixtures/networks/external-default.yml
@@ -1,4 +1,4 @@
-version: 2
+version: "2"
 services:
   simple:
     image: busybox:latest
diff --git a/tests/fixtures/networks/external-networks.yml b/tests/fixtures/networks/external-networks.yml
index 644e3dda..db75b780 100644
--- a/tests/fixtures/networks/external-networks.yml
+++ b/tests/fixtures/networks/external-networks.yml
@@ -1,4 +1,4 @@
-version: 2
+version: "2"
 
 services:
   web:
diff --git a/tests/fixtures/networks/missing-network.yml b/tests/fixtures/networks/missing-network.yml
index 666f7d34..41012535 100644
--- a/tests/fixtures/networks/missing-network.yml
+++ b/tests/fixtures/networks/missing-network.yml
@@ -1,4 +1,4 @@
-version: 2
+version: "2"
 
 services:
   web:
diff --git a/tests/fixtures/networks/network-mode.yml b/tests/fixtures/networks/network-mode.yml
index 7ab63df8..e4d070b4 100644
--- a/tests/fixtures/networks/network-mode.yml
+++ b/tests/fixtures/networks/network-mode.yml
@@ -1,4 +1,4 @@
-version: 2
+version: "2"
 
 services:
   bridge:
diff --git a/tests/fixtures/no-services/docker-compose.yml b/tests/fixtures/no-services/docker-compose.yml
index fa498784..6e76ec0c 100644
--- a/tests/fixtures/no-services/docker-compose.yml
+++ b/tests/fixtures/no-services/docker-compose.yml
@@ -1,4 +1,4 @@
-version: 2
+version: "2"
 
 networks:
   foo: {}
diff --git a/tests/fixtures/sleeps-composefile/docker-compose.yml b/tests/fixtures/sleeps-composefile/docker-compose.yml
index 1eff7b73..7c8d84f8 100644
--- a/tests/fixtures/sleeps-composefile/docker-compose.yml
+++ b/tests/fixtures/sleeps-composefile/docker-compose.yml
@@ -1,5 +1,5 @@
 
-version: 2
+version: "2"
 
 services:
   simple:
diff --git a/tests/fixtures/v2-full/docker-compose.yml b/tests/fixtures/v2-full/docker-compose.yml
index 725296c9..a973dd0c 100644
--- a/tests/fixtures/v2-full/docker-compose.yml
+++ b/tests/fixtures/v2-full/docker-compose.yml
@@ -1,5 +1,5 @@
 
-version: 2
+version: "2"
 
 volumes:
   data:
diff --git a/tests/fixtures/v2-simple/docker-compose.yml b/tests/fixtures/v2-simple/docker-compose.yml
index 12a9de72..c99ae02f 100644
--- a/tests/fixtures/v2-simple/docker-compose.yml
+++ b/tests/fixtures/v2-simple/docker-compose.yml
@@ -1,4 +1,4 @@
-version: 2
+version: "2"
 services:
   simple:
     image: busybox:latest
diff --git a/tests/fixtures/v2-simple/links-invalid.yml b/tests/fixtures/v2-simple/links-invalid.yml
index 422f9314..481aa404 100644
--- a/tests/fixtures/v2-simple/links-invalid.yml
+++ b/tests/fixtures/v2-simple/links-invalid.yml
@@ -1,4 +1,4 @@
-version: 2
+version: "2"
 services:
   simple:
     image: busybox:latest
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 0c8c9a6a..180c9df1 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -10,6 +10,7 @@ from docker.errors import NotFound
 from .testcases import DockerClientTestCase
 from compose.config import config
 from compose.config import ConfigurationError
+from compose.config.config import V2_0
 from compose.config.types import VolumeFromSpec
 from compose.config.types import VolumeSpec
 from compose.const import LABEL_PROJECT
@@ -112,7 +113,7 @@ class ProjectTest(DockerClientTestCase):
             name='composetest',
             client=self.client,
             config_data=build_service_dicts({
-                'version': 2,
+                'version': V2_0,
                 'services': {
                     'net': {
                         'image': 'busybox:latest',
@@ -139,7 +140,7 @@ class ProjectTest(DockerClientTestCase):
             return Project.from_config(
                 name='composetest',
                 config_data=build_service_dicts({
-                    'version': 2,
+                    'version': V2_0,
                     'services': {
                         'web': {
                             'image': 'busybox:latest',
@@ -559,7 +560,7 @@ class ProjectTest(DockerClientTestCase):
     @v2_only()
     def test_project_up_networks(self):
         config_data = config.Config(
-            version=2,
+            version=V2_0,
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
@@ -592,7 +593,7 @@ class ProjectTest(DockerClientTestCase):
     @v2_only()
     def test_up_with_ipam_config(self):
         config_data = config.Config(
-            version=2,
+            version=V2_0,
             services=[],
             volumes={},
             networks={
@@ -651,7 +652,7 @@ class ProjectTest(DockerClientTestCase):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
-            version=2,
+            version=V2_0,
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
@@ -677,7 +678,7 @@ class ProjectTest(DockerClientTestCase):
         base_file = config.ConfigFile(
             'base.yml',
             {
-                'version': 2,
+                'version': V2_0,
                 'services': {
                     'simple': {'image': 'busybox:latest', 'command': 'top'},
                     'another': {
@@ -696,7 +697,7 @@ class ProjectTest(DockerClientTestCase):
         override_file = config.ConfigFile(
             'override.yml',
             {
-                'version': 2,
+                'version': V2_0,
                 'services': {
                     'another': {
                         'logging': {
@@ -729,7 +730,7 @@ class ProjectTest(DockerClientTestCase):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
-            version=2,
+            version=V2_0,
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
@@ -754,7 +755,7 @@ class ProjectTest(DockerClientTestCase):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
-            version=2,
+            version=V2_0,
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
@@ -779,7 +780,7 @@ class ProjectTest(DockerClientTestCase):
         vol_name = '{0:x}'.format(random.getrandbits(32))
 
         config_data = config.Config(
-            version=2,
+            version=V2_0,
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
@@ -802,7 +803,7 @@ class ProjectTest(DockerClientTestCase):
         full_vol_name = 'composetest_{0}'.format(vol_name)
 
         config_data = config.Config(
-            version=2,
+            version=V2_0,
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
@@ -841,7 +842,7 @@ class ProjectTest(DockerClientTestCase):
         full_vol_name = 'composetest_{0}'.format(vol_name)
         self.client.create_volume(vol_name)
         config_data = config.Config(
-            version=2,
+            version=V2_0,
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
@@ -866,7 +867,7 @@ class ProjectTest(DockerClientTestCase):
         vol_name = '{0:x}'.format(random.getrandbits(32))
 
         config_data = config.Config(
-            version=2,
+            version=V2_0,
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
@@ -895,7 +896,7 @@ class ProjectTest(DockerClientTestCase):
         base_file = config.ConfigFile(
             'base.yml',
             {
-                'version': 2,
+                'version': V2_0,
                 'services': {
                     'simple': {
                         'image': 'busybox:latest',
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 5870946d..8e2f2593 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -10,6 +10,8 @@ from pytest import skip
 from .. import unittest
 from compose.cli.docker_client import docker_client
 from compose.config.config import resolve_environment
+from compose.config.config import V1
+from compose.config.config import V2_0
 from compose.const import API_VERSIONS
 from compose.const import LABEL_PROJECT
 from compose.progress_stream import stream_output
@@ -54,9 +56,9 @@ class DockerClientTestCase(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         if engine_version_too_low_for_v2():
-            version = API_VERSIONS[1]
+            version = API_VERSIONS[V1]
         else:
-            version = API_VERSIONS[2]
+            version = API_VERSIONS[V2_0]
 
         cls.client = docker_client(version)
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 44f5c684..302f4703 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -14,14 +14,15 @@ import pytest
 from compose.config import config
 from compose.config.config import resolve_build_args
 from compose.config.config import resolve_environment
+from compose.config.config import V1
+from compose.config.config import V2_0
 from compose.config.errors import ConfigurationError
 from compose.config.types import VolumeSpec
 from compose.const import IS_WINDOWS_PLATFORM
 from tests import mock
 from tests import unittest
 
-DEFAULT_VERSION = V2 = 2
-V1 = 1
+DEFAULT_VERSION = V2_0
 
 
 def make_service_dict(name, service_dict, working_dir, filename=None):
@@ -78,7 +79,7 @@ class ConfigTest(unittest.TestCase):
     def test_load_v2(self):
         config_data = config.load(
             build_config_details({
-                'version': 2,
+                'version': '2',
                 'services': {
                     'foo': {'image': 'busybox'},
                     'bar': {'image': 'busybox', 'environment': ['FOO=1']},
@@ -143,9 +144,55 @@ class ConfigTest(unittest.TestCase):
             }
         })
 
+    def test_valid_versions(self):
+        for version in ['2', '2.0']:
+            cfg = config.load(build_config_details({'version': version}))
+            assert cfg.version == V2_0
+
+    def test_v1_file_version(self):
+        cfg = config.load(build_config_details({'web': {'image': 'busybox'}}))
+        assert cfg.version == V1
+        assert list(s['name'] for s in cfg.services) == ['web']
+
+        cfg = config.load(build_config_details({'version': {'image': 'busybox'}}))
+        assert cfg.version == V1
+        assert list(s['name'] for s in cfg.services) == ['version']
+
+    def test_wrong_version_type(self):
+        for version in [None, 2, 2.0]:
+            with pytest.raises(ConfigurationError):
+                config.load(
+                    build_config_details(
+                        {'version': version},
+                        filename='filename.yml',
+                    )
+                )
+
+    def test_unsupported_version(self):
+        with pytest.raises(ConfigurationError):
+            config.load(
+                build_config_details(
+                    {'version': '2.1'},
+                    filename='filename.yml',
+                )
+            )
+
+    def test_v1_file_with_version_is_invalid(self):
+        for version in [1, "1"]:
+            with pytest.raises(ConfigurationError):
+                config.load(
+                    build_config_details(
+                        {
+                            'version': version,
+                            'web': {'image': 'busybox'},
+                        },
+                        filename='filename.yml',
+                    )
+                )
+
     def test_named_volume_config_empty(self):
         config_details = build_config_details({
-            'version': 2,
+            'version': '2',
             'services': {
                 'simple': {'image': 'busybox'}
             },
@@ -214,7 +261,7 @@ class ConfigTest(unittest.TestCase):
         with self.assertRaises(ConfigurationError):
             config.load(
                 build_config_details(
-                    {'version': 2, 'services': {'web': 'busybox:latest'}},
+                    {'version': '2', 'services': {'web': 'busybox:latest'}},
                     'working_dir',
                     'filename.yml'
                 )
@@ -224,7 +271,7 @@ class ConfigTest(unittest.TestCase):
         with self.assertRaises(ConfigurationError):
             config.load(
                 build_config_details({
-                    'version': 2,
+                    'version': '2',
                     'services': {'web': 'busybox:latest'},
                     'networks': {
                         'invalid': {'foo', 'bar'}
@@ -246,7 +293,7 @@ class ConfigTest(unittest.TestCase):
             with pytest.raises(ConfigurationError) as exc:
                 config.load(
                     build_config_details({
-                        'version': 2,
+                        'version': '2',
                         'services': {invalid_name: {'image': 'busybox'}}
                     }, 'working_dir', 'filename.yml')
                 )
@@ -256,7 +303,7 @@ class ConfigTest(unittest.TestCase):
         with pytest.raises(ConfigurationError) as exc:
             config.load(build_config_details(
                 {
-                    'version': 2,
+                    'version': '2',
                     'services': {
                         'web': {'image': 'busybox', 'name': 'bogus'},
                     }
@@ -307,7 +354,7 @@ class ConfigTest(unittest.TestCase):
             config.load(
                 build_config_details(
                     {
-                        'version': 2,
+                        'version': '2',
                         'services': {1: {'image': 'busybox'}}
                     },
                     'working_dir',
@@ -370,7 +417,7 @@ class ConfigTest(unittest.TestCase):
     def test_load_with_multiple_files_and_empty_override_v2(self):
         base_file = config.ConfigFile(
             'base.yml',
-            {'version': 2, 'services': {'web': {'image': 'example/web'}}})
+            {'version': '2', 'services': {'web': {'image': 'example/web'}}})
         override_file = config.ConfigFile('override.yml', None)
         details = config.ConfigDetails('.', [base_file, override_file])
 
@@ -394,7 +441,7 @@ class ConfigTest(unittest.TestCase):
         base_file = config.ConfigFile('base.yml', None)
         override_file = config.ConfigFile(
             'override.tml',
-            {'version': 2, 'services': {'web': {'image': 'example/web'}}}
+            {'version': '2', 'services': {'web': {'image': 'example/web'}}}
         )
         details = config.ConfigDetails('.', [base_file, override_file])
         with pytest.raises(ConfigurationError) as exc:
@@ -494,7 +541,7 @@ class ConfigTest(unittest.TestCase):
             config.load(
                 build_config_details(
                     {
-                        'version': 2,
+                        'version': '2',
                         'services': {
                             'web': {
                                 'build': '.',
@@ -509,7 +556,7 @@ class ConfigTest(unittest.TestCase):
 
         service = config.load(
             build_config_details({
-                'version': 2,
+                'version': '2',
                 'services': {
                     'web': {
                         'build': '.'
@@ -522,7 +569,7 @@ class ConfigTest(unittest.TestCase):
         service = config.load(
             build_config_details(
                 {
-                    'version': 2,
+                    'version': '2',
                     'services': {
                         'web': {
                             'build': {
@@ -543,7 +590,7 @@ class ConfigTest(unittest.TestCase):
         base_file = config.ConfigFile(
             'base.yaml',
             {
-                'version': 2,
+                'version': '2',
                 'services': {
                     'web': {
                         'image': 'example/web',
@@ -556,7 +603,7 @@ class ConfigTest(unittest.TestCase):
         override_file = config.ConfigFile(
             'override.yaml',
             {
-                'version': 2,
+                'version': '2',
                 'services': {
                     'web': {
                         'build': '/',
@@ -585,7 +632,7 @@ class ConfigTest(unittest.TestCase):
         base_file = config.ConfigFile(
             'base.yaml',
             {
-                'version': 2,
+                'version': '2',
                 'services': {
                     'web': {
                         'image': 'busybox:latest',
@@ -601,7 +648,7 @@ class ConfigTest(unittest.TestCase):
         base_file = config.ConfigFile(
             'base.yaml',
             {
-                'version': 2,
+                'version': '2',
                 'services': {
                     'web': {
                         'image': 'busybox:latest',
@@ -681,7 +728,7 @@ class ConfigTest(unittest.TestCase):
             config.load(
                 build_config_details(
                     {
-                        'version': 2,
+                        'version': '2',
                         'services': {
                             'foo': {'image': 1},
                         },
@@ -1016,7 +1063,7 @@ class ConfigTest(unittest.TestCase):
 
     def test_external_volume_config(self):
         config_details = build_config_details({
-            'version': 2,
+            'version': '2',
             'services': {
                 'bogus': {'image': 'busybox'}
             },
@@ -1034,7 +1081,7 @@ class ConfigTest(unittest.TestCase):
 
     def test_external_volume_invalid_config(self):
         config_details = build_config_details({
-            'version': 2,
+            'version': '2',
             'services': {
                 'bogus': {'image': 'busybox'}
             },
@@ -1047,7 +1094,7 @@ class ConfigTest(unittest.TestCase):
 
     def test_depends_on_orders_services(self):
         config_details = build_config_details({
-            'version': 2,
+            'version': '2',
             'services': {
                 'one': {'image': 'busybox', 'depends_on': ['three', 'two']},
                 'two': {'image': 'busybox', 'depends_on': ['three']},
@@ -1062,7 +1109,7 @@ class ConfigTest(unittest.TestCase):
 
     def test_depends_on_unknown_service_errors(self):
         config_details = build_config_details({
-            'version': 2,
+            'version': '2',
             'services': {
                 'one': {'image': 'busybox', 'depends_on': ['three']},
             },
@@ -1075,7 +1122,7 @@ class ConfigTest(unittest.TestCase):
 class NetworkModeTest(unittest.TestCase):
     def test_network_mode_standard(self):
         config_data = config.load(build_config_details({
-            'version': 2,
+            'version': '2',
             'services': {
                 'web': {
                     'image': 'busybox',
@@ -1101,7 +1148,7 @@ class NetworkModeTest(unittest.TestCase):
 
     def test_network_mode_container(self):
         config_data = config.load(build_config_details({
-            'version': 2,
+            'version': '2',
             'services': {
                 'web': {
                     'image': 'busybox',
@@ -1126,7 +1173,7 @@ class NetworkModeTest(unittest.TestCase):
 
     def test_network_mode_service(self):
         config_data = config.load(build_config_details({
-            'version': 2,
+            'version': '2',
             'services': {
                 'web': {
                     'image': 'busybox',
@@ -1160,7 +1207,7 @@ class NetworkModeTest(unittest.TestCase):
     def test_network_mode_service_nonexistent(self):
         with pytest.raises(ConfigurationError) as excinfo:
             config.load(build_config_details({
-                'version': 2,
+                'version': '2',
                 'services': {
                     'web': {
                         'image': 'busybox',
@@ -1175,7 +1222,7 @@ class NetworkModeTest(unittest.TestCase):
     def test_network_mode_plus_networks_is_invalid(self):
         with pytest.raises(ConfigurationError) as excinfo:
             config.load(build_config_details({
-                'version': 2,
+                'version': '2',
                 'services': {
                     'web': {
                         'image': 'busybox',
@@ -2202,7 +2249,7 @@ class ExtendsTest(unittest.TestCase):
         tmpdir = py.test.ensuretemp('test_extends_with_mixed_version')
         self.addCleanup(tmpdir.remove)
         tmpdir.join('docker-compose.yml').write("""
-            version: 2
+            version: "2"
             services:
               web:
                 extends:
@@ -2224,7 +2271,7 @@ class ExtendsTest(unittest.TestCase):
         tmpdir = py.test.ensuretemp('test_extends_with_defined_version')
         self.addCleanup(tmpdir.remove)
         tmpdir.join('docker-compose.yml').write("""
-            version: 2
+            version: "2"
             services:
               web:
                 extends:
@@ -2233,7 +2280,7 @@ class ExtendsTest(unittest.TestCase):
                 image: busybox
         """)
         tmpdir.join('base.yml').write("""
-            version: 2
+            version: "2"
             services:
                 base:
                   volumes: ['/foo']
diff --git a/tests/unit/config/types_test.py b/tests/unit/config/types_test.py
index 50b7efcb..c741a339 100644
--- a/tests/unit/config/types_test.py
+++ b/tests/unit/config/types_test.py
@@ -3,13 +3,13 @@ from __future__ import unicode_literals
 
 import pytest
 
+from compose.config.config import V1
+from compose.config.config import V2_0
 from compose.config.errors import ConfigurationError
 from compose.config.types import parse_extra_hosts
 from compose.config.types import VolumeFromSpec
 from compose.config.types import VolumeSpec
 from compose.const import IS_WINDOWS_PLATFORM
-from tests.unit.config.config_test import V1
-from tests.unit.config.config_test import V2
 
 
 def test_parse_extra_hosts_list():
@@ -91,26 +91,26 @@ class TestVolumesFromSpec(object):
             VolumeFromSpec.parse('unknown:format:ro', self.services, V1)
 
     def test_parse_v2_from_service(self):
-        volume_from = VolumeFromSpec.parse('servicea', self.services, V2)
+        volume_from = VolumeFromSpec.parse('servicea', self.services, V2_0)
         assert volume_from == VolumeFromSpec('servicea', 'rw', 'service')
 
     def test_parse_v2_from_service_with_mode(self):
-        volume_from = VolumeFromSpec.parse('servicea:ro', self.services, V2)
+        volume_from = VolumeFromSpec.parse('servicea:ro', self.services, V2_0)
         assert volume_from == VolumeFromSpec('servicea', 'ro', 'service')
 
     def test_parse_v2_from_container(self):
-        volume_from = VolumeFromSpec.parse('container:foo', self.services, V2)
+        volume_from = VolumeFromSpec.parse('container:foo', self.services, V2_0)
         assert volume_from == VolumeFromSpec('foo', 'rw', 'container')
 
     def test_parse_v2_from_container_with_mode(self):
-        volume_from = VolumeFromSpec.parse('container:foo:ro', self.services, V2)
+        volume_from = VolumeFromSpec.parse('container:foo:ro', self.services, V2_0)
         assert volume_from == VolumeFromSpec('foo', 'ro', 'container')
 
     def test_parse_v2_invalid_type(self):
         with pytest.raises(ConfigurationError) as exc:
-            VolumeFromSpec.parse('bogus:foo:ro', self.services, V2)
+            VolumeFromSpec.parse('bogus:foo:ro', self.services, V2_0)
         assert "Unknown volumes_from type 'bogus'" in exc.exconly()
 
     def test_parse_v2_invalid(self):
         with pytest.raises(ConfigurationError):
-            VolumeFromSpec.parse('unknown:format:ro', self.services, V2)
+            VolumeFromSpec.parse('unknown:format:ro', self.services, V2_0)

From ef8db3650aa551959c0979bba939d5747ec74a68 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 29 Jan 2016 16:15:16 +0000
Subject: [PATCH 0762/1265] Improve error messages for invalid versions

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py         | 23 ++++++++--
 compose/config/errors.py         |  8 ++++
 compose/config/validation.py     |  8 +++-
 compose/const.py                 |  1 -
 tests/unit/config/config_test.py | 73 +++++++++++++++++---------------
 5 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index bda086b9..094c8b3a 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -16,10 +16,10 @@ from cached_property import cached_property
 
 from ..const import COMPOSEFILE_V1 as V1
 from ..const import COMPOSEFILE_V2_0 as V2_0
-from ..const import COMPOSEFILE_VERSIONS
 from .errors import CircularReference
 from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
+from .errors import VERSION_EXPLANATION
 from .interpolation import interpolate_environment_variables
 from .sort_services import get_container_name_from_network_mode
 from .sort_services import get_service_name_from_network_mode
@@ -105,6 +105,7 @@ SUPPORTED_FILENAMES = [
 
 DEFAULT_OVERRIDE_FILENAME = 'docker-compose.override.yml'
 
+
 log = logging.getLogger(__name__)
 
 
@@ -131,7 +132,10 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
 
     @cached_property
     def version(self):
-        version = self.config.get('version', V1)
+        if 'version' not in self.config:
+            return V1
+
+        version = self.config['version']
 
         if isinstance(version, dict):
             log.warn("Unexpected type for field 'version', in file {} assuming "
@@ -139,12 +143,23 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
                      "Compose file version 1".format(self.filename))
             return V1
 
+        if not isinstance(version, six.string_types):
+            raise ConfigurationError(
+                'Version in "{}" is invalid - it should be a string.'
+                .format(self.filename))
+
+        if version == '1':
+            raise ConfigurationError(
+                'Version in "{}" is invalid. {}'
+                .format(self.filename, VERSION_EXPLANATION))
+
         if version == '2':
             version = V2_0
 
-        if version not in COMPOSEFILE_VERSIONS:
+        if version != V2_0:
             raise ConfigurationError(
-                'Invalid Compose file version: {0}'.format(version))
+                'Version in "{}" is unsupported. {}'
+                .format(self.filename, VERSION_EXPLANATION))
 
         return version
 
diff --git a/compose/config/errors.py b/compose/config/errors.py
index 99129f3d..f94ac7ac 100644
--- a/compose/config/errors.py
+++ b/compose/config/errors.py
@@ -2,6 +2,14 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 
+VERSION_EXPLANATION = (
+    'Either specify a version of "2" (or "2.0") and place your service '
+    'definitions under the `services` key, or omit the `version` key and place '
+    'your service definitions at the root of the file to use version 1.\n'
+    'For more on the Compose file format versions, see '
+    'https://docs.docker.com/compose/compose-file/')
+
+
 class ConfigurationError(Exception):
     def __init__(self, msg):
         self.msg = msg
diff --git a/compose/config/validation.py b/compose/config/validation.py
index ba1ac521..6b240135 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -15,6 +15,7 @@ from jsonschema import RefResolver
 from jsonschema import ValidationError
 
 from .errors import ConfigurationError
+from .errors import VERSION_EXPLANATION
 from .sort_services import get_service_name_from_network_mode
 
 
@@ -229,11 +230,14 @@ def handle_error_for_schema_with_id(error, path):
                 "A service can either be built to image or use an existing "
                 "image, not both.".format(path_string(path)))
 
-    if schema_id == '#/definitions/service':
-        if error.validator == 'additionalProperties':
+    if error.validator == 'additionalProperties':
+        if schema_id == '#/definitions/service':
             invalid_config_key = parse_key_from_error_msg(error)
             return get_unsupported_config_msg(path, invalid_config_key)
 
+        if not error.path:
+            return '{}\n{}'.format(error.message, VERSION_EXPLANATION)
+
 
 def handle_generic_service_error(error, path):
     msg_format = None
diff --git a/compose/const.py b/compose/const.py
index d78a5fa7..0e307835 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -17,7 +17,6 @@ LABEL_CONFIG_HASH = 'com.docker.compose.config-hash'
 
 COMPOSEFILE_V1 = '1'
 COMPOSEFILE_V2_0 = '2.0'
-COMPOSEFILE_VERSIONS = (COMPOSEFILE_V1, COMPOSEFILE_V2_0)
 
 API_VERSIONS = {
     COMPOSEFILE_V1: '1.21',
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 302f4703..3c012ea7 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -17,6 +17,7 @@ from compose.config.config import resolve_environment
 from compose.config.config import V1
 from compose.config.config import V2_0
 from compose.config.errors import ConfigurationError
+from compose.config.errors import VERSION_EXPLANATION
 from compose.config.types import VolumeSpec
 from compose.const import IS_WINDOWS_PLATFORM
 from tests import mock
@@ -159,8 +160,8 @@ class ConfigTest(unittest.TestCase):
         assert list(s['name'] for s in cfg.services) == ['version']
 
     def test_wrong_version_type(self):
-        for version in [None, 2, 2.0]:
-            with pytest.raises(ConfigurationError):
+        for version in [None, 1, 2, 2.0]:
+            with pytest.raises(ConfigurationError) as excinfo:
                 config.load(
                     build_config_details(
                         {'version': version},
@@ -168,8 +169,11 @@ class ConfigTest(unittest.TestCase):
                     )
                 )
 
+            assert 'Version in "filename.yml" is invalid - it should be a string.' \
+                in excinfo.exconly()
+
     def test_unsupported_version(self):
-        with pytest.raises(ConfigurationError):
+        with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
                     {'version': '2.1'},
@@ -177,18 +181,38 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-    def test_v1_file_with_version_is_invalid(self):
-        for version in [1, "1"]:
-            with pytest.raises(ConfigurationError):
-                config.load(
-                    build_config_details(
-                        {
-                            'version': version,
-                            'web': {'image': 'busybox'},
-                        },
-                        filename='filename.yml',
-                    )
+        assert 'Version in "filename.yml" is unsupported' in excinfo.exconly()
+        assert VERSION_EXPLANATION in excinfo.exconly()
+
+    def test_version_1_is_invalid(self):
+        with pytest.raises(ConfigurationError) as excinfo:
+            config.load(
+                build_config_details(
+                    {
+                        'version': '1',
+                        'web': {'image': 'busybox'},
+                    },
+                    filename='filename.yml',
                 )
+            )
+
+        assert 'Version in "filename.yml" is invalid' in excinfo.exconly()
+        assert VERSION_EXPLANATION in excinfo.exconly()
+
+    def test_v1_file_with_version_is_invalid(self):
+        with pytest.raises(ConfigurationError) as excinfo:
+            config.load(
+                build_config_details(
+                    {
+                        'version': '2',
+                        'web': {'image': 'busybox'},
+                    },
+                    filename='filename.yml',
+                )
+            )
+
+        assert 'Additional properties are not allowed' in excinfo.exconly()
+        assert VERSION_EXPLANATION in excinfo.exconly()
 
     def test_named_volume_config_empty(self):
         config_details = build_config_details({
@@ -226,27 +250,6 @@ class ConfigTest(unittest.TestCase):
             ])
         )
 
-    def test_load_invalid_version(self):
-        with self.assertRaises(ConfigurationError):
-            config.load(
-                build_config_details({
-                    'version': 18,
-                    'services': {
-                        'foo': {'image': 'busybox'}
-                    }
-                }, 'working_dir', 'filename.yml')
-            )
-
-        with self.assertRaises(ConfigurationError):
-            config.load(
-                build_config_details({
-                    'version': 'two point oh',
-                    'services': {
-                        'foo': {'image': 'busybox'}
-                    }
-                }, 'working_dir', 'filename.yml')
-            )
-
     def test_load_throws_error_when_not_dict(self):
         with self.assertRaises(ConfigurationError):
             config.load(

From 1152c5b25b571c3a2f7ffe4394844b1ebcbad570 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 29 Jan 2016 16:38:23 +0000
Subject: [PATCH 0763/1265] Tweak and test warning shown when version is a dict

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py         |  6 +++---
 tests/unit/config/config_test.py | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 094c8b3a..be680503 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -138,9 +138,9 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
         version = self.config['version']
 
         if isinstance(version, dict):
-            log.warn("Unexpected type for field 'version', in file {} assuming "
-                     "version is the name of a service, and defaulting to "
-                     "Compose file version 1".format(self.filename))
+            log.warn('Unexpected type for "version" key in "{}". Assuming '
+                     '"version" is the name of a service, and defaulting to '
+                     'Compose file version 1.'.format(self.filename))
             return V1
 
         if not isinstance(version, six.string_types):
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 3c012ea7..af256f20 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -232,13 +232,18 @@ class ConfigTest(unittest.TestCase):
         assert volumes['other'] == {}
 
     def test_load_service_with_name_version(self):
-        config_data = config.load(
-            build_config_details({
-                'version': {
-                    'image': 'busybox'
-                }
-            }, 'working_dir', 'filename.yml')
-        )
+        with mock.patch('compose.config.config.log') as mock_logging:
+            config_data = config.load(
+                build_config_details({
+                    'version': {
+                        'image': 'busybox'
+                    }
+                }, 'working_dir', 'filename.yml')
+            )
+
+        assert 'Unexpected type for "version" key in "filename.yml"' \
+            in mock_logging.warn.call_args[0][0]
+
         service_dicts = config_data.services
         self.assertEqual(
             service_sort(service_dicts),

From 4f92004d9ae3f36a18ac0246e3771da0a9d5ea4c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 28 Jan 2016 18:50:05 -0500
Subject: [PATCH 0764/1265] Re-order compose docs so that quickstart guides
 come before other documentation.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/extends.md    | 2 +-
 docs/networking.md | 1 +
 docs/production.md | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/extends.md b/docs/extends.md
index c9b65db8..252ffdfc 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -5,7 +5,7 @@ description = "How to use Docker Compose's extends keyword to share configuratio
 keywords = ["fig, composition, compose, docker, orchestration, documentation, docs"]
 [menu.main]
 parent="workw_compose"
-weight=2
+weight=20
 +++
 <![end-metadata]-->
 
diff --git a/docs/networking.md b/docs/networking.md
index fb34e3de..96cfa810 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -5,6 +5,7 @@ description = "How Compose sets up networking between containers"
 keywords = ["documentation, docs,  docker, compose, orchestration, containers, networking"]
 [menu.main]
 parent="workw_compose"
+weight=21
 +++
 <![end-metadata]-->
 
diff --git a/docs/production.md b/docs/production.md
index d51ca549..27c686dd 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -5,7 +5,7 @@ description = "Guide to using Docker Compose in production"
 keywords = ["documentation, docs,  docker, compose, orchestration, containers,  production"]
 [menu.main]
 parent="workw_compose"
-weight=1
+weight=22
 +++
 <![end-metadata]-->
 

From 5e30f089e3c439c7f4a32e4bdc02e39890532cf9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 28 Jan 2016 18:53:40 -0500
Subject: [PATCH 0765/1265] Use the same capitalization for all menu items in
 the docs.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/compose-file.md    | 2 +-
 docs/env.md             | 2 +-
 docs/extends.md         | 2 +-
 docs/production.md      | 2 +-
 docs/reference/index.md | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index cc21bd8a..9bc72561 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -1,6 +1,6 @@
 <!--[metadata]>
 +++
-title = "Compose file reference"
+title = "Compose File Reference"
 description = "Compose file reference"
 keywords = ["fig, composition, compose, docker"]
 aliases = ["/compose/yml"]
diff --git a/docs/env.md b/docs/env.md
index c7b93c77..f4eeedeb 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -1,6 +1,6 @@
 <!--[metadata]>
 +++
-title = "Environment variables reference"
+title = "Environment Variables Reference"
 description = "Compose CLI reference"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
 [menu.main]
diff --git a/docs/extends.md b/docs/extends.md
index 252ffdfc..95a3d64f 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -1,6 +1,6 @@
 <!--[metadata]>
 +++
-title = "Extending services in Compose"
+title = "Extending Services in Compose"
 description = "How to use Docker Compose's extends keyword to share configuration between files and projects"
 keywords = ["fig, composition, compose, docker, orchestration, documentation, docs"]
 [menu.main]
diff --git a/docs/production.md b/docs/production.md
index 27c686dd..dc9544ca 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -1,6 +1,6 @@
 <!--[metadata]>
 +++
-title = "Using Compose in production"
+title = "Using Compose in Production"
 description = "Guide to using Docker Compose in production"
 keywords = ["documentation, docs,  docker, compose, orchestration, containers,  production"]
 [menu.main]
diff --git a/docs/reference/index.md b/docs/reference/index.md
index d1bd61c2..d6fa2948 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -1,6 +1,6 @@
 <!--[metadata]>
 +++
-title = "Command line reference"
+title = "Command-line Reference"
 description = "Compose CLI reference"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
 [menu.main]

From 2df5593e8ff3ac5bd6670bf7011ef687a69529fa Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 28 Jan 2016 19:17:18 -0500
Subject: [PATCH 0766/1265] Cleanup command-line reference docs by renaming
 overview to envvars.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/faq.md                                |  2 +-
 docs/networking.md                         |  6 +++-
 docs/overview.md                           |  2 +-
 docs/reference/docker-compose.md           | 19 +++++++++---
 docs/reference/{overview.md => envvars.md} | 34 ++++++++--------------
 docs/reference/index.md                    |  3 +-
 6 files changed, 36 insertions(+), 30 deletions(-)
 rename docs/reference/{overview.md => envvars.md} (80%)

diff --git a/docs/faq.md b/docs/faq.md
index 264a27ee..3cb6a553 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -51,7 +51,7 @@ Compose uses the project name to create unique identifiers for all of a
 project's  containers and other resources. To run multiple copies of a project,
 set a custom project name using the [`-p` command line
 option](./reference/docker-compose.md) or the [`COMPOSE_PROJECT_NAME`
-environment variable](./reference/overview.md#compose-project-name).
+environment variable](./reference/envvars.md#compose-project-name).
 
 ## What's the difference between `up`, `run`, and `start`?
 
diff --git a/docs/networking.md b/docs/networking.md
index 96cfa810..0a6e51d0 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -20,7 +20,11 @@ container for a service joins the default network and is both *reachable* by
 other containers on that network, and *discoverable* by them at a hostname
 identical to the container name.
 
-> **Note:** Your app's network is given a name based on the "project name", which is based on the name of the directory it lives in. You can override the project name with either the [`--project-name` flag](reference/docker-compose.md) or the [`COMPOSE_PROJECT_NAME` environment variable](reference/overview.md#compose-project-name).
+> **Note:** Your app's network is given a name based on the "project name",
+> which is based on the name of the directory it lives in. You can override the
+> project name with either the [`--project-name`
+> flag](reference/docker-compose.md) or the [`COMPOSE_PROJECT_NAME` environment
+> variable](reference/envvars.md#compose-project-name).
 
 For example, suppose your app is in a directory called `myapp`, and your `docker-compose.yml` looks like this:
 
diff --git a/docs/overview.md b/docs/overview.md
index 19f51ab4..5cd07ede 100644
--- a/docs/overview.md
+++ b/docs/overview.md
@@ -93,7 +93,7 @@ this project name to:
 The default project name is the basename of the project directory. You can set
 a custom project name by using the
 [`-p` command line option](./reference/docker-compose.md) or the
-[`COMPOSE_PROJECT_NAME` environment variable](./reference/overview.md#compose-project-name).
+[`COMPOSE_PROJECT_NAME` environment variable](./reference/envvars.md#compose-project-name).
 
 ### Preserve volume data when containers are created
 
diff --git a/docs/reference/docker-compose.md b/docs/reference/docker-compose.md
index 6e7e4901..c20708c6 100644
--- a/docs/reference/docker-compose.md
+++ b/docs/reference/docker-compose.md
@@ -1,6 +1,6 @@
 <!--[metadata]>
 +++
-title = "docker-compose"
+title = "docker-compose Command"
 description = "docker-compose Command Binary"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  docker-compose"]
 [menu.main]
@@ -12,7 +12,13 @@ weight=-2
 
 # docker-compose Command
 
+This page provides the usage information for the `docker-compose` Command.
+You can also see this information by running `docker-compose --help` from the
+command line.
+
 ```
+Define and run multi-container applications with Docker.
+
 Usage:
   docker-compose [-f=<arg>...] [options] [COMMAND] [ARGS...]
   docker-compose -h|--help
@@ -25,6 +31,10 @@ Options:
 
 Commands:
   build              Build or rebuild services
+  config             Validate and view the compose file
+  create             Create services
+  down               Stop and remove containers, networks, images, and volumes
+  events             Receive real time events from containers
   help               Get help on a command
   kill               Kill containers
   logs               View output from containers
@@ -41,6 +51,7 @@ Commands:
   unpause            Unpause services
   up                 Create and start containers
   version            Show the Docker-Compose version information
+
 ```
 
 The Docker Compose binary. You use this command to build and manage multiple
@@ -92,15 +103,15 @@ same directory level, Compose combines the two files into a single configuration
 The configuration in the `docker-compose.override.yml` file is applied over and
 in addition to the values in the `docker-compose.yml` file.
 
-See also the `COMPOSE_FILE` [environment variable](overview.md#compose-file).
+See also the `COMPOSE_FILE` [environment variable](envvars.md#compose-file).
 
 Each configuration has a project name. If you supply a `-p` flag, you can
 specify a project name. If you don't specify the flag, Compose uses the current
 directory name. See also the `COMPOSE_PROJECT_NAME` [environment variable](
-overview.md#compose-project-name)
+envvars.md#compose-project-name)
 
 
 ## Where to go next
 
-* [CLI environment variables](overview.md)
+* [CLI environment variables](envvars.md)
 * [Command line reference](index.md)
diff --git a/docs/reference/overview.md b/docs/reference/envvars.md
similarity index 80%
rename from docs/reference/overview.md
rename to docs/reference/envvars.md
index 8e3967b2..d91dd9f6 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/envvars.md
@@ -1,34 +1,24 @@
 <!--[metadata]>
 +++
-title = "Introduction to the CLI"
-description = "Introduction to the CLI"
+title = "CLI Environment Variables"
+description = "CLI Environment Variables"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
+aliases = ["/compose/reference/overview/"]
 [menu.main]
 parent = "smn_compose_cli"
-weight=-2
+weight=-1
 +++
 <![end-metadata]-->
 
 
-# Introduction to the CLI
-
-This section describes the subcommands you can use with the `docker-compose` command.  You can run subcommand against one or more services. To run against a specific service, you supply the service name from your compose configuration. If you do not specify the service name, the command runs against all the services in your configuration.
-
-
-## Commands
-
-* [docker-compose Command](docker-compose.md)
-* [CLI Reference](index.md)
-
-
-## Environment Variables
+# CLI Environment Variables
 
 Several environment variables are available for you to configure the Docker Compose command-line behaviour.
 
 Variables starting with `DOCKER_` are the same as those used to configure the
 Docker command-line client. If you're using `docker-machine`, then the `eval "$(docker-machine env my-docker-vm)"` command should set them to their correct values. (In this example, `my-docker-vm` is the name of a machine you created.)
 
-### COMPOSE\_PROJECT\_NAME
+## COMPOSE\_PROJECT\_NAME
 
 Sets the project name. This value is prepended along with the service name to the container container on start up. For example, if you project name is `myapp` and it includes two services `db` and `web` then compose starts containers named  `myapp_db_1` and `myapp_web_1` respectively.
 
@@ -36,14 +26,14 @@ Setting this is optional. If you do not set this, the `COMPOSE_PROJECT_NAME`
 defaults to the `basename` of the project directory. See also the `-p`
 [command-line option](docker-compose.md).
 
-### COMPOSE\_FILE
+## COMPOSE\_FILE
 
 Specify the file containing the compose configuration. If not provided,
 Compose looks for a file named  `docker-compose.yml` in the current directory
 and then each parent directory in succession until a file by that name is
 found. See also the `-f` [command-line option](docker-compose.md).
 
-### COMPOSE\_API\_VERSION
+## COMPOSE\_API\_VERSION
 
 The Docker API only supports requests from clients which report a specific
 version. If you receive a `client and server don't have same version error` using
@@ -63,20 +53,20 @@ If you run into problems running with this set, resolve the mismatch through
 upgrade and remove this setting to see if your problems resolve before notifying
 support.
 
-### DOCKER\_HOST
+## DOCKER\_HOST
 
 Sets the URL of the `docker` daemon. As with the Docker client, defaults to `unix:///var/run/docker.sock`.
 
-### DOCKER\_TLS\_VERIFY
+## DOCKER\_TLS\_VERIFY
 
 When set to anything other than an empty string, enables TLS communication with
 the `docker` daemon.
 
-### DOCKER\_CERT\_PATH
+## DOCKER\_CERT\_PATH
 
 Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TLS verification. Defaults to `~/.docker`.
 
-### COMPOSE\_HTTP\_TIMEOUT
+## COMPOSE\_HTTP\_TIMEOUT
 
 Configures the time (in seconds) a request to the Docker daemon is allowed to hang before Compose considers
 it failed. Defaults to 60 seconds.
diff --git a/docs/reference/index.md b/docs/reference/index.md
index d6fa2948..528550c7 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -14,6 +14,7 @@ weight=80
 
 The following pages describe the usage information for the [docker-compose](docker-compose.md) subcommands. You can also see this information by running `docker-compose [SUBCOMMAND] --help` from the command line.
 
+* [docker-compose](docker-compose.md)
 * [build](build.md)
 * [config](config.md)
 * [create](create.md)
@@ -37,5 +38,5 @@ The following pages describe the usage information for the [docker-compose](dock
 
 ## Where to go next
 
-* [CLI environment variables](overview.md)
+* [CLI environment variables](envvars.md)
 * [docker-compose Command](docker-compose.md)

From cf24c36c5549a2a87952da27c6e3d35974687e1c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 29 Jan 2016 13:00:43 -0500
Subject: [PATCH 0767/1265] Rename the old environment variable page to link
 environment variables.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/compose-file.md                    | 3 ++-
 docs/{env.md => link-env-deprecated.md} | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename docs/{env.md => link-env-deprecated.md} (94%)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 9bc72561..e5326566 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -903,7 +903,8 @@ It's more complicated if you're using particular configuration features:
             syslog-address: "tcp://192.168.0.42:123"
 
 -   `links` with environment variables: As documented in the
-    [environment variables reference](env.md), environment variables created by
+    [environment variables reference](link-env-deprecated.md), environment variables
+    created by
     links have been deprecated for some time. In the new Docker network system,
     they have been removed. You should either connect directly to the
     appropriate hostname or set the relevant environment variable yourself,
diff --git a/docs/env.md b/docs/link-env-deprecated.md
similarity index 94%
rename from docs/env.md
rename to docs/link-env-deprecated.md
index f4eeedeb..55ba5f2d 100644
--- a/docs/env.md
+++ b/docs/link-env-deprecated.md
@@ -1,15 +1,16 @@
 <!--[metadata]>
 +++
-title = "Environment Variables Reference"
+title = "Link Environment Variables"
 description = "Compose CLI reference"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
+aliases = ["/compose/env"]
 [menu.main]
 parent="workw_compose"
 weight=89
 +++
 <![end-metadata]-->
 
-# Compose environment variables reference
+# Link environment variables reference
 
 > **Note:** Environment variables are no longer the recommended method for connecting to linked services. Instead, you should use the link name (by default, the name of the linked service) as the hostname to connect to. See the [docker-compose.yml documentation](compose-file.md#links) for details.
 >

From 7b03de7d01ded900a416187efcbb312c5d8423de Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 1 Feb 2016 12:10:21 -0500
Subject: [PATCH 0768/1265] Move command reference to overview.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/extends.md                                   | 2 +-
 docs/faq.md                                       | 2 +-
 docs/index.md                                     | 2 +-
 docs/networking.md                                | 2 +-
 docs/overview.md                                  | 2 +-
 docs/reference/envvars.md                         | 5 ++---
 docs/reference/index.md                           | 6 +++---
 docs/reference/{docker-compose.md => overview.md} | 8 ++++----
 8 files changed, 14 insertions(+), 15 deletions(-)
 rename docs/reference/{docker-compose.md => overview.md} (95%)

diff --git a/docs/extends.md b/docs/extends.md
index 95a3d64f..4067a4f0 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -42,7 +42,7 @@ are copied.
 To use multiple override files, or an override file with a different name, you
 can use the `-f` option to specify the list of files. Compose merges files in
 the order they're specified on the command line. See the [`docker-compose`
-command reference](./reference/docker-compose.md) for more information about
+command reference](./reference/overview.md) for more information about
 using `-f`.
 
 When you use multiple configuration files, you must make sure all paths in the
diff --git a/docs/faq.md b/docs/faq.md
index 3cb6a553..8fa629de 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -50,7 +50,7 @@ handling `SIGTERM` properly.
 Compose uses the project name to create unique identifiers for all of a
 project's  containers and other resources. To run multiple copies of a project,
 set a custom project name using the [`-p` command line
-option](./reference/docker-compose.md) or the [`COMPOSE_PROJECT_NAME`
+option](./reference/overview.md) or the [`COMPOSE_PROJECT_NAME`
 environment variable](./reference/envvars.md#compose-project-name).
 
 ## What's the difference between `up`, `run`, and `start`?
diff --git a/docs/index.md b/docs/index.md
index 61bc41ee..f5d84218 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,6 +1,6 @@
 <!--[metadata]>
 +++
-title = "Compose"
+title = "Docker Compose"
 description = "Introduction and Overview of Compose"
 keywords = ["documentation, docs,  docker, compose, orchestration,  containers"]
 [menu.main]
diff --git a/docs/networking.md b/docs/networking.md
index 0a6e51d0..7d819d18 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -23,7 +23,7 @@ identical to the container name.
 > **Note:** Your app's network is given a name based on the "project name",
 > which is based on the name of the directory it lives in. You can override the
 > project name with either the [`--project-name`
-> flag](reference/docker-compose.md) or the [`COMPOSE_PROJECT_NAME` environment
+> flag](reference/overview.md) or the [`COMPOSE_PROJECT_NAME` environment
 > variable](reference/envvars.md#compose-project-name).
 
 For example, suppose your app is in a directory called `myapp`, and your `docker-compose.yml` looks like this:
diff --git a/docs/overview.md b/docs/overview.md
index 5cd07ede..f837d82f 100644
--- a/docs/overview.md
+++ b/docs/overview.md
@@ -92,7 +92,7 @@ this project name to:
 
 The default project name is the basename of the project directory. You can set
 a custom project name by using the
-[`-p` command line option](./reference/docker-compose.md) or the
+[`-p` command line option](./reference/overview.md) or the
 [`COMPOSE_PROJECT_NAME` environment variable](./reference/envvars.md#compose-project-name).
 
 ### Preserve volume data when containers are created
diff --git a/docs/reference/envvars.md b/docs/reference/envvars.md
index d91dd9f6..6360fe54 100644
--- a/docs/reference/envvars.md
+++ b/docs/reference/envvars.md
@@ -3,7 +3,6 @@
 title = "CLI Environment Variables"
 description = "CLI Environment Variables"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
-aliases = ["/compose/reference/overview/"]
 [menu.main]
 parent = "smn_compose_cli"
 weight=-1
@@ -24,14 +23,14 @@ Sets the project name. This value is prepended along with the service name to th
 
 Setting this is optional. If you do not set this, the `COMPOSE_PROJECT_NAME`
 defaults to the `basename` of the project directory. See also the `-p`
-[command-line option](docker-compose.md).
+[command-line option](overview.md).
 
 ## COMPOSE\_FILE
 
 Specify the file containing the compose configuration. If not provided,
 Compose looks for a file named  `docker-compose.yml` in the current directory
 and then each parent directory in succession until a file by that name is
-found. See also the `-f` [command-line option](docker-compose.md).
+found. See also the `-f` [command-line option](overview.md).
 
 ## COMPOSE\_API\_VERSION
 
diff --git a/docs/reference/index.md b/docs/reference/index.md
index 528550c7..2ac3676a 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -12,9 +12,9 @@ weight=80
 
 ## Compose command-line reference
 
-The following pages describe the usage information for the [docker-compose](docker-compose.md) subcommands. You can also see this information by running `docker-compose [SUBCOMMAND] --help` from the command line.
+The following pages describe the usage information for the [docker-compose](overview.md) subcommands. You can also see this information by running `docker-compose [SUBCOMMAND] --help` from the command line.
 
-* [docker-compose](docker-compose.md)
+* [docker-compose](overview.md)
 * [build](build.md)
 * [config](config.md)
 * [create](create.md)
@@ -39,4 +39,4 @@ The following pages describe the usage information for the [docker-compose](dock
 ## Where to go next
 
 * [CLI environment variables](envvars.md)
-* [docker-compose Command](docker-compose.md)
+* [docker-compose Command](overview.md)
diff --git a/docs/reference/docker-compose.md b/docs/reference/overview.md
similarity index 95%
rename from docs/reference/docker-compose.md
rename to docs/reference/overview.md
index c20708c6..09f2817a 100644
--- a/docs/reference/docker-compose.md
+++ b/docs/reference/overview.md
@@ -1,8 +1,9 @@
 <!--[metadata]>
 +++
-title = "docker-compose Command"
-description = "docker-compose Command Binary"
+title = "Overview of docker-compose CLI"
+description = "Overview of docker-compose CLI"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  docker-compose"]
+aliases = ["/compose/reference/docker-compose/"]
 [menu.main]
 parent = "smn_compose_cli"
 weight=-2
@@ -10,7 +11,7 @@ weight=-2
 <![end-metadata]-->
 
 
-# docker-compose Command
+# Overview of docker-compose CLI
 
 This page provides the usage information for the `docker-compose` Command.
 You can also see this information by running `docker-compose --help` from the
@@ -114,4 +115,3 @@ envvars.md#compose-project-name)
 ## Where to go next
 
 * [CLI environment variables](envvars.md)
-* [Command line reference](index.md)

From c70c72f49ac72f864f614f38288a1151dc590553 Mon Sep 17 00:00:00 2001
From: Ryan Taylor Long <ryan@rtlong.com>
Date: Thu, 28 Jan 2016 06:19:03 +0000
Subject: [PATCH 0769/1265] Add depends_on to ALLOWED_KEYS

This ensures and already existing `depends_on` is not deleted when the service on which it is defined also employs `extends`.

Signed-off-by: Ryan Taylor Long <ryan@rtlong.com>
---
 compose/config/config.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/config/config.py b/compose/config/config.py
index be680503..7a8e5533 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -84,6 +84,7 @@ DOCKER_CONFIG_KEYS = [
 ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
     'build',
     'container_name',
+    'depends_on',
     'dockerfile',
     'expose',
     'external_links',

From bf6a5d3e4956d51f03926577fc759b29388f824f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 29 Jan 2016 13:36:51 -0500
Subject: [PATCH 0770/1265] Fix merging of lists with multiple files.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         | 12 ++++++++----
 tests/unit/config/config_test.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 7a8e5533..07f62290 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -84,10 +84,7 @@ DOCKER_CONFIG_KEYS = [
 ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
     'build',
     'container_name',
-    'depends_on',
     'dockerfile',
-    'expose',
-    'external_links',
     'logging',
 ]
 
@@ -666,7 +663,14 @@ def merge_service_dicts(base, override, version):
     for field in ['volumes', 'devices']:
         merge_field(field, merge_path_mappings)
 
-    for field in ['ports', 'expose', 'external_links']:
+    for field in [
+        'depends_on',
+        'expose',
+        'external_links',
+        'links',
+        'ports',
+        'volumes_from',
+    ]:
         merge_field(field, operator.add, default=[])
 
     for field in ['dns', 'dns_search', 'env_file']:
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index af256f20..f667b3bb 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -602,6 +602,7 @@ class ConfigTest(unittest.TestCase):
                 'services': {
                     'web': {
                         'image': 'example/web',
+                        'depends_on': ['db'],
                     },
                     'db': {
                         'image': 'example/db',
@@ -616,7 +617,11 @@ class ConfigTest(unittest.TestCase):
                     'web': {
                         'build': '/',
                         'volumes': ['/home/user/project:/code'],
+                        'depends_on': ['other'],
                     },
+                    'other': {
+                        'image': 'example/other',
+                    }
                 }
             })
         details = config.ConfigDetails('.', [base_file, override_file])
@@ -628,11 +633,16 @@ class ConfigTest(unittest.TestCase):
                 'build': {'context': os.path.abspath('/')},
                 'image': 'example/web',
                 'volumes': [VolumeSpec.parse('/home/user/project:/code')],
+                'depends_on': ['db', 'other'],
             },
             {
                 'name': 'db',
                 'image': 'example/db',
             },
+            {
+                'name': 'other',
+                'image': 'example/other',
+            },
         ]
         assert service_sort(service_dicts) == service_sort(expected)
 
@@ -2299,6 +2309,24 @@ class ExtendsTest(unittest.TestCase):
         service = load_from_filename(str(tmpdir.join('docker-compose.yml')))
         self.assertEquals(service[0]['command'], "top")
 
+    def test_extends_with_depends_on(self):
+        tmpdir = py.test.ensuretemp('test_extends_with_defined_version')
+        self.addCleanup(tmpdir.remove)
+        tmpdir.join('docker-compose.yml').write("""
+            version: 2
+            services:
+              base:
+                image: example
+              web:
+                extends: base
+                image: busybox
+                depends_on: ['other']
+              other:
+                image: example
+        """)
+        services = load_from_filename(str(tmpdir.join('docker-compose.yml')))
+        assert service_sort(services)[2]['depends_on'] == ['other']
+
 
 @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class ExpandPathTest(unittest.TestCase):

From e32863f89ebe0c70143695525e5062ae1c8f375c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 1 Feb 2016 13:47:13 -0500
Subject: [PATCH 0771/1265] Make links unique-by-alias when merging

Factor out MergeDict from merge_service_dicts to reduce complexity below limit.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py | 85 ++++++++++++++++++++++++++++------------
 compose/config/types.py  | 19 +++++++++
 2 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 07f62290..f362f1b8 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -26,6 +26,7 @@ from .sort_services import get_service_name_from_network_mode
 from .sort_services import sort_service_dicts
 from .types import parse_extra_hosts
 from .types import parse_restart_spec
+from .types import ServiceLink
 from .types import VolumeFromSpec
 from .types import VolumeSpec
 from .validation import match_named_volumes
@@ -641,51 +642,79 @@ def merge_service_dicts_from_files(base, override, version):
     return new_service
 
 
+class MergeDict(dict):
+    """A dict-like object responsible for merging two dicts into one."""
+
+    def __init__(self, base, override):
+        self.base = base
+        self.override = override
+
+    def needs_merge(self, field):
+        return field in self.base or field in self.override
+
+    def merge_field(self, field, merge_func, default=None):
+        if not self.needs_merge(field):
+            return
+
+        self[field] = merge_func(
+            self.base.get(field, default),
+            self.override.get(field, default))
+
+    def merge_mapping(self, field, parse_func):
+        if not self.needs_merge(field):
+            return
+
+        self[field] = parse_func(self.base.get(field))
+        self[field].update(parse_func(self.override.get(field)))
+
+    def merge_sequence(self, field, parse_func):
+        def parse_sequence_func(seq):
+            return to_mapping((parse_func(item) for item in seq), 'merge_field')
+
+        if not self.needs_merge(field):
+            return
+
+        merged = parse_sequence_func(self.base.get(field, []))
+        merged.update(parse_sequence_func(self.override.get(field, [])))
+        self[field] = [item.repr() for item in merged.values()]
+
+    def merge_scalar(self, field):
+        if self.needs_merge(field):
+            self[field] = self.override.get(field, self.base.get(field))
+
+
 def merge_service_dicts(base, override, version):
-    d = {}
+    md = MergeDict(base, override)
 
-    def merge_field(field, merge_func, default=None):
-        if field in base or field in override:
-            d[field] = merge_func(
-                base.get(field, default),
-                override.get(field, default))
-
-    def merge_mapping(mapping, parse_func):
-        if mapping in base or mapping in override:
-            merged = parse_func(base.get(mapping, None))
-            merged.update(parse_func(override.get(mapping, None)))
-            d[mapping] = merged
-
-    merge_mapping('environment', parse_environment)
-    merge_mapping('labels', parse_labels)
-    merge_mapping('ulimits', parse_ulimits)
+    md.merge_mapping('environment', parse_environment)
+    md.merge_mapping('labels', parse_labels)
+    md.merge_mapping('ulimits', parse_ulimits)
+    md.merge_sequence('links', ServiceLink.parse)
 
     for field in ['volumes', 'devices']:
-        merge_field(field, merge_path_mappings)
+        md.merge_field(field, merge_path_mappings)
 
     for field in [
         'depends_on',
         'expose',
         'external_links',
-        'links',
         'ports',
         'volumes_from',
     ]:
-        merge_field(field, operator.add, default=[])
+        md.merge_field(field, operator.add, default=[])
 
     for field in ['dns', 'dns_search', 'env_file']:
-        merge_field(field, merge_list_or_string)
+        md.merge_field(field, merge_list_or_string)
 
-    for field in set(ALLOWED_KEYS) - set(d):
-        if field in base or field in override:
-            d[field] = override.get(field, base.get(field))
+    for field in set(ALLOWED_KEYS) - set(md):
+        md.merge_scalar(field)
 
     if version == V1:
-        legacy_v1_merge_image_or_build(d, base, override)
+        legacy_v1_merge_image_or_build(md, base, override)
     else:
-        merge_build(d, base, override)
+        merge_build(md, base, override)
 
-    return d
+    return dict(md)
 
 
 def merge_build(output, base, override):
@@ -919,6 +948,10 @@ def to_list(value):
         return value
 
 
+def to_mapping(sequence, key_field):
+    return {getattr(item, key_field): item for item in sequence}
+
+
 def has_uppercase(name):
     return any(char in string.ascii_uppercase for char in name)
 
diff --git a/compose/config/types.py b/compose/config/types.py
index 9bda7180..fc3347c8 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -168,3 +168,22 @@ class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
     @property
     def is_named_volume(self):
         return self.external and not self.external.startswith(('.', '/', '~'))
+
+
+class ServiceLink(namedtuple('_ServiceLink', 'target alias')):
+
+    @classmethod
+    def parse(cls, link_spec):
+        target, _, alias = link_spec.partition(':')
+        if not alias:
+            alias = target
+        return cls(target, alias)
+
+    def repr(self):
+        if self.target == self.alias:
+            return self.target
+        return '{s.target}:{s.alias}'.format(s=self)
+
+    @property
+    def merge_field(self):
+        return self.alias

From 3ec87adccc6d248aecf6beffbe5cb5fa9c7755a5 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 1 Feb 2016 14:04:53 -0500
Subject: [PATCH 0772/1265] Update merge docs with depends_on, and correction
 about how links and volumes_from are merged.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/extends.md                  | 27 ++++++++++-----------------
 tests/unit/config/config_test.py |  2 +-
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/docs/extends.md b/docs/extends.md
index c9b65db8..8390767d 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -32,12 +32,9 @@ contains your base configuration. The override file, as its name implies, can
 contain configuration overrides for existing services or entirely new
 services.
 
-If a service is defined in both files, Compose merges the configurations using
-the same rules as the `extends` field (see [Adding and overriding
-configuration](#adding-and-overriding-configuration)), with one exception.  If a
-service contains `links` or `volumes_from` those fields are copied over and
-replace any values in the original service, in the same way single-valued fields
-are copied.
+If a service is defined in both files Compose merges the configurations using
+the rules described in [Adding and overriding
+configuration](#adding-and-overriding-configuration).
 
 To use multiple override files, or an override file with a different name, you
 can use the `-f` option to specify the list of files. Compose merges files in
@@ -176,10 +173,12 @@ is useful if you have several services that reuse a common set of configuration
 options. Using `extends` you can define a common set of service options in one
 place and refer to it from anywhere.
 
-> **Note:** `links` and `volumes_from` are never shared between services using
-> `extends`. See
-> [Adding and overriding configuration](#adding-and-overriding-configuration)
- > for more information.
+> **Note:** `links`, `volumes_from`, and `depends_on` are never shared between
+> services using >`extends`. These exceptions exist to avoid
+> implicit dependencies&mdash;you always define `links` and `volumes_from`
+> locally. This ensures dependencies between services are clearly visible when
+> reading the current file. Defining these locally also ensures changes to the
+> referenced file don't result in breakage.
 
 ### Understand the extends configuration
 
@@ -275,13 +274,7 @@ common configuration:
 
 ## Adding and overriding configuration
 
-Compose copies configurations from the original service over to the local one,
-**except** for `links` and `volumes_from`. These exceptions exist to avoid
-implicit dependencies&mdash;you always define `links` and `volumes_from`
-locally. This ensures dependencies between services are clearly visible when
-reading the current file. Defining these locally also ensures changes to the
-referenced file don't result in breakage.
-
+Compose copies configurations from the original service over to the local one.
 If a configuration option is defined in both the original service the local
 service, the local value *replaces* or *extends* the original value.
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index f667b3bb..8c9b73dc 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -2313,7 +2313,7 @@ class ExtendsTest(unittest.TestCase):
         tmpdir = py.test.ensuretemp('test_extends_with_defined_version')
         self.addCleanup(tmpdir.remove)
         tmpdir.join('docker-compose.yml').write("""
-            version: 2
+            version: "2"
             services:
               base:
                 image: example

From 8e838968fe64ca222c51cd77d2a84f805bada7a9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 29 Jan 2016 14:41:18 -0500
Subject: [PATCH 0773/1265] Refactor project network initlization.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/network.py         | 64 ++++++++++++++++++++++++++
 compose/project.py         | 93 ++++++++------------------------------
 tests/unit/project_test.py |  8 ++--
 3 files changed, 88 insertions(+), 77 deletions(-)

diff --git a/compose/network.py b/compose/network.py
index 4f4f5522..4f4e06b2 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -104,3 +104,67 @@ def create_ipam_config_from_dict(ipam_dict):
             for config in ipam_dict.get('config', [])
         ],
     )
+
+
+def build_networks(name, config_data, client):
+    network_config = config_data.networks or {}
+    networks = {
+        network_name: Network(
+            client=client, project=name, name=network_name,
+            driver=data.get('driver'),
+            driver_opts=data.get('driver_opts'),
+            ipam=data.get('ipam'),
+            external_name=data.get('external_name'),
+        )
+        for network_name, data in network_config.items()
+    }
+
+    if 'default' not in networks:
+        networks['default'] = Network(client, name, 'default')
+
+    return networks
+
+
+class ProjectNetworks(object):
+
+    def __init__(self, networks, use_networking):
+        self.networks = networks or {}
+        self.use_networking = use_networking
+
+    @classmethod
+    def from_services(cls, services, networks, use_networking):
+        networks = {
+            network: networks[network]
+            for service in services
+            for network in service.get('networks', ['default'])
+        }
+        return cls(networks, use_networking)
+
+    def remove(self):
+        if not self.use_networking:
+            return
+        for network in self.networks.values():
+            network.remove()
+
+    def initialize(self):
+        if not self.use_networking:
+            return
+
+        for network in self.networks.values():
+            network.ensure()
+
+
+def get_networks(service_dict, network_definitions):
+    if 'network_mode' in service_dict:
+        return []
+
+    networks = []
+    for name in service_dict.pop('networks', ['default']):
+        network = network_definitions.get(name)
+        if network:
+            networks.append(network.full_name)
+        else:
+            raise ConfigurationError(
+                'Service "{}" uses an undefined network "{}"'
+                .format(service_dict['name'], name))
+    return networks
diff --git a/compose/project.py b/compose/project.py
index 6411f7cc..2e9cfb8f 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -19,7 +19,9 @@ from .const import LABEL_ONE_OFF
 from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
 from .container import Container
-from .network import Network
+from .network import build_networks
+from .network import get_networks
+from .network import ProjectNetworks
 from .service import ContainerNetworkMode
 from .service import ConvergenceStrategy
 from .service import NetworkMode
@@ -36,15 +38,12 @@ class Project(object):
     """
     A collection of services.
     """
-    def __init__(self, name, services, client, networks=None, volumes=None,
-                 use_networking=False, network_driver=None):
+    def __init__(self, name, services, client, networks=None, volumes=None):
         self.name = name
         self.services = services
         self.client = client
-        self.use_networking = use_networking
-        self.network_driver = network_driver
-        self.networks = networks or []
         self.volumes = volumes or {}
+        self.networks = networks or ProjectNetworks({}, False)
 
     def labels(self, one_off=False):
         return [
@@ -58,23 +57,12 @@ class Project(object):
         Construct a Project from a config.Config object.
         """
         use_networking = (config_data.version and config_data.version != V1)
-        project = cls(name, [], client, use_networking=use_networking)
-
-        network_config = config_data.networks or {}
-        custom_networks = [
-            Network(
-                client=client, project=name, name=network_name,
-                driver=data.get('driver'),
-                driver_opts=data.get('driver_opts'),
-                ipam=data.get('ipam'),
-                external_name=data.get('external_name'),
-            )
-            for network_name, data in network_config.items()
-        ]
-
-        all_networks = custom_networks[:]
-        if 'default' not in network_config:
-            all_networks.append(project.default_network)
+        networks = build_networks(name, config_data, client)
+        project_networks = ProjectNetworks.from_services(
+            config_data.services,
+            networks,
+            use_networking)
+        project = cls(name, [], client, project_networks)
 
         if config_data.volumes:
             for vol_name, data in config_data.volumes.items():
@@ -86,13 +74,15 @@ class Project(object):
                 )
 
         for service_dict in config_data.services:
+            service_dict = dict(service_dict)
             if use_networking:
-                networks = get_networks(service_dict, all_networks)
+                service_networks = get_networks(service_dict, networks)
             else:
-                networks = []
+                service_networks = []
 
+            service_dict.pop('networks', None)
             links = project.get_links(service_dict)
-            network_mode = project.get_network_mode(service_dict, networks)
+            network_mode = project.get_network_mode(service_dict, service_networks)
             volumes_from = get_volumes_from(project, service_dict)
 
             if config_data.version != V1:
@@ -109,17 +99,13 @@ class Project(object):
                     client=client,
                     project=name,
                     use_networking=use_networking,
-                    networks=networks,
+                    networks=service_networks,
                     links=links,
                     network_mode=network_mode,
                     volumes_from=volumes_from,
                     **service_dict)
             )
 
-        project.networks += custom_networks
-        if 'default' not in network_config and project.uses_default_network():
-            project.networks.append(project.default_network)
-
         return project
 
     @property
@@ -201,7 +187,7 @@ class Project(object):
     def get_network_mode(self, service_dict, networks):
         network_mode = service_dict.pop('network_mode', None)
         if not network_mode:
-            if self.use_networking:
+            if self.networks.use_networking:
                 return NetworkMode(networks[0]) if networks else NetworkMode('none')
             return NetworkMode(None)
 
@@ -285,7 +271,7 @@ class Project(object):
     def down(self, remove_image_type, include_volumes):
         self.stop()
         self.remove_stopped(v=include_volumes)
-        self.remove_networks()
+        self.networks.remove()
 
         if include_volumes:
             self.remove_volumes()
@@ -296,33 +282,10 @@ class Project(object):
         for service in self.get_services():
             service.remove_image(remove_image_type)
 
-    def remove_networks(self):
-        if not self.use_networking:
-            return
-        for network in self.networks:
-            network.remove()
-
     def remove_volumes(self):
         for volume in self.volumes.values():
             volume.remove()
 
-    def initialize_networks(self):
-        if not self.use_networking:
-            return
-
-        for network in self.networks:
-            network.ensure()
-
-    def uses_default_network(self):
-        return any(
-            self.default_network.full_name in service.networks
-            for service in self.services
-        )
-
-    @property
-    def default_network(self):
-        return Network(client=self.client, project=self.name, name='default')
-
     def restart(self, service_names=None, **options):
         containers = self.containers(service_names, stopped=True)
         parallel.parallel_restart(containers, options)
@@ -392,7 +355,7 @@ class Project(object):
 
         plans = self._get_convergence_plans(services, strategy)
 
-        self.initialize_networks()
+        self.networks.initialize()
         self.initialize_volumes()
 
         return [
@@ -465,22 +428,6 @@ class Project(object):
         return acc + dep_services
 
 
-def get_networks(service_dict, network_definitions):
-    if 'network_mode' in service_dict:
-        return []
-
-    networks = []
-    for name in service_dict.pop('networks', ['default']):
-        matches = [n for n in network_definitions if n.name == name]
-        if matches:
-            networks.append(matches[0].full_name)
-        else:
-            raise ConfigurationError(
-                'Service "{}" uses an undefined network "{}"'
-                .format(service_dict['name'], name))
-    return networks
-
-
 def get_volumes_from(project, service_dict):
     volumes_from = service_dict.pop('volumes_from', None)
     if not volumes_from:
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 21c6be47..bec238de 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -45,7 +45,7 @@ class ProjectTest(unittest.TestCase):
         self.assertEqual(project.get_service('web').options['image'], 'busybox:latest')
         self.assertEqual(project.get_service('db').name, 'db')
         self.assertEqual(project.get_service('db').options['image'], 'busybox:latest')
-        self.assertFalse(project.use_networking)
+        self.assertFalse(project.networks.use_networking)
 
     def test_from_config_v2(self):
         config = Config(
@@ -65,7 +65,7 @@ class ProjectTest(unittest.TestCase):
         )
         project = Project.from_config('composetest', config, None)
         self.assertEqual(len(project.services), 2)
-        self.assertTrue(project.use_networking)
+        self.assertTrue(project.networks.use_networking)
 
     def test_get_service(self):
         web = Service(
@@ -426,7 +426,7 @@ class ProjectTest(unittest.TestCase):
             ),
         )
 
-        assert project.uses_default_network()
+        assert 'default' in project.networks.networks
 
     def test_uses_default_network_false(self):
         project = Project.from_config(
@@ -446,7 +446,7 @@ class ProjectTest(unittest.TestCase):
             ),
         )
 
-        assert not project.uses_default_network()
+        assert 'default' not in project.networks.networks
 
     def test_container_without_name(self):
         self.mock_client.containers.return_value = [

From 0810eeba106f71fc374c791283a84cd9f6725e8f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 29 Jan 2016 16:00:50 -0500
Subject: [PATCH 0774/1265] Don't initialize networks that aren't used by any
 services.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py               |  2 +-
 compose/network.py                | 11 ++++++++---
 compose/project.py                | 13 ++++++++-----
 tests/acceptance/cli_test.py      | 16 ++++++++--------
 tests/integration/project_test.py |  7 ++++++-
 5 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 93c4729f..5121d5c3 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -693,7 +693,7 @@ def run_one_off_container(container_options, project, service, options):
                 start_deps=True,
                 strategy=ConvergenceStrategy.never)
 
-    project.initialize_networks()
+    project.initialize()
 
     container = service.create_container(
         quiet=True,
diff --git a/compose/network.py b/compose/network.py
index 4f4e06b2..36de4502 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -133,12 +133,17 @@ class ProjectNetworks(object):
 
     @classmethod
     def from_services(cls, services, networks, use_networking):
-        networks = {
-            network: networks[network]
+        service_networks = {
+            network: networks.get(network)
             for service in services
             for network in service.get('networks', ['default'])
         }
-        return cls(networks, use_networking)
+        unused = set(networks) - set(service_networks) - {'default'}
+        if unused:
+            log.warn(
+                "Some networks were defined but are not used by any service: "
+                "{}".format(", ".join(unused)))
+        return cls(service_networks, use_networking)
 
     def remove(self):
         if not self.use_networking:
diff --git a/compose/project.py b/compose/project.py
index 2e9cfb8f..291e32b1 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -351,13 +351,12 @@ class Project(object):
            timeout=DEFAULT_TIMEOUT,
            detached=False):
 
-        services = self.get_services_without_duplicate(service_names, include_deps=start_deps)
+        self.initialize()
+        services = self.get_services_without_duplicate(
+            service_names,
+            include_deps=start_deps)
 
         plans = self._get_convergence_plans(services, strategy)
-
-        self.networks.initialize()
-        self.initialize_volumes()
-
         return [
             container
             for service in services
@@ -369,6 +368,10 @@ class Project(object):
             )
         ]
 
+    def initialize(self):
+        self.networks.initialize()
+        self.initialize_volumes()
+
     def _get_convergence_plans(self, services, strategy):
         plans = {}
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 447b1e32..6b9a28e5 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -406,7 +406,8 @@ class CLITestCase(DockerClientTestCase):
 
         services = self.project.get_services()
 
-        networks = self.client.networks(names=[self.project.default_network.full_name])
+        network_name = self.project.networks.networks['default']
+        networks = self.client.networks(names=[network_name])
         self.assertEqual(len(networks), 1)
         self.assertEqual(networks[0]['Driver'], 'bridge')
         assert 'com.docker.network.bridge.enable_icc' not in networks[0]['Options']
@@ -439,7 +440,9 @@ class CLITestCase(DockerClientTestCase):
 
         self.dispatch(['-f', filename, 'up', '-d'], None)
 
-        networks = self.client.networks(names=[self.project.default_network.full_name])
+        network_name = self.project.networks.networks['default']
+        networks = self.client.networks(names=[network_name])
+
         assert networks[0]['Options']['com.docker.network.bridge.enable_icc'] == 'false'
 
     @v2_only()
@@ -586,18 +589,15 @@ class CLITestCase(DockerClientTestCase):
             n['Name'] for n in self.client.networks()
             if n['Name'].startswith('{}_'.format(self.project.name))
         ]
-
-        assert sorted(network_names) == [
-            '{}_{}'.format(self.project.name, name)
-            for name in ['bar', 'foo']
-        ]
+        assert network_names == []
 
     def test_up_with_links_v1(self):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['up', '-d', 'web'], None)
 
         # No network was created
-        networks = self.client.networks(names=[self.project.default_network.full_name])
+        network_name = self.project.networks.networks['default']
+        networks = self.client.networks(names=[network_name])
         assert networks == []
 
         web = self.project.get_service('web')
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 180c9df1..79644e59 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -565,6 +565,7 @@ class ProjectTest(DockerClientTestCase):
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top',
+                'networks': ['foo', 'bar', 'baz'],
             }],
             volumes={},
             networks={
@@ -594,7 +595,11 @@ class ProjectTest(DockerClientTestCase):
     def test_up_with_ipam_config(self):
         config_data = config.Config(
             version=V2_0,
-            services=[],
+            services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'networks': ['front'],
+            }],
             volumes={},
             networks={
                 'front': {

From e551988616021b50c8069b5d36a808afee5a8653 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 29 Jan 2016 16:30:24 -0500
Subject: [PATCH 0775/1265] Include networks in the config_hash.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/network.py                | 10 +++++++---
 compose/project.py                |  1 +
 compose/service.py                |  1 +
 tests/acceptance/cli_test.py      |  6 +++---
 tests/integration/project_test.py |  3 ++-
 tests/unit/service_test.py        |  8 +++++---
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/compose/network.py b/compose/network.py
index 36de4502..82a78f3b 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -136,7 +136,7 @@ class ProjectNetworks(object):
         service_networks = {
             network: networks.get(network)
             for service in services
-            for network in service.get('networks', ['default'])
+            for network in get_network_names_for_service(service)
         }
         unused = set(networks) - set(service_networks) - {'default'}
         if unused:
@@ -159,12 +159,15 @@ class ProjectNetworks(object):
             network.ensure()
 
 
-def get_networks(service_dict, network_definitions):
+def get_network_names_for_service(service_dict):
     if 'network_mode' in service_dict:
         return []
+    return service_dict.get('networks', ['default'])
 
+
+def get_networks(service_dict, network_definitions):
     networks = []
-    for name in service_dict.pop('networks', ['default']):
+    for name in get_network_names_for_service(service_dict):
         network = network_definitions.get(name)
         if network:
             networks.append(network.full_name)
@@ -172,4 +175,5 @@ def get_networks(service_dict, network_definitions):
             raise ConfigurationError(
                 'Service "{}" uses an undefined network "{}"'
                 .format(service_dict['name'], name))
+
     return networks
diff --git a/compose/project.py b/compose/project.py
index 291e32b1..a90ec2c3 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -96,6 +96,7 @@ class Project(object):
 
             project.services.append(
                 Service(
+                    service_dict.pop('name'),
                     client=client,
                     project=name,
                     use_networking=use_networking,
diff --git a/compose/service.py b/compose/service.py
index 2ca0e64d..e6aad3ae 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -472,6 +472,7 @@ class Service(object):
             'image_id': self.image()['Id'],
             'links': self.get_link_names(),
             'net': self.network_mode.id,
+            'networks': self.networks,
             'volumes_from': [
                 (v.source.name, v.mode)
                 for v in self.volumes_from if isinstance(v.source, Service)
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 6b9a28e5..032900d5 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -406,7 +406,7 @@ class CLITestCase(DockerClientTestCase):
 
         services = self.project.get_services()
 
-        network_name = self.project.networks.networks['default']
+        network_name = self.project.networks.networks['default'].full_name
         networks = self.client.networks(names=[network_name])
         self.assertEqual(len(networks), 1)
         self.assertEqual(networks[0]['Driver'], 'bridge')
@@ -440,7 +440,7 @@ class CLITestCase(DockerClientTestCase):
 
         self.dispatch(['-f', filename, 'up', '-d'], None)
 
-        network_name = self.project.networks.networks['default']
+        network_name = self.project.networks.networks['default'].full_name
         networks = self.client.networks(names=[network_name])
 
         assert networks[0]['Options']['com.docker.network.bridge.enable_icc'] == 'false'
@@ -596,7 +596,7 @@ class CLITestCase(DockerClientTestCase):
         self.dispatch(['up', '-d', 'web'], None)
 
         # No network was created
-        network_name = self.project.networks.networks['default']
+        network_name = self.project.networks.networks['default'].full_name
         networks = self.client.networks(names=[network_name])
         assert networks == []
 
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 79644e59..45bae2c3 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -832,7 +832,8 @@ class ProjectTest(DockerClientTestCase):
         )
         project = Project.from_config(
             name='composetest',
-            config_data=config_data, client=self.client
+            config_data=config_data,
+            client=self.client
         )
         with self.assertRaises(config.ConfigurationError) as e:
             project.initialize_volumes()
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 74e9f0f5..f34de3bf 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -266,7 +266,7 @@ class ServiceTest(unittest.TestCase):
 
         self.assertEqual(
             opts['labels'][LABEL_CONFIG_HASH],
-            '3c85881a8903b9d73a06c41860c8be08acce1494ab4cf8408375966dccd714de')
+            'f8bfa1058ad1f4231372a0b1639f0dfdb574dafff4e8d7938049ae993f7cf1fc')
         self.assertEqual(
             opts['environment'],
             {
@@ -417,9 +417,10 @@ class ServiceTest(unittest.TestCase):
             'options': {'image': 'example.com/foo'},
             'links': [('one', 'one')],
             'net': 'other',
+            'networks': [],
             'volumes_from': [('two', 'rw')],
         }
-        self.assertEqual(config_dict, expected)
+        assert config_dict == expected
 
     def test_config_dict_with_network_mode_from_container(self):
         self.mock_client.inspect_image.return_value = {'Id': 'abcd'}
@@ -437,10 +438,11 @@ class ServiceTest(unittest.TestCase):
             'image_id': 'abcd',
             'options': {'image': 'example.com/foo'},
             'links': [],
+            'networks': [],
             'net': 'aaabbb',
             'volumes_from': [],
         }
-        self.assertEqual(config_dict, expected)
+        assert config_dict == expected
 
     def test_remove_image_none(self):
         web = Service('web', image='example', client=self.mock_client)

From 3d3388d59ba94b074b38418fcec8da1ccddd7b58 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 29 Jan 2016 17:31:27 -0500
Subject: [PATCH 0776/1265] Extract volume init and removal from project.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/project.py                | 72 +++++--------------------------
 compose/volume.py                 | 70 ++++++++++++++++++++++++++++++
 tests/integration/project_test.py | 12 +++---
 3 files changed, 86 insertions(+), 68 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index a90ec2c3..62e1d2cd 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -6,7 +6,6 @@ import logging
 from functools import reduce
 
 from docker.errors import APIError
-from docker.errors import NotFound
 
 from . import parallel
 from .config import ConfigurationError
@@ -28,7 +27,7 @@ from .service import NetworkMode
 from .service import Service
 from .service import ServiceNetworkMode
 from .utils import microseconds_from_time_nano
-from .volume import Volume
+from .volume import ProjectVolumes
 
 
 log = logging.getLogger(__name__)
@@ -42,7 +41,7 @@ class Project(object):
         self.name = name
         self.services = services
         self.client = client
-        self.volumes = volumes or {}
+        self.volumes = volumes or ProjectVolumes({})
         self.networks = networks or ProjectNetworks({}, False)
 
     def labels(self, one_off=False):
@@ -62,16 +61,8 @@ class Project(object):
             config_data.services,
             networks,
             use_networking)
-        project = cls(name, [], client, project_networks)
-
-        if config_data.volumes:
-            for vol_name, data in config_data.volumes.items():
-                project.volumes[vol_name] = Volume(
-                    client=client, project=name, name=vol_name,
-                    driver=data.get('driver'),
-                    driver_opts=data.get('driver_opts'),
-                    external_name=data.get('external_name')
-                )
+        volumes = ProjectVolumes.from_config(name, config_data, client)
+        project = cls(name, [], client, project_networks, volumes)
 
         for service_dict in config_data.services:
             service_dict = dict(service_dict)
@@ -86,13 +77,10 @@ class Project(object):
             volumes_from = get_volumes_from(project, service_dict)
 
             if config_data.version != V1:
-                service_volumes = service_dict.get('volumes', [])
-                for volume_spec in service_volumes:
-                    if volume_spec.is_named_volume:
-                        declared_volume = project.volumes[volume_spec.external]
-                        service_volumes[service_volumes.index(volume_spec)] = (
-                            volume_spec._replace(external=declared_volume.full_name)
-                        )
+                service_dict['volumes'] = [
+                    volumes.namespace_spec(volume_spec)
+                    for volume_spec in service_dict.get('volumes', [])
+                ]
 
             project.services.append(
                 Service(
@@ -233,49 +221,13 @@ class Project(object):
     def remove_stopped(self, service_names=None, **options):
         parallel.parallel_remove(self.containers(service_names, stopped=True), options)
 
-    def initialize_volumes(self):
-        try:
-            for volume in self.volumes.values():
-                if volume.external:
-                    log.debug(
-                        'Volume {0} declared as external. No new '
-                        'volume will be created.'.format(volume.name)
-                    )
-                    if not volume.exists():
-                        raise ConfigurationError(
-                            'Volume {name} declared as external, but could'
-                            ' not be found. Please create the volume manually'
-                            ' using `{command}{name}` and try again.'.format(
-                                name=volume.full_name,
-                                command='docker volume create --name='
-                            )
-                        )
-                    continue
-                volume.create()
-        except NotFound:
-            raise ConfigurationError(
-                'Volume %s specifies nonexistent driver %s' % (volume.name, volume.driver)
-            )
-        except APIError as e:
-            if 'Choose a different volume name' in str(e):
-                raise ConfigurationError(
-                    'Configuration for volume {0} specifies driver {1}, but '
-                    'a volume with the same name uses a different driver '
-                    '({3}). If you wish to use the new configuration, please '
-                    'remove the existing volume "{2}" first:\n'
-                    '$ docker volume rm {2}'.format(
-                        volume.name, volume.driver, volume.full_name,
-                        volume.inspect()['Driver']
-                    )
-                )
-
     def down(self, remove_image_type, include_volumes):
         self.stop()
         self.remove_stopped(v=include_volumes)
         self.networks.remove()
 
         if include_volumes:
-            self.remove_volumes()
+            self.volumes.remove()
 
         self.remove_images(remove_image_type)
 
@@ -283,10 +235,6 @@ class Project(object):
         for service in self.get_services():
             service.remove_image(remove_image_type)
 
-    def remove_volumes(self):
-        for volume in self.volumes.values():
-            volume.remove()
-
     def restart(self, service_names=None, **options):
         containers = self.containers(service_names, stopped=True)
         parallel.parallel_restart(containers, options)
@@ -371,7 +319,7 @@ class Project(object):
 
     def initialize(self):
         self.networks.initialize()
-        self.initialize_volumes()
+        self.volumes.initialize()
 
     def _get_convergence_plans(self, services, strategy):
         plans = {}
diff --git a/compose/volume.py b/compose/volume.py
index 469e406a..2713fd32 100644
--- a/compose/volume.py
+++ b/compose/volume.py
@@ -3,8 +3,10 @@ from __future__ import unicode_literals
 
 import logging
 
+from docker.errors import APIError
 from docker.errors import NotFound
 
+from .config import ConfigurationError
 
 log = logging.getLogger(__name__)
 
@@ -50,3 +52,71 @@ class Volume(object):
         if self.external_name:
             return self.external_name
         return '{0}_{1}'.format(self.project, self.name)
+
+
+class ProjectVolumes(object):
+
+    def __init__(self, volumes):
+        self.volumes = volumes
+
+    @classmethod
+    def from_config(cls, name, config_data, client):
+        config_volumes = config_data.volumes or {}
+        volumes = {
+            vol_name: Volume(
+                    client=client,
+                    project=name,
+                    name=vol_name,
+                    driver=data.get('driver'),
+                    driver_opts=data.get('driver_opts'),
+                    external_name=data.get('external_name'))
+            for vol_name, data in config_volumes.items()
+        }
+        return cls(volumes)
+
+    def remove(self):
+        for volume in self.volumes.values():
+            volume.remove()
+
+    def initialize(self):
+        try:
+            for volume in self.volumes.values():
+                if volume.external:
+                    log.debug(
+                        'Volume {0} declared as external. No new '
+                        'volume will be created.'.format(volume.name)
+                    )
+                    if not volume.exists():
+                        raise ConfigurationError(
+                            'Volume {name} declared as external, but could'
+                            ' not be found. Please create the volume manually'
+                            ' using `{command}{name}` and try again.'.format(
+                                name=volume.full_name,
+                                command='docker volume create --name='
+                            )
+                        )
+                    continue
+                volume.create()
+        except NotFound:
+            raise ConfigurationError(
+                'Volume %s specifies nonexistent driver %s' % (volume.name, volume.driver)
+            )
+        except APIError as e:
+            if 'Choose a different volume name' in str(e):
+                raise ConfigurationError(
+                    'Configuration for volume {0} specifies driver {1}, but '
+                    'a volume with the same name uses a different driver '
+                    '({3}). If you wish to use the new configuration, please '
+                    'remove the existing volume "{2}" first:\n'
+                    '$ docker volume rm {2}'.format(
+                        volume.name, volume.driver, volume.full_name,
+                        volume.inspect()['Driver']
+                    )
+                )
+
+    def namespace_spec(self, volume_spec):
+        if not volume_spec.is_named_volume:
+            return volume_spec
+
+        volume = self.volumes[volume_spec.external]
+        return volume_spec._replace(external=volume.full_name)
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 45bae2c3..6bb076a3 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -749,7 +749,7 @@ class ProjectTest(DockerClientTestCase):
             name='composetest',
             config_data=config_data, client=self.client
         )
-        project.initialize_volumes()
+        project.volumes.initialize()
 
         volume_data = self.client.inspect_volume(full_vol_name)
         self.assertEqual(volume_data['Name'], full_vol_name)
@@ -800,7 +800,7 @@ class ProjectTest(DockerClientTestCase):
             config_data=config_data, client=self.client
         )
         with self.assertRaises(config.ConfigurationError):
-            project.initialize_volumes()
+            project.volumes.initialize()
 
     @v2_only()
     def test_initialize_volumes_updated_driver(self):
@@ -821,7 +821,7 @@ class ProjectTest(DockerClientTestCase):
             name='composetest',
             config_data=config_data, client=self.client
         )
-        project.initialize_volumes()
+        project.volumes.initialize()
 
         volume_data = self.client.inspect_volume(full_vol_name)
         self.assertEqual(volume_data['Name'], full_vol_name)
@@ -836,7 +836,7 @@ class ProjectTest(DockerClientTestCase):
             client=self.client
         )
         with self.assertRaises(config.ConfigurationError) as e:
-            project.initialize_volumes()
+            project.volumes.initialize()
         assert 'Configuration for volume {0} specifies driver smb'.format(
             vol_name
         ) in str(e.exception)
@@ -863,7 +863,7 @@ class ProjectTest(DockerClientTestCase):
             name='composetest',
             config_data=config_data, client=self.client
         )
-        project.initialize_volumes()
+        project.volumes.initialize()
 
         with self.assertRaises(NotFound):
             self.client.inspect_volume(full_vol_name)
@@ -889,7 +889,7 @@ class ProjectTest(DockerClientTestCase):
             config_data=config_data, client=self.client
         )
         with self.assertRaises(config.ConfigurationError) as e:
-            project.initialize_volumes()
+            project.volumes.initialize()
         assert 'Volume {0} declared as external'.format(
             vol_name
         ) in str(e.exception)

From 2651c00f0c6255798c7e39a0407cd2357cd37b25 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 2 Feb 2016 19:31:49 +0000
Subject: [PATCH 0777/1265] Connect container to networks before starting it

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/service.py b/compose/service.py
index e6aad3ae..652ee794 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -424,8 +424,8 @@ class Service(object):
             return self.start_container(container)
 
     def start_container(self, container):
-        container.start()
         self.connect_container_to_networks(container)
+        container.start()
         return container
 
     def connect_container_to_networks(self, container):

From a713447e0b746838ebaed192cadd4cbd3caba2af Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Tue, 2 Feb 2016 12:04:13 -0800
Subject: [PATCH 0778/1265] Fixing duplicate identifiers

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/faq.md            | 1 +
 docs/reference/down.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/faq.md b/docs/faq.md
index 8fa629de..73596c18 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -4,6 +4,7 @@ title = "Frequently Asked Questions"
 description = "Docker Compose FAQ"
 keywords = "documentation, docs,  docker, compose, faq"
 [menu.main]
+identifier="faq.compose"
 parent="workw_compose"
 weight=90
 +++
diff --git a/docs/reference/down.md b/docs/reference/down.md
index 428e4e58..2495abea 100644
--- a/docs/reference/down.md
+++ b/docs/reference/down.md
@@ -4,7 +4,7 @@ title = "down"
 description = "down"
 keywords = ["fig, composition, compose, docker, orchestration, cli,  down"]
 [menu.main]
-identifier="build.compose"
+identifier="down.compose"
 parent = "smn_compose_cli"
 +++
 <![end-metadata]-->

From f612bc98d9da19e5b1b75a8239dd138c9d146c27 Mon Sep 17 00:00:00 2001
From: Spencer Rinehart <anubis@overthemonkey.com>
Date: Wed, 3 Feb 2016 14:34:36 -0600
Subject: [PATCH 0779/1265] Fix example formatting for depends_on.

Markdown was acting against expectations here by merging the example indented YAML into the previous list item instead of treating it as a code block.

I decided that a better way of handling this would be to add a "Simple example:" line that is also used elsewhere in this file.  It resets the markdown indentation in a way that works.

Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
---
 docs/compose-file.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index e5326566..c8f55992 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -181,6 +181,8 @@ Express dependency between services, which has two effects:
   dependencies. In the following example, `docker-compose up web` will also
   create and start `db` and `redis`.
 
+Simple example:
+
     version: 2
     services:
       web:

From bdddbe3a73266dd42d2f2baaa2c008aebc3b089e Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Wed, 3 Feb 2016 17:42:57 -0800
Subject: [PATCH 0780/1265] Improve names in Compose file 2 example

Just makes it a bit clearer what's going on.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 docs/compose-file.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index e5326566..b86a8b45 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -862,21 +862,21 @@ A more extended example, defining volumes and networks:
         volumes:
          - .:/code
         networks:
-          - front
-          - back
+          - front-tier
+          - back-tier
       redis:
         image: redis
         volumes:
-          - data:/var/lib/redis
+          - redis-data:/var/lib/redis
         networks:
-          - back
+          - back-tier
     volumes:
-      data:
+      redis-data:
         driver: local
     networks:
-      front:
+      front-tier:
         driver: bridge
-      back:
+      back-tier:
         driver: bridge
 
 

From a7c298799130a8eb07844bd4ecbb7b7dc461b7f7 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 4 Feb 2016 12:17:20 -0500
Subject: [PATCH 0781/1265] Update docs for version being a string.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/compose-file.md | 16 ++++++++--------
 docs/networking.md   |  8 ++++----
 docs/overview.md     |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index c8f55992..0b7c6dcb 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -183,7 +183,7 @@ Express dependency between services, which has two effects:
 
 Simple example:
 
-    version: 2
+    version: '2'
     services:
       web:
         build: .
@@ -658,7 +658,7 @@ In the example below, instead of attemping to create a volume called
 `[projectname]_data`, Compose will look for an existing volume simply
 called `data` and mount it into the `db` service's containers.
 
-    version: 2
+    version: '2'
 
     services:
       db:
@@ -748,7 +748,7 @@ attemping to create a network called `[projectname]_outside`, Compose will
 look for an existing network simply called `outside` and connect the `proxy`
 service's containers to it.
 
-    version: 2
+    version: '2'
 
     services:
       proxy:
@@ -780,7 +780,7 @@ There are two versions of the Compose file format:
 
 - Version 1, the legacy format. This is specified by omitting a `version` key at
   the root of the YAML.
-- Version 2, the recommended format. This is specified with a `version: 2` entry
+- Version 2, the recommended format. This is specified with a `version: '2'` entry
   at the root of the YAML.
 
 To move your project from version 1 to 2, see the [Upgrading](#upgrading)
@@ -842,7 +842,7 @@ under the `networks` key.
 
 Simple example:
 
-    version: 2
+    version: '2'
     services:
       web:
         build: .
@@ -855,7 +855,7 @@ Simple example:
 
 A more extended example, defining volumes and networks:
 
-    version: 2
+    version: '2'
     services:
       web:
         build: .
@@ -887,7 +887,7 @@ A more extended example, defining volumes and networks:
 In the majority of cases, moving from version 1 to 2 is a very simple process:
 
 1. Indent the whole file by one level and put a `services:` key at the top.
-2. Add a `version: 2` line at the top of the file.
+2. Add a `version: '2'` line at the top of the file.
 
 It's more complicated if you're using particular configuration features:
 
@@ -950,7 +950,7 @@ It's more complicated if you're using particular configuration features:
     named volume called `data`, you must declare a `data` volume in your
     top-level `volumes` section. The whole file might look like this:
 
-        version: 2
+        version: '2'
         services:
           db:
             image: postgres
diff --git a/docs/networking.md b/docs/networking.md
index 7d819d18..d625ca19 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -28,7 +28,7 @@ identical to the container name.
 
 For example, suppose your app is in a directory called `myapp`, and your `docker-compose.yml` looks like this:
 
-    version: 2
+    version: '2'
 
     services:
       web:
@@ -63,7 +63,7 @@ If any containers have connections open to the old container, they will be close
 
 Links allow you to define extra aliases by which a service is reachable from another service. They are not required to enable services to communicate - by default, any service can reach any other service at that service's name. In the following example, `db` is reachable from `web` at the hostnames `db` and `database`:
 
-    version: 2
+    version: '2'
     services:
       web:
         build: .
@@ -86,7 +86,7 @@ Each service can specify what networks to connect to with the *service-level* `n
 
 Here's an example Compose file defining two custom networks. The `proxy` service is isolated from the `db` service, because they do not share a network in common - only `app` can talk to both.
 
-    version: 2
+    version: '2'
 
     services:
       proxy:
@@ -123,7 +123,7 @@ For full details of the network configuration options available, see the followi
 
 Instead of (or as well as) specifying your own networks, you can also change the settings of the app-wide default network by defining an entry under `networks` named `default`:
 
-    version: 2
+    version: '2'
 
     services:
       web:
diff --git a/docs/overview.md b/docs/overview.md
index f837d82f..bb3c5d71 100644
--- a/docs/overview.md
+++ b/docs/overview.md
@@ -32,7 +32,7 @@ they can be run together in an isolated environment.
 
 A `docker-compose.yml` looks like this:
 
-    version: 2
+    version: '2'
     services:
       web:
         build: .

From be236d88013b26d21a91f11afb1ceff748a24a89 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 4 Feb 2016 16:01:11 +0000
Subject: [PATCH 0782/1265] Update docker-py and dockerpty

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py    | 5 +++--
 requirements.txt       | 4 ++--
 setup.py               | 4 ++--
 tests/unit/cli_test.py | 5 +++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 5121d5c3..deb1e912 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -42,7 +42,7 @@ from .utils import yesno
 
 
 if not IS_WINDOWS_PLATFORM:
-    from dockerpty.pty import PseudoTerminal
+    from dockerpty.pty import PseudoTerminal, RunOperation
 
 log = logging.getLogger(__name__)
 console_handler = logging.StreamHandler(sys.stderr)
@@ -712,12 +712,13 @@ def run_one_off_container(container_options, project, service, options):
     signals.set_signal_handler_to_shutdown()
     try:
         try:
-            pty = PseudoTerminal(
+            operation = RunOperation(
                 project.client,
                 container.id,
                 interactive=not options['-T'],
                 logs=False,
             )
+            pty = PseudoTerminal(project.client, operation)
             sockets = pty.sockets()
             service.start_container(container)
             pty.start(sockets)
diff --git a/requirements.txt b/requirements.txt
index 68ef9f35..3fdd34ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 PyYAML==3.11
 cached-property==1.2.0
-docker-py==1.7.0rc3
+docker-py==1.7.0
+dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
-git+https://github.com/d11wtq/dockerpty.git@29b1394108b017ef3e3deaf00604a9eb99880d5e#egg=dockerpty
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3
diff --git a/setup.py b/setup.py
index b365e05b..df4172ce 100644
--- a/setup.py
+++ b/setup.py
@@ -34,8 +34,8 @@ install_requires = [
     'requests >= 2.6.1, < 2.8',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.5.0, < 2',
-    'dockerpty >= 0.3.4, < 0.4',
+    'docker-py >= 1.7.0, < 2',
+    'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',
 ]
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index fec7cdba..69236e2e 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -79,8 +79,9 @@ class CLITestCase(unittest.TestCase):
             TopLevelCommand().dispatch(['help', 'nonexistent'], None)
 
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason="requires dockerpty")
+    @mock.patch('compose.cli.main.RunOperation', autospec=True)
     @mock.patch('compose.cli.main.PseudoTerminal', autospec=True)
-    def test_run_interactive_passes_logs_false(self, mock_pseudo_terminal):
+    def test_run_interactive_passes_logs_false(self, mock_pseudo_terminal, mock_run_operation):
         command = TopLevelCommand()
         mock_client = mock.create_autospec(docker.Client)
         mock_project = mock.Mock(client=mock_client)
@@ -106,7 +107,7 @@ class CLITestCase(unittest.TestCase):
                 '--name': None,
             })
 
-        _, _, call_kwargs = mock_pseudo_terminal.mock_calls[0]
+        _, _, call_kwargs = mock_run_operation.mock_calls[0]
         assert call_kwargs['logs'] is False
 
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason="requires dockerpty")

From 869e815213569cec8592c6d0529104489ba557f2 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 4 Feb 2016 23:46:41 +0000
Subject: [PATCH 0783/1265] Bump 1.7.0dev

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 CHANGELOG.md        | 117 ++++++++++++++++++++++++++++++++++++++++++++
 compose/__init__.py |   2 +-
 docs/install.md     |   4 +-
 3 files changed, 120 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79aee75f..d115f05d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,123 @@
 Change log
 ==========
 
+1.6.0 (2016-01-15)
+------------------
+
+Major Features:
+
+-   Compose 1.6 introduces a new format for `docker-compose.yml` which lets
+    you define networks and volumes in the Compose file as well as services. It
+    also makes a few changes to the structure of some configuration options.
+
+    You don't have to use it - your existing Compose files will run on Compose
+    1.6 exactly as they do today.
+
+    Check the upgrade guide for full details:
+    https://docs.docker.com/compose/compose-file/upgrading
+
+-   Support for networking has exited experimental status and is the recommended
+    way to enable communication between containers.
+
+    If you use the new file format, your app will use networking. If you aren't
+    ready yet, just leave your Compose file as it is and it'll continue to work
+    just the same.
+
+    By default, you don't have to configure any networks. In fact, using
+    networking with Compose involves even less configuration than using links.
+    Consult the networking guide for how to use it:
+    https://docs.docker.com/compose/networking
+
+    The experimental flags `--x-networking` and `--x-network-driver`, introduced
+    in Compose 1.5, have been removed.
+
+-   You can now pass arguments to a build if you're using the new file format:
+
+        build:
+          context: .
+          args:
+            buildno: 1
+
+-   You can now specify both a `build` and an `image` key if you're using the
+    new file format. `docker-compose build` will build the image and tag it with
+    the name you've specified, while `docker-compose pull` will attempt to pull
+    it.
+
+-   There's a new `events` command for monitoring container events from
+    the application, much like `docker events`. This is a good primitive for
+    building tools on top of Compose for performing actions when particular
+    things happen, such as containers starting and stopping.
+
+-   There's a new `depends_on` option for specifying dependencies between
+    services. This enforces the order of startup, and ensures that when you run
+    `docker-compose up SERVICE` on a service with dependencies, those are started
+    as well.
+
+New Features:
+
+-   Added a new command `config` which validates and prints the Compose
+    configuration after interpolating variables, resolving relative paths, and
+    merging multiple files and `extends`.
+
+-   Added a new command `create` for creating containers without starting them.
+
+-   Added a new command `down` to stop and remove all the resources created by
+    `up` in a single command.
+
+-   Added support for the `cpu_quota` configuration option.
+
+-   Added support for the `stop_signal` configuration option.
+
+-   Commands `start`, `restart`, `pause`, and `unpause` now exit with an
+    error status code if no containers were modified.
+
+-   Added a new `--abort-on-container-exit` flag to `up` which causes `up` to
+    stop all container and exit once the first container exits.
+
+-   Removed support for `FIG_FILE`, `FIG_PROJECT_NAME`, and no longer reads
+    `fig.yml` as a default Compose file location.
+
+-   Removed the `migrate-to-labels` command.
+
+-   Removed the `--allow-insecure-ssl` flag.
+
+
+Bug Fixes:
+
+-   Fixed a validation bug that prevented the use of a range of ports in
+    the `expose` field.
+
+-   Fixed a validation bug that prevented the use of arrays in the `entrypoint`
+    field if they contained duplicate entries.
+
+-   Fixed a bug that caused `ulimits` to be ignored when used with `extends`.
+
+-   Fixed a bug that prevented ipv6 addresses in `extra_hosts`.
+
+-   Fixed a bug that caused `extends` to be ignored when included from
+    multiple Compose files.
+
+-   Fixed an incorrect warning when a container volume was defined in
+    the Compose file.
+
+-   Fixed a bug that prevented the force shutdown behaviour of `up` and
+    `logs`.
+
+-   Fixed a bug that caused `None` to be printed as the network driver name
+    when the default network driver was used.
+
+-   Fixed a bug where using the string form of `dns` or `dns_search` would
+    cause an error.
+
+-   Fixed a bug where a container would be reported as "Up" when it was
+    in the restarting state.
+
+-   Fixed a confusing error message when DOCKER_CERT_PATH was not set properly.
+
+-   Fixed a bug where attaching to a container would fail if it was using a
+    non-standard logging driver (or none at all).
+
+
 1.5.2 (2015-12-03)
 ------------------
 
diff --git a/compose/__init__.py b/compose/__init__.py
index 3ba90fde..fedc90ff 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.6.0dev'
+__version__ = '1.7.0dev'
diff --git a/docs/install.md b/docs/install.md
index 3aaca8fa..cc3890f9 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -18,7 +18,7 @@ first.
 
 To install Compose, do the following:
 
-1. Install Docker Engine version 1.7.1 or greater:
+1. Install Docker Engine:
 
      * <a href="https://docs.docker.com/engine/installation/mac/" target="_blank">Mac OS X installation</a> (Toolbox installation includes both Engine and Compose)
 
@@ -39,7 +39,7 @@ which the release page specifies, in your terminal.
 
      The following is an example command illustrating the format:
 
-        curl -L https://github.com/docker/compose/releases/download/1.5.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+        curl -L https://github.com/docker/compose/releases/download/1.6.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 
      If you have problems installing with `curl`, see
      [Alternative Install Options](#alternative-install-options).

From 57fc85b457f31f17a9ce40d2b4546b1bc6a072d0 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 10 Nov 2015 15:26:04 -0500
Subject: [PATCH 0784/1265] Wrap long lines and restrict lines to 105
 characters.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/docker_client.py      |  8 ++++---
 compose/cli/main.py               |  8 ++++---
 compose/config/errors.py          |  3 ++-
 compose/service.py                |  4 +++-
 tests/acceptance/cli_test.py      |  7 +++++-
 tests/integration/project_test.py | 19 +++++++++------
 tests/integration/service_test.py | 14 +++++++----
 tests/unit/config/config_test.py  | 39 ++++++++++++++++++++----------
 tests/unit/container_test.py      |  4 +++-
 tests/unit/service_test.py        | 40 ++++++++++++++++++++++++-------
 tox.ini                           |  3 +--
 11 files changed, 106 insertions(+), 43 deletions(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index b680616e..9e79fe77 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -20,14 +20,16 @@ def docker_client(version=None):
     according to the same logic as the official Docker client.
     """
     if 'DOCKER_CLIENT_TIMEOUT' in os.environ:
-        log.warn('The DOCKER_CLIENT_TIMEOUT environment variable is deprecated. Please use COMPOSE_HTTP_TIMEOUT instead.')
+        log.warn("The DOCKER_CLIENT_TIMEOUT environment variable is deprecated.  "
+                 "Please use COMPOSE_HTTP_TIMEOUT instead.")
 
     try:
         kwargs = kwargs_from_env(assert_hostname=False)
     except TLSParameterError:
         raise UserError(
-            'TLS configuration is invalid - make sure your DOCKER_TLS_VERIFY and DOCKER_CERT_PATH are set correctly.\n'
-            'You might need to run `eval "$(docker-machine env default)"`')
+            "TLS configuration is invalid - make sure your DOCKER_TLS_VERIFY "
+            "and DOCKER_CERT_PATH are set correctly.\n"
+            "You might need to run `eval \"$(docker-machine env default)\"`")
 
     if version:
         kwargs['version'] = version
diff --git a/compose/cli/main.py b/compose/cli/main.py
index deb1e912..282feebe 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -77,9 +77,11 @@ def main():
         sys.exit(1)
     except ReadTimeout as e:
         log.error(
-            "An HTTP request took too long to complete. Retry with --verbose to obtain debug information.\n"
-            "If you encounter this issue regularly because of slow network conditions, consider setting "
-            "COMPOSE_HTTP_TIMEOUT to a higher value (current value: %s)." % HTTP_TIMEOUT
+            "An HTTP request took too long to complete. Retry with --verbose to "
+            "obtain debug information.\n"
+            "If you encounter this issue regularly because of slow network "
+            "conditions, consider setting COMPOSE_HTTP_TIMEOUT to a higher "
+            "value (current value: %s)." % HTTP_TIMEOUT
         )
         sys.exit(1)
 
diff --git a/compose/config/errors.py b/compose/config/errors.py
index f94ac7ac..d5df7ae5 100644
--- a/compose/config/errors.py
+++ b/compose/config/errors.py
@@ -38,7 +38,8 @@ class CircularReference(ConfigurationError):
 class ComposeFileNotFound(ConfigurationError):
     def __init__(self, supported_filenames):
         super(ComposeFileNotFound, self).__init__("""
-        Can't find a suitable configuration file in this directory or any parent. Are you in the right directory?
+        Can't find a suitable configuration file in this directory or any
+        parent. Are you in the right directory?
 
         Supported filenames: %s
         """ % ", ".join(supported_filenames))
diff --git a/compose/service.py b/compose/service.py
index 652ee794..16582c19 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -195,7 +195,9 @@ class Service(object):
 
             if num_running != len(all_containers):
                 # we have some stopped containers, let's start them up again
-                stopped_containers = sorted([c for c in all_containers if not c.is_running], key=attrgetter('number'))
+                stopped_containers = sorted(
+                    (c for c in all_containers if not c.is_running),
+                    key=attrgetter('number'))
 
                 num_stopped = len(stopped_containers)
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 032900d5..56c4ce8d 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -887,7 +887,12 @@ class CLITestCase(DockerClientTestCase):
     def test_run_service_with_explicitly_maped_ip_ports(self):
         # create one off container
         self.base_dir = 'tests/fixtures/ports-composefile'
-        self.dispatch(['run', '-d', '-p', '127.0.0.1:30000:3000', '--publish', '127.0.0.1:30001:3001', 'simple'], None)
+        self.dispatch([
+            'run', '-d',
+            '-p', '127.0.0.1:30000:3000',
+            '--publish', '127.0.0.1:30001:3001',
+            'simple'
+        ])
         container = self.project.get_service('simple').containers(one_off=True)[0]
 
         # get port information
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 6bb076a3..6091bb22 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -242,19 +242,24 @@ class ProjectTest(DockerClientTestCase):
         db_container = db.create_container()
 
         project.start(service_names=['web'])
-        self.assertEqual(set(c.name for c in project.containers()), set([web_container_1.name, web_container_2.name]))
+        self.assertEqual(
+            set(c.name for c in project.containers()),
+            set([web_container_1.name, web_container_2.name]))
 
         project.start()
-        self.assertEqual(set(c.name for c in project.containers()),
-                         set([web_container_1.name, web_container_2.name, db_container.name]))
+        self.assertEqual(
+            set(c.name for c in project.containers()),
+            set([web_container_1.name, web_container_2.name, db_container.name]))
 
         project.pause(service_names=['web'])
-        self.assertEqual(set([c.name for c in project.containers() if c.is_paused]),
-                         set([web_container_1.name, web_container_2.name]))
+        self.assertEqual(
+            set([c.name for c in project.containers() if c.is_paused]),
+            set([web_container_1.name, web_container_2.name]))
 
         project.pause()
-        self.assertEqual(set([c.name for c in project.containers() if c.is_paused]),
-                         set([web_container_1.name, web_container_2.name, db_container.name]))
+        self.assertEqual(
+            set([c.name for c in project.containers() if c.is_paused]),
+            set([web_container_1.name, web_container_2.name, db_container.name]))
 
         project.unpause(service_names=['db'])
         self.assertEqual(len([c.name for c in project.containers() if c.is_paused]), 2)
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 189eb9da..65428b7d 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -128,7 +128,7 @@ class ServiceTest(DockerClientTestCase):
         service = self.create_service('db', read_only=read_only)
         container = service.create_container()
         service.start_container(container)
-        self.assertEqual(container.get('HostConfig.ReadonlyRootfs'), read_only, container.get('HostConfig'))
+        assert container.get('HostConfig.ReadonlyRootfs') == read_only
 
     def test_create_container_with_security_opt(self):
         security_opt = ['label:disable']
@@ -378,7 +378,9 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(len(service.containers()), 0)
         self.assertEqual(len(service.containers(stopped=True)), 1)
 
-        containers = service.execute_convergence_plan(ConvergencePlan('recreate', containers), start=False)
+        containers = service.execute_convergence_plan(
+            ConvergencePlan('recreate', containers),
+            start=False)
         self.assertEqual(len(service.containers()), 0)
         self.assertEqual(len(service.containers(stopped=True)), 1)
 
@@ -769,7 +771,9 @@ class ServiceTest(DockerClientTestCase):
         containers = service.containers()
         self.assertEqual(len(containers), 2)
         for container in containers:
-            self.assertEqual(list(container.inspect()['HostConfig']['PortBindings'].keys()), ['8000/tcp'])
+            self.assertEqual(
+                list(container.get('HostConfig.PortBindings')),
+                ['8000/tcp'])
 
     def test_scale_with_immediate_exit(self):
         service = self.create_service('web', image='busybox', command='true')
@@ -846,7 +850,9 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(container.get('Config.WorkingDir'), '/working/dir/sample')
 
     def test_split_env(self):
-        service = self.create_service('web', environment=['NORMAL=F1', 'CONTAINS_EQUALS=F=2', 'TRAILING_EQUALS='])
+        service = self.create_service(
+            'web',
+            environment=['NORMAL=F1', 'CONTAINS_EQUALS=F=2', 'TRAILING_EQUALS='])
         env = create_and_start_container(service).environment
         for k, v in {'NORMAL': 'F1', 'CONTAINS_EQUALS': 'F=2', 'TRAILING_EQUALS': ''}.items():
             self.assertEqual(env[k], v)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 8c9b73dc..0b3b0c75 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1469,24 +1469,42 @@ class VolumeConfigTest(unittest.TestCase):
 
     @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='posix paths')
     def test_relative_path_does_expand_posix(self):
-        d = make_service_dict('foo', {'build': '.', 'volumes': ['./data:/data']}, working_dir='/home/me/myproject')
+        d = make_service_dict(
+            'foo',
+            {'build': '.', 'volumes': ['./data:/data']},
+            working_dir='/home/me/myproject')
         self.assertEqual(d['volumes'], ['/home/me/myproject/data:/data'])
 
-        d = make_service_dict('foo', {'build': '.', 'volumes': ['.:/data']}, working_dir='/home/me/myproject')
+        d = make_service_dict(
+            'foo',
+            {'build': '.', 'volumes': ['.:/data']},
+            working_dir='/home/me/myproject')
         self.assertEqual(d['volumes'], ['/home/me/myproject:/data'])
 
-        d = make_service_dict('foo', {'build': '.', 'volumes': ['../otherproject:/data']}, working_dir='/home/me/myproject')
+        d = make_service_dict(
+            'foo',
+            {'build': '.', 'volumes': ['../otherproject:/data']},
+            working_dir='/home/me/myproject')
         self.assertEqual(d['volumes'], ['/home/me/otherproject:/data'])
 
     @pytest.mark.skipif(not IS_WINDOWS_PLATFORM, reason='windows paths')
     def test_relative_path_does_expand_windows(self):
-        d = make_service_dict('foo', {'build': '.', 'volumes': ['./data:/data']}, working_dir='c:\\Users\\me\\myproject')
+        d = make_service_dict(
+            'foo',
+            {'build': '.', 'volumes': ['./data:/data']},
+            working_dir='c:\\Users\\me\\myproject')
         self.assertEqual(d['volumes'], ['c:\\Users\\me\\myproject\\data:/data'])
 
-        d = make_service_dict('foo', {'build': '.', 'volumes': ['.:/data']}, working_dir='c:\\Users\\me\\myproject')
+        d = make_service_dict(
+            'foo',
+            {'build': '.', 'volumes': ['.:/data']},
+            working_dir='c:\\Users\\me\\myproject')
         self.assertEqual(d['volumes'], ['c:\\Users\\me\\myproject:/data'])
 
-        d = make_service_dict('foo', {'build': '.', 'volumes': ['../otherproject:/data']}, working_dir='c:\\Users\\me\\myproject')
+        d = make_service_dict(
+            'foo',
+            {'build': '.', 'volumes': ['../otherproject:/data']},
+            working_dir='c:\\Users\\me\\myproject')
         self.assertEqual(d['volumes'], ['c:\\Users\\me\\otherproject:/data'])
 
     @mock.patch.dict(os.environ)
@@ -2354,14 +2372,11 @@ class VolumePathTest(unittest.TestCase):
 
     @pytest.mark.xfail((not IS_WINDOWS_PLATFORM), reason='does not have a drive')
     def test_split_path_mapping_with_windows_path(self):
-        windows_volume_path = "c:\\Users\\msamblanet\\Documents\\anvil\\connect\\config:/opt/connect/config:ro"
-        expected_mapping = (
-            "/opt/connect/config:ro",
-            "c:\\Users\\msamblanet\\Documents\\anvil\\connect\\config"
-        )
+        host_path = "c:\\Users\\msamblanet\\Documents\\anvil\\connect\\config"
+        windows_volume_path = host_path + ":/opt/connect/config:ro"
+        expected_mapping = ("/opt/connect/config:ro", host_path)
 
         mapping = config.split_path_mapping(windows_volume_path)
-
         self.assertEqual(mapping, expected_mapping)
 
 
diff --git a/tests/unit/container_test.py b/tests/unit/container_test.py
index 88691150..e71defdd 100644
--- a/tests/unit/container_test.py
+++ b/tests/unit/container_test.py
@@ -148,7 +148,9 @@ class GetContainerNameTestCase(unittest.TestCase):
     def test_get_container_name(self):
         self.assertIsNone(get_container_name({}))
         self.assertEqual(get_container_name({'Name': 'myproject_db_1'}), 'myproject_db_1')
-        self.assertEqual(get_container_name({'Names': ['/myproject_db_1', '/myproject_web_1/db']}), 'myproject_db_1')
+        self.assertEqual(
+            get_container_name({'Names': ['/myproject_db_1', '/myproject_web_1/db']}),
+            'myproject_db_1')
         self.assertEqual(
             get_container_name({
                 'Names': [
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index f34de3bf..5a2a88ce 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -146,7 +146,13 @@ class ServiceTest(unittest.TestCase):
     def test_memory_swap_limit(self):
         self.mock_client.create_host_config.return_value = {}
 
-        service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, mem_limit=1000000000, memswap_limit=2000000000)
+        service = Service(
+            name='foo',
+            image='foo',
+            hostname='name',
+            client=self.mock_client,
+            mem_limit=1000000000,
+            memswap_limit=2000000000)
         service._get_container_create_options({'some': 'overrides'}, 1)
 
         self.assertTrue(self.mock_client.create_host_config.called)
@@ -162,7 +168,12 @@ class ServiceTest(unittest.TestCase):
     def test_cgroup_parent(self):
         self.mock_client.create_host_config.return_value = {}
 
-        service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, cgroup_parent='test')
+        service = Service(
+            name='foo',
+            image='foo',
+            hostname='name',
+            client=self.mock_client,
+            cgroup_parent='test')
         service._get_container_create_options({'some': 'overrides'}, 1)
 
         self.assertTrue(self.mock_client.create_host_config.called)
@@ -176,7 +187,13 @@ class ServiceTest(unittest.TestCase):
 
         log_opt = {'syslog-address': 'tcp://192.168.0.42:123'}
         logging = {'driver': 'syslog', 'options': log_opt}
-        service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, logging=logging)
+        service = Service(
+            name='foo',
+            image='foo',
+            hostname='name',
+            client=self.mock_client,
+            log_driver='syslog',
+            logging=logging)
         service._get_container_create_options({'some': 'overrides'}, 1)
 
         self.assertTrue(self.mock_client.create_host_config.called)
@@ -348,11 +365,18 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(parse_repository_tag("user/repo"), ("user/repo", "", ":"))
         self.assertEqual(parse_repository_tag("user/repo:tag"), ("user/repo", "tag", ":"))
         self.assertEqual(parse_repository_tag("url:5000/repo"), ("url:5000/repo", "", ":"))
-        self.assertEqual(parse_repository_tag("url:5000/repo:tag"), ("url:5000/repo", "tag", ":"))
-
-        self.assertEqual(parse_repository_tag("root@sha256:digest"), ("root", "sha256:digest", "@"))
-        self.assertEqual(parse_repository_tag("user/repo@sha256:digest"), ("user/repo", "sha256:digest", "@"))
-        self.assertEqual(parse_repository_tag("url:5000/repo@sha256:digest"), ("url:5000/repo", "sha256:digest", "@"))
+        self.assertEqual(
+            parse_repository_tag("url:5000/repo:tag"),
+            ("url:5000/repo", "tag", ":"))
+        self.assertEqual(
+            parse_repository_tag("root@sha256:digest"),
+            ("root", "sha256:digest", "@"))
+        self.assertEqual(
+            parse_repository_tag("user/repo@sha256:digest"),
+            ("user/repo", "sha256:digest", "@"))
+        self.assertEqual(
+            parse_repository_tag("url:5000/repo@sha256:digest"),
+            ("url:5000/repo", "sha256:digest", "@"))
 
     def test_create_container_with_build(self):
         service = Service('foo', client=self.mock_client, build={'context': '.'})
diff --git a/tox.ini b/tox.ini
index dc85bc6d..5e89c037 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,8 +42,7 @@ directory = coverage-html
 # end coverage configuration
 
 [flake8]
-# Allow really long lines for now
-max-line-length = 140
+max-line-length = 105
 # Set this high for now
 max-complexity = 12
 exclude = compose/packages

From b6356471054f5115c57109cc2035fca6a6bb5189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Bistuer?= <loic.bistuer@gmail.com>
Date: Fri, 5 Feb 2016 09:42:59 +0700
Subject: [PATCH 0785/1265] Fixed typo in compose-file.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Loïc Bistuer <loic.bistuer@gmail.com>
---
 docs/compose-file.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index ec90ddcd..e0d447a5 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -645,7 +645,7 @@ documentation for more information. Optional.
        foo: "bar"
        baz: 1
 
-## external
+### external
 
 If set to `true`, specifies that this volume has been created outside of
 Compose. `docker-compose up` will not attempt to create it, and will raise

From 8acb5e17e8caf26f73d4e0a600650140f713eb43 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 25 Jan 2016 14:32:43 +0000
Subject: [PATCH 0786/1265] Add pytest section to tox.ini

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tox.ini | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index dc85bc6d..a18bfda7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ deps =
     -rrequirements.txt
     -rrequirements-dev.txt
 commands =
-    py.test -v -rxs \
+    py.test -v \
         --cov=compose \
         --cov-report html \
         --cov-report term \
@@ -47,3 +47,6 @@ max-line-length = 140
 # Set this high for now
 max-complexity = 12
 exclude = compose/packages
+
+[pytest]
+addopts = --tb=short -rxs

From 677c50650c86b4b6fabbc21e18165f2117022bbe Mon Sep 17 00:00:00 2001
From: jrabbit <jackjrabbit@gmail.com>
Date: Sat, 6 Feb 2016 02:54:06 -0500
Subject: [PATCH 0787/1265] Change special case from '_', None to ()

Signed-off-by: jrabbit <jackjrabbit@gmail.com>
---
 compose/config/config.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 2e4e036c..2eb3f2af 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -464,18 +464,12 @@ def resolve_environment(service_dict):
         env.update(env_vars_from_file(env_file))
 
     env.update(parse_environment(service_dict.get('environment')))
-    d = dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
-    if '_' in d.keys():
-        del d['_']
-    return d
+    return dict(filter(None, (resolve_env_var(k, v) for k, v in six.iteritems(env))))
 
 
 def resolve_build_args(build):
     args = parse_build_arguments(build.get('args'))
-    d = dict(resolve_env_var(k, v) for k, v in six.iteritems(args))
-    if '_' in d.keys():
-        del d['_']
-    return d
+    return dict(filter(None, (resolve_env_var(k, v) for k, v in six.iteritems(args))))
 
 
 def validate_extended_service_dict(service_dict, filename, service):
@@ -736,7 +730,7 @@ def resolve_env_var(key, val):
     elif key in os.environ:
         return key, os.environ[key]
     else:
-        return "_", None
+        return ()
 
 
 def env_vars_from_file(filename):

From e929086c49225c9dcbd723eab80861059a5c7271 Mon Sep 17 00:00:00 2001
From: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
Date: Mon, 8 Feb 2016 14:29:03 +0100
Subject: [PATCH 0788/1265] Separate MergePortsTest from MergeListsTest and add
 MergeNetworksTest.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
---
 tests/unit/config/config_test.py | 52 ++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 8c9b73dc..0fe1307e 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1594,30 +1594,64 @@ class BuildOrImageMergeTest(unittest.TestCase):
         )
 
 
-class MergeListsTest(unittest.TestCase):
+class MergeListsTest(object):
+    def config_name(self):
+        return ""
+
+    def base_config(self):
+        return []
+
+    def override_config(self):
+        return []
+
+    def merged_config(self):
+        return set(self.base_config()) | set(self.override_config())
+
     def test_empty(self):
-        assert 'ports' not in config.merge_service_dicts({}, {}, DEFAULT_VERSION)
+        assert self.config_name() not in config.merge_service_dicts({}, {}, DEFAULT_VERSION)
 
     def test_no_override(self):
         service_dict = config.merge_service_dicts(
-            {'ports': ['10:8000', '9000']},
+            {self.config_name(): self.base_config()},
             {},
             DEFAULT_VERSION)
-        assert set(service_dict['ports']) == set(['10:8000', '9000'])
+        assert set(service_dict[self.config_name()]) == set(self.base_config())
 
     def test_no_base(self):
         service_dict = config.merge_service_dicts(
             {},
-            {'ports': ['10:8000', '9000']},
+            {self.config_name(): self.base_config()},
             DEFAULT_VERSION)
-        assert set(service_dict['ports']) == set(['10:8000', '9000'])
+        assert set(service_dict[self.config_name()]) == set(self.base_config())
 
     def test_add_item(self):
         service_dict = config.merge_service_dicts(
-            {'ports': ['10:8000', '9000']},
-            {'ports': ['20:8000']},
+            {self.config_name(): self.base_config()},
+            {self.config_name(): self.override_config()},
             DEFAULT_VERSION)
-        assert set(service_dict['ports']) == set(['10:8000', '9000', '20:8000'])
+        assert set(service_dict[self.config_name()]) == set(self.merged_config())
+
+
+class MergePortsTest(unittest.TestCase, MergeListsTest):
+    def config_name(self):
+        return 'ports'
+
+    def base_config(self):
+        return ['10:8000', '9000']
+
+    def override_config(self):
+        return ['20:8000']
+
+
+class MergeNetworksTest(unittest.TestCase, MergeListsTest):
+    def config_name(self):
+        return 'networks'
+
+    def base_config(self):
+        return ['frontend', 'backend']
+
+    def override_config(self):
+        return ['monitoring']
 
 
 class MergeStringsOrListsTest(unittest.TestCase):

From 5a3a10d43bba5882f2e41824d2040ed6ad9e1874 Mon Sep 17 00:00:00 2001
From: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
Date: Mon, 8 Feb 2016 15:17:21 +0100
Subject: [PATCH 0789/1265] Correctly merge the 'services/<service>/networks'
 key in the case of multiple compose files.

Fixes docker/compose#2839.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
---
 compose/config/config.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/config/config.py b/compose/config/config.py
index f362f1b8..d5d2547e 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -698,6 +698,7 @@ def merge_service_dicts(base, override, version):
         'depends_on',
         'expose',
         'external_links',
+        'networks',
         'ports',
         'volumes_from',
     ]:

From 5bd88f634fc35becf3644d0ffadd6ebc39be93ea Mon Sep 17 00:00:00 2001
From: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
Date: Mon, 8 Feb 2016 15:33:26 +0100
Subject: [PATCH 0790/1265] Handle the 'network_mode' key when merging multiple
 compose files.

Fixes docker/compose#2840.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
---
 compose/config/config.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/config/config.py b/compose/config/config.py
index d5d2547e..174dacab 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -87,6 +87,7 @@ ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
     'container_name',
     'dockerfile',
     'logging',
+    'network_mode',
 ]
 
 DOCKER_VALID_URL_PREFIXES = (

From 421981e7d26bd5a5558d1bfdc8079749b15bb7bf Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 8 Feb 2016 12:18:48 -0500
Subject: [PATCH 0791/1265] Use 12 characters for the short id to match docker
 and fix backwards compatibility.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/container.py         |  2 +-
 tests/unit/container_test.py | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/compose/container.py b/compose/container.py
index 2565c8ff..3a1ce0b9 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -60,7 +60,7 @@ class Container(object):
 
     @property
     def short_id(self):
-        return self.id[:10]
+        return self.id[:12]
 
     @property
     def name(self):
diff --git a/tests/unit/container_test.py b/tests/unit/container_test.py
index 88691150..189b0c99 100644
--- a/tests/unit/container_test.py
+++ b/tests/unit/container_test.py
@@ -12,8 +12,9 @@ from compose.container import get_container_name
 class ContainerTest(unittest.TestCase):
 
     def setUp(self):
+        self.container_id = "abcabcabcbabc12345"
         self.container_dict = {
-            "Id": "abc",
+            "Id": self.container_id,
             "Image": "busybox:latest",
             "Command": "top",
             "Created": 1387384730,
@@ -41,19 +42,22 @@ class ContainerTest(unittest.TestCase):
         self.assertEqual(
             container.dictionary,
             {
-                "Id": "abc",
+                "Id": self.container_id,
                 "Image": "busybox:latest",
                 "Name": "/composetest_db_1",
             })
 
     def test_from_ps_prefixed(self):
-        self.container_dict['Names'] = ['/swarm-host-1' + n for n in self.container_dict['Names']]
+        self.container_dict['Names'] = [
+            '/swarm-host-1' + n for n in self.container_dict['Names']
+        ]
 
-        container = Container.from_ps(None,
-                                      self.container_dict,
-                                      has_been_inspected=True)
+        container = Container.from_ps(
+            None,
+            self.container_dict,
+            has_been_inspected=True)
         self.assertEqual(container.dictionary, {
-            "Id": "abc",
+            "Id": self.container_id,
             "Image": "busybox:latest",
             "Name": "/composetest_db_1",
         })
@@ -142,6 +146,10 @@ class ContainerTest(unittest.TestCase):
         self.assertEqual(container.get('HostConfig.VolumesFrom'), ["volume_id"])
         self.assertEqual(container.get('Foo.Bar.DoesNotExist'), None)
 
+    def test_short_id(self):
+        container = Container(None, self.container_dict, has_been_inspected=True)
+        assert container.short_id == self.container_id[:12]
+
 
 class GetContainerNameTestCase(unittest.TestCase):
 

From 582de19a5a2402d492e67339da46d8c8e2c70d53 Mon Sep 17 00:00:00 2001
From: cr7pt0gr4ph7 <cr7pt0gr4ph7@gmail.com>
Date: Mon, 8 Feb 2016 21:57:15 +0100
Subject: [PATCH 0792/1265] Simplify unit tests in config/config_test.py by
 using class variables instead of methods for parametrizing tests.

Signed-off-by: cr7pt0gr4ph7 <cr7pt0gr4ph7@gmail.com>
---
 tests/unit/config/config_test.py | 88 +++++++++++++-------------------
 1 file changed, 35 insertions(+), 53 deletions(-)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 0fe1307e..bd57c4a7 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1506,57 +1506,54 @@ class VolumeConfigTest(unittest.TestCase):
 
 
 class MergePathMappingTest(object):
-    def config_name(self):
-        return ""
+    config_name = ""
 
     def test_empty(self):
         service_dict = config.merge_service_dicts({}, {}, DEFAULT_VERSION)
-        assert self.config_name() not in service_dict
+        assert self.config_name not in service_dict
 
     def test_no_override(self):
         service_dict = config.merge_service_dicts(
-            {self.config_name(): ['/foo:/code', '/data']},
+            {self.config_name: ['/foo:/code', '/data']},
             {},
             DEFAULT_VERSION)
-        assert set(service_dict[self.config_name()]) == set(['/foo:/code', '/data'])
+        assert set(service_dict[self.config_name]) == set(['/foo:/code', '/data'])
 
     def test_no_base(self):
         service_dict = config.merge_service_dicts(
             {},
-            {self.config_name(): ['/bar:/code']},
+            {self.config_name: ['/bar:/code']},
             DEFAULT_VERSION)
-        assert set(service_dict[self.config_name()]) == set(['/bar:/code'])
+        assert set(service_dict[self.config_name]) == set(['/bar:/code'])
 
     def test_override_explicit_path(self):
         service_dict = config.merge_service_dicts(
-            {self.config_name(): ['/foo:/code', '/data']},
-            {self.config_name(): ['/bar:/code']},
+            {self.config_name: ['/foo:/code', '/data']},
+            {self.config_name: ['/bar:/code']},
             DEFAULT_VERSION)
-        assert set(service_dict[self.config_name()]) == set(['/bar:/code', '/data'])
+        assert set(service_dict[self.config_name]) == set(['/bar:/code', '/data'])
 
     def test_add_explicit_path(self):
         service_dict = config.merge_service_dicts(
-            {self.config_name(): ['/foo:/code', '/data']},
-            {self.config_name(): ['/bar:/code', '/quux:/data']},
+            {self.config_name: ['/foo:/code', '/data']},
+            {self.config_name: ['/bar:/code', '/quux:/data']},
             DEFAULT_VERSION)
-        assert set(service_dict[self.config_name()]) == set(['/bar:/code', '/quux:/data'])
+        assert set(service_dict[self.config_name]) == set(['/bar:/code', '/quux:/data'])
 
     def test_remove_explicit_path(self):
         service_dict = config.merge_service_dicts(
-            {self.config_name(): ['/foo:/code', '/quux:/data']},
-            {self.config_name(): ['/bar:/code', '/data']},
+            {self.config_name: ['/foo:/code', '/quux:/data']},
+            {self.config_name: ['/bar:/code', '/data']},
             DEFAULT_VERSION)
-        assert set(service_dict[self.config_name()]) == set(['/bar:/code', '/data'])
+        assert set(service_dict[self.config_name]) == set(['/bar:/code', '/data'])
 
 
 class MergeVolumesTest(unittest.TestCase, MergePathMappingTest):
-    def config_name(self):
-        return 'volumes'
+    config_name = 'volumes'
 
 
 class MergeDevicesTest(unittest.TestCase, MergePathMappingTest):
-    def config_name(self):
-        return 'devices'
+    config_name = 'devices'
 
 
 class BuildOrImageMergeTest(unittest.TestCase):
@@ -1595,63 +1592,48 @@ class BuildOrImageMergeTest(unittest.TestCase):
 
 
 class MergeListsTest(object):
-    def config_name(self):
-        return ""
-
-    def base_config(self):
-        return []
-
-    def override_config(self):
-        return []
+    config_name = ""
+    base_config = []
+    override_config = []
 
     def merged_config(self):
-        return set(self.base_config()) | set(self.override_config())
+        return set(self.base_config) | set(self.override_config)
 
     def test_empty(self):
-        assert self.config_name() not in config.merge_service_dicts({}, {}, DEFAULT_VERSION)
+        assert self.config_name not in config.merge_service_dicts({}, {}, DEFAULT_VERSION)
 
     def test_no_override(self):
         service_dict = config.merge_service_dicts(
-            {self.config_name(): self.base_config()},
+            {self.config_name: self.base_config},
             {},
             DEFAULT_VERSION)
-        assert set(service_dict[self.config_name()]) == set(self.base_config())
+        assert set(service_dict[self.config_name]) == set(self.base_config)
 
     def test_no_base(self):
         service_dict = config.merge_service_dicts(
             {},
-            {self.config_name(): self.base_config()},
+            {self.config_name: self.base_config},
             DEFAULT_VERSION)
-        assert set(service_dict[self.config_name()]) == set(self.base_config())
+        assert set(service_dict[self.config_name]) == set(self.base_config)
 
     def test_add_item(self):
         service_dict = config.merge_service_dicts(
-            {self.config_name(): self.base_config()},
-            {self.config_name(): self.override_config()},
+            {self.config_name: self.base_config},
+            {self.config_name: self.override_config},
             DEFAULT_VERSION)
-        assert set(service_dict[self.config_name()]) == set(self.merged_config())
+        assert set(service_dict[self.config_name]) == set(self.merged_config())
 
 
 class MergePortsTest(unittest.TestCase, MergeListsTest):
-    def config_name(self):
-        return 'ports'
-
-    def base_config(self):
-        return ['10:8000', '9000']
-
-    def override_config(self):
-        return ['20:8000']
+    config_name = 'ports'
+    base_config = ['10:8000', '9000']
+    override_config = ['20:8000']
 
 
 class MergeNetworksTest(unittest.TestCase, MergeListsTest):
-    def config_name(self):
-        return 'networks'
-
-    def base_config(self):
-        return ['frontend', 'backend']
-
-    def override_config(self):
-        return ['monitoring']
+    config_name = 'networks'
+    base_config = ['frontend', 'backend']
+    override_config = ['monitoring']
 
 
 class MergeStringsOrListsTest(unittest.TestCase):

From 63870fbccd45678917f3b0889d4935440dc8f7f8 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 8 Feb 2016 18:15:21 -0500
Subject: [PATCH 0793/1265] Fix upgrading url.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d115f05d..8df63c5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ Major Features:
     1.6 exactly as they do today.
 
     Check the upgrade guide for full details:
-    https://docs.docker.com/compose/compose-file/upgrading
+    https://docs.docker.com/compose/compose-file#upgrading
 
 -   Support for networking has exited experimental status and is the recommended
     way to enable communication between containers.

From 481caa8e480aa044e1a00f707c4b9af76677b457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20K=C3=A4ufl?= <docker-compose@c.michael-kaeufl.de>
Date: Sat, 6 Feb 2016 22:10:22 +0100
Subject: [PATCH 0794/1265] Used absolute links in readme
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This prevents links being broken on pypi
(e.g. https://pypi.python.org/pypi/docs/index.md#features)

Signed-off-by: Michael Käufl <docker-compose@c.michael-kaeufl.de>
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 595ff1e1..f8822151 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,11 @@ Compose is a tool for defining and running multi-container Docker applications.
 With Compose, you use a Compose file to configure your application's services.
 Then, using a single command, you create and start all the services
 from your configuration. To learn more about all the features of Compose
-see [the list of features](docs/index.md#features).
+see [the list of features](https://github.com/docker/compose/blob/release/docs/overview.md#features).
 
 Compose is great for development, testing, and staging environments, as well as
 CI workflows. You can learn more about each case in
-[Common Use Cases](docs/overview.md#common-use-cases).
+[Common Use Cases](https://github.com/docker/compose/blob/release/docs/overview.md#common-use-cases).
 
 Using Compose is basically a three-step process.
 
@@ -34,7 +34,7 @@ A `docker-compose.yml` looks like this:
       image: redis
 
 For more information about the Compose file, see the
-[Compose file reference](docs/compose-file.md)
+[Compose file reference](https://github.com/docker/compose/blob/release/docs/compose-file.md)
 
 Compose has commands for managing the whole lifecycle of your application:
 

From 59a2920758ca763175093e0f2917d5ead1a117a7 Mon Sep 17 00:00:00 2001
From: Yohan Graterol <yohangraterol92@gmail.com>
Date: Tue, 9 Feb 2016 18:40:44 -0500
Subject: [PATCH 0795/1265] Typo into the doc with `networks` in yaml

Signed-off-by: Yohan Graterol <yohangraterol92@gmail.com>
---
 docs/compose-file.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index ec90ddcd..240fea1e 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -761,14 +761,14 @@ service's containers to it.
         networks:
           - default
 
-    networks
+    networks:
       outside:
         external: true
 
 You can also specify the name of the network separately from the name used to
 refer to it within the Compose file:
 
-    networks
+    networks:
       outside:
         external:
           name: actual-name-of-network

From ab6e07da7d7d1ab9f2b8b0880edf836988227df4 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 10 Feb 2016 15:56:50 +0000
Subject: [PATCH 0796/1265] Fix version in install guide

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/install.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/install.md b/docs/install.md
index cc3890f9..c50d7649 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
 7. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.5.2
+        docker-compose version: 1.6.0
 
 
 ## Alternative install options

From 37564a73c3844aa8563a4a929a07868f2c09ec6c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 10 Feb 2016 13:54:40 -0500
Subject: [PATCH 0797/1265] Merge build.args when merging services.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         | 29 ++++++++++++----------------
 tests/unit/config/config_test.py | 33 ++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 102758e9..ddfcca50 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -713,29 +713,24 @@ def merge_service_dicts(base, override, version):
 
     if version == V1:
         legacy_v1_merge_image_or_build(md, base, override)
-    else:
-        merge_build(md, base, override)
+    elif md.needs_merge('build'):
+        md['build'] = merge_build(md, base, override)
 
     return dict(md)
 
 
 def merge_build(output, base, override):
-    build = {}
+    def to_dict(service):
+        build_config = service.get('build', {})
+        if isinstance(build_config, six.string_types):
+            return {'context': build_config}
+        return build_config
 
-    if 'build' in base:
-        if isinstance(base['build'], six.string_types):
-            build['context'] = base['build']
-        else:
-            build.update(base['build'])
-
-    if 'build' in override:
-        if isinstance(override['build'], six.string_types):
-            build['context'] = override['build']
-        else:
-            build.update(override['build'])
-
-    if build:
-        output['build'] = build
+    md = MergeDict(to_dict(base), to_dict(override))
+    md.merge_scalar('context')
+    md.merge_scalar('dockerfile')
+    md.merge_mapping('args', parse_build_arguments)
+    return dict(md)
 
 
 def legacy_v1_merge_image_or_build(output, base, override):
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index e545aba7..e0456845 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1079,6 +1079,39 @@ class ConfigTest(unittest.TestCase):
             'extends': {'service': 'foo'}
         }
 
+    def test_merge_build_args(self):
+        base = {
+            'build': {
+                'context': '.',
+                'args': {
+                    'ONE': '1',
+                    'TWO': '2',
+                },
+            }
+        }
+        override = {
+            'build': {
+                'args': {
+                    'TWO': 'dos',
+                    'THREE': '3',
+                },
+            }
+        }
+        actual = config.merge_service_dicts(
+            base,
+            override,
+            DEFAULT_VERSION)
+        assert actual == {
+            'build': {
+                'context': '.',
+                'args': {
+                    'ONE': '1',
+                    'TWO': 'dos',
+                    'THREE': '3',
+                },
+            }
+        }
+
     def test_external_volume_config(self):
         config_details = build_config_details({
             'version': '2',

From 5e6dc3521c2b9bb3cac3553987f173c48ec17579 Mon Sep 17 00:00:00 2001
From: Spencer Rinehart <anubis@overthemonkey.com>
Date: Fri, 5 Feb 2016 10:47:14 -0600
Subject: [PATCH 0798/1265] Add support for shm_size.  Fixes #2823.

shm_size controls the size of /dev/shm in the container and requires
Docker 1.10 or newer (API version 1.22).  This requires docker-py 1.8.0
(docker/docker-py#923).

Similar to fields like `mem_limit`, `shm_size` may be specified as
either an integer or a string (e.g., `64M`).

Updating docker-py to the master branch in order to get the unreleased
dependency on `shm_size` there in place.

Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
---
 compose/config/config.py                | 1 +
 compose/config/service_schema_v1.json   | 1 +
 compose/config/service_schema_v2.0.json | 1 +
 compose/service.py                      | 2 ++
 docs/compose-file.md                    | 3 ++-
 requirements.txt                        | 2 +-
 tests/integration/service_test.py       | 6 ++++++
 7 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 102758e9..c87d73bb 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -72,6 +72,7 @@ DOCKER_CONFIG_KEYS = [
     'read_only',
     'restart',
     'security_opt',
+    'shm_size',
     'stdin_open',
     'stop_signal',
     'tty',
diff --git a/compose/config/service_schema_v1.json b/compose/config/service_schema_v1.json
index d220ec54..4d974d71 100644
--- a/compose/config/service_schema_v1.json
+++ b/compose/config/service_schema_v1.json
@@ -98,6 +98,7 @@
         "read_only": {"type": "boolean"},
         "restart": {"type": "string"},
         "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "shm_size": {"type": ["number", "string"]},
         "stdin_open": {"type": "boolean"},
         "stop_signal": {"type": "string"},
         "tty": {"type": "boolean"},
diff --git a/compose/config/service_schema_v2.0.json b/compose/config/service_schema_v2.0.json
index 8dd4faf5..d3b294d7 100644
--- a/compose/config/service_schema_v2.0.json
+++ b/compose/config/service_schema_v2.0.json
@@ -127,6 +127,7 @@
         "read_only": {"type": "boolean"},
         "restart": {"type": "string"},
         "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "shm_size": {"type": ["number", "string"]},
         "stdin_open": {"type": "boolean"},
         "stop_signal": {"type": "string"},
         "tty": {"type": "boolean"},
diff --git a/compose/service.py b/compose/service.py
index 652ee794..6472caeb 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -57,6 +57,7 @@ DOCKER_START_KEYS = [
     'volumes_from',
     'security_opt',
     'cpu_quota',
+    'shm_size',
 ]
 
 
@@ -654,6 +655,7 @@ class Service(object):
             ipc_mode=options.get('ipc'),
             cgroup_parent=options.get('cgroup_parent'),
             cpu_quota=options.get('cpu_quota'),
+            shm_size=options.get('shm_size'),
         )
 
     def build(self, no_cache=False, pull=False, force_rm=False):
diff --git a/docs/compose-file.md b/docs/compose-file.md
index b2524f66..01fe3683 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -591,7 +591,7 @@ specifying read-only access(``ro``) or read-write(``rw``).
 >     - container_name
 >     - container_name:rw
 
-### cpu\_shares, cpu\_quota, cpuset, domainname, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, stdin\_open, tty, user, working\_dir
+### cpu\_shares, cpu\_quota, cpuset, domainname, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, shm\_size, stdin\_open, tty, user, working\_dir
 
 Each of these is a single value, analogous to its
 [docker run](https://docs.docker.com/engine/reference/run/) counterpart.
@@ -615,6 +615,7 @@ Each of these is a single value, analogous to its
     restart: always
 
     read_only: true
+    shm_size: 64M
     stdin_open: true
     tty: true
 
diff --git a/requirements.txt b/requirements.txt
index 3fdd34ed..2204e6d5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 PyYAML==3.11
 cached-property==1.2.0
-docker-py==1.7.0
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
+git+https://github.com/docker/docker-py.git@bba8e28f822c4cd3ebe2a2ca588f41f9d7d66e26#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 37dc4a0e..9871d440 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -102,6 +102,12 @@ class ServiceTest(DockerClientTestCase):
         container.start()
         self.assertEqual(container.get('HostConfig.CpuQuota'), 40000)
 
+    def test_create_container_with_shm_size(self):
+        service = self.create_service('db', shm_size=67108864)
+        container = service.create_container()
+        service.start_container(container)
+        self.assertEqual(container.get('HostConfig.ShmSize'), 67108864)
+
     def test_create_container_with_extra_hosts_list(self):
         extra_hosts = ['somehost:162.242.195.82', 'otherhost:50.31.209.229']
         service = self.create_service('db', extra_hosts=extra_hosts)

From ab40d389d05f5f2e08dbea4c43ebb8a467172bf9 Mon Sep 17 00:00:00 2001
From: Spencer Rinehart <anubis@overthemonkey.com>
Date: Fri, 5 Feb 2016 11:46:15 -0600
Subject: [PATCH 0799/1265] Fix sorting of DOCKER_START_KEYS.

Make sure it's sorted!

Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
---
 compose/service.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 6472caeb..9dd2865b 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -40,6 +40,7 @@ DOCKER_START_KEYS = [
     'cap_add',
     'cap_drop',
     'cgroup_parent',
+    'cpu_quota',
     'devices',
     'dns',
     'dns_search',
@@ -54,10 +55,9 @@ DOCKER_START_KEYS = [
     'pid',
     'privileged',
     'restart',
-    'volumes_from',
     'security_opt',
-    'cpu_quota',
     'shm_size',
+    'volumes_from',
 ]
 
 

From ac14642d94718aa3a5d30eea17a41b36056c3488 Mon Sep 17 00:00:00 2001
From: Manuel Kaufmann <humitos@gmail.com>
Date: Wed, 10 Feb 2016 18:58:01 -0500
Subject: [PATCH 0800/1265] Typo fixed

Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
---
 docs/django.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/django.md b/docs/django.md
index 573ea3d9..150d3631 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -129,7 +129,7 @@ In this step, you create a Django started project by building the image from the
 
 In this section, you set up the database connection for Django.
 
-1. In your project dirctory, edit the `composeexample/settings.py` file.
+1. In your project directory, edit the `composeexample/settings.py` file.
 
 2. Replace the `DATABASES = ...` with the following:
 

From 643166ae98764e1bfe8b2dad8de349e2c23c7f33 Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Wed, 10 Feb 2016 20:47:15 -0800
Subject: [PATCH 0801/1265] Updating Dockerfile

Signed-off-by: Mary Anthony <mary@docker.com>
---
 docs/Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/Dockerfile b/docs/Dockerfile
index 83b65633..5f32dc4d 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -5,9 +5,10 @@ RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/engin
 RUN svn checkout https://github.com/docker/swarm/trunk/docs /docs/content/swarm
 RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine
 RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content/registry
-RUN svn checkout https://github.com/kitematic/kitematic/trunk/docs /docs/content/kitematic
-RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content/tutorials
-RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content
+RUN svn checkout https://github.com/docker/notary/trunk/docs /docs/content/notary
+RUN svn checkout https://github.com/docker/kitematic/trunk/docs /docs/content/kitematic
+RUN svn checkout https://github.com/docker/toolbox/trunk/docs /docs/content/toolbox
+RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content/project
 
 ENV PROJECT=compose
 # To get the git info for this repo

From 740329a131fb74d45a3821303c4c1818f2bcd171 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 11 Feb 2016 13:50:23 -0500
Subject: [PATCH 0802/1265] Shm_size requires docker 1.10.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/integration/service_test.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 9871d440..1cc6b266 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -103,6 +103,7 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(container.get('HostConfig.CpuQuota'), 40000)
 
     def test_create_container_with_shm_size(self):
+        self.require_api_version('1.22')
         service = self.create_service('db', shm_size=67108864)
         container = service.create_container()
         service.start_container(container)

From 1e7dd2e7400114c76d9d438d2b4a2f403a816573 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 11 Feb 2016 13:10:29 -0500
Subject: [PATCH 0803/1265] Upgrade pyinstaller.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 requirements-build.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-build.txt b/requirements-build.txt
index 20aad420..3f1dbd75 100644
--- a/requirements-build.txt
+++ b/requirements-build.txt
@@ -1 +1 @@
-pyinstaller==3.0
+pyinstaller==3.1.1

From 532dffd68807de1c50e99afe2feaff78c7a00391 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 10 Feb 2016 13:32:04 -0500
Subject: [PATCH 0804/1265] Fix build section without context.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py                |  3 +++
 compose/config/service_schema_v2.0.json |  7 ++++++-
 compose/config/validation.py            |  5 ++---
 tests/unit/config/config_test.py        | 11 +++++++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index c342abc5..19722b0a 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -874,6 +874,9 @@ def validate_paths(service_dict):
             build_path = build
         elif isinstance(build, dict) and 'context' in build:
             build_path = build['context']
+        else:
+            # We have a build section but no context, so nothing to validate
+            return
 
         if (
             not is_url(build_path) and
diff --git a/compose/config/service_schema_v2.0.json b/compose/config/service_schema_v2.0.json
index d3b294d7..f7a67818 100644
--- a/compose/config/service_schema_v2.0.json
+++ b/compose/config/service_schema_v2.0.json
@@ -196,7 +196,12 @@
       "anyOf": [
           {"required": ["build"]},
           {"required": ["image"]}
-      ]
+      ],
+      "properties": {
+        "build": {
+          "required": ["context"]
+        }
+      }
     }
   }
 }
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 6b240135..35727e2c 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -253,10 +253,9 @@ def handle_generic_service_error(error, path):
         msg_format = "{path} contains an invalid type, it should be {msg}"
         error_msg = _parse_valid_types_from_validator(error.validator_value)
 
-    # TODO: no test case for this branch, there are no config options
-    # which exercise this branch
     elif error.validator == 'required':
-        msg_format = "{path} is invalid, {msg}"
+        error_msg = ", ".join(error.validator_value)
+        msg_format = "{path} is invalid, {msg} is required."
 
     elif error.validator == 'dependencies':
         config_key = list(error.validator_value.keys())[0]
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index e0456845..7fecfed3 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1169,6 +1169,17 @@ class ConfigTest(unittest.TestCase):
             config.load(config_details)
         assert "Service 'one' depends on service 'three'" in exc.exconly()
 
+    def test_load_dockerfile_without_context(self):
+        config_details = build_config_details({
+            'version': '2',
+            'services': {
+                'one': {'build': {'dockerfile': 'Dockerfile.foo'}},
+            },
+        })
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(config_details)
+        assert 'one.build is invalid, context is required.' in exc.exconly()
+
 
 class NetworkModeTest(unittest.TestCase):
     def test_network_mode_standard(self):

From e225f12551fd056da6c8d96fcef8c8b7a891d386 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 10 Feb 2016 16:49:50 -0800
Subject: [PATCH 0805/1265] Add logging when initializing a volume.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/volume.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/compose/volume.py b/compose/volume.py
index 2713fd32..26fbda96 100644
--- a/compose/volume.py
+++ b/compose/volume.py
@@ -64,12 +64,13 @@ class ProjectVolumes(object):
         config_volumes = config_data.volumes or {}
         volumes = {
             vol_name: Volume(
-                    client=client,
-                    project=name,
-                    name=vol_name,
-                    driver=data.get('driver'),
-                    driver_opts=data.get('driver_opts'),
-                    external_name=data.get('external_name'))
+                client=client,
+                project=name,
+                name=vol_name,
+                driver=data.get('driver'),
+                driver_opts=data.get('driver_opts'),
+                external_name=data.get('external_name')
+            )
             for vol_name, data in config_volumes.items()
         }
         return cls(volumes)
@@ -96,6 +97,11 @@ class ProjectVolumes(object):
                             )
                         )
                     continue
+                log.info(
+                    'Creating volume "{0}" with {1} driver'.format(
+                        volume.full_name, volume.driver or 'default'
+                    )
+                )
                 volume.create()
         except NotFound:
             raise ConfigurationError(

From 79f993f52c9c2a358c48a9d0aea46fe832e7b167 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 10 Feb 2016 16:35:27 -0800
Subject: [PATCH 0806/1265] Detailed error message when daemon version is too
 old.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py | 19 ++++++++++++++++++-
 compose/const.py    |  5 +++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index deb1e912..7413c53c 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -19,6 +19,7 @@ from ..config import config
 from ..config import ConfigurationError
 from ..config import parse_environment
 from ..config.serialize import serialize_config
+from ..const import API_VERSION_TO_ENGINE_VERSION
 from ..const import DEFAULT_TIMEOUT
 from ..const import HTTP_TIMEOUT
 from ..const import IS_WINDOWS_PLATFORM
@@ -64,7 +65,7 @@ def main():
         log.error("No such command: %s\n\n%s", e.command, commands)
         sys.exit(1)
     except APIError as e:
-        log.error(e.explanation)
+        log_api_error(e)
         sys.exit(1)
     except BuildError as e:
         log.error("Service '%s' failed to build: %s" % (e.service.name, e.reason))
@@ -84,6 +85,22 @@ def main():
         sys.exit(1)
 
 
+def log_api_error(e):
+    if 'client is newer than server' in e.explanation:
+        # we need JSON formatted errors. In the meantime...
+        # TODO: fix this by refactoring project dispatch
+        # http://github.com/docker/compose/pull/2832#commitcomment-15923800
+        client_version = e.explanation.split('client API version: ')[1].split(',')[0]
+        log.error(
+            "The engine version is lesser than the minimum required by "
+            "compose. Your current project requires a Docker Engine of "
+            "version {version} or superior.".format(
+                version=API_VERSION_TO_ENGINE_VERSION[client_version]
+            ))
+    else:
+        log.error(e.explanation)
+
+
 def setup_logging():
     root_logger = logging.getLogger()
     root_logger.addHandler(console_handler)
diff --git a/compose/const.py b/compose/const.py
index 0e307835..db5e2fb4 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -22,3 +22,8 @@ API_VERSIONS = {
     COMPOSEFILE_V1: '1.21',
     COMPOSEFILE_V2_0: '1.22',
 }
+
+API_VERSION_TO_ENGINE_VERSION = {
+    API_VERSIONS[COMPOSEFILE_V1]: '1.9.0',
+    API_VERSIONS[COMPOSEFILE_V2_0]: '1.10.0'
+}

From 367fabdbfa3db8324560bc16baf6202f68b7fffb Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 11 Feb 2016 16:31:08 -0800
Subject: [PATCH 0807/1265] Bring up all dependencies when running a single
 service.

Added test for running a depends_on service

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py                               |  2 +-
 tests/acceptance/cli_test.py                      |  9 +++++++++
 tests/fixtures/v2-dependencies/docker-compose.yml | 13 +++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 tests/fixtures/v2-dependencies/docker-compose.yml

diff --git a/compose/cli/main.py b/compose/cli/main.py
index deb1e912..1ffa9cc3 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -686,7 +686,7 @@ def image_type_from_opt(flag, value):
 
 def run_one_off_container(container_options, project, service, options):
     if not options['--no-deps']:
-        deps = service.get_linked_service_names()
+        deps = service.get_dependency_names()
         if deps:
             project.up(
                 service_names=deps,
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 032900d5..ea3d132a 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -738,6 +738,15 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(db.containers()), 1)
         self.assertEqual(len(console.containers()), 0)
 
+    @v2_only()
+    def test_run_service_with_dependencies(self):
+        self.base_dir = 'tests/fixtures/v2-dependencies'
+        self.dispatch(['run', 'web', '/bin/true'], None)
+        db = self.project.get_service('db')
+        console = self.project.get_service('console')
+        self.assertEqual(len(db.containers()), 1)
+        self.assertEqual(len(console.containers()), 0)
+
     def test_run_with_no_deps(self):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['run', '--no-deps', 'web', '/bin/true'])
diff --git a/tests/fixtures/v2-dependencies/docker-compose.yml b/tests/fixtures/v2-dependencies/docker-compose.yml
new file mode 100644
index 00000000..2e14b94b
--- /dev/null
+++ b/tests/fixtures/v2-dependencies/docker-compose.yml
@@ -0,0 +1,13 @@
+version: "2.0"
+services:
+    db:
+      image: busybox:latest
+      command: top
+    web:
+      image: busybox:latest
+      command: top
+      depends_on:
+        - db
+    console:
+      image: busybox:latest
+      command: top

From a8fda480e3b414983fd2d077ed5bcfef5d9247b7 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 12 Feb 2016 10:41:27 -0800
Subject: [PATCH 0808/1265] driver_opts can only be of type string

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/fields_schema_v2.0.json |  2 +-
 tests/unit/config/config_test.py       | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/compose/config/fields_schema_v2.0.json b/compose/config/fields_schema_v2.0.json
index 7703adcd..876065e5 100644
--- a/compose/config/fields_schema_v2.0.json
+++ b/compose/config/fields_schema_v2.0.json
@@ -78,7 +78,7 @@
         "driver_opts": {
           "type": "object",
           "patternProperties": {
-            "^.+$": {"type": ["string", "number"]}
+            "^.+$": {"type": "string"}
           }
         },
         "external": {
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 7fecfed3..5f7633d9 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -231,6 +231,20 @@ class ConfigTest(unittest.TestCase):
         assert volumes['simple'] == {}
         assert volumes['other'] == {}
 
+    def test_volume_invalid_driver_opt(self):
+        config_details = build_config_details({
+            'version': '2',
+            'services': {
+                'simple': {'image': 'busybox'}
+            },
+            'volumes': {
+                'simple': {'driver_opts': {'size': 42}},
+            }
+        })
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(config_details)
+        assert 'driver_opts.size contains an invalid type' in exc.exconly()
+
     def test_load_service_with_name_version(self):
         with mock.patch('compose.config.config.log') as mock_logging:
             config_data = config.load(

From dd55415d4f1738fb2a9b76ffb9a9d333ae0d3332 Mon Sep 17 00:00:00 2001
From: Chia-liang Kao <clkao@clkao.org>
Date: Sun, 14 Feb 2016 01:42:51 +0800
Subject: [PATCH 0809/1265] Don't mount pwd if it is /

Signed-off-by: Chia-liang Kao <clkao@clkao.org>
---
 script/run.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/script/run.sh b/script/run.sh
index 087c2692..5b07d1a9 100755
--- a/script/run.sh
+++ b/script/run.sh
@@ -31,7 +31,9 @@ fi
 
 
 # Setup volume mounts for compose config and context
-VOLUMES="-v $(pwd):$(pwd)"
+if [ "$(pwd)" != '/' ]; then
+    VOLUMES="-v $(pwd):$(pwd)"
+fi
 if [ -n "$COMPOSE_FILE" ]; then
     compose_dir=$(dirname $COMPOSE_FILE)
 fi
@@ -50,4 +52,4 @@ else
     DOCKER_RUN_OPTIONS="-i"
 fi
 
-exec docker run --rm $DOCKER_RUN_OPTIONS $DOCKER_ADDR $COMPOSE_OPTIONS $VOLUMES -w $(pwd) $IMAGE $@
+exec docker run --rm $DOCKER_RUN_OPTIONS $DOCKER_ADDR $COMPOSE_OPTIONS $VOLUMES -w "$(pwd)" $IMAGE $@

From e6a675f338a895d93208d1f291d1cee901bf0e32 Mon Sep 17 00:00:00 2001
From: Chia-liang Kao <clkao@clkao.org>
Date: Sun, 14 Feb 2016 01:43:06 +0800
Subject: [PATCH 0810/1265] Detect -t and -i separately

Signed-off-by: Chia-liang Kao <clkao@clkao.org>
---
 script/run.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/script/run.sh b/script/run.sh
index 5b07d1a9..992e285e 100755
--- a/script/run.sh
+++ b/script/run.sh
@@ -47,9 +47,10 @@ fi
 
 # Only allocate tty if we detect one
 if [ -t 1 ]; then
-    DOCKER_RUN_OPTIONS="-ti"
-else
-    DOCKER_RUN_OPTIONS="-i"
+    DOCKER_RUN_OPTIONS="-t"
+fi
+if [ -t 0 ]; then
+    DOCKER_RUN_OPTIONS="$DOCKER_RUN_OPTIONS -i"
 fi
 
 exec docker run --rm $DOCKER_RUN_OPTIONS $DOCKER_ADDR $COMPOSE_OPTIONS $VOLUMES -w "$(pwd)" $IMAGE $@

From 2204b642ef2ef6d666f970a971bd4f1ed6080715 Mon Sep 17 00:00:00 2001
From: Chia-liang Kao <clkao@clkao.org>
Date: Sun, 14 Feb 2016 01:57:04 +0800
Subject: [PATCH 0811/1265] Quote argv as they are

Signed-off-by: Chia-liang Kao <clkao@clkao.org>
---
 script/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/run.sh b/script/run.sh
index 992e285e..07132a0c 100755
--- a/script/run.sh
+++ b/script/run.sh
@@ -53,4 +53,4 @@ if [ -t 0 ]; then
     DOCKER_RUN_OPTIONS="$DOCKER_RUN_OPTIONS -i"
 fi
 
-exec docker run --rm $DOCKER_RUN_OPTIONS $DOCKER_ADDR $COMPOSE_OPTIONS $VOLUMES -w "$(pwd)" $IMAGE $@
+exec docker run --rm $DOCKER_RUN_OPTIONS $DOCKER_ADDR $COMPOSE_OPTIONS $VOLUMES -w "$(pwd)" $IMAGE "$@"

From 69d015471853fe3cdf15f57267d3f0a7cf72114f Mon Sep 17 00:00:00 2001
From: Anthon van der Neut <anthon@mnt.org>
Date: Tue, 16 Feb 2016 14:46:47 +0100
Subject: [PATCH 0812/1265] reset colors after warning

If a warning is shown, and you happen to have no color setting in your (bash) prompt, the \033[37m setting, stays active. With the message hardly readable (light grey on my default light yellow background), that means the prompt is barely visible and you need to do `tput reset`.
Would probably be better if the background color was set as well in case you have dark on light theme by default in your terminal.

Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
---
 contrib/migration/migrate-compose-file-v1-to-v2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/migration/migrate-compose-file-v1-to-v2.py b/contrib/migration/migrate-compose-file-v1-to-v2.py
index 4f9be97f..387e9ef4 100755
--- a/contrib/migration/migrate-compose-file-v1-to-v2.py
+++ b/contrib/migration/migrate-compose-file-v1-to-v2.py
@@ -155,7 +155,7 @@ def parse_opts(args):
 
 
 def main(args):
-    logging.basicConfig(format='\033[33m%(levelname)s:\033[37m %(message)s\n')
+    logging.basicConfig(format='\033[33m%(levelname)s:\033[37m %(message)s\033[0m\n')
 
     opts = parse_opts(args)
 

From 8af0a0f85bb278691cc25c6d4c8f28cf7bc34784 Mon Sep 17 00:00:00 2001
From: Victoria Bialas <victoria.bialas@docker.com>
Date: Sun, 14 Feb 2016 19:52:27 -0800
Subject: [PATCH 0813/1265] update to description of files generated from
 examples, which are no longer owned by root w/new release

updated descriptions of changing file ownership and images per Seb's comments

fixed line wraps

fixed line breaks per Joffrey's comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
---
 docs/Dockerfile                  |   1 +
 docs/django.md                   |  21 ++++++++---
 docs/images/django-it-worked.png | Bin 0 -> 21041 bytes
 docs/images/rails-welcome.png    | Bin 0 -> 62372 bytes
 docs/overview.md                 |  45 +++++++++++-------------
 docs/rails.md                    |  58 +++++++++++++++++++++++--------
 6 files changed, 83 insertions(+), 42 deletions(-)
 create mode 100644 docs/images/django-it-worked.png
 create mode 100644 docs/images/rails-welcome.png

diff --git a/docs/Dockerfile b/docs/Dockerfile
index 5f32dc4d..b16d0d2c 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -10,6 +10,7 @@ RUN svn checkout https://github.com/docker/kitematic/trunk/docs /docs/content/ki
 RUN svn checkout https://github.com/docker/toolbox/trunk/docs /docs/content/toolbox
 RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content/project
 
+
 ENV PROJECT=compose
 # To get the git info for this repo
 COPY . /src
diff --git a/docs/django.md b/docs/django.md
index 150d3631..a127d008 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -117,12 +117,23 @@ In this step, you create a Django started project by building the image from the
         -rwxr-xr-x 1 root   root   manage.py
         -rw-rw-r-- 1 user   user   requirements.txt
 
-    The files `django-admin` created are owned by root. This happens because
-    the container runs as the `root` user.
+  If you are running Docker on Linux, the files `django-admin` created are owned
+  by root. This happens because the container runs as the root user. Change the
+  ownership of the the new files.
 
-4. Change the ownership of the new files.
+          sudo chown -R $USER:$USER .
 
-        sudo chown -R $USER:$USER .
+  If you are running Docker on Mac or Windows, you should already have ownership
+  of all files, including those generated by `django-admin`. List the files just
+  verify this.
+
+        $ ls -l
+        total 32
+        -rw-r--r--  1 user  staff  145 Feb 13 23:00 Dockerfile
+        drwxr-xr-x  6 user  staff  204 Feb 13 23:07 composeexample
+        -rw-r--r--  1 user  staff  159 Feb 13 23:02 docker-compose.yml
+        -rwxr-xr-x  1 user  staff  257 Feb 13 23:07 manage.py
+        -rw-r--r--  1 user  staff   16 Feb 13 23:01 requirements.txt
 
 
 ## Connect the database
@@ -169,6 +180,8 @@ In this section, you set up the database connection for Django.
     Docker host. If you are using a Docker Machine VM, you can use the
     `docker-machine ip MACHINE_NAME` to get the IP address.
 
+    ![Django example](images/django-it-worked.png)
+
 ## More Compose documentation
 
 - [User guide](index.md)
diff --git a/docs/images/django-it-worked.png b/docs/images/django-it-worked.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e8266279ec0ffdaa35239562dd340e2abfebbf6
GIT binary patch
literal 21041
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
af4LWM$R^u*48l$T0000<MNUMnLSTX)91Y|E

literal 0
HcmV?d00001

diff --git a/docs/images/rails-welcome.png b/docs/images/rails-welcome.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d250f84ba4854bf589bb69c11ebf41c145e13fd
GIT binary patch
literal 62372
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%0A+EZjGlQg-UrTNSA}s5N~^R8&^Cr1Px&x-pAVLa
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

literal 0
HcmV?d00001

diff --git a/docs/overview.md b/docs/overview.md
index bb3c5d71..2efb715a 100644
--- a/docs/overview.md
+++ b/docs/overview.md
@@ -24,11 +24,14 @@ CI workflows. You can learn more about each case in
 
 Using Compose is basically a three-step process.
 
-1. Define your app's environment with a `Dockerfile` so it can be
-reproduced anywhere.
-2. Define the services that make up your app in `docker-compose.yml` so
-they can be run together in an isolated environment.
-3. Lastly, run `docker-compose up` and Compose will start and run your entire app.
+1. Define your app's environment with a `Dockerfile` so it can be reproduced
+anywhere.
+
+2. Define the services that make up your app in `docker-compose.yml`
+so they can be run together in an isolated environment.
+
+3. Lastly, run
+`docker-compose up` and Compose will start and run your entire app.
 
 A `docker-compose.yml` looks like this:
 
@@ -37,16 +40,16 @@ A `docker-compose.yml` looks like this:
       web:
         build: .
         ports:
-         - "5000:5000"
+        - "5000:5000"
         volumes:
-         - .:/code
-         - logvolume01:/var/log
+        - .:/code
+        - logvolume01:/var/log
         links:
-         - redis
-      redis:
-        image: redis
-    volumes:
-      logvolume01: {}
+        - redis
+        redis:
+          image: redis
+        volumes:
+          logvolume01: {}
 
 For more information about the Compose file, see the
 [Compose file reference](compose-file.md)
@@ -80,14 +83,12 @@ The features of Compose that make it effective are:
 
 ### Multiple isolated environments on a single host
 
-Compose uses a project name to isolate environments from each other. You can use
-this project name to:
+Compose uses a project name to isolate environments from each other. You can make use of this project name in several different contexts:
 
-* on a dev host, to create multiple copies of a single environment (ex: you want
-  to run a stable copy for each feature branch of a project)
+* on a dev host, to create multiple copies of a single environment (e.g., you want to run a stable copy for each feature branch of a project)
 * on a CI server, to keep builds from interfering with each other, you can set
   the project name to a unique build number
-* on a shared host or dev host, to prevent different projects which may use the
+* on a shared host or dev host, to prevent different projects, which may use the
   same service names, from interfering with each other
 
 The default project name is the basename of the project directory. You can set
@@ -148,9 +149,7 @@ started guide" to a single machine readable Compose file and a few commands.
 An important part of any Continuous Deployment or Continuous Integration process
 is the automated test suite. Automated end-to-end testing requires an
 environment in which to run tests. Compose provides a convenient way to create
-and destroy isolated testing environments for your test suite. By defining the full
-environment in a [Compose file](compose-file.md) you can create and destroy these
-environments in just a few commands:
+and destroy isolated testing environments for your test suite. By defining the full environment in a [Compose file](compose-file.md) you can create and destroy these environments in just a few commands:
 
     $ docker-compose up -d
     $ ./run_tests
@@ -159,9 +158,7 @@ environments in just a few commands:
 ### Single host deployments
 
 Compose has traditionally been focused on development and testing workflows,
-but with each release we're making progress on more production-oriented features.
-You can use Compose to deploy to a remote Docker Engine. The Docker Engine may
-be a single instance provisioned with
+but with each release we're making progress on more production-oriented features. You can use Compose to deploy to a remote Docker Engine. The Docker Engine may be a single instance provisioned with
 [Docker Machine](https://docs.docker.com/machine/) or an entire
 [Docker Swarm](https://docs.docker.com/swarm/) cluster.
 
diff --git a/docs/rails.md b/docs/rails.md
index f7634a6d..145f53d8 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -30,7 +30,9 @@ Dockerfile consists of:
     RUN bundle install
     ADD . /myapp
 
-That'll put your application code inside an image that will build a container with Ruby, Bundler and all your dependencies inside it. For more information on how to write Dockerfiles, see the [Docker user guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](https://docs.docker.com/engine/reference/builder/).
+That'll put your application code inside an image that will build a container
+with Ruby, Bundler and all your dependencies inside it. For more information on
+how to write Dockerfiles, see the [Docker user guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](https://docs.docker.com/engine/reference/builder/).
 
 Next, create a bootstrap `Gemfile` which just loads Rails. It'll be overwritten in a moment by `rails new`.
 
@@ -41,7 +43,11 @@ You'll need an empty `Gemfile.lock` in order to build our `Dockerfile`.
 
     $ touch Gemfile.lock
 
-Finally, `docker-compose.yml` is where the magic happens. This file describes the services that comprise your app (a database and a web app), how to get each 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.
+Finally, `docker-compose.yml` is where the magic happens. This file describes
+the services that comprise your app (a database and a web app), how to get each
+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:
       image: postgres
@@ -62,22 +68,38 @@ using `docker-compose run`:
 
     $ docker-compose run web rails new . --force --database=postgresql --skip-bundle
 
-First, Compose will build the image for the `web` service using the
-`Dockerfile`. Then it'll run `rails new` inside a new container, using that
-image. Once it's done, you should have generated a fresh app:
+First, Compose will build the image for the `web` service using the `Dockerfile`. Then it'll run `rails new` inside a new container, using that image. Once it's done, you should have generated a fresh app:
 
-    $ ls
-    Dockerfile   app          docker-compose.yml      tmp
-    Gemfile      bin          lib          vendor
-    Gemfile.lock config       log
-    README.rdoc  config.ru    public
-    Rakefile     db           test
+      $ ls -l
+      total 56
+      -rw-r--r--   1 user  staff   215 Feb 13 23:33 Dockerfile
+      -rw-r--r--   1 user  staff  1480 Feb 13 23:43 Gemfile
+      -rw-r--r--   1 user  staff  2535 Feb 13 23:43 Gemfile.lock
+      -rw-r--r--   1 root  root   478 Feb 13 23:43 README.rdoc
+      -rw-r--r--   1 root  root   249 Feb 13 23:43 Rakefile
+      drwxr-xr-x   8 root  root   272 Feb 13 23:43 app
+      drwxr-xr-x   6 root  root   204 Feb 13 23:43 bin
+      drwxr-xr-x  11 root  root   374 Feb 13 23:43 config
+      -rw-r--r--   1 root  root   153 Feb 13 23:43 config.ru
+      drwxr-xr-x   3 root  root   102 Feb 13 23:43 db
+      -rw-r--r--   1 user  staff   161 Feb 13 23:35 docker-compose.yml
+      drwxr-xr-x   4 root  root   136 Feb 13 23:43 lib
+      drwxr-xr-x   3 root  root   102 Feb 13 23:43 log
+      drwxr-xr-x   7 root  root   238 Feb 13 23:43 public
+      drwxr-xr-x   9 root  root   306 Feb 13 23:43 test
+      drwxr-xr-x   3 root  root   102 Feb 13 23:43 tmp
+      drwxr-xr-x   3 root  root   102 Feb 13 23:43 vendor
 
 
-The files `rails new` created are owned by root. This happens because the
-container runs as the `root` user.  Change the ownership of the new files.
+If you are running Docker on Linux, the files `rails new`  created are owned by
+root. This happens because the container runs as the root user. Change the
+ownership of the the new files.
 
-    sudo chown -R $USER:$USER .
+      sudo chown -R $USER:$USER .
+
+If you are running Docker on Mac or Windows, you should already have ownership
+of all files, including those generated by `rails new`. List the files just to
+verify this.
 
 Uncomment the line in your new `Gemfile` which loads `therubyracer`, so you've
 got a Javascript runtime:
@@ -130,6 +152,14 @@ Finally, you need to create the database. In another terminal, run:
 
 That's it. Your app should now be running on port 3000 on your Docker daemon. If you're using [Docker Machine](https://docs.docker.com/machine/), then `docker-machine ip MACHINE_VM` returns the Docker host IP address.
 
+![Rails example](images/rails-welcome.png)
+
+>**Note**: If you stop the example application and attempt to restart it, you might get the
+following error: `web_1 | A server is already running. Check
+/myapp/tmp/pids/server.pid.` One way to resolve this is to delete the file
+`tmp/pids/server.pid`, and then re-start the application with `docker-compose
+up`.
+
 
 ## More Compose documentation
 

From 4de12ad7a1408323d14271c3c39b238b36666494 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 16 Feb 2016 16:34:31 -0500
Subject: [PATCH 0814/1265] Update link to docker volume create docs.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/compose-file.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 01fe3683..04733916 100644
--- a/docs/compose-file.md
+++ b/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

From 471264239f4c9e6b80f8db06dae36303bea032fc Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 16 Feb 2016 16:38:31 -0500
Subject: [PATCH 0815/1265] Update guides to use v2 config format.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/django.md         | 24 +++++++++++++-----------
 docs/gettingstarted.md | 23 +++++++++++++----------
 docs/rails.md          | 24 +++++++++++++-----------
 docs/wordpress.md      | 28 +++++++++++++++-------------
 4 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/docs/django.md b/docs/django.md
index a127d008..c8863b34 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -72,17 +72,19 @@ and a `docker-compose.yml` file.
 
 9. Add the following configuration to the file.
 
-        db:
-          image: postgres
-        web:
-          build: .
-          command: python manage.py runserver 0.0.0.0:8000
-          volumes:
-            - .:/code
-          ports:
-            - "8000:8000"
-          links:
-            - db
+        version: '2'
+        services:
+          db:
+            image: postgres
+          web:
+            build: .
+            command: python manage.py runserver 0.0.0.0:8000
+            volumes:
+              - .:/code
+            ports:
+              - "8000:8000"
+            depends_on:
+              - db
 
     This file defines two services: The `db` service and the `web` service.
 
diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md
index 1939500c..36577f07 100644
--- a/docs/gettingstarted.md
+++ b/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: .
-          ports:
-           - "5000:5000"
-          volumes:
-           - .:/code
-          links:
-           - redis
-        redis:
-          image: redis
+
+        version: '2'
+        services:
+          web:
+            build: .
+            ports:
+             - "5000:5000"
+            volumes:
+             - .:/code
+            depends_on:
+             - redis
+          redis:
+            image: redis
 
 This Compose file defines two services, `web` and `redis`. The web service:
 
diff --git a/docs/rails.md b/docs/rails.md
index 145f53d8..ccb0ab73 100644
--- a/docs/rails.md
+++ b/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:
-      image: postgres
-    web:
-      build: .
-      command: bundle exec rails s -p 3000 -b '0.0.0.0'
-      volumes:
-        - .:/myapp
-      ports:
-        - "3000:3000"
-      links:
-        - db
+    version: '2'
+    services:
+      db:
+        image: postgres
+      web:
+        build: .
+        command: bundle exec rails s -p 3000 -b '0.0.0.0'
+        volumes:
+          - .:/myapp
+        ports:
+          - "3000:3000"
+        depends_on:
+          - db
 
 ### Build the project
 
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 50362253..62aec251 100644
--- a/docs/wordpress.md
+++ b/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:
-      build: .
-      command: php -S 0.0.0.0:8000 -t /code
-      ports:
-        - "8000:8000"
-      links:
-        - db
-      volumes:
-        - .:/code
-    db:
-      image: orchardup/mysql
-      environment:
-        MYSQL_DATABASE: wordpress
+    version: '2'
+    services:
+      web:
+        build: .
+        command: php -S 0.0.0.0:8000 -t /code
+        ports:
+          - "8000:8000"
+        depends_on:
+          - db
+        volumes:
+          - .:/code
+      db:
+        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

From 1512793b30de1c84bff319070c4c4d7f65fd49db Mon Sep 17 00:00:00 2001
From: Anthon van der Neut <anthon@mnt.org>
Date: Wed, 17 Feb 2016 09:56:49 +0100
Subject: [PATCH 0816/1265] for 1.6.0 the version value needs to be a string

After conversion a file would immediately not load in docker-compose 1.6.0 with the message:

  ERROR: Version in "./converted.yml" is invalid - it should be a string.

Signed-off-by: Anthon van der Neut anthon@mnt.org
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
---
 contrib/migration/migrate-compose-file-v1-to-v2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/migration/migrate-compose-file-v1-to-v2.py b/contrib/migration/migrate-compose-file-v1-to-v2.py
index 4f9be97f..c690197b 100755
--- a/contrib/migration/migrate-compose-file-v1-to-v2.py
+++ b/contrib/migration/migrate-compose-file-v1-to-v2.py
@@ -33,7 +33,7 @@ def migrate(content):
 
     services = {name: data.pop(name) for name in data.keys()}
 
-    data['version'] = 2
+    data['version'] = "2"
     data['services'] = services
     create_volumes_section(data)
 

From 4a09da43eaf6a9a202b6b803a3824263d491746c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 16 Feb 2016 14:24:17 -0500
Subject: [PATCH 0817/1265] Fix copying of volumes by using the name of the
 volume instead of the host path.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py                |  2 +-
 tests/integration/service_test.py | 24 ++++++++++++++++++++++++
 tests/unit/service_test.py        | 19 ++++++++++---------
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 9dd2865b..e54f29b0 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -925,7 +925,7 @@ def get_container_data_volumes(container, volumes_option):
             continue
 
         # Copy existing volume from old container
-        volume = volume._replace(external=mount['Source'])
+        volume = volume._replace(external=mount['Name'])
         volumes.append(volume)
 
     return volumes
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 1cc6b266..bcb87335 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -273,6 +273,30 @@ class ServiceTest(DockerClientTestCase):
                           self.client.inspect_container,
                           old_container.id)
 
+    def test_execute_convergence_plan_recreate_twice(self):
+        service = self.create_service(
+            'db',
+            volumes=[VolumeSpec.parse('/etc')],
+            entrypoint=['top'],
+            command=['-d', '1'])
+
+        orig_container = service.create_container()
+        service.start_container(orig_container)
+
+        orig_container.inspect()  # reload volume data
+        volume_path = orig_container.get_mount('/etc')['Source']
+
+        # Do this twice to reproduce the bug
+        for _ in range(2):
+            new_container, = service.execute_convergence_plan(
+                ConvergencePlan('recreate', [orig_container]))
+
+            assert new_container.get_mount('/etc')['Source'] == volume_path
+            assert ('affinity:container==%s' % orig_container.id in
+                    new_container.get('Config.Env'))
+
+            orig_container = new_container
+
     def test_execute_convergence_plan_when_containers_are_stopped(self):
         service = self.create_service(
             'db',
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index f34de3bf..603356be 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -691,8 +691,8 @@ class ServiceVolumesTest(unittest.TestCase):
         }, has_been_inspected=True)
 
         expected = [
-            VolumeSpec.parse('/var/lib/docker/aaaaaaaa:/existing/volume:rw'),
-            VolumeSpec.parse('/var/lib/docker/cccccccc:/mnt/image/data:rw'),
+            VolumeSpec.parse('existingvolume:/existing/volume:rw'),
+            VolumeSpec.parse('imagedata:/mnt/image/data:rw'),
         ]
 
         volumes = get_container_data_volumes(container, options)
@@ -724,11 +724,11 @@ class ServiceVolumesTest(unittest.TestCase):
         expected = [
             '/host/volume:/host/volume:ro',
             '/host/rw/volume:/host/rw/volume:rw',
-            '/var/lib/docker/aaaaaaaa:/existing/volume:rw',
+            'existingvolume:/existing/volume:rw',
         ]
 
         binds = merge_volume_bindings(options, intermediate_container)
-        self.assertEqual(set(binds), set(expected))
+        assert sorted(binds) == sorted(expected)
 
     def test_mount_same_host_path_to_two_volumes(self):
         service = Service(
@@ -761,13 +761,14 @@ class ServiceVolumesTest(unittest.TestCase):
             ]),
         )
 
-    def test_different_host_path_in_container_json(self):
+    def test_get_container_create_options_with_different_host_path_in_container_json(self):
         service = Service(
             'web',
             image='busybox',
             volumes=[VolumeSpec.parse('/host/path:/data')],
             client=self.mock_client,
         )
+        volume_name = 'abcdefff1234'
 
         self.mock_client.inspect_image.return_value = {
             'Id': 'ababab',
@@ -788,7 +789,7 @@ class ServiceVolumesTest(unittest.TestCase):
                     'Mode': '',
                     'RW': True,
                     'Driver': 'local',
-                    'Name': 'abcdefff1234'
+                    'Name': volume_name,
                 },
             ]
         }
@@ -799,9 +800,9 @@ class ServiceVolumesTest(unittest.TestCase):
             previous_container=Container(self.mock_client, {'Id': '123123123'}),
         )
 
-        self.assertEqual(
-            self.mock_client.create_host_config.call_args[1]['binds'],
-            ['/mnt/sda1/host/path:/data:rw'],
+        assert (
+            self.mock_client.create_host_config.call_args[1]['binds'] ==
+            ['{}:/data:rw'.format(volume_name)]
         )
 
     def test_warn_on_masked_volume_no_warning_when_no_container_volumes(self):

From 1952b5239205c82c278896ade6eb7041eb9de7eb Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 16 Feb 2016 16:48:04 -0800
Subject: [PATCH 0818/1265] Constraint build argument types. Numbers are cast
 into strings

Numerical driver_opts are also valid and typecast into strings.
Additional config tests.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py                | 13 ++++++--
 compose/config/fields_schema_v2.0.json  |  2 +-
 compose/config/service_schema_v2.0.json | 15 ++++++++-
 compose/utils.py                        |  4 +++
 tests/unit/config/config_test.py        | 43 ++++++++++++++++++++++++-
 5 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 19722b0a..7b9e6f83 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -16,6 +16,7 @@ from cached_property import cached_property
 
 from ..const import COMPOSEFILE_V1 as V1
 from ..const import COMPOSEFILE_V2_0 as V2_0
+from ..utils import build_string_dict
 from .errors import CircularReference
 from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
@@ -292,7 +293,7 @@ def load(config_details):
     config_details = config_details._replace(config_files=processed_files)
 
     main_file = config_details.config_files[0]
-    volumes = load_mapping(config_details.config_files, 'get_volumes', 'Volume')
+    volumes = load_volumes(config_details.config_files)
     networks = load_mapping(config_details.config_files, 'get_networks', 'Network')
     service_dicts = load_services(
         config_details.working_dir,
@@ -336,6 +337,14 @@ def load_mapping(config_files, get_func, entity_type):
     return mapping
 
 
+def load_volumes(config_files):
+    volumes = load_mapping(config_files, 'get_volumes', 'Volume')
+    for volume_name, volume in volumes.items():
+        if 'driver_opts' in volume:
+            volume['driver_opts'] = build_string_dict(volume['driver_opts'])
+    return volumes
+
+
 def load_services(working_dir, config_file, service_configs):
     def build_service(service_name, service_dict, service_names):
         service_config = ServiceConfig.with_abs_paths(
@@ -851,7 +860,7 @@ def normalize_build(service_dict, working_dir):
         else:
             build.update(service_dict['build'])
             if 'args' in build:
-                build['args'] = resolve_build_args(build)
+                build['args'] = build_string_dict(resolve_build_args(build))
 
         service_dict['build'] = build
 
diff --git a/compose/config/fields_schema_v2.0.json b/compose/config/fields_schema_v2.0.json
index 876065e5..7703adcd 100644
--- a/compose/config/fields_schema_v2.0.json
+++ b/compose/config/fields_schema_v2.0.json
@@ -78,7 +78,7 @@
         "driver_opts": {
           "type": "object",
           "patternProperties": {
-            "^.+$": {"type": "string"}
+            "^.+$": {"type": ["string", "number"]}
           }
         },
         "external": {
diff --git a/compose/config/service_schema_v2.0.json b/compose/config/service_schema_v2.0.json
index f7a67818..3196ca89 100644
--- a/compose/config/service_schema_v2.0.json
+++ b/compose/config/service_schema_v2.0.json
@@ -23,7 +23,20 @@
               "properties": {
                 "context": {"type": "string"},
                 "dockerfile": {"type": "string"},
-                "args": {"$ref": "#/definitions/list_or_dict"}
+                "args": {
+                  "oneOf": [
+                    {"$ref": "#/definitions/list_of_strings"},
+                    {
+                      "type": "object",
+                      "patternProperties": {
+                        "^.+$": {
+                          "type": ["string", "number"]
+                        }
+                      },
+                      "additionalProperties": false
+                    }
+                  ]
+                }
               },
               "additionalProperties": false
             }
diff --git a/compose/utils.py b/compose/utils.py
index 29d8a695..669df1d2 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -92,3 +92,7 @@ def json_hash(obj):
 
 def microseconds_from_time_nano(time_nano):
     return int(time_nano % 1000000000 / 1000)
+
+
+def build_string_dict(source_dict):
+    return dict([(k, str(v)) for k, v in source_dict.items()])
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 5f7633d9..1d6f1cbb 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -231,7 +231,7 @@ class ConfigTest(unittest.TestCase):
         assert volumes['simple'] == {}
         assert volumes['other'] == {}
 
-    def test_volume_invalid_driver_opt(self):
+    def test_volume_numeric_driver_opt(self):
         config_details = build_config_details({
             'version': '2',
             'services': {
@@ -241,6 +241,19 @@ class ConfigTest(unittest.TestCase):
                 'simple': {'driver_opts': {'size': 42}},
             }
         })
+        cfg = config.load(config_details)
+        assert cfg.volumes['simple']['driver_opts']['size'] == '42'
+
+    def test_volume_invalid_driver_opt(self):
+        config_details = build_config_details({
+            'version': '2',
+            'services': {
+                'simple': {'image': 'busybox'}
+            },
+            'volumes': {
+                'simple': {'driver_opts': {'size': True}},
+            }
+        })
         with pytest.raises(ConfigurationError) as exc:
             config.load(config_details)
         assert 'driver_opts.size contains an invalid type' in exc.exconly()
@@ -608,6 +621,34 @@ class ConfigTest(unittest.TestCase):
         self.assertTrue('context' in service[0]['build'])
         self.assertEqual(service[0]['build']['dockerfile'], 'Dockerfile-alt')
 
+    def test_load_with_buildargs(self):
+        service = config.load(
+            build_config_details(
+                {
+                    'version': '2',
+                    'services': {
+                        'web': {
+                            'build': {
+                                'context': '.',
+                                'dockerfile': 'Dockerfile-alt',
+                                'args': {
+                                    'opt1': 42,
+                                    'opt2': 'foobar'
+                                }
+                            }
+                        }
+                    }
+                },
+                'tests/fixtures/extends',
+                'filename.yml'
+            )
+        ).services[0]
+        assert 'args' in service['build']
+        assert 'opt1' in service['build']['args']
+        assert isinstance(service['build']['args']['opt1'], str)
+        assert service['build']['args']['opt1'] == '42'
+        assert service['build']['args']['opt2'] == 'foobar'
+
     def test_load_with_multiple_files_v2(self):
         base_file = config.ConfigFile(
             'base.yaml',

From 4f7530c480213d4cf526353aa3b68979ef605bd6 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 11 Feb 2016 19:53:28 -0500
Subject: [PATCH 0819/1265] Only set a container affinity if there are volumes
 to copy over.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py         | 32 ++++++++++++---------
 tests/unit/service_test.py | 58 ++++++++++++++++++++++++++++++++------
 2 files changed, 68 insertions(+), 22 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index e54f29b0..78eed4c4 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -592,20 +592,19 @@ class Service(object):
                     ports.append(port)
             container_options['ports'] = ports
 
-        override_options['binds'] = merge_volume_bindings(
-            container_options.get('volumes') or [],
-            previous_container)
-
-        if 'volumes' in container_options:
-            container_options['volumes'] = dict(
-                (v.internal, {}) for v in container_options['volumes'])
-
         container_options['environment'] = merge_environment(
             self.options.get('environment'),
             override_options.get('environment'))
 
-        if previous_container:
-            container_options['environment']['affinity:container'] = ('=' + previous_container.id)
+        binds, affinity = merge_volume_bindings(
+            container_options.get('volumes') or [],
+            previous_container)
+        override_options['binds'] = binds
+        container_options['environment'].update(affinity)
+
+        if 'volumes' in container_options:
+            container_options['volumes'] = dict(
+                (v.internal, {}) for v in container_options['volumes'])
 
         container_options['image'] = self.image_name
 
@@ -877,18 +876,23 @@ def merge_volume_bindings(volumes, previous_container):
     """Return a list of volume bindings for a container. Container data volumes
     are replaced by those from the previous container.
     """
+    affinity = {}
+
     volume_bindings = dict(
         build_volume_binding(volume)
         for volume in volumes
         if volume.external)
 
     if previous_container:
-        data_volumes = get_container_data_volumes(previous_container, volumes)
-        warn_on_masked_volume(volumes, data_volumes, previous_container.service)
+        old_volumes = get_container_data_volumes(previous_container, volumes)
+        warn_on_masked_volume(volumes, old_volumes, previous_container.service)
         volume_bindings.update(
-            build_volume_binding(volume) for volume in data_volumes)
+            build_volume_binding(volume) for volume in old_volumes)
 
-    return list(volume_bindings.values())
+        if old_volumes:
+            affinity = {'affinity:container': '=' + previous_container.id}
+
+    return list(volume_bindings.values()), affinity
 
 
 def get_container_data_volumes(container, volumes_option):
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 603356be..ce28a9ca 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -267,13 +267,52 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(
             opts['labels'][LABEL_CONFIG_HASH],
             'f8bfa1058ad1f4231372a0b1639f0dfdb574dafff4e8d7938049ae993f7cf1fc')
-        self.assertEqual(
-            opts['environment'],
-            {
-                'affinity:container': '=ababab',
-                'also': 'real',
-            }
+        assert opts['environment'] == {'also': 'real'}
+
+    def test_get_container_create_options_sets_affinity_with_binds(self):
+        service = Service(
+            'foo',
+            image='foo',
+            client=self.mock_client,
         )
+        self.mock_client.inspect_image.return_value = {'Id': 'abcd'}
+        prev_container = mock.Mock(
+            id='ababab',
+            image_config={'ContainerConfig': {'Volumes': ['/data']}})
+
+        def container_get(key):
+            return {
+                'Mounts': [
+                    {
+                        'Destination': '/data',
+                        'Source': '/some/path',
+                        'Name': 'abab1234',
+                    },
+                ]
+            }.get(key, None)
+
+        prev_container.get.side_effect = container_get
+
+        opts = service._get_container_create_options(
+            {},
+            1,
+            previous_container=prev_container)
+
+        assert opts['environment'] == {'affinity:container': '=ababab'}
+
+    def test_get_container_create_options_no_affinity_without_binds(self):
+        service = Service('foo', image='foo', client=self.mock_client)
+        self.mock_client.inspect_image.return_value = {'Id': 'abcd'}
+        prev_container = mock.Mock(
+            id='ababab',
+            image_config={'ContainerConfig': {}})
+        prev_container.get.return_value = None
+
+        opts = service._get_container_create_options(
+            {},
+            1,
+            previous_container=prev_container)
+        assert opts['environment'] == {}
 
     def test_get_container_not_found(self):
         self.mock_client.containers.return_value = []
@@ -650,6 +689,7 @@ class ServiceVolumesTest(unittest.TestCase):
             '/host/volume:/host/volume:ro',
             '/new/volume',
             '/existing/volume',
+            'named:/named/vol',
         ]]
 
         self.mock_client.inspect_image.return_value = {
@@ -710,7 +750,8 @@ class ServiceVolumesTest(unittest.TestCase):
             'ContainerConfig': {'Volumes': {}}
         }
 
-        intermediate_container = Container(self.mock_client, {
+        previous_container = Container(self.mock_client, {
+            'Id': 'cdefab',
             'Image': 'ababab',
             'Mounts': [{
                 'Source': '/var/lib/docker/aaaaaaaa',
@@ -727,8 +768,9 @@ class ServiceVolumesTest(unittest.TestCase):
             'existingvolume:/existing/volume:rw',
         ]
 
-        binds = merge_volume_bindings(options, intermediate_container)
+        binds, affinity = merge_volume_bindings(options, previous_container)
         assert sorted(binds) == sorted(expected)
+        assert affinity == {'affinity:container': '=cdefab'}
 
     def test_mount_same_host_path_to_two_volumes(self):
         service = Service(

From 93a02e497dd19c055235936ec4cfe3d14f99d263 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 18 Feb 2016 10:53:40 -0800
Subject: [PATCH 0820/1265] Apply driver_opts processing to network configs

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py | 21 +++++++++++----------
 compose/utils.py         |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 7b9e6f83..dbc6b6b2 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -293,8 +293,12 @@ def load(config_details):
     config_details = config_details._replace(config_files=processed_files)
 
     main_file = config_details.config_files[0]
-    volumes = load_volumes(config_details.config_files)
-    networks = load_mapping(config_details.config_files, 'get_networks', 'Network')
+    volumes = load_mapping(
+        config_details.config_files, 'get_volumes', 'Volume'
+    )
+    networks = load_mapping(
+        config_details.config_files, 'get_networks', 'Network'
+    )
     service_dicts = load_services(
         config_details.working_dir,
         main_file,
@@ -334,17 +338,14 @@ def load_mapping(config_files, get_func, entity_type):
 
             mapping[name] = config
 
+            if 'driver_opts' in config:
+                config['driver_opts'] = build_string_dict(
+                    config['driver_opts']
+                )
+
     return mapping
 
 
-def load_volumes(config_files):
-    volumes = load_mapping(config_files, 'get_volumes', 'Volume')
-    for volume_name, volume in volumes.items():
-        if 'driver_opts' in volume:
-            volume['driver_opts'] = build_string_dict(volume['driver_opts'])
-    return volumes
-
-
 def load_services(working_dir, config_file, service_configs):
     def build_service(service_name, service_dict, service_names):
         service_config = ServiceConfig.with_abs_paths(
diff --git a/compose/utils.py b/compose/utils.py
index 669df1d2..494beea3 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -95,4 +95,4 @@ def microseconds_from_time_nano(time_nano):
 
 
 def build_string_dict(source_dict):
-    return dict([(k, str(v)) for k, v in source_dict.items()])
+    return dict((k, str(v)) for k, v in source_dict.items())

From 2b5d3f51cb7e8501c1b5481ce45d139b7e49171e Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 12 Feb 2016 16:10:36 -0800
Subject: [PATCH 0821/1265] Allow user to specify custom network aliases

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py                |  3 +++
 compose/config/service_schema_v2.0.json | 13 ++++++++++---
 compose/config/validation.py            | 13 +++++++++++++
 compose/network.py                      | 11 ++++++++---
 compose/project.py                      |  4 ++--
 compose/service.py                      | 12 ++++++------
 6 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index dbc6b6b2..1e077adc 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -31,6 +31,7 @@ from .types import ServiceLink
 from .types import VolumeFromSpec
 from .types import VolumeSpec
 from .validation import match_named_volumes
+from .validation import match_network_aliases
 from .validation import validate_against_fields_schema
 from .validation import validate_against_service_schema
 from .validation import validate_depends_on
@@ -546,6 +547,8 @@ def validate_service(service_config, service_names, version):
     validate_network_mode(service_config, service_names)
     validate_depends_on(service_config, service_names)
 
+    match_network_aliases(service_config.config)
+
     if not service_dict.get('image') and has_uppercase(service_name):
         raise ConfigurationError(
             "Service '{name}' contains uppercase characters which are not valid "
diff --git a/compose/config/service_schema_v2.0.json b/compose/config/service_schema_v2.0.json
index 3196ca89..1c8022d3 100644
--- a/compose/config/service_schema_v2.0.json
+++ b/compose/config/service_schema_v2.0.json
@@ -120,9 +120,16 @@
         "network_mode": {"type": "string"},
 
         "networks": {
-          "type": "array",
-          "items": {"type": "string"},
-          "uniqueItems": true
+          "$ref": "#/definitions/list_of_strings"
+        },
+        "network_aliases": {
+          "type": "object",
+          "patternProperties": {
+            "^[a-zA-Z0-9._-]+$": {
+              "$ref": "#/definitions/list_of_strings"
+            }
+          },
+          "additionalProperties": false
         },
 
         "pid": {"type": ["string", "null"]},
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 35727e2c..53929150 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -91,6 +91,19 @@ def match_named_volumes(service_dict, project_volumes):
             )
 
 
+def match_network_aliases(service_dict):
+    networks = service_dict.get('networks', [])
+    aliased_networks = service_dict.get('network_aliases', {}).keys()
+    for n in aliased_networks:
+        if n not in networks:
+            raise ConfigurationError(
+                'Network "{0}" is referenced in network_aliases, but is not'
+                'declared in the networks list for service "{1}"'.format(
+                    n, service_dict.get('name')
+                )
+            )
+
+
 def validate_top_level_service_objects(filename, service_dicts):
     """Perform some high level validation of the service name and value.
 
diff --git a/compose/network.py b/compose/network.py
index 82a78f3b..99c04649 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -15,7 +15,7 @@ log = logging.getLogger(__name__)
 
 class Network(object):
     def __init__(self, client, project, name, driver=None, driver_opts=None,
-                 ipam=None, external_name=None):
+                 ipam=None, external_name=None, aliases=None):
         self.client = client
         self.project = project
         self.name = name
@@ -23,6 +23,7 @@ class Network(object):
         self.driver_opts = driver_opts
         self.ipam = create_ipam_config_from_dict(ipam)
         self.external_name = external_name
+        self.aliases = aliases or []
 
     def ensure(self):
         if self.external_name:
@@ -166,14 +167,18 @@ def get_network_names_for_service(service_dict):
 
 
 def get_networks(service_dict, network_definitions):
-    networks = []
+    networks = {}
+    aliases = service_dict.get('network_aliases', {})
     for name in get_network_names_for_service(service_dict):
+        log.debug(name)
         network = network_definitions.get(name)
         if network:
-            networks.append(network.full_name)
+            log.debug(aliases)
+            networks[network.full_name] = aliases.get(name, [])
         else:
             raise ConfigurationError(
                 'Service "{}" uses an undefined network "{}"'
                 .format(service_dict['name'], name))
 
+    log.debug(networks)
     return networks
diff --git a/compose/project.py b/compose/project.py
index 62e1d2cd..0394fa15 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -69,11 +69,11 @@ class Project(object):
             if use_networking:
                 service_networks = get_networks(service_dict, networks)
             else:
-                service_networks = []
+                service_networks = {}
 
             service_dict.pop('networks', None)
             links = project.get_links(service_dict)
-            network_mode = project.get_network_mode(service_dict, service_networks)
+            network_mode = project.get_network_mode(service_dict, service_networks.keys())
             volumes_from = get_volumes_from(project, service_dict)
 
             if config_data.version != V1:
diff --git a/compose/service.py b/compose/service.py
index 78eed4c4..c597abd0 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -124,7 +124,7 @@ class Service(object):
         self.links = links or []
         self.volumes_from = volumes_from or []
         self.network_mode = network_mode or NetworkMode(None)
-        self.networks = networks or []
+        self.networks = networks or {}
         self.options = options
 
     def containers(self, stopped=False, one_off=False, filters={}):
@@ -432,14 +432,14 @@ class Service(object):
     def connect_container_to_networks(self, container):
         connected_networks = container.get('NetworkSettings.Networks')
 
-        for network in self.networks:
+        for network, aliases in self.networks.items():
             if network in connected_networks:
                 self.client.disconnect_container_from_network(
                     container.id, network)
 
             self.client.connect_container_to_network(
                 container.id, network,
-                aliases=self._get_aliases(container),
+                aliases=list(self._get_aliases(container).union(aliases)),
                 links=self._get_links(False),
             )
 
@@ -473,7 +473,7 @@ class Service(object):
             'image_id': self.image()['Id'],
             'links': self.get_link_names(),
             'net': self.network_mode.id,
-            'networks': self.networks,
+            'networks': self.networks.keys(),
             'volumes_from': [
                 (v.source.name, v.mode)
                 for v in self.volumes_from if isinstance(v.source, Service)
@@ -514,9 +514,9 @@ class Service(object):
 
     def _get_aliases(self, container):
         if container.labels.get(LABEL_ONE_OFF) == "True":
-            return []
+            return set()
 
-        return [self.name, container.short_id]
+        return set([self.name, container.short_id])
 
     def _get_links(self, link_to_self):
         links = {}

From 633e349ab97af63849fc739eb9596be6f6f24362 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 12 Feb 2016 16:58:29 -0800
Subject: [PATCH 0822/1265] Test network_aliases feature

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/validation.py                |  2 +-
 compose/project.py                          |  4 ++-
 tests/acceptance/cli_test.py                | 27 +++++++++++++++++++++
 tests/fixtures/networks/network-aliases.yml | 18 ++++++++++++++
 tests/unit/config/config_test.py            | 21 ++++++++++++++++
 5 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 tests/fixtures/networks/network-aliases.yml

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 53929150..59ce9f54 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -97,7 +97,7 @@ def match_network_aliases(service_dict):
     for n in aliased_networks:
         if n not in networks:
             raise ConfigurationError(
-                'Network "{0}" is referenced in network_aliases, but is not'
+                'Network "{0}" is referenced in network_aliases, but is not '
                 'declared in the networks list for service "{1}"'.format(
                     n, service_dict.get('name')
                 )
diff --git a/compose/project.py b/compose/project.py
index 0394fa15..cfb11aa0 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -73,7 +73,9 @@ class Project(object):
 
             service_dict.pop('networks', None)
             links = project.get_links(service_dict)
-            network_mode = project.get_network_mode(service_dict, service_networks.keys())
+            network_mode = project.get_network_mode(
+                service_dict, list(service_networks.keys())
+            )
             volumes_from = get_volumes_from(project, service_dict)
 
             if config_data.version != V1:
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index ea3d132a..49048fb7 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -445,6 +445,33 @@ class CLITestCase(DockerClientTestCase):
 
         assert networks[0]['Options']['com.docker.network.bridge.enable_icc'] == 'false'
 
+    def test_up_with_network_aliases(self):
+        filename = 'network-aliases.yml'
+        self.base_dir = 'tests/fixtures/networks'
+        self.dispatch(['-f', filename, 'up', '-d'], None)
+        back_name = '{}_back'.format(self.project.name)
+        front_name = '{}_front'.format(self.project.name)
+
+        networks = [
+            n for n in self.client.networks()
+            if n['Name'].startswith('{}_'.format(self.project.name))
+        ]
+
+        # Two networks were created: back and front
+        assert sorted(n['Name'] for n in networks) == [back_name, front_name]
+        web_container = self.project.get_service('web').containers()[0]
+
+        back_aliases = web_container.get(
+            'NetworkSettings.Networks.{}.Aliases'.format(back_name)
+        )
+        assert 'web' in back_aliases
+        front_aliases = web_container.get(
+            'NetworkSettings.Networks.{}.Aliases'.format(front_name)
+        )
+        assert 'web' in front_aliases
+        assert 'forward_facing' in front_aliases
+        assert 'ahead' in front_aliases
+
     @v2_only()
     def test_up_with_networks(self):
         self.base_dir = 'tests/fixtures/networks'
diff --git a/tests/fixtures/networks/network-aliases.yml b/tests/fixtures/networks/network-aliases.yml
new file mode 100644
index 00000000..987b0809
--- /dev/null
+++ b/tests/fixtures/networks/network-aliases.yml
@@ -0,0 +1,18 @@
+version: "2"
+
+services:
+  web:
+    image: busybox
+    command: top
+    networks:
+      - front
+      - back
+
+    network_aliases:
+      front:
+        - forward_facing
+        - ahead
+
+networks:
+  front: {}
+  back: {}
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 1d6f1cbb..88d46a14 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -556,6 +556,27 @@ class ConfigTest(unittest.TestCase):
         assert services[1]['name'] == 'db'
         assert services[2]['name'] == 'web'
 
+    def test_invalid_network_alias(self):
+        config_details = build_config_details({
+            'version': '2',
+            'services': {
+                'web': {
+                    'image': 'busybox',
+                    'networks': ['hello'],
+                    'network_aliases': {
+                        'world': ['planet', 'universe']
+                    }
+                }
+            },
+            'networks': {
+                'hello': {},
+                'world': {}
+            }
+        })
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(config_details)
+        assert 'not declared in the networks list' in exc.exconly()
+
     def test_config_build_configuration(self):
         service = config.load(
             build_config_details(

From 7801cfc5d1ac9f481ebc991ef8bd6fab7a94575c Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 12 Feb 2016 17:17:31 -0800
Subject: [PATCH 0823/1265] Document network_aliases config

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 docs/compose-file.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 04733916..2e9632c4 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -451,9 +451,27 @@ id.
     net: "none"
     net: "container:[service name or container name/id]"
 
+### network_aliases
+
+> [Version 2 file format](#version-2) only.
+
+Alias names for this service on each joined network. All networks referenced
+here must also appear under the `networks` key.
+
+    networks:
+      - some-network
+      - other-network
+    network_aliases:
+      some-network:
+        - alias1
+        - alias3
+      other-network:
+        - alias2
+        - alias4
+
 ### network_mode
 
-> [Version 2 file format](#version-1) only. In version 1, use [net](#net).
+> [Version 2 file format](#version-2) only. In version 1, use [net](#net).
 
 Network mode. Use the same values as the docker client `--net` parameter, plus
 the special form `service:[service name]`.

From 41e399be9880583954c6de6559886465e3f8db85 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 12 Feb 2016 17:20:18 -0800
Subject: [PATCH 0824/1265] Fix network list serialization in py3

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/service.py b/compose/service.py
index c597abd0..5f40a457 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -473,7 +473,7 @@ class Service(object):
             'image_id': self.image()['Id'],
             'links': self.get_link_names(),
             'net': self.network_mode.id,
-            'networks': self.networks.keys(),
+            'networks': list(self.networks.keys()),
             'volumes_from': [
                 (v.source.name, v.mode)
                 for v in self.volumes_from if isinstance(v.source, Service)

From 4b99b32ffb346d0cb4b488a69565ea991acbb38f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 12 Feb 2016 17:48:42 -0800
Subject: [PATCH 0825/1265] Add v2_only decorator to network aliases test

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/acceptance/cli_test.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 49048fb7..4ba48d45 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -445,6 +445,7 @@ class CLITestCase(DockerClientTestCase):
 
         assert networks[0]['Options']['com.docker.network.bridge.enable_icc'] == 'false'
 
+    @v2_only()
     def test_up_with_network_aliases(self):
         filename = 'network-aliases.yml'
         self.base_dir = 'tests/fixtures/networks'

From 825a0941f04523a6c68e47bb3392a720744f7b7a Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 18 Feb 2016 12:04:07 -0800
Subject: [PATCH 0826/1265] Network aliases are now part of the network
 dictionary

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py                    |  3 --
 compose/config/service_schema_v2.0.json     | 30 +++++++++++++-------
 compose/config/validation.py                | 13 ---------
 compose/network.py                          | 28 +++++++++++--------
 docs/compose-file.md                        | 31 +++++++++------------
 tests/fixtures/networks/network-aliases.yml | 10 +++----
 tests/unit/config/config_test.py            | 21 --------------
 7 files changed, 54 insertions(+), 82 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 1e077adc..dbc6b6b2 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -31,7 +31,6 @@ from .types import ServiceLink
 from .types import VolumeFromSpec
 from .types import VolumeSpec
 from .validation import match_named_volumes
-from .validation import match_network_aliases
 from .validation import validate_against_fields_schema
 from .validation import validate_against_service_schema
 from .validation import validate_depends_on
@@ -547,8 +546,6 @@ def validate_service(service_config, service_names, version):
     validate_network_mode(service_config, service_names)
     validate_depends_on(service_config, service_names)
 
-    match_network_aliases(service_config.config)
-
     if not service_dict.get('image') and has_uppercase(service_name):
         raise ConfigurationError(
             "Service '{name}' contains uppercase characters which are not valid "
diff --git a/compose/config/service_schema_v2.0.json b/compose/config/service_schema_v2.0.json
index 1c8022d3..edccedc6 100644
--- a/compose/config/service_schema_v2.0.json
+++ b/compose/config/service_schema_v2.0.json
@@ -120,18 +120,28 @@
         "network_mode": {"type": "string"},
 
         "networks": {
-          "$ref": "#/definitions/list_of_strings"
-        },
-        "network_aliases": {
-          "type": "object",
-          "patternProperties": {
-            "^[a-zA-Z0-9._-]+$": {
-              "$ref": "#/definitions/list_of_strings"
+          "oneOf": [
+            {"$ref": "#/definitions/list_of_strings"},
+            {
+              "type": "object",
+              "patternProperties": {
+                "^[a-zA-Z0-9._-]+$": {
+                  "oneOf": [
+                    {
+                      "type": "object",
+                      "properties": {
+                        "aliases": {"$ref": "#/definitions/list_of_strings"}
+                      },
+                      "additionalProperties": false
+                    },
+                    {"type": "null"}
+                  ]
+                }
+              },
+              "additionalProperties": false
             }
-          },
-          "additionalProperties": false
+          ]
         },
-
         "pid": {"type": ["string", "null"]},
 
         "ports": {
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 59ce9f54..35727e2c 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -91,19 +91,6 @@ def match_named_volumes(service_dict, project_volumes):
             )
 
 
-def match_network_aliases(service_dict):
-    networks = service_dict.get('networks', [])
-    aliased_networks = service_dict.get('network_aliases', {}).keys()
-    for n in aliased_networks:
-        if n not in networks:
-            raise ConfigurationError(
-                'Network "{0}" is referenced in network_aliases, but is not '
-                'declared in the networks list for service "{1}"'.format(
-                    n, service_dict.get('name')
-                )
-            )
-
-
 def validate_top_level_service_objects(filename, service_dicts):
     """Perform some high level validation of the service name and value.
 
diff --git a/compose/network.py b/compose/network.py
index 99c04649..d17ed080 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -15,7 +15,7 @@ log = logging.getLogger(__name__)
 
 class Network(object):
     def __init__(self, client, project, name, driver=None, driver_opts=None,
-                 ipam=None, external_name=None, aliases=None):
+                 ipam=None, external_name=None):
         self.client = client
         self.project = project
         self.name = name
@@ -23,7 +23,6 @@ class Network(object):
         self.driver_opts = driver_opts
         self.ipam = create_ipam_config_from_dict(ipam)
         self.external_name = external_name
-        self.aliases = aliases or []
 
     def ensure(self):
         if self.external_name:
@@ -160,25 +159,32 @@ class ProjectNetworks(object):
             network.ensure()
 
 
-def get_network_names_for_service(service_dict):
+def get_network_aliases_for_service(service_dict):
     if 'network_mode' in service_dict:
-        return []
-    return service_dict.get('networks', ['default'])
+        return {}
+    networks = service_dict.get('networks', ['default'])
+    if isinstance(networks, list):
+        return dict((net, []) for net in networks)
+
+    return dict(
+        (net, (config or {}).get('aliases', []))
+        for net, config in networks.items()
+    )
+
+
+def get_network_names_for_service(service_dict):
+    return get_network_aliases_for_service(service_dict).keys()
 
 
 def get_networks(service_dict, network_definitions):
     networks = {}
-    aliases = service_dict.get('network_aliases', {})
-    for name in get_network_names_for_service(service_dict):
-        log.debug(name)
+    for name, aliases in get_network_aliases_for_service(service_dict).items():
         network = network_definitions.get(name)
         if network:
-            log.debug(aliases)
-            networks[network.full_name] = aliases.get(name, [])
+            networks[network.full_name] = aliases
         else:
             raise ConfigurationError(
                 'Service "{}" uses an undefined network "{}"'
                 .format(service_dict['name'], name))
 
-    log.debug(networks)
     return networks
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 2e9632c4..45e1ac09 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -451,24 +451,6 @@ id.
     net: "none"
     net: "container:[service name or container name/id]"
 
-### network_aliases
-
-> [Version 2 file format](#version-2) only.
-
-Alias names for this service on each joined network. All networks referenced
-here must also appear under the `networks` key.
-
-    networks:
-      - some-network
-      - other-network
-    network_aliases:
-      some-network:
-        - alias1
-        - alias3
-      other-network:
-        - alias2
-        - alias4
-
 ### network_mode
 
 > [Version 2 file format](#version-2) only. In version 1, use [net](#net).
@@ -493,6 +475,19 @@ Networks to join, referencing entries under the
       - some-network
       - other-network
 
+#### aliases
+
+Alias names for this service on the specified network.
+
+    networks:
+      some-network:
+        aliases:
+          - alias1
+          - alias3
+      other-network:
+        aliases:
+          - alias2
+
 ### pid
 
     pid: "host"
diff --git a/tests/fixtures/networks/network-aliases.yml b/tests/fixtures/networks/network-aliases.yml
index 987b0809..8cf7d5af 100644
--- a/tests/fixtures/networks/network-aliases.yml
+++ b/tests/fixtures/networks/network-aliases.yml
@@ -5,13 +5,11 @@ services:
     image: busybox
     command: top
     networks:
-      - front
-      - back
-
-    network_aliases:
       front:
-        - forward_facing
-        - ahead
+        aliases:
+          - forward_facing
+          - ahead
+      back:
 
 networks:
   front: {}
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 88d46a14..1d6f1cbb 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -556,27 +556,6 @@ class ConfigTest(unittest.TestCase):
         assert services[1]['name'] == 'db'
         assert services[2]['name'] == 'web'
 
-    def test_invalid_network_alias(self):
-        config_details = build_config_details({
-            'version': '2',
-            'services': {
-                'web': {
-                    'image': 'busybox',
-                    'networks': ['hello'],
-                    'network_aliases': {
-                        'world': ['planet', 'universe']
-                    }
-                }
-            },
-            'networks': {
-                'hello': {},
-                'world': {}
-            }
-        })
-        with pytest.raises(ConfigurationError) as exc:
-            config.load(config_details)
-        assert 'not declared in the networks list' in exc.exconly()
-
     def test_config_build_configuration(self):
         service = config.load(
             build_config_details(

From 7152f7ea7662633415de0750b6cb6b3f6742c847 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 18 Feb 2016 14:52:52 -0800
Subject: [PATCH 0827/1265] Handle mismatched network formats in config files

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py          |  6 +++++-
 compose/network.py                |  5 +----
 docs/compose-file.md              | 10 ++++++++-
 tests/acceptance/cli_test.py      |  2 +-
 tests/integration/project_test.py |  4 ++--
 tests/unit/config/config_test.py  | 36 +++++++++++++++++++++++++++++++
 tests/unit/project_test.py        |  2 +-
 7 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index dbc6b6b2..d0024e9c 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -612,6 +612,9 @@ def finalize_service(service_config, service_names, version):
         else:
             service_dict['network_mode'] = network_mode
 
+    if 'networks' in service_dict:
+        service_dict['networks'] = parse_networks(service_dict['networks'])
+
     if 'restart' in service_dict:
         service_dict['restart'] = parse_restart_spec(service_dict['restart'])
 
@@ -701,6 +704,7 @@ def merge_service_dicts(base, override, version):
     md.merge_mapping('environment', parse_environment)
     md.merge_mapping('labels', parse_labels)
     md.merge_mapping('ulimits', parse_ulimits)
+    md.merge_mapping('networks', parse_networks)
     md.merge_sequence('links', ServiceLink.parse)
 
     for field in ['volumes', 'devices']:
@@ -710,7 +714,6 @@ def merge_service_dicts(base, override, version):
         'depends_on',
         'expose',
         'external_links',
-        'networks',
         'ports',
         'volumes_from',
     ]:
@@ -798,6 +801,7 @@ def parse_dict_or_list(split_func, type_name, arguments):
 parse_build_arguments = functools.partial(parse_dict_or_list, split_env, 'build arguments')
 parse_environment = functools.partial(parse_dict_or_list, split_env, 'environment')
 parse_labels = functools.partial(parse_dict_or_list, split_label, 'labels')
+parse_networks = functools.partial(parse_dict_or_list, lambda k: (k, None), 'networks')
 
 
 def parse_ulimits(ulimits):
diff --git a/compose/network.py b/compose/network.py
index d17ed080..135502cc 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -162,10 +162,7 @@ class ProjectNetworks(object):
 def get_network_aliases_for_service(service_dict):
     if 'network_mode' in service_dict:
         return {}
-    networks = service_dict.get('networks', ['default'])
-    if isinstance(networks, list):
-        return dict((net, []) for net in networks)
-
+    networks = service_dict.get('networks', {'default': None})
     return dict(
         (net, (config or {}).get('aliases', []))
         for net, config in networks.items()
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 45e1ac09..6441297f 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -477,7 +477,15 @@ Networks to join, referencing entries under the
 
 #### aliases
 
-Alias names for this service on the specified network.
+Aliases (alternative hostnames) for this service on the network. Other servers
+on the network can use either the service name or this alias to connect to
+this service.  Since `alias` is network-scoped:
+
+  * the same service can have different aliases when connected to another
+    network.
+  * it is allowable to configure the same alias name to multiple containers
+    (services) on the same network.
+
 
     networks:
       some-network:
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 4ba48d45..318ab3d3 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -185,7 +185,7 @@ class CLITestCase(DockerClientTestCase):
                     'build': {
                         'context': os.path.abspath(self.base_dir),
                     },
-                    'networks': ['front', 'default'],
+                    'networks': {'front': None, 'default': None},
                     'volumes_from': ['service:other:rw'],
                 },
                 'other': {
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 6bb076a3..6542fa18 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -565,7 +565,7 @@ class ProjectTest(DockerClientTestCase):
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top',
-                'networks': ['foo', 'bar', 'baz'],
+                'networks': {'foo': None, 'bar': None, 'baz': None},
             }],
             volumes={},
             networks={
@@ -598,7 +598,7 @@ class ProjectTest(DockerClientTestCase):
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
-                'networks': ['front'],
+                'networks': {'front': None},
             }],
             volumes={},
             networks={
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 1d6f1cbb..204003bc 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -649,6 +649,42 @@ class ConfigTest(unittest.TestCase):
         assert service['build']['args']['opt1'] == '42'
         assert service['build']['args']['opt2'] == 'foobar'
 
+    def test_load_with_multiple_files_mismatched_networks_format(self):
+        base_file = config.ConfigFile(
+            'base.yaml',
+            {
+                'version': '2',
+                'services': {
+                    'web': {
+                        'image': 'example/web',
+                        'networks': {
+                            'foobar': {'aliases': ['foo', 'bar']}
+                        }
+                    }
+                },
+                'networks': {'foobar': {}, 'baz': {}}
+            }
+        )
+
+        override_file = config.ConfigFile(
+            'override.yaml',
+            {
+                'version': '2',
+                'services': {
+                    'web': {
+                        'networks': ['baz']
+                    }
+                }
+            }
+        )
+
+        details = config.ConfigDetails('.', [base_file, override_file])
+        web_service = config.load(details).services[0]
+        assert web_service['networks'] == {
+            'foobar': {'aliases': ['foo', 'bar']},
+            'baz': None
+        }
+
     def test_load_with_multiple_files_v2(self):
         base_file = config.ConfigFile(
             'base.yaml',
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index bec238de..c28c2152 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -438,7 +438,7 @@ class ProjectTest(unittest.TestCase):
                     {
                         'name': 'foo',
                         'image': 'busybox:latest',
-                        'networks': ['custom']
+                        'networks': {'custom': None}
                     },
                 ],
                 networks={'custom': {}},

From 0cb8ba37757d8e075be9630d96b08475aff8986a Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 18 Feb 2016 15:28:12 -0800
Subject: [PATCH 0828/1265] Use modern set notation in _get_aliases

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/service.py b/compose/service.py
index 5f40a457..8b22b7d7 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -516,7 +516,7 @@ class Service(object):
         if container.labels.get(LABEL_ONE_OFF) == "True":
             return set()
 
-        return set([self.name, container.short_id])
+        return {self.name, container.short_id}
 
     def _get_links(self, link_to_self):
         links = {}

From 068a56eb97f7b8a0522f94eec7b66a95fff80a1d Mon Sep 17 00:00:00 2001
From: Victoria Bialas <victoria.bialas@docker.com>
Date: Thu, 18 Feb 2016 17:49:28 -0800
Subject: [PATCH 0829/1265] corrected description of network aliases, added
 real-world example per #2907

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
---
 docs/compose-file.md | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 6441297f..77c69734 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -477,15 +477,13 @@ Networks to join, referencing entries under the
 
 #### aliases
 
-Aliases (alternative hostnames) for this service on the network. Other servers
-on the network can use either the service name or this alias to connect to
-this service.  Since `alias` is network-scoped:
+Aliases (alternative hostnames) for this service on the network. Other containers on the same network can use either the service name or this alias to connect to one of the service's containers.  
 
-  * the same service can have different aliases when connected to another
-    network.
-  * it is allowable to configure the same alias name to multiple containers
-    (services) on the same network.
+Since `aliases` is network-scoped, the same service can have different aliases on different networks.
 
+> **Note**: A network-wide alias can be shared by multiple containers, and even by multiple services. If it is, then exactly which container the name will resolve to is not guaranteed.
+
+The general format is shown here.
 
     networks:
       some-network:
@@ -496,6 +494,35 @@ this service.  Since `alias` is network-scoped:
         aliases:
           - alias2
 
+In the example below, three services are provided (`web`, `worker`, and `db`), along with two networks (`new` and `legacy`). The `db` service is reachable at the hostname `db` or `database` on the `new` network, and at `db` or `mysql` on the legacy network.
+
+    version: 2
+
+    services:
+      web:
+        build: ./web
+        networks:
+          - new
+
+      worker:
+        build: ./worker
+        networks:
+        - legacy
+
+      db:
+        image: mysql
+        networks:
+          new:
+            aliases:
+              - database
+          legacy:
+            aliases:
+              - mysql
+
+    networks:
+      new:
+      legacy:
+
 ### pid
 
     pid: "host"

From 630a50295b30a4d30e233326a2f13d1d4b0d725d Mon Sep 17 00:00:00 2001
From: Victoria Bialas <victoria.bialas@docker.com>
Date: Thu, 18 Feb 2016 18:05:30 -0800
Subject: [PATCH 0830/1265] copyedit to make  show as file format

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
---
 docs/compose-file.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 77c69734..55d4109d 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -494,7 +494,7 @@ The general format is shown here.
         aliases:
           - alias2
 
-In the example below, three services are provided (`web`, `worker`, and `db`), along with two networks (`new` and `legacy`). The `db` service is reachable at the hostname `db` or `database` on the `new` network, and at `db` or `mysql` on the legacy network.
+In the example below, three services are provided (`web`, `worker`, and `db`), along with two networks (`new` and `legacy`). The `db` service is reachable at the hostname `db` or `database` on the `new` network, and at `db` or `mysql` on the `legacy` network.
 
     version: 2
 

From eb4a98c0d141063c2d112c4de879e226a3c96c5e Mon Sep 17 00:00:00 2001
From: Victoria Bialas <victoria.bialas@docker.com>
Date: Thu, 18 Feb 2016 17:49:28 -0800
Subject: [PATCH 0831/1265] corrected description of network aliases, added
 real-world example per #2907

copyedit to make  show as file format

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
---
 docs/compose-file.md | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 6441297f..55d4109d 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -477,15 +477,13 @@ Networks to join, referencing entries under the
 
 #### aliases
 
-Aliases (alternative hostnames) for this service on the network. Other servers
-on the network can use either the service name or this alias to connect to
-this service.  Since `alias` is network-scoped:
+Aliases (alternative hostnames) for this service on the network. Other containers on the same network can use either the service name or this alias to connect to one of the service's containers.  
 
-  * the same service can have different aliases when connected to another
-    network.
-  * it is allowable to configure the same alias name to multiple containers
-    (services) on the same network.
+Since `aliases` is network-scoped, the same service can have different aliases on different networks.
 
+> **Note**: A network-wide alias can be shared by multiple containers, and even by multiple services. If it is, then exactly which container the name will resolve to is not guaranteed.
+
+The general format is shown here.
 
     networks:
       some-network:
@@ -496,6 +494,35 @@ this service.  Since `alias` is network-scoped:
         aliases:
           - alias2
 
+In the example below, three services are provided (`web`, `worker`, and `db`), along with two networks (`new` and `legacy`). The `db` service is reachable at the hostname `db` or `database` on the `new` network, and at `db` or `mysql` on the `legacy` network.
+
+    version: 2
+
+    services:
+      web:
+        build: ./web
+        networks:
+          - new
+
+      worker:
+        build: ./worker
+        networks:
+        - legacy
+
+      db:
+        image: mysql
+        networks:
+          new:
+            aliases:
+              - database
+          legacy:
+            aliases:
+              - mysql
+
+    networks:
+      new:
+      legacy:
+
 ### pid
 
     pid: "host"

From 520c695bf4f4fa7c41a0febb00234f21be776d43 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 2 Feb 2016 17:55:21 +0000
Subject: [PATCH 0832/1265] Update Swarm integration guide and make it an
 official part of the docs

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 SWARM.md           |  40 +---------
 docs/networking.md |  14 ++--
 docs/production.md |  10 +--
 docs/swarm.md      | 184 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 197 insertions(+), 51 deletions(-)
 create mode 100644 docs/swarm.md

diff --git a/SWARM.md b/SWARM.md
index 1ea4e25f..c6f378a9 100644
--- a/SWARM.md
+++ b/SWARM.md
@@ -1,39 +1 @@
-Docker Compose/Swarm integration
-================================
-
-Eventually, Compose and Swarm aim to have full integration, meaning you can point a Compose app at a Swarm cluster and have it all just work as if you were using a single Docker host.
-
-However, integration is currently incomplete: Compose can create containers on a Swarm cluster, but the majority of Compose apps won’t work out of the box unless all containers are scheduled on one host, because links between containers do not work across hosts.
-
-Docker networking is [getting overhauled](https://github.com/docker/libnetwork) in such a way that it’ll fit the multi-host model much better. For now, linked containers are automatically scheduled on the same host.
-
-Building
---------
-
-Swarm can build an image from a Dockerfile just like a single-host Docker instance can, but the resulting image will only live on a single node and won't be distributed to other nodes.
-
-If you want to use Compose to scale the service in question to multiple nodes, you'll have to build it yourself, push it to a registry (e.g. the Docker Hub) and reference it from `docker-compose.yml`:
-
-    $ docker build -t myusername/web .
-    $ docker push myusername/web
-
-    $ cat docker-compose.yml
-    web:
-      image: myusername/web
-
-    $ docker-compose up -d
-    $ docker-compose scale web=3
-
-Scheduling
-----------
-
-Swarm offers a rich set of scheduling and affinity hints, enabling you to control where containers are located. They are specified via container environment variables, so you can use Compose's `environment` option to set them.
-
-    environment:
-      # Schedule containers on a node that has the 'storage' label set to 'ssd'
-      - "constraint:storage==ssd"
-
-      # Schedule containers where the 'redis' image is already pulled
-      - "affinity:image==redis"
-
-For the full set of available filters and expressions, see the [Swarm documentation](https://docs.docker.com/swarm/scheduler/filter/).
+This file has moved to: https://docs.docker.com/compose/swarm/
diff --git a/docs/networking.md b/docs/networking.md
index d625ca19..1fd6c116 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -76,7 +76,9 @@ See the [links reference](compose-file.md#links) for more information.
 
 ## Multi-host networking
 
-When deploying a Compose application to a Swarm cluster, you can make use of the built-in `overlay` driver to enable multi-host communication between containers with no changes to application code. Consult the [Getting started with multi-host networking](/engine/userguide/networking/get-started-overlay.md) to see how to set up the overlay driver, and then specify `driver: overlay` in your networking config (see the sections below for how to do this).
+When [deploying a Compose application to a Swarm cluster](swarm.md), you can make use of the built-in `overlay` driver to enable multi-host communication between containers with no changes to your Compose file or application code.
+
+Consult the [Getting started with multi-host networking](/engine/userguide/networking/get-started-overlay.md) to see how to set up a Swarm cluster. The cluster will use the `overlay` driver by default, but you can specify it explicitly if you prefer - see below for how to do this.
 
 ## Specifying custom networks
 
@@ -105,11 +107,11 @@ Here's an example Compose file defining two custom networks. The `proxy` service
 
     networks:
       front:
-        # Use the overlay driver for multi-host communication
-        driver: overlay
+        # Use a custom driver
+        driver: custom-driver-1
       back:
         # Use a custom driver which takes special options
-        driver: my-custom-driver
+        driver: custom-driver-2
         driver_opts:
           foo: "1"
           bar: "2"
@@ -135,8 +137,8 @@ Instead of (or as well as) specifying your own networks, you can also change the
 
     networks:
       default:
-        # Use the overlay driver for multi-host communication
-        driver: overlay
+        # Use a custom driver
+        driver: custom-driver-1
 
 ## Using a pre-existing network
 
diff --git a/docs/production.md b/docs/production.md
index dc9544ca..40ce1e66 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -60,7 +60,7 @@ recreating any services which `web` depends on.
 You can use Compose to deploy an app to a remote Docker host by setting the
 `DOCKER_HOST`, `DOCKER_TLS_VERIFY`, and `DOCKER_CERT_PATH` environment variables
 appropriately. For tasks like this,
-[Docker Machine](https://docs.docker.com/machine/) makes managing local and
+[Docker Machine](/machine/overview) makes managing local and
 remote Docker hosts very easy, and is recommended even if you're not deploying
 remotely.
 
@@ -69,14 +69,12 @@ commands will work with no further configuration.
 
 ### Running Compose on a Swarm cluster
 
-[Docker Swarm](https://docs.docker.com/swarm/), a Docker-native clustering
+[Docker Swarm](/swarm/overview), a Docker-native clustering
 system, exposes the same API as a single Docker host, which means you can use
 Compose against a Swarm instance and run your apps across multiple hosts.
 
-Compose/Swarm integration is still in the experimental stage, and Swarm is still
-in beta, but if you'd like to explore and experiment, check out the <a
-href="https://github.com/docker/compose/blob/master/SWARM.md">integration
-guide</a>.
+Compose/Swarm integration is still in the experimental stage, but if you'd like
+to explore and experiment, check out the [integration guide](swarm.md).
 
 ## Compose documentation
 
diff --git a/docs/swarm.md b/docs/swarm.md
new file mode 100644
index 00000000..2b609efa
--- /dev/null
+++ b/docs/swarm.md
@@ -0,0 +1,184 @@
+<!--[metadata]>
++++
+title = "Using Compose with Swarm"
+description = "How to use Compose and Swarm together to deploy apps to multi-host clusters"
+keywords = ["documentation, docs,  docker, compose, orchestration, containers, swarm"]
+[menu.main]
+parent="workw_compose"
++++
+<![end-metadata]-->
+
+
+# Using Compose with Swarm
+
+Docker Compose and [Docker Swarm](/swarm/overview) aim to have full integration, meaning
+you can point a Compose app at a Swarm cluster and have it all just work as if
+you were using a single Docker host.
+
+The actual extent of integration depends on which version of the [Compose file
+format](compose-file.md#versioning) you are using:
+
+1.  If you're using version 1 along with `links`, your app will work, but Swarm
+    will schedule all containers on one host, because links between containers
+    do not work across hosts with the old networking system.
+
+2. If you're using version 2, your app should work with no changes:
+
+    - subject to the [limitations](#limitations) described below,
+
+    - as long as the Swarm cluster is configured to use the [overlay
+      driver](/engine/userguide/networking/dockernetworks.md#an-overlay-network),
+      or a custom driver which supports multi-host networking.
+
+Read the [Getting started with multi-host
+networking](/engine/userguide/networking/get-started-overlay.md) to see how to
+set up a Swarm cluster with [Docker Machine](/machine/overview) and the overlay driver.
+Once you've got it running, deploying your app to it should be as simple as:
+
+    $ eval "$(docker-machine env --swarm <name of swarm master machine>)"
+    $ docker-compose up
+
+
+## Limitations
+
+### Building images
+
+Swarm can build an image from a Dockerfile just like a single-host Docker
+instance can, but the resulting image will only live on a single node and won't
+be distributed to other nodes.
+
+If you want to use Compose to scale the service in question to multiple nodes,
+you'll have to build it yourself, push it to a registry (e.g. the Docker Hub)
+and reference it from `docker-compose.yml`:
+
+    $ docker build -t myusername/web .
+    $ docker push myusername/web
+
+    $ cat docker-compose.yml
+    web:
+      image: myusername/web
+
+    $ docker-compose up -d
+    $ docker-compose scale web=3
+
+### Multiple dependencies
+
+If a service has multiple dependencies of the type which force co-scheduling
+(see [Automatic scheduling](#automatic-scheduling) below), it's possible that
+Swarm will schedule the dependencies on different nodes, making the dependent
+service impossible to schedule. For example, here `foo` needs to be co-scheduled
+with `bar` and `baz`:
+
+    version: "2"
+    services:
+      foo:
+        image: foo
+        volumes_from: ["bar"]
+        network_mode: "service:baz"
+      bar:
+        image: bar
+      baz:
+        image: baz
+
+The problem is that Swarm might first schedule `bar` and `baz` on different
+nodes (since they're not dependent on one another), making it impossible to
+pick an appropriate node for `foo`.
+
+To work around this, use [manual scheduling](#manual-scheduling) to ensure that
+all three services end up on the same node:
+
+    version: "2"
+    services:
+      foo:
+        image: foo
+        volumes_from: ["bar"]
+        network_mode: "service:baz"
+        environment:
+          - "constraint:node==node-1"
+      bar:
+        image: bar
+        environment:
+          - "constraint:node==node-1"
+      baz:
+        image: baz
+        environment:
+          - "constraint:node==node-1"
+
+### Host ports and recreating containers
+
+If a service maps a port from the host, e.g. `80:8000`, then you may get an
+error like this when running `docker-compose up` on it after the first time:
+
+    docker: Error response from daemon: unable to find a node that satisfies
+    container==6ab2dfe36615ae786ef3fc35d641a260e3ea9663d6e69c5b70ce0ca6cb373c02.
+
+The usual cause of this error is that the container has a volume (defined either
+in its image or in the Compose file) without an explicit mapping, and so in
+order to preserve its data, Compose has directed Swarm to schedule the new
+container on the same node as the old container. This results in a port clash.
+
+There are two viable workarounds for this problem:
+
+-   Specify a named volume, and use a volume driver which is capable of mounting
+    the volume into the container regardless of what node it's scheduled on.
+
+    Compose does not give Swarm any specific scheduling instructions if a
+    service uses only named volumes.
+
+        version: "2"
+
+        services:
+          web:
+            build: .
+            ports:
+              - "80:8000"
+            volumes:
+              - web-logs:/var/log/web
+
+        volumes:
+          web-logs:
+            driver: custom-volume-driver
+
+-   Remove the old container before creating the new one. You will lose any data
+    in the volume.
+
+        $ docker-compose stop web
+        $ docker-compose rm -f web
+        $ docker-compose up web
+
+
+## Scheduling containers
+
+### Automatic scheduling
+
+Some configuration options will result in containers being automatically
+scheduled on the same Swarm node to ensure that they work correctly. These are:
+
+-   `network_mode: "service:..."` and `network_mode: "container:..."` (and
+    `net: "container:..."` in the version 1 file format).
+
+-   `volumes_from`
+
+-   `links`
+
+### Manual scheduling
+
+Swarm offers a rich set of scheduling and affinity hints, enabling you to
+control where containers are located. They are specified via container
+environment variables, so you can use Compose's `environment` option to set
+them.
+
+    # Schedule containers on a specific node
+    environment:
+      - "constraint:node==node-1"
+
+    # Schedule containers on a node that has the 'storage' label set to 'ssd'
+    environment:
+      - "constraint:storage==ssd"
+
+    # Schedule containers where the 'redis' image is already pulled
+    environment:
+      - "affinity:image==redis"
+
+For the full set of available filters and expressions, see the [Swarm
+documentation](/swarm/scheduler/filter.md).

From 4b2a66623199ad4c281b688957d1cf7ec282abbd Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 16 Feb 2016 17:30:23 -0500
Subject: [PATCH 0833/1265] Validate that each section of the config is a
 mapping before running interpolation.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         | 31 +++++++++++------
 compose/config/interpolation.py  |  2 +-
 compose/config/validation.py     | 59 ++++++++++++++++++++++----------
 tests/acceptance/cli_test.py     |  2 +-
 tests/unit/config/config_test.py | 34 +++++++++++++++---
 5 files changed, 91 insertions(+), 37 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index d0024e9c..055ae18a 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -33,11 +33,11 @@ from .types import VolumeSpec
 from .validation import match_named_volumes
 from .validation import validate_against_fields_schema
 from .validation import validate_against_service_schema
+from .validation import validate_config_section
 from .validation import validate_depends_on
 from .validation import validate_extends_file_path
 from .validation import validate_network_mode
 from .validation import validate_top_level_object
-from .validation import validate_top_level_service_objects
 from .validation import validate_ulimits
 
 
@@ -388,22 +388,31 @@ def load_services(working_dir, config_file, service_configs):
     return build_services(service_config)
 
 
-def process_config_file(config_file, service_name=None):
-    service_dicts = config_file.get_service_dicts()
-    validate_top_level_service_objects(config_file.filename, service_dicts)
+def interpolate_config_section(filename, config, section):
+    validate_config_section(filename, config, section)
+    return interpolate_environment_variables(config, section)
 
-    interpolated_config = interpolate_environment_variables(service_dicts, 'service')
+
+def process_config_file(config_file, service_name=None):
+    services = interpolate_config_section(
+        config_file.filename,
+        config_file.get_service_dicts(),
+        'service')
 
     if config_file.version == V2_0:
         processed_config = dict(config_file.config)
-        processed_config['services'] = services = interpolated_config
-        processed_config['volumes'] = interpolate_environment_variables(
-            config_file.get_volumes(), 'volume')
-        processed_config['networks'] = interpolate_environment_variables(
-            config_file.get_networks(), 'network')
+        processed_config['services'] = services
+        processed_config['volumes'] = interpolate_config_section(
+            config_file.filename,
+            config_file.get_volumes(),
+            'volume')
+        processed_config['networks'] = interpolate_config_section(
+            config_file.filename,
+            config_file.get_networks(),
+            'network')
 
     if config_file.version == V1:
-        processed_config = services = interpolated_config
+        processed_config = services
 
     config_file = config_file._replace(config=processed_config)
     validate_against_fields_schema(config_file)
diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index e1c781fe..1e56ebb6 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -21,7 +21,7 @@ def interpolate_environment_variables(config, section):
         )
 
     return dict(
-        (name, process_item(name, config_dict))
+        (name, process_item(name, config_dict or {}))
         for name, config_dict in config.items()
     )
 
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 35727e2c..557e5768 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -91,29 +91,50 @@ def match_named_volumes(service_dict, project_volumes):
             )
 
 
-def validate_top_level_service_objects(filename, service_dicts):
-    """Perform some high level validation of the service name and value.
+def python_type_to_yaml_type(type_):
+    type_name = type(type_).__name__
+    return {
+        'dict': 'mapping',
+        'list': 'array',
+        'int': 'number',
+        'float': 'number',
+        'bool': 'boolean',
+        'unicode': 'string',
+        'str': 'string',
+        'bytes': 'string',
+    }.get(type_name, type_name)
 
-    This validation must happen before interpolation, which must happen
-    before the rest of validation, which is why it's separate from the
-    rest of the service validation.
+
+def validate_config_section(filename, config, section):
+    """Validate the structure of a configuration section. This must be done
+    before interpolation so it's separate from schema validation.
     """
-    for service_name, service_dict in service_dicts.items():
-        if not isinstance(service_name, six.string_types):
-            raise ConfigurationError(
-                "In file '{}' service name: {} needs to be a string, eg '{}'".format(
-                    filename,
-                    service_name,
-                    service_name))
+    if not isinstance(config, dict):
+        raise ConfigurationError(
+            "In file '{filename}' {section} must be a mapping, not "
+            "'{type}'.".format(
+                filename=filename,
+                section=section,
+                type=python_type_to_yaml_type(config)))
 
-        if not isinstance(service_dict, dict):
+    for key, value in config.items():
+        if not isinstance(key, six.string_types):
             raise ConfigurationError(
-                "In file '{}' service '{}' doesn\'t have any configuration options. "
-                "All top level keys in your docker-compose.yml must map "
-                "to a dictionary of configuration options.".format(
-                    filename, service_name
-                )
-            )
+                "In file '{filename}' {section} name {name} needs to be a "
+                "string, eg '{name}'".format(
+                    filename=filename,
+                    section=section,
+                    name=key))
+
+        if not isinstance(value, (dict, type(None))):
+            raise ConfigurationError(
+                "In file '{filename}' {section} '{name}' is the wrong type. "
+                "It should be a mapping of configuration options, it is a "
+                "'{type}'.".format(
+                    filename=filename,
+                    section=section,
+                    name=key,
+                    type=python_type_to_yaml_type(value)))
 
 
 def validate_top_level_object(config_file):
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 318ab3d3..f4392693 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -159,7 +159,7 @@ class CLITestCase(DockerClientTestCase):
             '-f', 'tests/fixtures/invalid-composefile/invalid.yml',
             'config', '-q'
         ], returncode=1)
-        assert "'notaservice' doesn't have any configuration" in result.stderr
+        assert "'notaservice' is the wrong type" in result.stderr
 
     # TODO: this shouldn't be v2-dependent
     @v2_only()
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 204003bc..c58ddc60 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -231,7 +231,7 @@ class ConfigTest(unittest.TestCase):
         assert volumes['simple'] == {}
         assert volumes['other'] == {}
 
-    def test_volume_numeric_driver_opt(self):
+    def test_named_volume_numeric_driver_opt(self):
         config_details = build_config_details({
             'version': '2',
             'services': {
@@ -258,6 +258,30 @@ class ConfigTest(unittest.TestCase):
             config.load(config_details)
         assert 'driver_opts.size contains an invalid type' in exc.exconly()
 
+    def test_named_volume_invalid_type_list(self):
+        config_details = build_config_details({
+            'version': '2',
+            'services': {
+                'simple': {'image': 'busybox'}
+            },
+            'volumes': []
+        })
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(config_details)
+        assert "volume must be a mapping, not 'array'" in exc.exconly()
+
+    def test_networks_invalid_type_list(self):
+        config_details = build_config_details({
+            'version': '2',
+            'services': {
+                'simple': {'image': 'busybox'}
+            },
+            'networks': []
+        })
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(config_details)
+        assert "network must be a mapping, not 'array'" in exc.exconly()
+
     def test_load_service_with_name_version(self):
         with mock.patch('compose.config.config.log') as mock_logging:
             config_data = config.load(
@@ -368,7 +392,7 @@ class ConfigTest(unittest.TestCase):
             'filename.yml')
         with pytest.raises(ConfigurationError) as exc:
             config.load(config_details)
-        error_msg = "service 'web' doesn't have any configuration options"
+        error_msg = "service 'web' is the wrong type"
         assert error_msg in exc.exconly()
 
     def test_config_integer_service_name_raise_validation_error(self):
@@ -381,7 +405,7 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-        assert "In file 'filename.yml' service name: 1 needs to be a string, eg '1'" \
+        assert "In file 'filename.yml' service name 1 needs to be a string, eg '1'" \
             in excinfo.exconly()
 
     def test_config_integer_service_name_raise_validation_error_v2(self):
@@ -397,7 +421,7 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-        assert "In file 'filename.yml' service name: 1 needs to be a string, eg '1'" \
+        assert "In file 'filename.yml' service name 1 needs to be a string, eg '1'" \
             in excinfo.exconly()
 
     def test_load_with_multiple_files_v1(self):
@@ -532,7 +556,7 @@ class ConfigTest(unittest.TestCase):
 
         with pytest.raises(ConfigurationError) as exc:
             config.load(details)
-        assert "service 'bogus' doesn't have any configuration" in exc.exconly()
+        assert "service 'bogus' is the wrong type" in exc.exconly()
         assert "In file 'override.yaml'" in exc.exconly()
 
     def test_load_sorts_in_dependency_order(self):

From 0d218c34c7b58144188085f748be031efd316d1c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 19 Feb 2016 12:35:05 -0500
Subject: [PATCH 0834/1265] Make config validation error messages more
 consistent.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/validation.py     | 33 ++++++++++++++++----------------
 docs/compose-file.md             |  2 +-
 tests/acceptance/cli_test.py     |  2 +-
 tests/unit/config/config_test.py | 21 +++++++++++---------
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 557e5768..6dc72f56 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -111,30 +111,29 @@ def validate_config_section(filename, config, section):
     """
     if not isinstance(config, dict):
         raise ConfigurationError(
-            "In file '{filename}' {section} must be a mapping, not "
-            "'{type}'.".format(
+            "In file '{filename}', {section} must be a mapping, not "
+            "{type}.".format(
                 filename=filename,
                 section=section,
-                type=python_type_to_yaml_type(config)))
+                type=anglicize_json_type(python_type_to_yaml_type(config))))
 
     for key, value in config.items():
         if not isinstance(key, six.string_types):
             raise ConfigurationError(
-                "In file '{filename}' {section} name {name} needs to be a "
-                "string, eg '{name}'".format(
+                "In file '{filename}', the {section} name {name} must be a "
+                "quoted string, i.e. '{name}'.".format(
                     filename=filename,
                     section=section,
                     name=key))
 
         if not isinstance(value, (dict, type(None))):
             raise ConfigurationError(
-                "In file '{filename}' {section} '{name}' is the wrong type. "
-                "It should be a mapping of configuration options, it is a "
-                "'{type}'.".format(
+                "In file '{filename}', {section} '{name}' must be a mapping not "
+                "{type}.".format(
                     filename=filename,
                     section=section,
                     name=key,
-                    type=python_type_to_yaml_type(value)))
+                    type=anglicize_json_type(python_type_to_yaml_type(value))))
 
 
 def validate_top_level_object(config_file):
@@ -203,10 +202,10 @@ def get_unsupported_config_msg(path, error_key):
     return msg
 
 
-def anglicize_validator(validator):
-    if validator in ["array", "object"]:
-        return 'an ' + validator
-    return 'a ' + validator
+def anglicize_json_type(json_type):
+    if json_type.startswith(('a', 'e', 'i', 'o', 'u')):
+        return 'an ' + json_type
+    return 'a ' + json_type
 
 
 def is_service_dict_schema(schema_id):
@@ -314,14 +313,14 @@ def _parse_valid_types_from_validator(validator):
     a valid type. Parse the valid types and prefix with the correct article.
     """
     if not isinstance(validator, list):
-        return anglicize_validator(validator)
+        return anglicize_json_type(validator)
 
     if len(validator) == 1:
-        return anglicize_validator(validator[0])
+        return anglicize_json_type(validator[0])
 
     return "{}, or {}".format(
-        ", ".join([anglicize_validator(validator[0])] + validator[1:-1]),
-        anglicize_validator(validator[-1]))
+        ", ".join([anglicize_json_type(validator[0])] + validator[1:-1]),
+        anglicize_json_type(validator[-1]))
 
 
 def _parse_oneof_validator(error):
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 55d4109d..f446e2ab 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -477,7 +477,7 @@ Networks to join, referencing entries under the
 
 #### aliases
 
-Aliases (alternative hostnames) for this service on the network. Other containers on the same network can use either the service name or this alias to connect to one of the service's containers.  
+Aliases (alternative hostnames) for this service on the network. Other containers on the same network can use either the service name or this alias to connect to one of the service's containers.
 
 Since `aliases` is network-scoped, the same service can have different aliases on different networks.
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index f4392693..6c5b7818 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -159,7 +159,7 @@ class CLITestCase(DockerClientTestCase):
             '-f', 'tests/fixtures/invalid-composefile/invalid.yml',
             'config', '-q'
         ], returncode=1)
-        assert "'notaservice' is the wrong type" in result.stderr
+        assert "'notaservice' must be a mapping" in result.stderr
 
     # TODO: this shouldn't be v2-dependent
     @v2_only()
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index c58ddc60..1f5183d7 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -268,7 +268,7 @@ class ConfigTest(unittest.TestCase):
         })
         with pytest.raises(ConfigurationError) as exc:
             config.load(config_details)
-        assert "volume must be a mapping, not 'array'" in exc.exconly()
+        assert "volume must be a mapping, not an array" in exc.exconly()
 
     def test_networks_invalid_type_list(self):
         config_details = build_config_details({
@@ -280,7 +280,7 @@ class ConfigTest(unittest.TestCase):
         })
         with pytest.raises(ConfigurationError) as exc:
             config.load(config_details)
-        assert "network must be a mapping, not 'array'" in exc.exconly()
+        assert "network must be a mapping, not an array" in exc.exconly()
 
     def test_load_service_with_name_version(self):
         with mock.patch('compose.config.config.log') as mock_logging:
@@ -392,8 +392,7 @@ class ConfigTest(unittest.TestCase):
             'filename.yml')
         with pytest.raises(ConfigurationError) as exc:
             config.load(config_details)
-        error_msg = "service 'web' is the wrong type"
-        assert error_msg in exc.exconly()
+        assert "service 'web' must be a mapping not a string." in exc.exconly()
 
     def test_config_integer_service_name_raise_validation_error(self):
         with pytest.raises(ConfigurationError) as excinfo:
@@ -405,8 +404,10 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-        assert "In file 'filename.yml' service name 1 needs to be a string, eg '1'" \
-            in excinfo.exconly()
+        assert (
+            "In file 'filename.yml', the service name 1 must be a quoted string, i.e. '1'" in
+            excinfo.exconly()
+        )
 
     def test_config_integer_service_name_raise_validation_error_v2(self):
         with pytest.raises(ConfigurationError) as excinfo:
@@ -421,8 +422,10 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
-        assert "In file 'filename.yml' service name 1 needs to be a string, eg '1'" \
-            in excinfo.exconly()
+        assert (
+            "In file 'filename.yml', the service name 1 must be a quoted string, i.e. '1'." in
+            excinfo.exconly()
+        )
 
     def test_load_with_multiple_files_v1(self):
         base_file = config.ConfigFile(
@@ -556,7 +559,7 @@ class ConfigTest(unittest.TestCase):
 
         with pytest.raises(ConfigurationError) as exc:
             config.load(details)
-        assert "service 'bogus' is the wrong type" in exc.exconly()
+        assert "service 'bogus' must be a mapping not a string." in exc.exconly()
         assert "In file 'override.yaml'" in exc.exconly()
 
     def test_load_sorts_in_dependency_order(self):

From 02535f0cf159b74fef8123a17e29c660e1891565 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 19 Feb 2016 14:22:55 -0500
Subject: [PATCH 0835/1265] Fix validation message when there are multiple
 ested oneOf validations.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/validation.py     |  4 ++++
 tests/unit/config/config_test.py | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 35727e2c..fc737a4f 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -312,6 +312,10 @@ def _parse_oneof_validator(error):
     types = []
     for context in error.context:
 
+        if context.validator == 'oneOf':
+            _, error_msg = _parse_oneof_validator(context)
+            return path_string(context.path), error_msg
+
         if context.validator == 'required':
             return (None, context.message)
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 204003bc..ea90c50e 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -371,6 +371,27 @@ class ConfigTest(unittest.TestCase):
         error_msg = "service 'web' doesn't have any configuration options"
         assert error_msg in exc.exconly()
 
+    def test_load_with_empty_build_args(self):
+        config_details = build_config_details(
+            {
+                'version': '2',
+                'services': {
+                    'web': {
+                        'build': {
+                            'context': '.',
+                            'args': None,
+                        },
+                    },
+                },
+            }
+        )
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(config_details)
+        assert (
+            "services.web.build.args contains an invalid type, it should be an "
+            "array, or an object" in exc.exconly()
+        )
+
     def test_config_integer_service_name_raise_validation_error(self):
         with pytest.raises(ConfigurationError) as excinfo:
             config.load(

From ba39d4cc77f5d9ffccff68ae738e741278f60ace Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 22 Feb 2016 12:56:54 -0800
Subject: [PATCH 0836/1265] Use docker-py 1.7.1

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 2204e6d5..5f55ba8a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 PyYAML==3.11
 cached-property==1.2.0
+docker-py==1.7.1
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
-git+https://github.com/docker/docker-py.git@bba8e28f822c4cd3ebe2a2ca588f41f9d7d66e26#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3

From 0a06d827faa554f07ce515106fcc3e42af340e7a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 22 Feb 2016 14:48:56 -0800
Subject: [PATCH 0837/1265] Fix warning about boolean values.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/validation.py     | 12 ++++++------
 tests/unit/config/config_test.py |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 4e2083cb..60ee5c93 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -64,16 +64,16 @@ def format_expose(instance):
 
 @FormatChecker.cls_checks(format="bool-value-in-mapping")
 def format_boolean_in_environment(instance):
-    """
-    Check if there is a boolean in the environment and display a warning.
+    """Check if there is a boolean in the mapping sections and display a warning.
     Always return True here so the validation won't raise an error.
     """
     if isinstance(instance, bool):
         log.warn(
-            "There is a boolean value in the 'environment' key.\n"
-            "Environment variables can only be strings.\n"
-            "Please add quotes to any boolean values to make them string "
-            "(eg, 'True', 'yes', 'N').\n"
+            "There is a boolean value in the 'environment', 'labels', or "
+            "'extra_hosts' field of a service.\n"
+            "These sections only support string values.\n"
+            "Please add quotes to any boolean values to make them strings "
+            "(eg, 'True', 'false', 'yes', 'N', 'on', 'Off').\n"
             "This warning will become an error in a future release. \r\n"
         )
     return True
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index ce37d794..4d3bb7be 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1100,7 +1100,7 @@ class ConfigTest(unittest.TestCase):
 
     @mock.patch('compose.config.validation.log')
     def test_logs_warning_for_boolean_in_environment(self, mock_logging):
-        expected_warning_msg = "There is a boolean value in the 'environment' key."
+        expected_warning_msg = "There is a boolean value in the 'environment'"
         config.load(
             build_config_details(
                 {'web': {

From bf2bf21720c88b08ccb273c46c943bb72a8dccf8 Mon Sep 17 00:00:00 2001
From: Richard Bann <richardbann@gmail.com>
Date: Thu, 18 Feb 2016 12:13:16 +0100
Subject: [PATCH 0838/1265] Add failing test for --abort-on-container-exit

Handle --abort-on-container-exit. Fixes #2940

Signed-off-by: Richard Bann <richardbann@gmail.com>
---
 compose/cli/log_printer.py   | 11 ++++++++---
 compose/cli/main.py          |  3 +++
 compose/cli/signals.py       |  4 ++++
 tests/acceptance/cli_test.py |  6 ++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 85fef794..b7abc007 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -5,6 +5,7 @@ import sys
 from itertools import cycle
 
 from . import colors
+from . import signals
 from .multiplexer import Multiplexer
 from compose import utils
 from compose.utils import split_buffer
@@ -41,7 +42,7 @@ class LogPrinter(object):
         for color_func, container in zip(color_funcs, self.containers):
             generator_func = get_log_generator(container)
             prefix = color_func(build_log_prefix(container, prefix_width))
-            yield generator_func(container, prefix, color_func)
+            yield generator_func(container, prefix, color_func, self.cascade_stop)
 
 
 def build_log_prefix(container, prefix_width):
@@ -64,7 +65,7 @@ def get_log_generator(container):
     return build_no_log_generator
 
 
-def build_no_log_generator(container, prefix, color_func):
+def build_no_log_generator(container, prefix, color_func, cascade_stop):
     """Return a generator that prints a warning about logs and waits for
     container to exit.
     """
@@ -72,9 +73,11 @@ def build_no_log_generator(container, prefix, color_func):
         prefix,
         container.log_driver)
     yield color_func(wait_on_exit(container))
+    if cascade_stop:
+        raise signals.CascadeStopException()
 
 
-def build_log_generator(container, prefix, color_func):
+def build_log_generator(container, prefix, color_func, cascade_stop):
     # if the container doesn't have a log_stream we need to attach to container
     # before log printer starts running
     if container.log_stream is None:
@@ -86,6 +89,8 @@ def build_log_generator(container, prefix, color_func):
     for line in line_generator:
         yield prefix + line
     yield color_func(wait_on_exit(container))
+    if cascade_stop:
+        raise signals.CascadeStopException()
 
 
 def wait_on_exit(container):
diff --git a/compose/cli/main.py b/compose/cli/main.py
index cc15fa05..5a7ac8d4 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -774,6 +774,9 @@ def up_shutdown_context(project, service_names, timeout, detached):
         except signals.ShutdownException:
             print("Gracefully stopping... (press Ctrl+C again to force)")
             project.stop(service_names=service_names, timeout=timeout)
+        except signals.CascadeStopException:
+            print("Aborting on container exit... (press Ctrl+C to force)")
+            project.stop(service_names=service_names, timeout=timeout)
     except signals.ShutdownException:
         project.kill(service_names=service_names)
         sys.exit(2)
diff --git a/compose/cli/signals.py b/compose/cli/signals.py
index 68a0598e..808700df 100644
--- a/compose/cli/signals.py
+++ b/compose/cli/signals.py
@@ -8,6 +8,10 @@ class ShutdownException(Exception):
     pass
 
 
+class CascadeStopException(Exception):
+    pass
+
+
 def shutdown(signal, frame):
     raise ShutdownException()
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 318ab3d3..23427e99 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -746,6 +746,12 @@ class CLITestCase(DockerClientTestCase):
         os.kill(proc.pid, signal.SIGTERM)
         wait_on_condition(ContainerCountCondition(self.project, 0))
 
+    def test_up_handles_abort_on_container_exit(self):
+        start_process(self.base_dir, ['up', '--abort-on-container-exit'])
+        wait_on_condition(ContainerCountCondition(self.project, 2))
+        self.project.stop(['simple'])
+        wait_on_condition(ContainerCountCondition(self.project, 0))
+
     def test_run_service_without_links(self):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['run', 'console', '/bin/true'])

From 15b2094bad405e6524be7c365f7db055976fe93e Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 22 Feb 2016 16:46:09 -0800
Subject: [PATCH 0839/1265] Stop other containers if the flag is set.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/log_printer.py | 11 +++--------
 compose/cli/main.py        |  7 ++++---
 compose/cli/signals.py     |  4 ----
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index b7abc007..85fef794 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -5,7 +5,6 @@ import sys
 from itertools import cycle
 
 from . import colors
-from . import signals
 from .multiplexer import Multiplexer
 from compose import utils
 from compose.utils import split_buffer
@@ -42,7 +41,7 @@ class LogPrinter(object):
         for color_func, container in zip(color_funcs, self.containers):
             generator_func = get_log_generator(container)
             prefix = color_func(build_log_prefix(container, prefix_width))
-            yield generator_func(container, prefix, color_func, self.cascade_stop)
+            yield generator_func(container, prefix, color_func)
 
 
 def build_log_prefix(container, prefix_width):
@@ -65,7 +64,7 @@ def get_log_generator(container):
     return build_no_log_generator
 
 
-def build_no_log_generator(container, prefix, color_func, cascade_stop):
+def build_no_log_generator(container, prefix, color_func):
     """Return a generator that prints a warning about logs and waits for
     container to exit.
     """
@@ -73,11 +72,9 @@ def build_no_log_generator(container, prefix, color_func, cascade_stop):
         prefix,
         container.log_driver)
     yield color_func(wait_on_exit(container))
-    if cascade_stop:
-        raise signals.CascadeStopException()
 
 
-def build_log_generator(container, prefix, color_func, cascade_stop):
+def build_log_generator(container, prefix, color_func):
     # if the container doesn't have a log_stream we need to attach to container
     # before log printer starts running
     if container.log_stream is None:
@@ -89,8 +86,6 @@ def build_log_generator(container, prefix, color_func, cascade_stop):
     for line in line_generator:
         yield prefix + line
     yield color_func(wait_on_exit(container))
-    if cascade_stop:
-        raise signals.CascadeStopException()
 
 
 def wait_on_exit(container):
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 5a7ac8d4..3c4b5721 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -662,6 +662,10 @@ class TopLevelCommand(DocoptCommand):
             print("Attaching to", list_containers(log_printer.containers))
             log_printer.run()
 
+            if cascade_stop:
+                print("Aborting on container exit...")
+                project.stop(service_names=service_names, timeout=timeout)
+
     def version(self, project, options):
         """
         Show version informations
@@ -774,9 +778,6 @@ def up_shutdown_context(project, service_names, timeout, detached):
         except signals.ShutdownException:
             print("Gracefully stopping... (press Ctrl+C again to force)")
             project.stop(service_names=service_names, timeout=timeout)
-        except signals.CascadeStopException:
-            print("Aborting on container exit... (press Ctrl+C to force)")
-            project.stop(service_names=service_names, timeout=timeout)
     except signals.ShutdownException:
         project.kill(service_names=service_names)
         sys.exit(2)
diff --git a/compose/cli/signals.py b/compose/cli/signals.py
index 808700df..68a0598e 100644
--- a/compose/cli/signals.py
+++ b/compose/cli/signals.py
@@ -8,10 +8,6 @@ class ShutdownException(Exception):
     pass
 
 
-class CascadeStopException(Exception):
-    pass
-
-
 def shutdown(signal, frame):
     raise ShutdownException()
 

From 176b9664863144aac7199fbd293cfa5c720a68ac Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 18 Feb 2016 17:17:20 -0800
Subject: [PATCH 0840/1265] Update documentation for volume_driver option.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 docs/compose-file.md | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index f446e2ab..514e6a03 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -582,10 +582,11 @@ limit as an integer or soft/hard limits as a mapping.
 ### volumes, volume\_driver
 
 Mount paths or named volumes, optionally specifying a path on the host machine
-(`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`). Named volumes can
-be specified with the
-[top-level `volumes` key](#volume-configuration-reference), but this is
-optional - the Docker Engine will create the volume if it doesn't exist.
+(`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`).
+For [version 2 files](#version-2), named volumes need to be specified with the
+[top-level `volumes` key](#volume-configuration-reference).
+When using [version 1](#version-1), the Docker Engine will create the named
+volume automatically if it doesn't exist.
 
 You can mount a relative path on the host, which will expand relative to
 the directory of the Compose configuration file being used. Relative paths
@@ -607,11 +608,16 @@ should always begin with `.` or `..`.
       # Named volume
       - datavolume:/var/lib/mysql
 
-If you use a volume name (instead of a volume path), you may also specify
-a `volume_driver`.
+If you do not use a host path, you may specify a `volume_driver`.
 
     volume_driver: mydriver
 
+Note that for [version 2 files](#version-2), this driver
+will not apply to named volumes (you should use the `driver` option when
+[declaring the volume](#volume-configuration-reference) instead).
+For [version 1](#version-1), both named volumes and container volumes will
+use the specified driver.
+
 > Note: No path expansion will be done if you have also specified a
 > `volume_driver`.
 

From 4b04280db83b5d8c4b259586df8ae568eee5f3a0 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 22 Feb 2016 17:30:42 -0800
Subject: [PATCH 0841/1265] Revert "Change special case from '_', None to ()"

This reverts commit 677c50650c86b4b6fabbc21e18165f2117022bbe.

Revert "Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior"

This reverts commit 001903771260069c475738efbbcb830dd9cf8227.

Revert "Mangle the tests. They pass for better or worse!"

This reverts commit 7ab9509ce65167dc81dd14f34cddfb5ecff1329d.

Revert "If an env var is passthrough but not defined on the host don't set it."

This reverts commit 6540efb3d380e7ae50dd94493a43382f31e1e004.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py          | 6 +++---
 tests/integration/service_test.py | 1 +
 tests/unit/config/config_test.py  | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 055ae18a..98b825ec 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -512,12 +512,12 @@ def resolve_environment(service_dict):
         env.update(env_vars_from_file(env_file))
 
     env.update(parse_environment(service_dict.get('environment')))
-    return dict(filter(None, (resolve_env_var(k, v) for k, v in six.iteritems(env))))
+    return dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
 
 
 def resolve_build_args(build):
     args = parse_build_arguments(build.get('args'))
-    return dict(filter(None, (resolve_env_var(k, v) for k, v in six.iteritems(args))))
+    return dict(resolve_env_var(k, v) for k, v in six.iteritems(args))
 
 
 def validate_extended_service_dict(service_dict, filename, service):
@@ -827,7 +827,7 @@ def resolve_env_var(key, val):
     elif key in os.environ:
         return key, os.environ[key]
     else:
-        return ()
+        return key, ''
 
 
 def env_vars_from_file(filename):
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index bcb87335..129d996d 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -916,6 +916,7 @@ class ServiceTest(DockerClientTestCase):
             'FILE_DEF': 'F1',
             'FILE_DEF_EMPTY': '',
             'ENV_DEF': 'E3',
+            'NO_DEF': ''
         }.items():
             self.assertEqual(env[k], v)
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 4d3bb7be..446fc560 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1975,7 +1975,7 @@ class EnvTest(unittest.TestCase):
         }
         self.assertEqual(
             resolve_environment(service_dict),
-            {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3'},
+            {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''},
         )
 
     def test_resolve_environment_from_env_file(self):
@@ -2016,6 +2016,7 @@ class EnvTest(unittest.TestCase):
                 'FILE_DEF': u'bär',
                 'FILE_DEF_EMPTY': '',
                 'ENV_DEF': 'E3',
+                'NO_DEF': ''
             },
         )
 
@@ -2034,7 +2035,7 @@ class EnvTest(unittest.TestCase):
         }
         self.assertEqual(
             resolve_build_args(build),
-            {'arg1': 'value1', 'empty_arg': '', 'env_arg': 'value2'},
+            {'arg1': 'value1', 'empty_arg': '', 'env_arg': 'value2', 'no_env': ''},
         )
 
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')

From d4515781525f57e0cf92e115379191cd1f3a1e9a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 22 Feb 2016 17:47:51 -0800
Subject: [PATCH 0842/1265] Make environment variables without a value the same
 as docker-cli.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py          |  2 +-
 compose/container.py              |  6 +++++-
 compose/service.py                | 11 +++++++++++
 tests/integration/service_test.py |  2 +-
 tests/unit/cli_test.py            |  7 ++++---
 tests/unit/config/config_test.py  |  6 +++---
 tests/unit/service_test.py        |  6 +++---
 7 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 98b825ec..4e91a3af 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -827,7 +827,7 @@ def resolve_env_var(key, val):
     elif key in os.environ:
         return key, os.environ[key]
     else:
-        return key, ''
+        return key, None
 
 
 def env_vars_from_file(filename):
diff --git a/compose/container.py b/compose/container.py
index 3a1ce0b9..c96b63ef 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -134,7 +134,11 @@ class Container(object):
 
     @property
     def environment(self):
-        return dict(var.split("=", 1) for var in self.get('Config.Env') or [])
+        def parse_env(var):
+            if '=' in var:
+                return var.split("=", 1)
+            return var, None
+        return dict(parse_env(var) for var in self.get('Config.Env') or [])
 
     @property
     def exit_code(self):
diff --git a/compose/service.py b/compose/service.py
index 8b22b7d7..01f17a12 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -622,6 +622,8 @@ class Service(object):
             override_options,
             one_off=one_off)
 
+        container_options['environment'] = format_environment(
+            container_options['environment'])
         return container_options
 
     def _get_container_host_config(self, override_options, one_off=False):
@@ -1020,3 +1022,12 @@ def get_log_config(logging_dict):
         type=log_driver,
         config=log_options
     )
+
+
+# TODO: remove once fix is available in docker-py
+def format_environment(environment):
+    def format_env(key, value):
+        if value is None:
+            return key
+        return '{key}={value}'.format(key=key, value=value)
+    return [format_env(*item) for item in environment.items()]
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 129d996d..968c0947 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -916,7 +916,7 @@ class ServiceTest(DockerClientTestCase):
             'FILE_DEF': 'F1',
             'FILE_DEF_EMPTY': '',
             'ENV_DEF': 'E3',
-            'NO_DEF': ''
+            'NO_DEF': None
         }.items():
             self.assertEqual(env[k], v)
 
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 69236e2e..26ae4e30 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -138,9 +138,10 @@ class CLITestCase(unittest.TestCase):
         })
 
         _, _, call_kwargs = mock_client.create_container.mock_calls[0]
-        self.assertEqual(
-            call_kwargs['environment'],
-            {'FOO': 'ONE', 'BAR': 'NEW', 'OTHER': u'bär'})
+        assert (
+            sorted(call_kwargs['environment']) ==
+            sorted(['FOO=ONE', 'BAR=NEW', 'OTHER=bär'])
+        )
 
     def test_run_service_with_restart_always(self):
         command = TopLevelCommand()
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 446fc560..11bc7f0b 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1975,7 +1975,7 @@ class EnvTest(unittest.TestCase):
         }
         self.assertEqual(
             resolve_environment(service_dict),
-            {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''},
+            {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': None},
         )
 
     def test_resolve_environment_from_env_file(self):
@@ -2016,7 +2016,7 @@ class EnvTest(unittest.TestCase):
                 'FILE_DEF': u'bär',
                 'FILE_DEF_EMPTY': '',
                 'ENV_DEF': 'E3',
-                'NO_DEF': ''
+                'NO_DEF': None
             },
         )
 
@@ -2035,7 +2035,7 @@ class EnvTest(unittest.TestCase):
         }
         self.assertEqual(
             resolve_build_args(build),
-            {'arg1': 'value1', 'empty_arg': '', 'env_arg': 'value2', 'no_env': ''},
+            {'arg1': 'value1', 'empty_arg': '', 'env_arg': 'value2', 'no_env': None},
         )
 
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index ce28a9ca..321ebad0 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -267,7 +267,7 @@ class ServiceTest(unittest.TestCase):
         self.assertEqual(
             opts['labels'][LABEL_CONFIG_HASH],
             'f8bfa1058ad1f4231372a0b1639f0dfdb574dafff4e8d7938049ae993f7cf1fc')
-        assert opts['environment'] == {'also': 'real'}
+        assert opts['environment'] == ['also=real']
 
     def test_get_container_create_options_sets_affinity_with_binds(self):
         service = Service(
@@ -298,7 +298,7 @@ class ServiceTest(unittest.TestCase):
             1,
             previous_container=prev_container)
 
-        assert opts['environment'] == {'affinity:container': '=ababab'}
+        assert opts['environment'] == ['affinity:container==ababab']
 
     def test_get_container_create_options_no_affinity_without_binds(self):
         service = Service('foo', image='foo', client=self.mock_client)
@@ -312,7 +312,7 @@ class ServiceTest(unittest.TestCase):
             {},
             1,
             previous_container=prev_container)
-        assert opts['environment'] == {}
+        assert opts['environment'] == []
 
     def test_get_container_not_found(self):
         self.mock_client.containers.return_value = []

From e6797e116648fb566305b39040d5fade83aacffc Mon Sep 17 00:00:00 2001
From: Victoria Bialas <victoria.bialas@docker.com>
Date: Mon, 22 Feb 2016 18:50:09 -0800
Subject: [PATCH 0843/1265] updated Wordpress example to be easier to follow,
 added/updated images

docs update per Mary's comments on the PR

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
---
 docs/django.md                    |   5 +-
 docs/gettingstarted.md            |   2 +-
 docs/images/django-it-worked.png  | Bin 21041 -> 28446 bytes
 docs/images/rails-welcome.png     | Bin 62372 -> 71034 bytes
 docs/images/wordpress-files.png   | Bin 0 -> 70823 bytes
 docs/images/wordpress-lang.png    | Bin 0 -> 30149 bytes
 docs/images/wordpress-welcome.png | Bin 0 -> 62063 bytes
 docs/rails.md                     |   4 +-
 docs/wordpress.md                 | 169 +++++++++++++++++++-----------
 9 files changed, 112 insertions(+), 68 deletions(-)
 create mode 100644 docs/images/wordpress-files.png
 create mode 100644 docs/images/wordpress-lang.png
 create mode 100644 docs/images/wordpress-welcome.png

diff --git a/docs/django.md b/docs/django.md
index c8863b34..fb1fa214 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -10,10 +10,9 @@ weight=4
 <![end-metadata]-->
 
 
-# Quickstart: Compose and Django
+# Quickstart: Docker Compose and Django
 
-This quick-start guide demonstrates how to use Compose to set up and run a
-simple Django/PostgreSQL app. Before starting, you'll need to have
+This quick-start guide demonstrates how to use Docker Compose to set up and run a simple Django/PostgreSQL app. Before starting, you'll need to have
 [Compose installed](install.md).
 
 ## Define the project components
diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md
index 36577f07..60482bce 100644
--- a/docs/gettingstarted.md
+++ b/docs/gettingstarted.md
@@ -12,7 +12,7 @@ weight=-85
 
 # Getting Started
 
-On this page you build a simple Python web application running on Compose. The
+On this page you build a simple Python web application running on Docker Compose. The
 application uses the Flask framework and increments a value in Redis. While the
 sample uses Python, the concepts demonstrated here should be understandable even
 if you're not familiar with it.
diff --git a/docs/images/django-it-worked.png b/docs/images/django-it-worked.png
index 2e8266279ec0ffdaa35239562dd340e2abfebbf6..75769754b975748dea24a9896083e6e9447d121f 100644
GIT binary patch
literal 28446
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
Q9vqyCf`)vREb#OH1EUHMCIA2c

literal 21041
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
af4LWM$R^u*48l$T0000<MNUMnLSTX)91Y|E

diff --git a/docs/images/rails-welcome.png b/docs/images/rails-welcome.png
index 8d250f84ba4854bf589bb69c11ebf41c145e13fd..51512dbda6986b41a5f9a8a0ca5ba6f5de450d1d 100644
GIT binary patch
literal 71034
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
a6Y}y^58ih#ifY@Kcf`{7Q?LtYPUU~rH#6%1

literal 62372
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%0A+EZjGlQg-UrTNSA}s5N~^R8&^Cr1Px&x-pAVLa
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

diff --git a/docs/images/wordpress-files.png b/docs/images/wordpress-files.png
new file mode 100644
index 0000000000000000000000000000000000000000..4762935baeb03568530e962231687bbcd38d075b
GIT binary patch
literal 70823
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

literal 0
HcmV?d00001

diff --git a/docs/images/wordpress-lang.png b/docs/images/wordpress-lang.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0bd864ef0a72930a28dd8e58685437ecbd947b3
GIT binary patch
literal 30149
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

literal 0
HcmV?d00001

diff --git a/docs/images/wordpress-welcome.png b/docs/images/wordpress-welcome.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9ba20368c55c34b18cc6a37ed1e5d3d37aa1a60
GIT binary patch
literal 62063
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

literal 0
HcmV?d00001

diff --git a/docs/rails.md b/docs/rails.md
index ccb0ab73..a8fc383e 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -9,9 +9,9 @@ weight=5
 +++
 <![end-metadata]-->
 
-## Quickstart: Compose and Rails
+## Quickstart: Docker Compose and Rails
 
-This Quickstart guide will show you how to use Compose to set up and run a Rails/PostgreSQL app. Before starting, you'll need to have [Compose installed](install.md).
+This Quickstart guide will show you how to use Docker Compose to set up and run a Rails/PostgreSQL app. Before starting, you'll need to have [Compose installed](install.md).
 
 ### Define the project
 
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 62aec251..62f50c24 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -10,88 +10,133 @@ weight=6
 <![end-metadata]-->
 
 
-# Quickstart: Compose and WordPress
+# Quickstart: Docker Compose and WordPress
 
-You can use Compose to easily run WordPress in an isolated environment built
-with Docker containers.
+You can use Docker Compose to easily run WordPress in an isolated environment built
+with Docker containers. This quick-start guide demonstrates how to use Compose to set up and run WordPress. Before starting, you'll need to have
+[Compose installed](install.md).
 
 ## Define the project
 
-First, [Install Compose](install.md) and then download WordPress into the
-current directory:
+1. Create an empty project directory.
 
-    $ curl https://wordpress.org/latest.tar.gz | tar -xvzf -
+    You can name the directory something easy for you to remember. This directory is the context for your application image. The directory should only contain resources to build that image.
 
-This will create a directory called `wordpress`. If you wish, you can rename it
-to the name of your project.
+    This project directory will contain a `Dockerfile`, a `docker-compose.yaml` file, along with a downloaded `wordpress` directory and a custom `wp-config.php`, all of which you will create in the following steps.
 
-Next, inside that directory, create a `Dockerfile`, a file that defines what
-environment your app is going to run in. For more information on how to write
-Dockerfiles, see the
-[Docker user guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the
-[Dockerfile reference](https://docs.docker.com/engine/reference/builder/). In
-this case, your Dockerfile should be:
+2. Change directories into your project directory.
 
-    FROM orchardup/php5
-    ADD . /code
+    For example, if you named your directory `my_wordpress`:
 
-This tells Docker how to build an image defining a container that contains PHP
-and WordPress.
+        $ cd my-wordpress/
 
-Next you'll create a `docker-compose.yml` file that will start your web service
-and a separate MySQL instance:
+3. Create a `Dockerfile`, a file that defines the environment in which your application will run.
 
-    version: '2'
-    services:
-      web:
-        build: .
-        command: php -S 0.0.0.0:8000 -t /code
-        ports:
-          - "8000:8000"
-        depends_on:
-          - db
-        volumes:
-          - .:/code
-      db:
-        image: orchardup/mysql
-        environment:
-          MYSQL_DATABASE: wordpress
+    For more information on how to write Dockerfiles, see the [Docker Engine user guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](https://docs.docker.com/engine/reference/builder/).
 
-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
-configuration at the `db` container:
+    In this case, your Dockerfile should include these two lines:
 
-    <?php
-    define('DB_NAME', 'wordpress');
-    define('DB_USER', 'root');
-    define('DB_PASSWORD', '');
-    define('DB_HOST', "db:3306");
-    define('DB_CHARSET', 'utf8');
-    define('DB_COLLATE', '');
+        FROM orchardup/php5
+        ADD . /code
 
-    define('AUTH_KEY',         'put your unique phrase here');
-    define('SECURE_AUTH_KEY',  'put your unique phrase here');
-    define('LOGGED_IN_KEY',    'put your unique phrase here');
-    define('NONCE_KEY',        'put your unique phrase here');
-    define('AUTH_SALT',        'put your unique phrase here');
-    define('SECURE_AUTH_SALT', 'put your unique phrase here');
-    define('LOGGED_IN_SALT',   'put your unique phrase here');
-    define('NONCE_SALT',       'put your unique phrase here');
+    This tells the Docker Engine daemon how to build an image defining a container that contains PHP and WordPress.
 
-    $table_prefix  = 'wp_';
-    define('WPLANG', '');
-    define('WP_DEBUG', false);
+4. Create a `docker-compose.yml` file that will start your web service and a separate MySQL instance:
 
-    if ( !defined('ABSPATH') )
-        define('ABSPATH', dirname(__FILE__) . '/');
+        version: '2'
+        services:
+          web:
+            build: .
+            command: php -S 0.0.0.0:8000 -t /code/wordpress/
+            ports:
+              - "8000:8000"
+            depends_on:
+              - db
+            volumes:
+              - .:/code
+          db:
+            image: orchardup/mysql
+            environment:
+              MYSQL_DATABASE: wordpress
 
-    require_once(ABSPATH . 'wp-settings.php');
+5. Download WordPress into the current directory:
+
+        $ curl https://wordpress.org/latest.tar.gz | tar -xvzf -
+
+    This creates a directory called `wordpress` in your project directory.
+
+6. Create a `wp-config.php` file within the `wordpress` directory.
+
+    A supporting file is needed to get this working. At the top level of the wordpress directory, add a new file called `wp-config.php` as shown. This is the standard WordPress config file with a single change to point the database configuration at the `db` container:
+
+        <?php
+        define('DB_NAME', 'wordpress');
+        define('DB_USER', 'root');
+        define('DB_PASSWORD', '');
+        define('DB_HOST', "db:3306");
+        define('DB_CHARSET', 'utf8');
+        define('DB_COLLATE', '');
+
+        define('AUTH_KEY',         'put your unique phrase here');
+        define('SECURE_AUTH_KEY',  'put your unique phrase here');
+        define('LOGGED_IN_KEY',    'put your unique phrase here');
+        define('NONCE_KEY',        'put your unique phrase here');
+        define('AUTH_SALT',        'put your unique phrase here');
+        define('SECURE_AUTH_SALT', 'put your unique phrase here');
+        define('LOGGED_IN_SALT',   'put your unique phrase here');
+        define('NONCE_SALT',       'put your unique phrase here');
+
+        $table_prefix  = 'wp_';
+        define('WPLANG', '');
+        define('WP_DEBUG', false);
+
+        if ( !defined('ABSPATH') )
+          define('ABSPATH', dirname(__FILE__) . '/');
+
+        require_once(ABSPATH . 'wp-settings.php');
+        ?>
+
+7. Verify the contents and structure of your project directory.
+<!--
+        Dockerfile
+        docker-compose.yaml
+        wordpress/
+          index.php
+          license.txt
+          readme.html
+          wp-activate.php
+          wp-admin/
+          wp-blog-header.php
+          wp-comments-post.php
+          wp-config-sample.php
+          wp-config.php
+          wp-content/
+          wp-cron.php
+          wp-includes/
+          wp-links-opml.php
+          wp-load.php
+          wp-login.php
+          wp-mail.php
+          wp-settings.php
+          wp-signup.php
+          wp-trackback.php
+          xmlrpc.php
+      -->
+
+    ![WordPress files](images/wordpress-files.png)
 
 ### Build the project
 
-With those four files in place, run `docker-compose up` inside your WordPress
-directory and it'll pull and build the needed images, and then start the web and
-database containers. If you're using [Docker Machine](https://docs.docker.com/machine/), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.
+With those four new files in place, run `docker-compose up` from your project directory. This will pull and build the needed images, and then start the web and database containers.
+
+If you're using [Docker Machine](https://docs.docker.com/machine/), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.
+
+At this point, WordPress should be running on port `8000` of your Docker Host, and you can complete the "famous five-minute installation" as a WordPress administrator.
+
+![Choose language for WordPress install](images/wordpress-lang.png)
+
+![WordPress Welcome](images/wordpress-welcome.png)
+
 
 ## More Compose documentation
 

From 97bbee19b7f16055c42d819bf005853159740b19 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 23 Feb 2016 14:55:06 -0800
Subject: [PATCH 0844/1265] Update docker-py version in requirements to 1.7.2

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5f55ba8a..e25386d2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 PyYAML==3.11
 cached-property==1.2.0
-docker-py==1.7.1
+docker-py==1.7.2
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4

From 49ef8a271d89212fe1e778188b301c6da67b9566 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 23 Feb 2016 11:31:22 -0800
Subject: [PATCH 0845/1265] Add release notes for 1.6.1

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 CHANGELOG.md    | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
 docs/install.md |  6 +++---
 script/run.sh   |  2 +-
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8df63c5f..7d553cc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,61 @@
 Change log
 ==========
 
+1.6.1 (2016-02-23)
+------------------
+
+Bug Fixes
+
+-   Fixed a bug where recreating a container multiple times would cause the
+    new container to be started without the previous volumes.
+
+-   Fixed a bug where Compose would set the value of unset environment variables
+    to an empty string, instead of a key without a value.
+
+-   Provide a better error message when Compose requires a more recent version
+    of the Docker API.
+
+-   Add a missing config field `network.aliases` which allows setting a network
+    scoped alias for a service.
+
+-   Fixed a bug where `run` would not start services listed in `depends_on`.
+
+-   Fixed a bug where `networks` and `network_mode` where not merged when using
+    extends or multiple Compose files.
+
+-   Fixed a bug with service aliases where the short container id alias was
+    only contained 10 characters, instead of the 12 characters used in previous
+    versions.
+
+-   Added a missing log message when creating a new named volume.
+
+-   Fixed a bug where `build.args` was not merged when using `extends` or
+    multiple Compose files.
+
+-   Fixed some bugs with config validation when null values or incorrect types
+    were used instead of a mapping.
+
+-   Fixed a bug where a `build` section without a `context` would show a stack
+    trace instead of a helpful validation message.
+
+-   Improved compatibility with swarm by only setting a container affinity to
+    the previous instance of a services' container when the service uses an
+    anonymous container volume. Previously the affinity was always set on all
+    containers.
+
+-   Fixed the validation of some `driver_opts` would cause an error if a number
+    was used instead of a string.
+
+-   Some improvements to the `run.sh` script used by the Compose container install
+    option.
+
+-   Fixed a bug with `up --abort-on-container-exit` where Compose would exit,
+    but would not stop other containers.
+
+-   Corrected the warning message that is printed when a boolean value is used
+    as a value in a mapping.
+
+
 1.6.0 (2016-01-15)
 ------------------
 
diff --git a/docs/install.md b/docs/install.md
index c50d7649..b7607a67 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -39,7 +39,7 @@ which the release page specifies, in your terminal.
 
      The following is an example command illustrating the format:
 
-        curl -L https://github.com/docker/compose/releases/download/1.6.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+        curl -L https://github.com/docker/compose/releases/download/1.6.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 
      If you have problems installing with `curl`, see
      [Alternative Install Options](#alternative-install-options).
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
 7. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.6.0
+        docker-compose version: 1.6.1
 
 
 ## Alternative install options
@@ -77,7 +77,7 @@ to get started.
 Compose can also be run inside a container, from a small bash script wrapper.
 To install compose as a container run:
 
-    $ curl -L https://github.com/docker/compose/releases/download/1.5.2/run.sh > /usr/local/bin/docker-compose
+    $ curl -L https://github.com/docker/compose/releases/download/1.6.1/run.sh > /usr/local/bin/docker-compose
     $ chmod +x /usr/local/bin/docker-compose
 
 ## Master builds
diff --git a/script/run.sh b/script/run.sh
index 07132a0c..3e30dd15 100755
--- a/script/run.sh
+++ b/script/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.5.2"
+VERSION="1.6.1"
 IMAGE="docker/compose:$VERSION"
 
 

From adb64ef8d5406c26834b2bd0a4dfab1de47ff9ca Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 5 Feb 2016 20:07:04 -0500
Subject: [PATCH 0846/1265] Merge v2 config jsonschemas into a single file.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py                      |   8 +-
 ...hema_v2.0.json => config_schema_v2.0.json} | 116 ++++++++++++++++--
 compose/config/fields_schema_v2.0.json        |  96 ---------------
 compose/config/validation.py                  |  14 +--
 docker-compose.spec                           |   9 +-
 5 files changed, 115 insertions(+), 128 deletions(-)
 rename compose/config/{service_schema_v2.0.json => config_schema_v2.0.json} (74%)
 delete mode 100644 compose/config/fields_schema_v2.0.json

diff --git a/compose/config/config.py b/compose/config/config.py
index 4e91a3af..3994a332 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -31,12 +31,12 @@ from .types import ServiceLink
 from .types import VolumeFromSpec
 from .types import VolumeSpec
 from .validation import match_named_volumes
-from .validation import validate_against_fields_schema
-from .validation import validate_against_service_schema
 from .validation import validate_config_section
+from .validation import validate_against_config_schema
 from .validation import validate_depends_on
 from .validation import validate_extends_file_path
 from .validation import validate_network_mode
+from .validation import validate_service_constraints
 from .validation import validate_top_level_object
 from .validation import validate_ulimits
 
@@ -415,7 +415,7 @@ def process_config_file(config_file, service_name=None):
         processed_config = services
 
     config_file = config_file._replace(config=processed_config)
-    validate_against_fields_schema(config_file)
+    validate_against_config_schema(config_file)
 
     if service_name and service_name not in services:
         raise ConfigurationError(
@@ -548,7 +548,7 @@ def validate_extended_service_dict(service_dict, filename, service):
 
 def validate_service(service_config, service_names, version):
     service_dict, service_name = service_config.config, service_config.name
-    validate_against_service_schema(service_dict, service_name, version)
+    validate_service_constraints(service_dict, service_name, version)
     validate_paths(service_dict)
 
     validate_ulimits(service_config)
diff --git a/compose/config/service_schema_v2.0.json b/compose/config/config_schema_v2.0.json
similarity index 74%
rename from compose/config/service_schema_v2.0.json
rename to compose/config/config_schema_v2.0.json
index edccedc6..e8ceb4c2 100644
--- a/compose/config/service_schema_v2.0.json
+++ b/compose/config/config_schema_v2.0.json
@@ -1,15 +1,50 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "service_schema_v2.0.json",
-
+  "id": "config_schema_v2.0.json",
   "type": "object",
 
-  "allOf": [
-    {"$ref": "#/definitions/service"},
-    {"$ref": "#/definitions/constraints"}
-  ],
+  "properties": {
+    "version": {
+      "type": "string"
+    },
+
+    "services": {
+      "id": "#/properties/services",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/service"
+        }
+      },
+      "additionalProperties": false
+    },
+
+    "networks": {
+      "id": "#/properties/networks",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/network"
+        }
+      }
+    },
+
+    "volumes": {
+      "id": "#/properties/volumes",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/volume"
+        }
+      },
+      "additionalProperties": false
+    }
+  },
+
+  "additionalProperties": false,
 
   "definitions": {
+
     "service": {
       "id": "#/definitions/service",
       "type": "object",
@@ -193,6 +228,60 @@
       "additionalProperties": false
     },
 
+    "network": {
+      "id": "#/definitions/network",
+      "type": "object",
+      "properties": {
+        "driver": {"type": "string"},
+        "driver_opts": {
+          "type": "object",
+          "patternProperties": {
+            "^.+$": {"type": ["string", "number"]}
+          }
+        },
+        "ipam": {
+            "type": "object",
+            "properties": {
+                "driver": {"type": "string"},
+                "config": {
+                    "type": "array"
+                }
+            },
+            "additionalProperties": false
+        },
+        "external": {
+          "type": ["boolean", "object"],
+          "properties": {
+            "name": {"type": "string"}
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+
+    "volume": {
+      "id": "#/definitions/volume",
+      "type": ["object", "null"],
+      "properties": {
+        "driver": {"type": "string"},
+        "driver_opts": {
+          "type": "object",
+          "patternProperties": {
+            "^.+$": {"type": ["string", "number"]}
+          }
+        },
+        "external": {
+          "type": ["boolean", "object"],
+          "properties": {
+            "name": {"type": "string"}
+          }
+        },
+        "additionalProperties": false
+      },
+      "additionalProperties": false
+    },
+
     "string_or_list": {
       "oneOf": [
         {"type": "string"},
@@ -221,15 +310,18 @@
         {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
       ]
     },
+
     "constraints": {
-      "id": "#/definitions/constraints",
-      "anyOf": [
+      "services": {
+        "id": "#/definitions/services/constraints",
+        "anyOf": [
           {"required": ["build"]},
           {"required": ["image"]}
-      ],
-      "properties": {
-        "build": {
-          "required": ["context"]
+        ],
+        "properties": {
+          "build": {
+            "required": ["context"]
+          }
         }
       }
     }
diff --git a/compose/config/fields_schema_v2.0.json b/compose/config/fields_schema_v2.0.json
deleted file mode 100644
index 7703adcd..00000000
--- a/compose/config/fields_schema_v2.0.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "type": "object",
-  "id": "fields_schema_v2.0.json",
-
-  "properties": {
-    "version": {
-      "type": "string"
-    },
-    "services": {
-      "id": "#/properties/services",
-      "type": "object",
-      "patternProperties": {
-        "^[a-zA-Z0-9._-]+$": {
-          "$ref": "service_schema_v2.0.json#/definitions/service"
-        }
-      },
-      "additionalProperties": false
-    },
-    "networks": {
-      "id": "#/properties/networks",
-      "type": "object",
-      "patternProperties": {
-        "^[a-zA-Z0-9._-]+$": {
-          "$ref": "#/definitions/network"
-        }
-      }
-    },
-    "volumes": {
-      "id": "#/properties/volumes",
-      "type": "object",
-      "patternProperties": {
-        "^[a-zA-Z0-9._-]+$": {
-          "$ref": "#/definitions/volume"
-        }
-      },
-      "additionalProperties": false
-    }
-  },
-
-  "definitions": {
-    "network": {
-      "id": "#/definitions/network",
-      "type": "object",
-      "properties": {
-        "driver": {"type": "string"},
-        "driver_opts": {
-          "type": "object",
-          "patternProperties": {
-            "^.+$": {"type": ["string", "number"]}
-          }
-        },
-        "ipam": {
-            "type": "object",
-            "properties": {
-                "driver": {"type": "string"},
-                "config": {
-                    "type": "array"
-                }
-            },
-            "additionalProperties": false
-        },
-        "external": {
-          "type": ["boolean", "object"],
-          "properties": {
-            "name": {"type": "string"}
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    "volume": {
-      "id": "#/definitions/volume",
-      "type": ["object", "null"],
-      "properties": {
-        "driver": {"type": "string"},
-        "driver_opts": {
-          "type": "object",
-          "patternProperties": {
-            "^.+$": {"type": ["string", "number"]}
-          }
-        },
-        "external": {
-          "type": ["boolean", "object"],
-          "properties": {
-            "name": {"type": "string"}
-          }
-        },
-        "additionalProperties": false
-      },
-      "additionalProperties": false
-    }
-  },
-  "additionalProperties": false
-}
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 60ee5c93..d7ca270c 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -385,21 +385,17 @@ def process_errors(errors, path_prefix=None):
     return '\n'.join(format_error_message(error) for error in errors)
 
 
-def validate_against_fields_schema(config_file):
-    schema_filename = "fields_schema_v{0}.json".format(config_file.version)
+def validate_against_config_schema(config_file):
     _validate_against_schema(
         config_file.config,
-        schema_filename,
+        "service_schema_v{0}.json".format(config_file.version),
         format_checker=["ports", "expose", "bool-value-in-mapping"],
         filename=config_file.filename)
 
 
-def validate_against_service_schema(config, service_name, version):
-    _validate_against_schema(
-        config,
-        "service_schema_v{0}.json".format(version),
-        format_checker=["ports"],
-        path_prefix=[service_name])
+def validate_service_constraints(config, service_name, version):
+    # TODO:
+    pass
 
 
 def _validate_against_schema(
diff --git a/docker-compose.spec b/docker-compose.spec
index b3d8db39..4282400e 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -22,19 +22,14 @@ exe = EXE(pyz,
                 'compose/config/fields_schema_v1.json',
                 'DATA'
             ),
-            (
-                'compose/config/fields_schema_v2.0.json',
-                'compose/config/fields_schema_v2.0.json',
-                'DATA'
-            ),
             (
                 'compose/config/service_schema_v1.json',
                 'compose/config/service_schema_v1.json',
                 'DATA'
             ),
             (
-                'compose/config/service_schema_v2.0.json',
-                'compose/config/service_schema_v2.0.json',
+                'compose/config/config_schema_v2.0.json',
+                'compose/config/config_schema_v2.0.json',
                 'DATA'
             ),
             (

From be554c3a74c137e835209b7a1f27b76bd64aa54f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 5 Feb 2016 20:21:58 -0500
Subject: [PATCH 0847/1265] Merge v1 config jsonschemas into a single file.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 ...e_schema_v1.json => config_schema_v1.json} | 44 +++++++++++--------
 compose/config/fields_schema_v1.json          | 13 ------
 compose/config/validation.py                  |  2 +-
 docker-compose.spec                           |  9 +---
 4 files changed, 28 insertions(+), 40 deletions(-)
 rename compose/config/{service_schema_v1.json => config_schema_v1.json} (89%)
 delete mode 100644 compose/config/fields_schema_v1.json

diff --git a/compose/config/service_schema_v1.json b/compose/config/config_schema_v1.json
similarity index 89%
rename from compose/config/service_schema_v1.json
rename to compose/config/config_schema_v1.json
index 4d974d71..affc19f0 100644
--- a/compose/config/service_schema_v1.json
+++ b/compose/config/config_schema_v1.json
@@ -1,13 +1,16 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "service_schema_v1.json",
+  "id": "config_schema_v1.json",
 
   "type": "object",
 
-  "allOf": [
-    {"$ref": "#/definitions/service"},
-    {"$ref": "#/definitions/constraints"}
-  ],
+  "patternProperties": {
+    "^[a-zA-Z0-9._-]+$": {
+      "$ref": "#/definitions/service"
+    }
+  },
+
+  "additionalProperties": false,
 
   "definitions": {
     "service": {
@@ -162,21 +165,24 @@
         {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
       ]
     },
+
     "constraints": {
-      "id": "#/definitions/constraints",
-      "anyOf": [
-        {
-          "required": ["build"],
-          "not": {"required": ["image"]}
-        },
-        {
-          "required": ["image"],
-          "not": {"anyOf": [
-            {"required": ["build"]},
-            {"required": ["dockerfile"]}
-          ]}
-        }
-      ]
+      "services": {
+        "id": "#/definitions/services/constraints",
+        "anyOf": [
+          {
+            "required": ["build"],
+            "not": {"required": ["image"]}
+          },
+          {
+            "required": ["image"],
+            "not": {"anyOf": [
+              {"required": ["build"]},
+              {"required": ["dockerfile"]}
+            ]}
+          }
+        ]
+      }
     }
   }
 }
diff --git a/compose/config/fields_schema_v1.json b/compose/config/fields_schema_v1.json
deleted file mode 100644
index 8f6a8c0a..00000000
--- a/compose/config/fields_schema_v1.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-
-  "type": "object",
-  "id": "fields_schema_v1.json",
-
-  "patternProperties": {
-    "^[a-zA-Z0-9._-]+$": {
-      "$ref": "service_schema_v1.json#/definitions/service"
-    }
-  },
-  "additionalProperties": false
-}
diff --git a/compose/config/validation.py b/compose/config/validation.py
index d7ca270c..07ec04ef 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -388,7 +388,7 @@ def process_errors(errors, path_prefix=None):
 def validate_against_config_schema(config_file):
     _validate_against_schema(
         config_file.config,
-        "service_schema_v{0}.json".format(config_file.version),
+        "config_schema_v{0}.json".format(config_file.version),
         format_checker=["ports", "expose", "bool-value-in-mapping"],
         filename=config_file.filename)
 
diff --git a/docker-compose.spec b/docker-compose.spec
index 4282400e..3a165dd6 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -18,13 +18,8 @@ exe = EXE(pyz,
           a.datas,
           [
             (
-                'compose/config/fields_schema_v1.json',
-                'compose/config/fields_schema_v1.json',
-                'DATA'
-            ),
-            (
-                'compose/config/service_schema_v1.json',
-                'compose/config/service_schema_v1.json',
+                'compose/config/config_schema_v1.json',
+                'compose/config/config_schema_v1.json',
                 'DATA'
             ),
             (

From 84a1822e407959bc4c75d4ed3b65c0444e8db885 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 27 Nov 2015 13:19:27 -0500
Subject: [PATCH 0848/1265] Reduce complexity of _get_container_create_options

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 01f17a12..dd3e8828 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -566,8 +566,7 @@ class Service(object):
         elif not container_options.get('name'):
             container_options['name'] = self.get_container_name(number, one_off)
 
-        if 'detach' not in container_options:
-            container_options['detach'] = True
+        container_options.setdefault('detach', True)
 
         # If a qualified hostname was given, split it into an
         # unqualified hostname and a domainname unless domainname
@@ -581,16 +580,9 @@ class Service(object):
             container_options['domainname'] = parts[2]
 
         if 'ports' in container_options or 'expose' in self.options:
-            ports = []
-            all_ports = container_options.get('ports', []) + self.options.get('expose', [])
-            for port_range in all_ports:
-                internal_range, _ = split_port(port_range)
-                for port in internal_range:
-                    port = str(port)
-                    if '/' in port:
-                        port = tuple(port.split('/'))
-                    ports.append(port)
-            container_options['ports'] = ports
+            container_options['ports'] = build_container_ports(
+                container_options,
+                self.options)
 
         container_options['environment'] = merge_environment(
             self.options.get('environment'),
@@ -1031,3 +1023,18 @@ def format_environment(environment):
             return key
         return '{key}={value}'.format(key=key, value=value)
     return [format_env(*item) for item in environment.items()]
+
+# Ports
+
+
+def build_container_ports(container_options, options):
+    ports = []
+    all_ports = container_options.get('ports', []) + options.get('expose', [])
+    for port_range in all_ports:
+        internal_range, _ = split_port(port_range)
+        for port in internal_range:
+            port = str(port)
+            if '/' in port:
+                port = tuple(port.split('/'))
+            ports.append(port)
+    return ports

From cdda616d6b21cd99bb2283009bfb066ee0b68767 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 27 Nov 2015 13:26:15 -0500
Subject: [PATCH 0849/1265] Reduce complexity of sort_service_dicts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/sort_services.py | 35 ++++++++++++++++++---------------
 tox.ini                         |  2 +-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/compose/config/sort_services.py b/compose/config/sort_services.py
index 9d29f329..20ac4461 100644
--- a/compose/config/sort_services.py
+++ b/compose/config/sort_services.py
@@ -23,28 +23,31 @@ def get_source_name_from_network_mode(network_mode, source_type):
     return net_name
 
 
+def get_service_names(links):
+    return [link.split(':')[0] for link in links]
+
+
+def get_service_names_from_volumes_from(volumes_from):
+    return [volume_from.source for volume_from in volumes_from]
+
+
+def get_service_dependents(service_dict, services):
+    name = service_dict['name']
+    return [
+        service for service in services
+        if (name in get_service_names(service.get('links', [])) or
+            name in get_service_names_from_volumes_from(service.get('volumes_from', [])) or
+            name == get_service_name_from_network_mode(service.get('network_mode')) or
+            name in service.get('depends_on', []))
+    ]
+
+
 def sort_service_dicts(services):
     # Topological sort (Cormen/Tarjan algorithm).
     unmarked = services[:]
     temporary_marked = set()
     sorted_services = []
 
-    def get_service_names(links):
-        return [link.split(':')[0] for link in links]
-
-    def get_service_names_from_volumes_from(volumes_from):
-        return [volume_from.source for volume_from in volumes_from]
-
-    def get_service_dependents(service_dict, services):
-        name = service_dict['name']
-        return [
-            service for service in services
-            if (name in get_service_names(service.get('links', [])) or
-                name in get_service_names_from_volumes_from(service.get('volumes_from', [])) or
-                name == get_service_name_from_network_mode(service.get('network_mode')) or
-                name in service.get('depends_on', []))
-        ]
-
     def visit(n):
         if n['name'] in temporary_marked:
             if n['name'] in get_service_names(n.get('links', [])):
diff --git a/tox.ini b/tox.ini
index a18bfda7..7984775d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -45,7 +45,7 @@ directory = coverage-html
 # Allow really long lines for now
 max-line-length = 140
 # Set this high for now
-max-complexity = 12
+max-complexity = 11
 exclude = compose/packages
 
 [pytest]

From 43ecf8793af1b1979c400634b31207684aa0ce8d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 19 Jan 2016 16:06:32 -0500
Subject: [PATCH 0850/1265] Address old TODO, and small refactor of container
 name logic in service.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py                | 19 ++++++++++---------
 tests/integration/service_test.py |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index dd3e8828..2fbea8d1 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -162,11 +162,11 @@ class Service(object):
         - starts containers until there are at least `desired_num` running
         - removes all stopped containers
         """
-        if self.custom_container_name() and desired_num > 1:
+        if self.custom_container_name and desired_num > 1:
             log.warn('The "%s" service is using the custom container name "%s". '
                      'Docker requires each container to have a unique name. '
                      'Remove the custom name to scale the service.'
-                     % (self.name, self.custom_container_name()))
+                     % (self.name, self.custom_container_name))
 
         if self.specifies_host_port():
             log.warn('The "%s" service specifies a port on the host. If multiple containers '
@@ -496,10 +496,6 @@ class Service(object):
     def get_volumes_from_names(self):
         return [s.source.name for s in self.volumes_from if isinstance(s.source, Service)]
 
-    def get_container_name(self, number, one_off=False):
-        # TODO: Implement issue #652 here
-        return build_container_name(self.project, self.name, number, one_off)
-
     # TODO: this would benefit from github.com/docker/docker/pull/14699
     # to remove the need to inspect every container
     def _next_container_number(self, one_off=False):
@@ -561,9 +557,7 @@ class Service(object):
             for k in DOCKER_CONFIG_KEYS if k in self.options)
         container_options.update(override_options)
 
-        if self.custom_container_name() and not one_off:
-            container_options['name'] = self.custom_container_name()
-        elif not container_options.get('name'):
+        if not container_options.get('name'):
             container_options['name'] = self.get_container_name(number, one_off)
 
         container_options.setdefault('detach', True)
@@ -706,9 +700,16 @@ class Service(object):
             '{0}={1}'.format(LABEL_ONE_OFF, "True" if one_off else "False")
         ]
 
+    @property
     def custom_container_name(self):
         return self.options.get('container_name')
 
+    def get_container_name(self, number, one_off=False):
+        if self.custom_container_name and not one_off:
+            return self.custom_container_name
+
+        return build_container_name(self.project, self.name, number, one_off)
+
     def remove_image(self, image_type):
         if not image_type or image_type == ImageType.none:
             return False
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 968c0947..35696ea3 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -782,7 +782,7 @@ class ServiceTest(DockerClientTestCase):
         results in warning output.
         """
         service = self.create_service('app', container_name='custom-container')
-        self.assertEqual(service.custom_container_name(), 'custom-container')
+        self.assertEqual(service.custom_container_name, 'custom-container')
 
         service.scale(3)
 
@@ -963,7 +963,7 @@ class ServiceTest(DockerClientTestCase):
 
     def test_custom_container_name(self):
         service = self.create_service('web', container_name='my-web-container')
-        self.assertEqual(service.custom_container_name(), 'my-web-container')
+        self.assertEqual(service.custom_container_name, 'my-web-container')
 
         container = create_and_start_container(service)
         self.assertEqual(container.name, 'my-web-container')

From dc3a5ce624fb0a0bf2d0c701aaa34df63b6fc5bd Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 10 Feb 2016 16:05:15 -0500
Subject: [PATCH 0851/1265] Refactor config validation to support constraints
 in the same jsonschema

Reworked the two schema validation functions to read from the same schema but
use different parts of it. Error handling is now split as well by the
schema that is being used to validate.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py               |   2 +-
 compose/config/config_schema_v1.json   |   4 +-
 compose/config/config_schema_v2.0.json |   4 +-
 compose/config/validation.py           | 153 ++++++++++++-------------
 tests/unit/config/config_test.py       |  19 ++-
 5 files changed, 87 insertions(+), 95 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 3994a332..850af31c 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -31,8 +31,8 @@ from .types import ServiceLink
 from .types import VolumeFromSpec
 from .types import VolumeSpec
 from .validation import match_named_volumes
-from .validation import validate_config_section
 from .validation import validate_against_config_schema
+from .validation import validate_config_section
 from .validation import validate_depends_on
 from .validation import validate_extends_file_path
 from .validation import validate_network_mode
diff --git a/compose/config/config_schema_v1.json b/compose/config/config_schema_v1.json
index affc19f0..cde8c8e5 100644
--- a/compose/config/config_schema_v1.json
+++ b/compose/config/config_schema_v1.json
@@ -167,8 +167,8 @@
     },
 
     "constraints": {
-      "services": {
-        "id": "#/definitions/services/constraints",
+      "service": {
+        "id": "#/definitions/constraints/service",
         "anyOf": [
           {
             "required": ["build"],
diff --git a/compose/config/config_schema_v2.0.json b/compose/config/config_schema_v2.0.json
index e8ceb4c2..54bfc978 100644
--- a/compose/config/config_schema_v2.0.json
+++ b/compose/config/config_schema_v2.0.json
@@ -312,8 +312,8 @@
     },
 
     "constraints": {
-      "services": {
-        "id": "#/definitions/services/constraints",
+      "service": {
+        "id": "#/definitions/constraints/service",
         "anyOf": [
           {"required": ["build"]},
           {"required": ["image"]}
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 07ec04ef..4eafe7b5 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -14,6 +14,7 @@ from jsonschema import FormatChecker
 from jsonschema import RefResolver
 from jsonschema import ValidationError
 
+from ..const import COMPOSEFILE_V1 as V1
 from .errors import ConfigurationError
 from .errors import VERSION_EXPLANATION
 from .sort_services import get_service_name_from_network_mode
@@ -209,7 +210,7 @@ def anglicize_json_type(json_type):
 
 
 def is_service_dict_schema(schema_id):
-    return schema_id == 'fields_schema_v1.json' or schema_id == '#/properties/services'
+    return schema_id in ('config_schema_v1.json',  '#/properties/services')
 
 
 def handle_error_for_schema_with_id(error, path):
@@ -221,35 +222,6 @@ def handle_error_for_schema_with_id(error, path):
             list(error.instance)[0],
             VALID_NAME_CHARS)
 
-    if schema_id == '#/definitions/constraints':
-        # Build context could in 'build' or 'build.context' and dockerfile could be
-        # in 'dockerfile' or 'build.dockerfile'
-        context = False
-        dockerfile = 'dockerfile' in error.instance
-        if 'build' in error.instance:
-            if isinstance(error.instance['build'], six.string_types):
-                context = True
-            else:
-                context = 'context' in error.instance['build']
-                dockerfile = dockerfile or 'dockerfile' in error.instance['build']
-
-        # TODO: only applies to v1
-        if 'image' in error.instance and context:
-            return (
-                "{} has both an image and build path specified. "
-                "A service can either be built to image or use an existing "
-                "image, not both.".format(path_string(path)))
-        if 'image' not in error.instance and not context:
-            return (
-                "{} has neither an image nor a build path specified. "
-                "At least one must be provided.".format(path_string(path)))
-        # TODO: only applies to v1
-        if 'image' in error.instance and dockerfile:
-            return (
-                "{} has both an image and alternate Dockerfile. "
-                "A service can either be built to image or use an existing "
-                "image, not both.".format(path_string(path)))
-
     if error.validator == 'additionalProperties':
         if schema_id == '#/definitions/service':
             invalid_config_key = parse_key_from_error_msg(error)
@@ -259,7 +231,7 @@ def handle_error_for_schema_with_id(error, path):
             return '{}\n{}'.format(error.message, VERSION_EXPLANATION)
 
 
-def handle_generic_service_error(error, path):
+def handle_generic_error(error, path):
     msg_format = None
     error_msg = error.message
 
@@ -365,71 +337,94 @@ def _parse_oneof_validator(error):
     return (None, "contains an invalid type, it should be {}".format(valid_types))
 
 
-def process_errors(errors, path_prefix=None):
-    """jsonschema gives us an error tree full of information to explain what has
-    gone wrong. Process each error and pull out relevant information and re-write
-    helpful error messages that are relevant.
-    """
-    path_prefix = path_prefix or []
+def process_service_constraint_errors(error, service_name, version):
+    if version == V1:
+        if 'image' in error.instance and 'build' in error.instance:
+            return (
+                "Service {} has both an image and build path specified. "
+                "A service can either be built to image or use an existing "
+                "image, not both.".format(service_name))
 
-    def format_error_message(error):
-        path = path_prefix + list(error.path)
+        if 'image' in error.instance and 'dockerfile' in error.instance:
+            return (
+                "Service {} has both an image and alternate Dockerfile. "
+                "A service can either be built to image or use an existing "
+                "image, not both.".format(service_name))
 
-        if 'id' in error.schema:
-            error_msg = handle_error_for_schema_with_id(error, path)
-            if error_msg:
-                return error_msg
+    if 'image' not in error.instance and 'build' not in error.instance:
+        return (
+            "Service {} has neither an image nor a build context specified. "
+            "At least one must be provided.".format(service_name))
 
-        return handle_generic_service_error(error, path)
 
-    return '\n'.join(format_error_message(error) for error in errors)
+def process_config_schema_errors(error):
+    path = list(error.path)
+
+    if 'id' in error.schema:
+        error_msg = handle_error_for_schema_with_id(error, path)
+        if error_msg:
+            return error_msg
+
+    return handle_generic_error(error, path)
 
 
 def validate_against_config_schema(config_file):
-    _validate_against_schema(
-        config_file.config,
-        "config_schema_v{0}.json".format(config_file.version),
-        format_checker=["ports", "expose", "bool-value-in-mapping"],
-        filename=config_file.filename)
+    schema = load_jsonschema(config_file.version)
+    format_checker = FormatChecker(["ports", "expose", "bool-value-in-mapping"])
+    validator = Draft4Validator(
+        schema,
+        resolver=RefResolver(get_resolver_path(), schema),
+        format_checker=format_checker)
+    handle_errors(
+        validator.iter_errors(config_file.config),
+        process_config_schema_errors,
+        config_file.filename)
 
 
 def validate_service_constraints(config, service_name, version):
-    # TODO:
-    pass
+    def handler(errors):
+        return process_service_constraint_errors(errors, service_name, version)
+
+    schema = load_jsonschema(version)
+    validator = Draft4Validator(schema['definitions']['constraints']['service'])
+    handle_errors(validator.iter_errors(config), handler, None)
 
 
-def _validate_against_schema(
-        config,
-        schema_filename,
-        format_checker=(),
-        path_prefix=None,
-        filename=None):
-    config_source_dir = os.path.dirname(os.path.abspath(__file__))
+def get_schema_path():
+    return os.path.dirname(os.path.abspath(__file__))
 
+
+def load_jsonschema(version):
+    filename = os.path.join(
+        get_schema_path(),
+        "config_schema_v{0}.json".format(version))
+
+    with open(filename, "r") as fh:
+        return json.load(fh)
+
+
+def get_resolver_path():
+    schema_path = get_schema_path()
     if sys.platform == "win32":
-        file_pre_fix = "///"
-        config_source_dir = config_source_dir.replace('\\', '/')
+        scheme = "///"
+        # TODO: why is this necessary?
+        schema_path = schema_path.replace('\\', '/')
     else:
-        file_pre_fix = "//"
+        scheme = "//"
+    return "file:{}{}/".format(scheme, schema_path)
 
-    resolver_full_path = "file:{}{}/".format(file_pre_fix, config_source_dir)
-    schema_file = os.path.join(config_source_dir, schema_filename)
 
-    with open(schema_file, "r") as schema_fh:
-        schema = json.load(schema_fh)
-
-    resolver = RefResolver(resolver_full_path, schema)
-    validation_output = Draft4Validator(
-        schema,
-        resolver=resolver,
-        format_checker=FormatChecker(format_checker))
-
-    errors = [error for error in sorted(validation_output.iter_errors(config), key=str)]
+def handle_errors(errors, format_error_func, filename):
+    """jsonschema returns an error tree full of information to explain what has
+    gone wrong. Process each error and pull out relevant information and re-write
+    helpful error messages that are relevant.
+    """
+    errors = list(sorted(errors, key=str))
     if not errors:
         return
 
-    error_msg = process_errors(errors, path_prefix=path_prefix)
-    file_msg = " in file '{}'".format(filename) if filename else ''
-    raise ConfigurationError("Validation failed{}, reason(s):\n{}".format(
-        file_msg,
-        error_msg))
+    error_msg = '\n'.join(format_error_func(error) for error in errors)
+    raise ConfigurationError(
+        "Validation failed{file_msg}, reason(s):\n{error_msg}".format(
+            file_msg=" in file '{}'".format(filename) if filename else "",
+            error_msg=error_msg))
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 11bc7f0b..f8f224a0 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -342,20 +342,17 @@ class ConfigTest(unittest.TestCase):
         for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
             with pytest.raises(ConfigurationError) as exc:
                 config.load(build_config_details(
-                    {invalid_name: {'image': 'busybox'}},
-                    'working_dir',
-                    'filename.yml'))
+                    {invalid_name: {'image': 'busybox'}}))
             assert 'Invalid service name \'%s\'' % invalid_name in exc.exconly()
 
-    def test_config_invalid_service_names_v2(self):
+    def test_load_config_invalid_service_names_v2(self):
         for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
             with pytest.raises(ConfigurationError) as exc:
-                config.load(
-                    build_config_details({
+                config.load(build_config_details(
+                    {
                         'version': '2',
-                        'services': {invalid_name: {'image': 'busybox'}}
-                    }, 'working_dir', 'filename.yml')
-                )
+                        'services': {invalid_name: {'image': 'busybox'}},
+                    }))
             assert 'Invalid service name \'%s\'' % invalid_name in exc.exconly()
 
     def test_load_with_invalid_field_name(self):
@@ -1317,7 +1314,7 @@ class ConfigTest(unittest.TestCase):
         })
         with pytest.raises(ConfigurationError) as exc:
             config.load(config_details)
-        assert 'one.build is invalid, context is required.' in exc.exconly()
+        assert 'has neither an image nor a build context' in exc.exconly()
 
 
 class NetworkModeTest(unittest.TestCase):
@@ -2269,7 +2266,7 @@ class ExtendsTest(unittest.TestCase):
         with pytest.raises(ConfigurationError) as exc:
             load_from_filename('tests/fixtures/extends/service-with-invalid-schema.yml')
         assert (
-            "myweb has neither an image nor a build path specified" in
+            "myweb has neither an image nor a build context specified" in
             exc.exconly()
         )
 

From a87d482a3bad04e211103c484b54580e243a9b4c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 15 Jan 2016 16:27:43 -0500
Subject: [PATCH 0852/1265] Move all build scripts to script/build

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 appveyor.yml                                         | 2 +-
 project/RELEASE-PROCESS.md                           | 2 +-
 script/{build-image => build/image}                  | 0
 script/{build-linux => build/linux}                  | 2 +-
 script/{build-linux-inner => build/linux-entrypoint} | 0
 script/{build-osx => build/osx}                      | 0
 script/{build-windows.ps1 => build/windows.ps1}      | 2 +-
 script/ci                                            | 2 +-
 script/release/build-binaries                        | 6 +++---
 script/{test => test-default}                        | 0
 script/travis/build-binary                           | 6 +++---
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename script/{build-image => build/image} (100%)
 rename script/{build-linux => build/linux} (76%)
 rename script/{build-linux-inner => build/linux-entrypoint} (100%)
 rename script/{build-osx => build/osx} (100%)
 rename script/{build-windows.ps1 => build/windows.ps1} (97%)
 rename script/{test => test-default} (100%)

diff --git a/appveyor.yml b/appveyor.yml
index 489be021..e4f39544 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,7 @@ build: false
 
 test_script:
   - "tox -e py27,py34 -- tests/unit"
-  - ps: ".\\script\\build-windows.ps1"
+  - ps: ".\\script\\build\\windows.ps1"
 
 artifacts:
   - path: .\dist\docker-compose-Windows-x86_64.exe
diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 040a2602..14d93088 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -58,7 +58,7 @@ When prompted build the non-linux binaries and test them.
 1.  Build the Mac binary in a Mountain Lion VM:
 
         script/prepare-osx
-        script/build-osx
+        script/build/osx
 
 2.  Download the windows binary from AppVeyor
 
diff --git a/script/build-image b/script/build/image
similarity index 100%
rename from script/build-image
rename to script/build/image
diff --git a/script/build-linux b/script/build/linux
similarity index 76%
rename from script/build-linux
rename to script/build/linux
index 47fb45e1..1a4cd4d9 100755
--- a/script/build-linux
+++ b/script/build/linux
@@ -7,7 +7,7 @@ set -ex
 TAG="docker-compose"
 docker build -t "$TAG" . | tail -n 200
 docker run \
-    --rm --entrypoint="script/build-linux-inner" \
+    --rm --entrypoint="script/build/linux-entrypoint" \
     -v $(pwd)/dist:/code/dist \
     -v $(pwd)/.git:/code/.git \
     "$TAG"
diff --git a/script/build-linux-inner b/script/build/linux-entrypoint
similarity index 100%
rename from script/build-linux-inner
rename to script/build/linux-entrypoint
diff --git a/script/build-osx b/script/build/osx
similarity index 100%
rename from script/build-osx
rename to script/build/osx
diff --git a/script/build-windows.ps1 b/script/build/windows.ps1
similarity index 97%
rename from script/build-windows.ps1
rename to script/build/windows.ps1
index 4a2bc1f7..db643274 100644
--- a/script/build-windows.ps1
+++ b/script/build/windows.ps1
@@ -26,7 +26,7 @@
 #
 # 6. Build the binary:
 #
-#        .\script\build-windows.ps1
+#        .\script\build\windows.ps1
 
 $ErrorActionPreference = "Stop"
 
diff --git a/script/ci b/script/ci
index f30265c0..f73be842 100755
--- a/script/ci
+++ b/script/ci
@@ -18,4 +18,4 @@ GIT_VOLUME="--volumes-from=$(hostname)"
 . script/test-versions
 
 >&2 echo "Building Linux binary"
-. script/build-linux-inner
+. script/build/linux-entrypoint
diff --git a/script/release/build-binaries b/script/release/build-binaries
index 083f8eb5..3a57b89a 100755
--- a/script/release/build-binaries
+++ b/script/release/build-binaries
@@ -22,15 +22,15 @@ REPO=docker/compose
 
 # Build the binaries
 script/clean
-script/build-linux
+script/build/linux
 # TODO: build osx binary
 # script/prepare-osx
-# script/build-osx
+# script/build/osx
 # TODO: build or fetch the windows binary
 echo "You need to build the osx/windows binaries, that step is not automated yet."
 
 echo "Building the container distribution"
-script/build-image $VERSION
+script/build/image $VERSION
 
 echo "Create a github release"
 # TODO: script more of this https://developer.github.com/v3/repos/releases/
diff --git a/script/test b/script/test-default
similarity index 100%
rename from script/test
rename to script/test-default
diff --git a/script/travis/build-binary b/script/travis/build-binary
index 7cc1092d..065244bf 100755
--- a/script/travis/build-binary
+++ b/script/travis/build-binary
@@ -3,11 +3,11 @@
 set -ex
 
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    script/build-linux
+    script/build/linux
     # TODO: requires auth to push, so disable for now
-    # script/build-image master
+    # script/build/image master
     # docker push docker/compose:master
 else
     script/prepare-osx
-    script/build-osx
+    script/build/osx
 fi

From ec6bb1660dde7e6700e894edb2235bdcf08a3a35 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 15 Jan 2016 16:31:30 -0500
Subject: [PATCH 0853/1265] Move run scripts to script/run

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 project/RELEASE-PROCESS.md |  2 +-
 script/dev                 | 21 ---------------------
 script/release/make-branch |  4 ++--
 script/{ => run}/run.ps1   |  0
 script/{ => run}/run.sh    |  0
 script/shell               |  4 ----
 6 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100755 script/dev
 rename script/{ => run}/run.ps1 (100%)
 rename script/{ => run}/run.sh (100%)
 delete mode 100755 script/shell

diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 14d93088..4b78a9ba 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -88,7 +88,7 @@ When prompted build the non-linux binaries and test them.
 
         ...release notes go here...
 
-5.  Attach the binaries and `script/run.sh`
+5.  Attach the binaries and `script/run/run.sh`
 
 6.  Add "Thanks" with a list of contributors. The contributor list can be generated
     by running `./script/release/contributors`.
diff --git a/script/dev b/script/dev
deleted file mode 100755
index 80b3d013..00000000
--- a/script/dev
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# This is a script for running Compose inside a Docker container. It's handy for
-# development.
-#
-# $ ln -s `pwd`/script/dev /usr/local/bin/docker-compose
-# $ cd /a/compose/project
-# $ docker-compose up
-# 
-
-set -e
-
-# Follow symbolic links
-if [ -h "$0" ]; then
-    DIR=$(readlink "$0")
-else
-    DIR=$0
-fi
-DIR="$(dirname "$DIR")"/..
-
-docker build -t docker-compose $DIR
-exec docker run -i -t -v /var/run/docker.sock:/var/run/docker.sock -v `pwd`:`pwd` -w `pwd` docker-compose $@
diff --git a/script/release/make-branch b/script/release/make-branch
index 46ba6bbc..86b4c9f6 100755
--- a/script/release/make-branch
+++ b/script/release/make-branch
@@ -65,10 +65,10 @@ git config "branch.${BRANCH}.release" $VERSION
 
 editor=${EDITOR:-vim}
 
-echo "Update versions in docs/install.md, compose/__init__.py, script/run.sh"
+echo "Update versions in docs/install.md, compose/__init__.py, script/run/run.sh"
 $editor docs/install.md
 $editor compose/__init__.py
-$editor script/run.sh
+$editor script/run/run.sh
 
 
 echo "Write release notes in CHANGELOG.md"
diff --git a/script/run.ps1 b/script/run/run.ps1
similarity index 100%
rename from script/run.ps1
rename to script/run/run.ps1
diff --git a/script/run.sh b/script/run/run.sh
similarity index 100%
rename from script/run.sh
rename to script/run/run.sh
diff --git a/script/shell b/script/shell
deleted file mode 100755
index 903be76f..00000000
--- a/script/shell
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -ex
-docker build -t docker-compose .
-exec docker run -v /var/run/docker.sock:/var/run/docker.sock -v `pwd`:/code -ti --rm --entrypoint bash docker-compose

From 11dc7207520be98f70ac38e000c8a90975908e39 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 15 Jan 2016 16:35:26 -0500
Subject: [PATCH 0854/1265] Move test scripts to script/test.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 CONTRIBUTING.md                       | 14 +++++++-------
 project/RELEASE-PROCESS.md            |  2 +-
 script/build/image                    |  2 +-
 script/build/linux-entrypoint         |  2 +-
 script/build/osx                      |  2 +-
 script/{ => build}/write-git-sha      |  0
 script/ci                             | 25 ++++++-------------------
 script/release/build-binaries         |  2 +-
 script/release/push-release           |  2 +-
 script/{prepare-osx => setup/osx}     |  0
 script/{test-versions => test/all}    |  2 +-
 script/test/ci                        | 25 +++++++++++++++++++++++++
 script/{test-default => test/default} |  2 +-
 script/{ => test}/versions.py         |  0
 script/travis/build-binary            |  2 +-
 15 files changed, 47 insertions(+), 35 deletions(-)
 rename script/{ => build}/write-git-sha (100%)
 rename script/{prepare-osx => setup/osx} (100%)
 rename script/{test-versions => test/all} (96%)
 create mode 100755 script/test/ci
 rename script/{test-default => test/default} (92%)
 rename script/{ => test}/versions.py (100%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 66224752..50e58ddc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -50,22 +50,22 @@ See Docker's [basic contribution workflow](https://docs.docker.com/opensource/wo
 Use the test script to run linting checks and then the full test suite against
 different Python interpreters:
 
-    $ script/test
+    $ script/test/default
 
 Tests are run against a Docker daemon inside a container, so that we can test
 against multiple Docker versions. By default they'll run against only the latest
 Docker version - set the `DOCKER_VERSIONS` environment variable to "all" to run
 against all supported versions:
 
-    $ DOCKER_VERSIONS=all script/test
+    $ DOCKER_VERSIONS=all script/test/default
 
-Arguments to `script/test` are passed through to the `nosetests` executable, so
+Arguments to `script/test/default` are passed through to the `tox` executable, so
 you can specify a test directory, file, module, class or method:
 
-    $ script/test tests/unit
-    $ script/test tests/unit/cli_test.py
-    $ script/test tests/unit/config_test.py::ConfigTest
-    $ script/test tests/unit/config_test.py::ConfigTest::test_load
+    $ script/test/default tests/unit
+    $ script/test/default tests/unit/cli_test.py
+    $ script/test/default tests/unit/config_test.py::ConfigTest
+    $ script/test/default tests/unit/config_test.py::ConfigTest::test_load
 
 ## Finding things to work on
 
diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 4b78a9ba..de94aae8 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -57,7 +57,7 @@ When prompted build the non-linux binaries and test them.
 
 1.  Build the Mac binary in a Mountain Lion VM:
 
-        script/prepare-osx
+        script/setup/osx
         script/build/osx
 
 2.  Download the windows binary from AppVeyor
diff --git a/script/build/image b/script/build/image
index 89733505..bdd98f03 100755
--- a/script/build/image
+++ b/script/build/image
@@ -10,7 +10,7 @@ fi
 TAG=$1
 VERSION="$(python setup.py --version)"
 
-./script/write-git-sha
+./script/build/write-git-sha
 python setup.py sdist
 cp dist/docker-compose-$VERSION.tar.gz dist/docker-compose-release.tar.gz
 docker build -t docker/compose:$TAG -f Dockerfile.run .
diff --git a/script/build/linux-entrypoint b/script/build/linux-entrypoint
index 9bf7c95d..bf515060 100755
--- a/script/build/linux-entrypoint
+++ b/script/build/linux-entrypoint
@@ -9,7 +9,7 @@ mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 
 $VENV/bin/pip install -q -r requirements-build.txt
-./script/write-git-sha
+./script/build/write-git-sha
 su -c "$VENV/bin/pyinstaller docker-compose.spec" user
 mv dist/docker-compose $TARGET
 $TARGET version
diff --git a/script/build/osx b/script/build/osx
index 168fd430..3de34576 100755
--- a/script/build/osx
+++ b/script/build/osx
@@ -9,7 +9,7 @@ virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
 venv/bin/pip install -r requirements-build.txt
 venv/bin/pip install --no-deps .
-./script/write-git-sha
+./script/build/write-git-sha
 venv/bin/pyinstaller docker-compose.spec
 mv dist/docker-compose dist/docker-compose-Darwin-x86_64
 dist/docker-compose-Darwin-x86_64 version
diff --git a/script/write-git-sha b/script/build/write-git-sha
similarity index 100%
rename from script/write-git-sha
rename to script/build/write-git-sha
diff --git a/script/ci b/script/ci
index f73be842..7b3489a1 100755
--- a/script/ci
+++ b/script/ci
@@ -1,21 +1,8 @@
 #!/bin/bash
-# This should be run inside a container built from the Dockerfile
-# at the root of the repo:
 #
-# $ TAG="docker-compose:$(git rev-parse --short HEAD)"
-# $ docker build -t "$TAG" .
-# $ docker run --rm --volume="/var/run/docker.sock:/var/run/docker.sock" --volume="$(pwd)/.git:/code/.git" -e "TAG=$TAG" --entrypoint="script/ci" "$TAG"
-
-set -ex
-
-docker version
-
-export DOCKER_VERSIONS=all
-STORAGE_DRIVER=${STORAGE_DRIVER:-overlay}
-export DOCKER_DAEMON_ARGS="--storage-driver=$STORAGE_DRIVER"
-
-GIT_VOLUME="--volumes-from=$(hostname)"
-. script/test-versions
-
->&2 echo "Building Linux binary"
-. script/build/linux-entrypoint
+# Backwards compatiblity for jenkins
+#
+# TODO: remove this script after all current PRs and jenkins are updated with
+# the new script/test/ci change
+set -e
+exec script/test/ci
diff --git a/script/release/build-binaries b/script/release/build-binaries
index 3a57b89a..d076197c 100755
--- a/script/release/build-binaries
+++ b/script/release/build-binaries
@@ -24,7 +24,7 @@ REPO=docker/compose
 script/clean
 script/build/linux
 # TODO: build osx binary
-# script/prepare-osx
+# script/setup/osx
 # script/build/osx
 # TODO: build or fetch the windows binary
 echo "You need to build the osx/windows binaries, that step is not automated yet."
diff --git a/script/release/push-release b/script/release/push-release
index 7d9ec0a2..33d0d777 100755
--- a/script/release/push-release
+++ b/script/release/push-release
@@ -57,7 +57,7 @@ docker push docker/compose:$VERSION
 echo "Uploading sdist to pypi"
 pandoc -f markdown -t rst README.md -o README.rst
 sed -i -e 's/logo.png?raw=true/https:\/\/github.com\/docker\/compose\/raw\/master\/logo.png?raw=true/' README.rst
-./script/write-git-sha
+./script/build/write-git-sha
 python setup.py sdist
 if [ "$(command -v twine 2> /dev/null)" ]; then
     twine upload ./dist/docker-compose-${VERSION/-/}.tar.gz
diff --git a/script/prepare-osx b/script/setup/osx
similarity index 100%
rename from script/prepare-osx
rename to script/setup/osx
diff --git a/script/test-versions b/script/test/all
similarity index 96%
rename from script/test-versions
rename to script/test/all
index 14a3e6e4..08bf1618 100755
--- a/script/test-versions
+++ b/script/test/all
@@ -14,7 +14,7 @@ docker run --rm \
 get_versions="docker run --rm
     --entrypoint=/code/.tox/py27/bin/python
     $TAG
-    /code/script/versions.py docker/docker"
+    /code/script/test/versions.py docker/docker"
 
 if [ "$DOCKER_VERSIONS" == "" ]; then
   DOCKER_VERSIONS="$($get_versions default)"
diff --git a/script/test/ci b/script/test/ci
new file mode 100755
index 00000000..c5927b2c
--- /dev/null
+++ b/script/test/ci
@@ -0,0 +1,25 @@
+#!/bin/bash
+# This should be run inside a container built from the Dockerfile
+# at the root of the repo:
+#
+# $ TAG="docker-compose:$(git rev-parse --short HEAD)"
+# $ docker build -t "$TAG" .
+# $ docker run --rm \
+#    --volume="/var/run/docker.sock:/var/run/docker.sock" \
+#    --volume="$(pwd)/.git:/code/.git" \
+#    -e "TAG=$TAG" \
+#    --entrypoint="script/test/ci" "$TAG"
+
+set -ex
+
+docker version
+
+export DOCKER_VERSIONS=all
+STORAGE_DRIVER=${STORAGE_DRIVER:-overlay}
+export DOCKER_DAEMON_ARGS="--storage-driver=$STORAGE_DRIVER"
+
+GIT_VOLUME="--volumes-from=$(hostname)"
+. script/test/all
+
+>&2 echo "Building Linux binary"
+. script/build/linux-entrypoint
diff --git a/script/test-default b/script/test/default
similarity index 92%
rename from script/test-default
rename to script/test/default
index bdb3579b..fa741a19 100755
--- a/script/test-default
+++ b/script/test/default
@@ -12,4 +12,4 @@ mkdir -p coverage-html
 docker build -t "$TAG" .
 
 GIT_VOLUME="--volume=$(pwd)/.git:/code/.git"
-. script/test-versions
+. script/test/all
diff --git a/script/versions.py b/script/test/versions.py
similarity index 100%
rename from script/versions.py
rename to script/test/versions.py
diff --git a/script/travis/build-binary b/script/travis/build-binary
index 065244bf..7707a1ee 100755
--- a/script/travis/build-binary
+++ b/script/travis/build-binary
@@ -8,6 +8,6 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     # script/build/image master
     # docker push docker/compose:master
 else
-    script/prepare-osx
+    script/setup/osx
     script/build/osx
 fi

From 2cd1b94dd3a16688e8be2442c35ac1f03d62cacb Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 25 Feb 2016 15:15:18 -0800
Subject: [PATCH 0855/1265] Update note about build + image with extends

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/extends.md | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/docs/extends.md b/docs/extends.md
index bceb0257..9ecccd8a 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -290,31 +290,17 @@ replaces the old value.
     # result
     command: python otherapp.py
 
-In the case of `build` and `image`, using one in the local service causes
-Compose to discard the other, if it was defined in the original service.
-
-Example of image replacing build:
-
-    # original service
-    build: .
-
-    # local service
-    image: redis
-
-    # result
-    image: redis
-
-
-Example of build replacing image:
-
-    # original service
-    image: redis
-
-    # local service
-    build: .
-
-    # result
-    build: .
+> **Note:** In the case of `build` and `image`, when using
+> [version 1 of the Compose file format](compose-file.md#version-1), using one
+> option in the local service causes Compose to discard the other option if it
+> was defined in the original service.
+>
+> For example, if the original service defines `image: webapp` and the
+> local service defines `build: .` then the resulting service will have
+> `build: .` and no `image` option.
+>
+> This is because `build` and `image` cannot be used together in a version 1
+> file.
 
 For the **multi-value options** `ports`, `expose`, `external_links`, `dns` and
 `dns_search`, Compose concatenates both sets of values:

From 5cc420e72739a576f18703966ebef4c160e2064c Mon Sep 17 00:00:00 2001
From: Victoria Bialas <victoria.bialas@docker.com>
Date: Thu, 25 Feb 2016 16:47:46 -0800
Subject: [PATCH 0856/1265] WIP: updated note format for dockerfile per
 Aanand's comments on PR #3019

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
---
 docs/compose-file.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 514e6a03..ad48b29f 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -95,13 +95,13 @@ specified.
 
 > **Note**: In the [version 1 file format](#version-1), `dockerfile` is
 > different in two ways:
->
-> -   It appears alongside `build`, not as a sub-option:
->
->         build: .
->         dockerfile: Dockerfile-alternate
-> -   Using `dockerfile` together with `image` is not allowed. Attempting to do
->     so results in an error.
+
+  * It appears alongside `build`, not as a sub-option:
+
+        build: .
+        dockerfile: Dockerfile-alternate
+
+  * Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
 
 #### args
 

From 5be48ba1eddd6c61a54b72ae5e8b88009c02770f Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 25 Feb 2016 17:19:58 -0800
Subject: [PATCH 0857/1265] Update docs about using build and image together

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/compose-file.md | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 514e6a03..1323131e 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -59,6 +59,14 @@ optionally [dockerfile](#dockerfile) and [args](#args).
       args:
         buildno: 1
 
+If you specify `image` as well as `build`, then Compose tags the built image
+with the tag specified in `image`:
+
+    build: ./dir
+    image: webapp
+
+This will result in an image tagged `webapp`, built from `./dir`.
+
 > **Note**: In the [version 1 file format](#version-1), `build` is different in
 > two ways:
 >
@@ -340,13 +348,22 @@ An entry with the ip address and hostname will be created in `/etc/hosts` inside
 
 ### image
 
-Tag or partial image ID. Can be local or remote - Compose will attempt to
-pull if it doesn't exist locally.
+Specify the image to start the container from. Can either be a repository/tag or
+a partial image ID.
 
-    image: ubuntu
-    image: orchardup/postgresql
+    image: redis
+    image: ubuntu:14.04
+    image: tutum/influxdb
+    image: example-registry.com:4000/postgresql
     image: a4bc65fd
 
+If the image does not exist, Compose attempts to pull it, unless you have also
+specified [build](#build), in which case it builds it using the specified
+options and tags it with the specified tag.
+
+> **Note**: In the [version 1 file format](#version-1), using `build` together
+> with `image` is not allowed. Attempting to do so results in an error.
+
 ### labels
 
 Add metadata to containers using [Docker labels](https://docs.docker.com/engine/userguide/labels-custom-metadata/). You can use either an array or a dictionary.

From c72e9b3843c2a286e6478dde445fe3de99d88239 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 23 Feb 2016 15:50:59 -0800
Subject: [PATCH 0858/1265] Add release notes for 1.6.2

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 CHANGELOG.md      | 6 ++++++
 docs/install.md   | 6 +++---
 script/run/run.sh | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d553cc2..8b93087f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Change log
 ==========
 
+1.6.2 (2016-02-23)
+------------------
+
+-   Fixed a bug where connecting to a TLS-enabled Docker Engine would fail with
+    a certificate verification error.
+
 1.6.1 (2016-02-23)
 ------------------
 
diff --git a/docs/install.md b/docs/install.md
index b7607a67..eee0c203 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -39,7 +39,7 @@ which the release page specifies, in your terminal.
 
      The following is an example command illustrating the format:
 
-        curl -L https://github.com/docker/compose/releases/download/1.6.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+        curl -L https://github.com/docker/compose/releases/download/1.6.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 
      If you have problems installing with `curl`, see
      [Alternative Install Options](#alternative-install-options).
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
 7. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.6.1
+        docker-compose version: 1.6.2
 
 
 ## Alternative install options
@@ -77,7 +77,7 @@ to get started.
 Compose can also be run inside a container, from a small bash script wrapper.
 To install compose as a container run:
 
-    $ curl -L https://github.com/docker/compose/releases/download/1.6.1/run.sh > /usr/local/bin/docker-compose
+    $ curl -L https://github.com/docker/compose/releases/download/1.6.2/run.sh > /usr/local/bin/docker-compose
     $ chmod +x /usr/local/bin/docker-compose
 
 ## Master builds
diff --git a/script/run/run.sh b/script/run/run.sh
index 3e30dd15..212f9b97 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.6.1"
+VERSION="1.6.2"
 IMAGE="docker/compose:$VERSION"
 
 

From 62fb6b99ebd508497766dcc763ae3b0c5d26fdf8 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 26 Feb 2016 11:26:56 -0800
Subject: [PATCH 0859/1265] Update FAQ regarding long stop times

- It happens on recreate, not just stop

- We now support `stop_signal`, which can help in some cases

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/faq.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/faq.md b/docs/faq.md
index 73596c18..a42243fc 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -15,7 +15,7 @@ weight=90
 If you don’t see your question here, feel free to drop by `#docker-compose` on
 freenode IRC and ask the community.
 
-## Why do my services take 10 seconds to stop?
+## Why do my services take 10 seconds to recreate or stop?
 
 Compose stop attempts to stop a container by sending a `SIGTERM`. It then waits
 for a [default timeout of 10 seconds](./reference/stop.md).  After the timeout,
@@ -40,6 +40,12 @@ in your Dockerfile.
 * If you are able, modify the application that you're running to
 add an explicit signal handler for `SIGTERM`.
 
+* Set the `stop_signal` to a signal which the application knows how to handle:
+
+      web:
+        build: .
+        stop_signal: SIGINT
+
 * If you can't modify the application, wrap the application in a lightweight init
 system (like [s6](http://skarnet.org/software/s6/)) or a signal proxy (like
 [dumb-init](https://github.com/Yelp/dumb-init) or

From d28c5dda9294d1f6824207aba7ac210e1e3fc3f8 Mon Sep 17 00:00:00 2001
From: Tomas Tomecek <ttomecek@redhat.com>
Date: Thu, 10 Sep 2015 13:17:55 +0200
Subject: [PATCH 0860/1265] implement exec

Resolves #593

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
---
 compose/cli/docopt_command.py |  4 +++
 compose/cli/main.py           | 54 ++++++++++++++++++++++++++++++++++-
 compose/container.py          |  6 ++++
 docs/reference/exec.md        | 29 +++++++++++++++++++
 tests/acceptance/cli_test.py  | 18 ++++++++++++
 5 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 docs/reference/exec.md

diff --git a/compose/cli/docopt_command.py b/compose/cli/docopt_command.py
index e3f4aa9e..d2900b39 100644
--- a/compose/cli/docopt_command.py
+++ b/compose/cli/docopt_command.py
@@ -43,6 +43,10 @@ class DocoptCommand(object):
 
     def get_handler(self, command):
         command = command.replace('-', '_')
+        # we certainly want to have "exec" command, since that's what docker client has
+        # but in python exec is a keyword
+        if command == "exec":
+            command = "exec_command"
 
         if not hasattr(self, command):
             raise NoSuchCommand(command, self)
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 6a04f9f0..2c0fda1c 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -43,7 +43,7 @@ from .utils import yesno
 
 
 if not IS_WINDOWS_PLATFORM:
-    from dockerpty.pty import PseudoTerminal, RunOperation
+    from dockerpty.pty import PseudoTerminal, RunOperation, ExecOperation
 
 log = logging.getLogger(__name__)
 console_handler = logging.StreamHandler(sys.stderr)
@@ -152,6 +152,7 @@ class TopLevelCommand(DocoptCommand):
       create             Create services
       down               Stop and remove containers, networks, images, and volumes
       events             Receive real time events from containers
+      exec               Execute a command in a running container
       help               Get help on a command
       kill               Kill containers
       logs               View output from containers
@@ -298,6 +299,57 @@ class TopLevelCommand(DocoptCommand):
             print(formatter(event))
             sys.stdout.flush()
 
+    def exec_command(self, project, options):
+        """
+        Execute a command in a running container
+
+        Usage: exec [options] SERVICE COMMAND [ARGS...]
+
+        Options:
+            -d                Detached mode: Run command in the background.
+            --privileged      Give extended privileges to the process.
+            --user USER       Run the command as this user.
+            -T                Disable pseudo-tty allocation. By default `docker-compose exec`
+                              allocates a TTY.
+            --index=index     index of the container if there are multiple
+                              instances of a service [default: 1]
+        """
+        index = int(options.get('--index'))
+        service = project.get_service(options['SERVICE'])
+        try:
+            container = service.get_container(number=index)
+        except ValueError as e:
+            raise UserError(str(e))
+        command = [options['COMMAND']] + options['ARGS']
+        tty = not options["-T"]
+
+        create_exec_options = {
+            "privileged": options["--privileged"],
+            "user": options["--user"],
+            "tty": tty,
+            "stdin": tty,
+        }
+
+        exec_id = container.create_exec(command, **create_exec_options)
+
+        if options['-d']:
+            container.start_exec(exec_id, tty=tty)
+            return
+
+        signals.set_signal_handler_to_shutdown()
+        try:
+            operation = ExecOperation(
+                    project.client,
+                    exec_id,
+                    interactive=tty,
+            )
+            pty = PseudoTerminal(project.client, operation)
+            pty.start()
+        except signals.ShutdownException:
+            log.info("received shutdown exception: closing")
+        exit_code = project.client.exec_inspect(exec_id).get("ExitCode")
+        sys.exit(exit_code)
+
     def help(self, project, options):
         """
         Get help on a command.
diff --git a/compose/container.py b/compose/container.py
index c96b63ef..6dac9499 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -216,6 +216,12 @@ class Container(object):
     def remove(self, **options):
         return self.client.remove_container(self.id, **options)
 
+    def create_exec(self, command, **options):
+        return self.client.exec_create(self.id, command, **options)
+
+    def start_exec(self, exec_id, **options):
+        return self.client.exec_start(exec_id, **options)
+
     def rename_to_tmp_name(self):
         """Rename the container to a hopefully unique temporary container name
         by prepending the short id.
diff --git a/docs/reference/exec.md b/docs/reference/exec.md
new file mode 100644
index 00000000..6c0eeb04
--- /dev/null
+++ b/docs/reference/exec.md
@@ -0,0 +1,29 @@
+<!--[metadata]>
++++
+title = "exec"
+description = "exec"
+keywords = ["fig, composition, compose, docker, orchestration, cli,  exec"]
+[menu.main]
+identifier="exec.compose"
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# exec
+
+```
+Usage: exec [options] SERVICE COMMAND [ARGS...]
+
+Options:
+-d                Detached mode: Run command in the background.
+--privileged      Give extended privileges to the process.
+--user USER       Run the command as this user.
+-T                Disable pseudo-tty allocation. By default `docker-compose exec`
+                  allocates a TTY.
+--index=index     index of the container if there are multiple
+                  instances of a service [default: 1]
+```
+
+This is equivalent of `docker exec`. With this subcommand you can run arbitrary
+commands in your services. Commands are by default allocating a TTY, so you can
+do e.g. `docker-compose exec web sh` to get an interactive prompt.
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 02f82872..2b61898e 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -752,6 +752,24 @@ class CLITestCase(DockerClientTestCase):
         self.project.stop(['simple'])
         wait_on_condition(ContainerCountCondition(self.project, 0))
 
+    def test_exec_without_tty(self):
+        self.base_dir = 'tests/fixtures/links-composefile'
+        self.dispatch(['up', '-d', 'console'])
+        self.assertEqual(len(self.project.containers()), 1)
+
+        stdout, stderr = self.dispatch(['exec', '-T', 'console', 'ls', '-1d', '/'])
+        self.assertEquals(stdout, "/\n")
+        self.assertEquals(stderr, "")
+
+    def test_exec_custom_user(self):
+        self.base_dir = 'tests/fixtures/links-composefile'
+        self.dispatch(['up', '-d', 'console'])
+        self.assertEqual(len(self.project.containers()), 1)
+
+        stdout, stderr = self.dispatch(['exec', '-T', '--user=operator', 'console', 'whoami'])
+        self.assertEquals(stdout, "operator\n")
+        self.assertEquals(stderr, "")
+
     def test_run_service_without_links(self):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['run', 'console', '/bin/true'])

From 6bfb23baaa45b1ab4bd8c4b1cbce2b49753643d1 Mon Sep 17 00:00:00 2001
From: Jesus <jesus.rodriguez.tinoco@gmail.com>
Date: Sat, 27 Feb 2016 18:25:54 +0100
Subject: [PATCH 0861/1265] Display containers name when scale a container

Display in the log output the name of those containers created using the scale command and
change the test_scale_with_api_error test to support the containers name when scale

Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
---
 compose/service.py                | 2 +-
 tests/integration/service_test.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index e1b0c916..a24b9733 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -223,7 +223,7 @@ class Service(object):
             parallel_execute(
                 container_numbers,
                 lambda n: create_and_start(service=self, number=n),
-                lambda n: n,
+                lambda n: self.get_container_name(n),
                 "Creating and starting"
             )
 
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 4bb625a1..6d0c97db 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -735,7 +735,7 @@ class ServiceTest(DockerClientTestCase):
 
         self.assertEqual(len(service.containers()), 1)
         self.assertTrue(service.containers()[0].is_running)
-        self.assertIn("ERROR: for 2  Boom", mock_stderr.getvalue())
+        self.assertIn("ERROR: for composetest_web_2  Boom", mock_stderr.getvalue())
 
     def test_scale_with_unexpected_exception(self):
         """Test that when scaling if the API returns an error, that is not of type

From 6b947ee478458927e119b6b2d9129f3ef62ab883 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 26 Feb 2016 11:22:41 -0800
Subject: [PATCH 0862/1265] Document ways to make services wait for
 dependencies

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/faq.md | 94 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 70 insertions(+), 24 deletions(-)

diff --git a/docs/faq.md b/docs/faq.md
index a42243fc..201549f1 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -15,6 +15,76 @@ weight=90
 If you don’t see your question here, feel free to drop by `#docker-compose` on
 freenode IRC and ask the community.
 
+
+## How do I control the order of service startup? I need my database to be ready before my application starts.
+
+You can control the order of service startup with the
+[depends_on](compose-file.md#depends-on) option. Compose always starts
+containers in dependency order, where dependencies are determined by
+`depends_on`, `links`, `volumes_from` and `network_mode: "service:..."`.
+
+However, Compose will not wait until a container is "ready" (whatever that means
+for your particular application) - only until it's running. There's a good
+reason for this.
+
+The problem of waiting for a database to be ready is really just a subset of a
+much larger problem of distributed systems. In production, your database could
+become unavailable or move hosts at any time. Your application needs to be
+resilient to these types of failures.
+
+To handle this, your application should attempt to re-establish a connection to
+the database after a failure. If the application retries the connection,
+it should eventually be able to connect to the database.
+
+The best solution is to perform this check in your application code, both at
+startup and whenever a connection is lost for any reason. However, if you don't
+need this level of resilience, you can work around the problem with a wrapper
+script:
+
+-   Use a tool such as [wait-for-it](https://github.com/vishnubob/wait-for-it)
+    or [dockerize](https://github.com/jwilder/dockerize). These are small
+    wrapper scripts which you can include in your application's image and will
+    poll a given host and port until it's accepting TCP connections.
+
+    Supposing your application's image has a `CMD` set in its Dockerfile, you
+    can wrap it by setting the entrypoint in `docker-compose.yml`:
+
+        version: "2"
+        services:
+          web:
+            build: .
+            ports:
+              - "80:8000"
+            depends_on:
+              - "db"
+            entrypoint: ./wait-for-it.sh db:5432
+          db:
+            image: postgres
+
+-   Write your own wrapper script to perform a more application-specific health
+    check. For example, you might want to wait until Postgres is definitely
+    ready to accept commands:
+
+        #!/bin/bash
+
+        set -e
+
+        host="$1"
+        shift
+        cmd="$@"
+
+        until psql -h "$host" -U "postgres" -c '\l'; do
+          >&2 echo "Postgres is unavailable - sleeping"
+          sleep 1
+        done
+
+        >&2 echo "Postgres is up - executing command"
+        exec $cmd
+
+    You can use this as a wrapper script as in the previous example, by setting
+    `entrypoint: ./wait-for-postgres.sh db`.
+
+
 ## Why do my services take 10 seconds to recreate or stop?
 
 Compose stop attempts to stop a container by sending a `SIGTERM`. It then waits
@@ -90,30 +160,6 @@ specify the filename to use, for example:
 docker-compose -f docker-compose.json up
 ```
 
-## How do I get Compose to wait for my database to be ready before starting my application?
-
-Unfortunately, Compose won't do that for you but for a good reason.
-
-The problem of waiting for a database to be ready is really just a subset of a
-much larger problem of distributed systems. In production, your database could
-become unavailable or move hosts at any time.  The application needs to be
-resilient to these types of failures.
-
-To handle this, the application would attempt to re-establish a connection to
-the database after a failure. If the application retries the connection,
-it should eventually be able to connect to the database.
-
-To wait for the application to be in a good state, you can implement a
-healthcheck. A healthcheck makes a request to the application and checks
-the response for a success status code. If it is not successful it waits
-for a short period of time, and tries again. After some timeout value, the check
-stops trying and report a failure.
-
-If you need to run tests against your application, you can start by running a
-healthcheck. Once the healthcheck gets a successful response, you can start
-running your tests.
-
-
 ## Should I include my code with `COPY`/`ADD` or a volume?
 
 You can add your code to the image using `COPY` or `ADD` directive in a

From 04877d47aa35e08544a52d374d7b654954e8e2cc Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 29 Feb 2016 14:36:21 -0800
Subject: [PATCH 0863/1265] Build osx binary on travis and upload to bintray.

This requires a change to the make-branch script, to have it push the bump branch
to the docker remote instead of the user remote. Pushing to the docker remote
triggers the travis build, which builds the binary.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 .travis.yml                     |  2 ++
 project/RELEASE-PROCESS.md      |  6 +++---
 script/release/build-binaries   | 10 +++++-----
 script/release/make-branch      | 20 +++-----------------
 script/travis/bintray.json.tmpl |  6 +++---
 5 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3bb365a1..fbf26964 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,3 +25,5 @@ deploy:
   key: '$BINTRAY_API_KEY'
   file: ./bintray.json
   skip_cleanup: true
+  on:
+    all_branches: true
diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index de94aae8..930af15a 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -55,10 +55,10 @@ Check out the bump branch and run the `build-binaries` script
 
 When prompted build the non-linux binaries and test them.
 
-1.  Build the Mac binary in a Mountain Lion VM:
+1.  Download the osx binary from Bintray. Make sure that the latest build has
+    finished, otherwise you'll be downloading an old binary.
 
-        script/setup/osx
-        script/build/osx
+    https://dl.bintray.com/docker-compose/$BRANCH_NAME/
 
 2.  Download the windows binary from AppVeyor
 
diff --git a/script/release/build-binaries b/script/release/build-binaries
index d076197c..9d4a606e 100755
--- a/script/release/build-binaries
+++ b/script/release/build-binaries
@@ -23,11 +23,6 @@ REPO=docker/compose
 # Build the binaries
 script/clean
 script/build/linux
-# TODO: build osx binary
-# script/setup/osx
-# script/build/osx
-# TODO: build or fetch the windows binary
-echo "You need to build the osx/windows binaries, that step is not automated yet."
 
 echo "Building the container distribution"
 script/build/image $VERSION
@@ -35,3 +30,8 @@ script/build/image $VERSION
 echo "Create a github release"
 # TODO: script more of this https://developer.github.com/v3/repos/releases/
 browser https://github.com/$REPO/releases/new
+
+echo "Don't forget to download the osx and windows binaries from appveyor/bintray\!"
+echo "https://dl.bintray.com/docker-compose/$BRANCH/"
+echo "https://ci.appveyor.com/project/docker/compose"
+echo
diff --git a/script/release/make-branch b/script/release/make-branch
index 86b4c9f6..7ccf3f05 100755
--- a/script/release/make-branch
+++ b/script/release/make-branch
@@ -82,20 +82,6 @@ $SHELL || true
 git commit -a -m "Bump $VERSION" --signoff --no-verify
 
 
-echo "Push branch to user remote"
-GITHUB_USER=$USER
-USER_REMOTE="$(find_remote $GITHUB_USER/compose)"
-if [ -z "$USER_REMOTE" ]; then
-    echo "$GITHUB_USER/compose not found"
-    read -r -p "Enter the name of your GitHub fork (username/repo): " GITHUB_REPO
-    # assumes there is already a user remote somewhere
-    USER_REMOTE=$(find_remote $GITHUB_REPO)
-fi
-if [ -z "$USER_REMOTE" ]; then
-    >&2 echo "No user remote found. You need to 'git push' your branch."
-    exit 2
-fi
-
-
-git push $USER_REMOTE
-browser https://github.com/$REPO/compare/docker:release...$GITHUB_USER:$BRANCH?expand=1
+echo "Push branch to docker remote"
+git push $REMOTE
+browser https://github.com/$REPO/compare/docker:release...$BRANCH?expand=1
diff --git a/script/travis/bintray.json.tmpl b/script/travis/bintray.json.tmpl
index 7d0adbeb..f9728558 100644
--- a/script/travis/bintray.json.tmpl
+++ b/script/travis/bintray.json.tmpl
@@ -1,7 +1,7 @@
 {
     "package": {
         "name": "${TRAVIS_OS_NAME}",
-        "repo": "master",
+        "repo": "${TRAVIS_BRANCH}",
         "subject": "docker-compose",
         "desc": "Automated build of master branch from travis ci.",
         "website_url": "https://github.com/docker/compose",
@@ -11,8 +11,8 @@
     },
 
     "version": {
-        "name": "master",
-        "desc": "Automated build of the master branch.",
+        "name": "${TRAVIS_BRANCH}",
+        "desc": "Automated build of the ${TRAVIS_BRANCH} branch.",
         "released": "${DATE}",
         "vcs_tag": "master"
     },

From b726f508a62b58c718b3568a51200224a613eed4 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 1 Mar 2016 11:42:19 -0500
Subject: [PATCH 0864/1265] Fix merging of logging options in v1 config.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         |  2 ++
 tests/unit/config/config_test.py | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/compose/config/config.py b/compose/config/config.py
index 850af31c..f34809a9 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -88,6 +88,8 @@ ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
     'build',
     'container_name',
     'dockerfile',
+    'log_driver',
+    'log_opt',
     'logging',
     'network_mode',
 ]
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index c2ca8e6e..420db60b 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1248,6 +1248,24 @@ class ConfigTest(unittest.TestCase):
             }
         }
 
+    def test_merge_logging_v1(self):
+        base = {
+            'image': 'alpine:edge',
+            'log_driver': 'something',
+            'log_opt': {'foo': 'three'},
+        }
+        override = {
+            'image': 'alpine:edge',
+            'command': 'true',
+        }
+        actual = config.merge_service_dicts(base, override, V1)
+        assert actual == {
+            'image': 'alpine:edge',
+            'log_driver': 'something',
+            'log_opt': {'foo': 'three'},
+            'command': 'true',
+        }
+
     def test_external_volume_config(self):
         config_details = build_config_details({
             'version': '2',

From 18510b4024518f41be7afdd114c898a75ac97480 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 1 Mar 2016 11:57:35 -0500
Subject: [PATCH 0865/1265] Don't allow booleans for mapping types.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config_schema_v1.json   |  3 +--
 compose/config/config_schema_v2.0.json |  3 +--
 compose/config/validation.py           | 19 +------------------
 tests/unit/config/config_test.py       | 26 +++++++++++---------------
 4 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/compose/config/config_schema_v1.json b/compose/config/config_schema_v1.json
index cde8c8e5..36a93793 100644
--- a/compose/config/config_schema_v1.json
+++ b/compose/config/config_schema_v1.json
@@ -156,8 +156,7 @@
           "type": "object",
           "patternProperties": {
             ".+": {
-              "type": ["string", "number", "boolean", "null"],
-              "format": "bool-value-in-mapping"
+              "type": ["string", "number", "null"]
             }
           },
           "additionalProperties": false
diff --git a/compose/config/config_schema_v2.0.json b/compose/config/config_schema_v2.0.json
index 54bfc978..28209ced 100644
--- a/compose/config/config_schema_v2.0.json
+++ b/compose/config/config_schema_v2.0.json
@@ -301,8 +301,7 @@
           "type": "object",
           "patternProperties": {
             ".+": {
-              "type": ["string", "number", "boolean", "null"],
-              "format": "bool-value-in-mapping"
+              "type": ["string", "number", "null"]
             }
           },
           "additionalProperties": false
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 4eafe7b5..088bec3f 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -63,23 +63,6 @@ def format_expose(instance):
     return True
 
 
-@FormatChecker.cls_checks(format="bool-value-in-mapping")
-def format_boolean_in_environment(instance):
-    """Check if there is a boolean in the mapping sections and display a warning.
-    Always return True here so the validation won't raise an error.
-    """
-    if isinstance(instance, bool):
-        log.warn(
-            "There is a boolean value in the 'environment', 'labels', or "
-            "'extra_hosts' field of a service.\n"
-            "These sections only support string values.\n"
-            "Please add quotes to any boolean values to make them strings "
-            "(eg, 'True', 'false', 'yes', 'N', 'on', 'Off').\n"
-            "This warning will become an error in a future release. \r\n"
-        )
-    return True
-
-
 def match_named_volumes(service_dict, project_volumes):
     service_volumes = service_dict.get('volumes', [])
     for volume_spec in service_volumes:
@@ -370,7 +353,7 @@ def process_config_schema_errors(error):
 
 def validate_against_config_schema(config_file):
     schema = load_jsonschema(config_file.version)
-    format_checker = FormatChecker(["ports", "expose", "bool-value-in-mapping"])
+    format_checker = FormatChecker(["ports", "expose"])
     validator = Draft4Validator(
         schema,
         resolver=RefResolver(get_resolver_path(), schema),
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index c2ca8e6e..8a523fea 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1095,22 +1095,18 @@ class ConfigTest(unittest.TestCase):
             ).services
             self.assertEqual(service[0]['entrypoint'], entrypoint)
 
-    @mock.patch('compose.config.validation.log')
-    def test_logs_warning_for_boolean_in_environment(self, mock_logging):
-        expected_warning_msg = "There is a boolean value in the 'environment'"
-        config.load(
-            build_config_details(
-                {'web': {
-                    'image': 'busybox',
-                    'environment': {'SHOW_STUFF': True}
-                }},
-                'working_dir',
-                'filename.yml'
-            )
-        )
+    def test_logs_warning_for_boolean_in_environment(self):
+        config_details = build_config_details({
+            'web': {
+                'image': 'busybox',
+                'environment': {'SHOW_STUFF': True}
+            }
+        })
 
-        assert mock_logging.warn.called
-        assert expected_warning_msg in mock_logging.warn.call_args[0][0]
+        with pytest.raises(ConfigurationError) as exc:
+            config.load(config_details)
+
+        assert "contains true, which is an invalid type" in exc.exconly()
 
     def test_config_valid_environment_dict_key_contains_dashes(self):
         services = config.load(

From 82632098a33cb57b7dc8412b13c5f17aacb162a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Seguin?= <stephseguin93@gmail.com>
Date: Thu, 21 Jan 2016 13:16:04 +0100
Subject: [PATCH 0866/1265] =?UTF-8?q?Add=20-f,=20--follow=20flag=20as=20op?=
 =?UTF-8?q?tion=20on=20logs.=20Closes=20#2187=20Signed-off-by:=20St=C3=A9p?=
 =?UTF-8?q?hane=20Seguin=20<stephseguin93@gmail.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose/cli/log_printer.py                    | 19 ++++++++++------
 compose/cli/main.py                           | 13 ++++++-----
 docs/reference/logs.md                        |  1 +
 requirements.txt                              |  2 +-
 tests/acceptance/cli_test.py                  | 22 +++++++++++++++++++
 .../logs-composefile/docker-compose.yml       |  6 +++++
 tests/unit/cli/log_printer_test.py            | 14 ++++++++++--
 tests/unit/cli/main_test.py                   |  4 ++--
 8 files changed, 64 insertions(+), 17 deletions(-)
 create mode 100644 tests/fixtures/logs-composefile/docker-compose.yml

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 85fef794..6fd5ca5d 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -13,11 +13,13 @@ from compose.utils import split_buffer
 class LogPrinter(object):
     """Print logs from many containers to a single output stream."""
 
-    def __init__(self, containers, output=sys.stdout, monochrome=False, cascade_stop=False):
+    def __init__(self, containers, output=sys.stdout, monochrome=False,
+                 cascade_stop=False, follow=False):
         self.containers = containers
         self.output = utils.get_output_stream(output)
         self.monochrome = monochrome
         self.cascade_stop = cascade_stop
+        self.follow = follow
 
     def run(self):
         if not self.containers:
@@ -41,7 +43,7 @@ class LogPrinter(object):
         for color_func, container in zip(color_funcs, self.containers):
             generator_func = get_log_generator(container)
             prefix = color_func(build_log_prefix(container, prefix_width))
-            yield generator_func(container, prefix, color_func)
+            yield generator_func(container, prefix, color_func, self.follow)
 
 
 def build_log_prefix(container, prefix_width):
@@ -64,28 +66,31 @@ def get_log_generator(container):
     return build_no_log_generator
 
 
-def build_no_log_generator(container, prefix, color_func):
+def build_no_log_generator(container, prefix, color_func, follow):
     """Return a generator that prints a warning about logs and waits for
     container to exit.
     """
     yield "{} WARNING: no logs are available with the '{}' log driver\n".format(
         prefix,
         container.log_driver)
-    yield color_func(wait_on_exit(container))
+    if follow:
+        yield color_func(wait_on_exit(container))
 
 
-def build_log_generator(container, prefix, color_func):
+def build_log_generator(container, prefix, color_func, follow):
     # if the container doesn't have a log_stream we need to attach to container
     # before log printer starts running
     if container.log_stream is None:
-        stream = container.attach(stdout=True, stderr=True,  stream=True, logs=True)
+        stream = container.logs(stdout=True, stderr=True, stream=True,
+                                follow=follow)
         line_generator = split_buffer(stream)
     else:
         line_generator = split_buffer(container.log_stream)
 
     for line in line_generator:
         yield prefix + line
-    yield color_func(wait_on_exit(container))
+    if follow:
+        yield color_func(wait_on_exit(container))
 
 
 def wait_on_exit(container):
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 6a04f9f0..1e6d0a55 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -328,13 +328,15 @@ class TopLevelCommand(DocoptCommand):
         Usage: logs [options] [SERVICE...]
 
         Options:
-            --no-color  Produce monochrome output.
+            --no-color      Produce monochrome output.
+            -f, --follow    Follow log output
         """
         containers = project.containers(service_names=options['SERVICE'], stopped=True)
 
         monochrome = options['--no-color']
+        follow = options['--follow']
         print("Attaching to", list_containers(containers))
-        LogPrinter(containers, monochrome=monochrome).run()
+        LogPrinter(containers, monochrome=monochrome, follow=follow).run()
 
     def pause(self, project, options):
         """
@@ -660,7 +662,8 @@ class TopLevelCommand(DocoptCommand):
 
             if detached:
                 return
-            log_printer = build_log_printer(to_attach, service_names, monochrome, cascade_stop)
+            log_printer = build_log_printer(to_attach, service_names, monochrome, cascade_stop,
+                                            follow=True)
             print("Attaching to", list_containers(log_printer.containers))
             log_printer.run()
 
@@ -758,13 +761,13 @@ def run_one_off_container(container_options, project, service, options):
     sys.exit(exit_code)
 
 
-def build_log_printer(containers, service_names, monochrome, cascade_stop):
+def build_log_printer(containers, service_names, monochrome, cascade_stop, follow):
     if service_names:
         containers = [
             container
             for container in containers if container.service in service_names
         ]
-    return LogPrinter(containers, monochrome=monochrome, cascade_stop=cascade_stop)
+    return LogPrinter(containers, monochrome=monochrome, cascade_stop=cascade_stop, follow=follow)
 
 
 @contextlib.contextmanager
diff --git a/docs/reference/logs.md b/docs/reference/logs.md
index 5b241ea7..4f0d5730 100644
--- a/docs/reference/logs.md
+++ b/docs/reference/logs.md
@@ -16,6 +16,7 @@ Usage: logs [options] [SERVICE...]
 
 Options:
 --no-color  Produce monochrome output.
+-f, --follow    Follow log output
 ```
 
 Displays log output from services.
diff --git a/requirements.txt b/requirements.txt
index e25386d2..b31840c8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 PyYAML==3.11
 cached-property==1.2.0
-docker-py==1.7.2
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
+git+https://github.com/docker/docker-py.git@81d8caaf36159bf1accd86eab2e157bf8dd071a9#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 02f82872..60a5693b 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -398,6 +398,8 @@ class CLITestCase(DockerClientTestCase):
 
         assert 'simple_1  | simple' in result.stdout
         assert 'another_1 | another' in result.stdout
+        assert 'simple_1 exited with code 0' in result.stdout
+        assert 'another_1 exited with code 0' in result.stdout
 
     @v2_only()
     def test_up(self):
@@ -1141,6 +1143,26 @@ class CLITestCase(DockerClientTestCase):
     def test_logs_invalid_service_name(self):
         self.dispatch(['logs', 'madeupname'], returncode=1)
 
+    def test_logs_follow(self):
+        self.base_dir = 'tests/fixtures/echo-services'
+        self.dispatch(['up', '-d'], None)
+
+        result = self.dispatch(['logs', '-f'])
+
+        assert result.stdout.count('\n') == 5
+        assert 'simple' in result.stdout
+        assert 'another' in result.stdout
+        assert 'exited with code 0' in result.stdout
+
+    def test_logs_unfollow(self):
+        self.base_dir = 'tests/fixtures/logs-composefile'
+        self.dispatch(['up', '-d'], None)
+
+        result = self.dispatch(['logs'])
+
+        assert result.stdout.count('\n') >= 1
+        assert 'exited with code 0' not in result.stdout
+
     def test_kill(self):
         self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
diff --git a/tests/fixtures/logs-composefile/docker-compose.yml b/tests/fixtures/logs-composefile/docker-compose.yml
new file mode 100644
index 00000000..0af9d805
--- /dev/null
+++ b/tests/fixtures/logs-composefile/docker-compose.yml
@@ -0,0 +1,6 @@
+simple:
+  image: busybox:latest
+  command: sh -c "echo hello && sleep 200"
+another:
+  image: busybox:latest
+  command: sh -c "echo test"
diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py
index 5b04226c..bed0eae8 100644
--- a/tests/unit/cli/log_printer_test.py
+++ b/tests/unit/cli/log_printer_test.py
@@ -17,7 +17,7 @@ def build_mock_container(reader):
         name_without_project='web_1',
         has_api_logs=True,
         log_stream=None,
-        attach=reader,
+        logs=reader,
         wait=mock.Mock(return_value=0),
     )
 
@@ -39,7 +39,7 @@ def mock_container():
 class TestLogPrinter(object):
 
     def test_single_container(self, output_stream, mock_container):
-        LogPrinter([mock_container], output=output_stream).run()
+        LogPrinter([mock_container], output=output_stream, follow=True).run()
 
         output = output_stream.getvalue()
         assert 'hello' in output
@@ -47,6 +47,15 @@ class TestLogPrinter(object):
         # Call count is 2 lines + "container exited line"
         assert output_stream.flush.call_count == 3
 
+    def test_single_container_without_follow(self, output_stream, mock_container):
+        LogPrinter([mock_container], output=output_stream, follow=False).run()
+
+        output = output_stream.getvalue()
+        assert 'hello' in output
+        assert 'world' in output
+        # Call count is 2 lines
+        assert output_stream.flush.call_count == 2
+
     def test_monochrome(self, output_stream, mock_container):
         LogPrinter([mock_container], output=output_stream, monochrome=True).run()
         assert '\033[' not in output_stream.getvalue()
@@ -86,3 +95,4 @@ class TestLogPrinter(object):
 
         output = output_stream.getvalue()
         assert "WARNING: no logs are available with the 'none' log driver\n" in output
+        assert "exited with code" not in output
diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py
index fd6c5002..bddb9f17 100644
--- a/tests/unit/cli/main_test.py
+++ b/tests/unit/cli/main_test.py
@@ -33,7 +33,7 @@ class CLIMainTestCase(unittest.TestCase):
             mock_container('another', 1),
         ]
         service_names = ['web', 'db']
-        log_printer = build_log_printer(containers, service_names, True, False)
+        log_printer = build_log_printer(containers, service_names, True, False, True)
         self.assertEqual(log_printer.containers, containers[:3])
 
     def test_build_log_printer_all_services(self):
@@ -43,7 +43,7 @@ class CLIMainTestCase(unittest.TestCase):
             mock_container('other', 1),
         ]
         service_names = []
-        log_printer = build_log_printer(containers, service_names, True, False)
+        log_printer = build_log_printer(containers, service_names, True, False, True)
         self.assertEqual(log_printer.containers, containers)
 
 

From d9b4286f919ee77ffe40d81405f517c1982a7f9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Seguin?= <stephseguin93@gmail.com>
Date: Sun, 28 Feb 2016 22:00:12 +0100
Subject: [PATCH 0867/1265] Add -t, --timestamps flag as option on logs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
---
 compose/cli/log_printer.py   | 18 ++++++++++++------
 compose/cli/main.py          |  8 +++++---
 docs/reference/logs.md       |  5 +++--
 tests/acceptance/cli_test.py |  8 ++++++++
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 6fd5ca5d..adef19ed 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -13,13 +13,19 @@ from compose.utils import split_buffer
 class LogPrinter(object):
     """Print logs from many containers to a single output stream."""
 
-    def __init__(self, containers, output=sys.stdout, monochrome=False,
-                 cascade_stop=False, follow=False):
+    def __init__(self,
+                 containers,
+                 output=sys.stdout,
+                 monochrome=False,
+                 cascade_stop=False,
+                 follow=False,
+                 timestamps=False):
         self.containers = containers
         self.output = utils.get_output_stream(output)
         self.monochrome = monochrome
         self.cascade_stop = cascade_stop
         self.follow = follow
+        self.timestamps = timestamps
 
     def run(self):
         if not self.containers:
@@ -43,7 +49,7 @@ class LogPrinter(object):
         for color_func, container in zip(color_funcs, self.containers):
             generator_func = get_log_generator(container)
             prefix = color_func(build_log_prefix(container, prefix_width))
-            yield generator_func(container, prefix, color_func, self.follow)
+            yield generator_func(container, prefix, color_func, self.follow, self.timestamps)
 
 
 def build_log_prefix(container, prefix_width):
@@ -66,7 +72,7 @@ def get_log_generator(container):
     return build_no_log_generator
 
 
-def build_no_log_generator(container, prefix, color_func, follow):
+def build_no_log_generator(container, prefix, color_func, follow, timestamps):
     """Return a generator that prints a warning about logs and waits for
     container to exit.
     """
@@ -77,12 +83,12 @@ def build_no_log_generator(container, prefix, color_func, follow):
         yield color_func(wait_on_exit(container))
 
 
-def build_log_generator(container, prefix, color_func, follow):
+def build_log_generator(container, prefix, color_func, follow, timestamps):
     # if the container doesn't have a log_stream we need to attach to container
     # before log printer starts running
     if container.log_stream is None:
         stream = container.logs(stdout=True, stderr=True, stream=True,
-                                follow=follow)
+                                follow=follow, timestamps=timestamps)
         line_generator = split_buffer(stream)
     else:
         line_generator = split_buffer(container.log_stream)
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 1e6d0a55..fb309ac5 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -328,15 +328,17 @@ class TopLevelCommand(DocoptCommand):
         Usage: logs [options] [SERVICE...]
 
         Options:
-            --no-color      Produce monochrome output.
-            -f, --follow    Follow log output
+            --no-color          Produce monochrome output.
+            -f, --follow        Follow log output
+            -t, --timestamps    Show timestamps
         """
         containers = project.containers(service_names=options['SERVICE'], stopped=True)
 
         monochrome = options['--no-color']
         follow = options['--follow']
+        timestamps = options['--timestamps']
         print("Attaching to", list_containers(containers))
-        LogPrinter(containers, monochrome=monochrome, follow=follow).run()
+        LogPrinter(containers, monochrome=monochrome, follow=follow, timestamps=timestamps).run()
 
     def pause(self, project, options):
         """
diff --git a/docs/reference/logs.md b/docs/reference/logs.md
index 4f0d5730..8135f4c9 100644
--- a/docs/reference/logs.md
+++ b/docs/reference/logs.md
@@ -15,8 +15,9 @@ parent = "smn_compose_cli"
 Usage: logs [options] [SERVICE...]
 
 Options:
---no-color  Produce monochrome output.
--f, --follow    Follow log output
+--no-color          Produce monochrome output.
+-f, --follow        Follow log output
+-t, --timestamps    Show timestamps
 ```
 
 Displays log output from services.
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 60a5693b..78e17e44 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1163,6 +1163,14 @@ class CLITestCase(DockerClientTestCase):
         assert result.stdout.count('\n') >= 1
         assert 'exited with code 0' not in result.stdout
 
+    def test_logs_timestamps(self):
+        self.base_dir = 'tests/fixtures/echo-services'
+        self.dispatch(['up', '-d'], None)
+
+        result = self.dispatch(['logs', '-f', '-t'], None)
+
+        self.assertRegexpMatches(result.stdout, '(\d{4})-(\d{2})-(\d{2})T(\d{2})\:(\d{2})\:(\d{2})')
+
     def test_kill(self):
         self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')

From 9b36dc5c540f9c88bdf6cb5e5b8e7e7b745d3c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Seguin?= <stephseguin93@gmail.com>
Date: Sun, 28 Feb 2016 22:00:53 +0100
Subject: [PATCH 0868/1265] =?UTF-8?q?Add=20--tail=20flag=20as=20option=20o?=
 =?UTF-8?q?n=20logs.=20Closes=20#265=20Signed-off-by:=20St=C3=A9phane=20Se?=
 =?UTF-8?q?guin=20<stephseguin93@gmail.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose/cli/log_printer.py                         | 13 ++++++++-----
 compose/cli/main.py                                | 14 +++++++++++---
 docs/reference/logs.md                             |  2 ++
 tests/acceptance/cli_test.py                       |  8 ++++++++
 .../logs-tail-composefile/docker-compose.yml       |  3 +++
 tests/unit/cli/log_printer_test.py                 |  2 +-
 6 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 tests/fixtures/logs-tail-composefile/docker-compose.yml

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index adef19ed..6a8553c5 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -19,13 +19,16 @@ class LogPrinter(object):
                  monochrome=False,
                  cascade_stop=False,
                  follow=False,
-                 timestamps=False):
+                 timestamps=False,
+                 tail="all"):
+
         self.containers = containers
         self.output = utils.get_output_stream(output)
         self.monochrome = monochrome
         self.cascade_stop = cascade_stop
         self.follow = follow
         self.timestamps = timestamps
+        self.tail = tail
 
     def run(self):
         if not self.containers:
@@ -49,7 +52,7 @@ class LogPrinter(object):
         for color_func, container in zip(color_funcs, self.containers):
             generator_func = get_log_generator(container)
             prefix = color_func(build_log_prefix(container, prefix_width))
-            yield generator_func(container, prefix, color_func, self.follow, self.timestamps)
+            yield generator_func(container, prefix, color_func, self.follow, self.timestamps, self.tail)
 
 
 def build_log_prefix(container, prefix_width):
@@ -72,7 +75,7 @@ def get_log_generator(container):
     return build_no_log_generator
 
 
-def build_no_log_generator(container, prefix, color_func, follow, timestamps):
+def build_no_log_generator(container, prefix, color_func, follow, timestamps, tail):
     """Return a generator that prints a warning about logs and waits for
     container to exit.
     """
@@ -83,12 +86,12 @@ def build_no_log_generator(container, prefix, color_func, follow, timestamps):
         yield color_func(wait_on_exit(container))
 
 
-def build_log_generator(container, prefix, color_func, follow, timestamps):
+def build_log_generator(container, prefix, color_func, follow, timestamps, tail):
     # if the container doesn't have a log_stream we need to attach to container
     # before log printer starts running
     if container.log_stream is None:
         stream = container.logs(stdout=True, stderr=True, stream=True,
-                                follow=follow, timestamps=timestamps)
+                                follow=follow, timestamps=timestamps, tail=tail)
         line_generator = split_buffer(stream)
     else:
         line_generator = split_buffer(container.log_stream)
diff --git a/compose/cli/main.py b/compose/cli/main.py
index fb309ac5..8cbdce01 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -329,16 +329,24 @@ class TopLevelCommand(DocoptCommand):
 
         Options:
             --no-color          Produce monochrome output.
-            -f, --follow        Follow log output
-            -t, --timestamps    Show timestamps
+            -f, --follow        Follow log output.
+            -t, --timestamps    Show timestamps.
+            --tail="all"        Number of lines to show from the end of the logs
+                                for each container.
         """
         containers = project.containers(service_names=options['SERVICE'], stopped=True)
 
         monochrome = options['--no-color']
         follow = options['--follow']
         timestamps = options['--timestamps']
+        tail = options['--tail']
+        if tail is not None:
+            if tail.isdigit():
+                tail = int(tail)
+            elif tail != 'all':
+                raise UserError("tail flag must be all or a number")
         print("Attaching to", list_containers(containers))
-        LogPrinter(containers, monochrome=monochrome, follow=follow, timestamps=timestamps).run()
+        LogPrinter(containers, monochrome=monochrome, follow=follow, timestamps=timestamps, tail=tail).run()
 
     def pause(self, project, options):
         """
diff --git a/docs/reference/logs.md b/docs/reference/logs.md
index 8135f4c9..745d24f7 100644
--- a/docs/reference/logs.md
+++ b/docs/reference/logs.md
@@ -18,6 +18,8 @@ Options:
 --no-color          Produce monochrome output.
 -f, --follow        Follow log output
 -t, --timestamps    Show timestamps
+--tail              Number of lines to show from the end of the logs
+                    for each container.
 ```
 
 Displays log output from services.
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 78e17e44..8e743075 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1171,6 +1171,14 @@ class CLITestCase(DockerClientTestCase):
 
         self.assertRegexpMatches(result.stdout, '(\d{4})-(\d{2})-(\d{2})T(\d{2})\:(\d{2})\:(\d{2})')
 
+    def test_logs_tail(self):
+        self.base_dir = 'tests/fixtures/logs-tail-composefile'
+        self.dispatch(['up'], None)
+
+        result = self.dispatch(['logs', '--tail', '2'], None)
+
+        assert result.stdout.count('\n') == 3
+
     def test_kill(self):
         self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')
diff --git a/tests/fixtures/logs-tail-composefile/docker-compose.yml b/tests/fixtures/logs-tail-composefile/docker-compose.yml
new file mode 100644
index 00000000..80d8feae
--- /dev/null
+++ b/tests/fixtures/logs-tail-composefile/docker-compose.yml
@@ -0,0 +1,3 @@
+simple:
+  image: busybox:latest
+  command: sh -c "echo a && echo b && echo c && echo d"
diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py
index bed0eae8..d5593639 100644
--- a/tests/unit/cli/log_printer_test.py
+++ b/tests/unit/cli/log_printer_test.py
@@ -47,7 +47,7 @@ class TestLogPrinter(object):
         # Call count is 2 lines + "container exited line"
         assert output_stream.flush.call_count == 3
 
-    def test_single_container_without_follow(self, output_stream, mock_container):
+    def test_single_container_without_stream(self, output_stream, mock_container):
         LogPrinter([mock_container], output=output_stream, follow=False).run()
 
         output = output_stream.getvalue()

From 038da4eea3add68bb80b78da43d0c5d90715fbe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Seguin?= <stephseguin93@gmail.com>
Date: Sun, 28 Feb 2016 22:04:16 +0100
Subject: [PATCH 0869/1265] Logs args of LogPrinter as a dictionary
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
---
 compose/cli/log_printer.py         | 23 +++++++++--------------
 compose/cli/main.py                | 17 ++++++++++-------
 tests/unit/cli/log_printer_test.py |  4 ++--
 tests/unit/cli/main_test.py        |  4 ++--
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 6a8553c5..326676ba 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -18,17 +18,13 @@ class LogPrinter(object):
                  output=sys.stdout,
                  monochrome=False,
                  cascade_stop=False,
-                 follow=False,
-                 timestamps=False,
-                 tail="all"):
-
+                 log_args=None):
+        log_args = log_args or {}
         self.containers = containers
         self.output = utils.get_output_stream(output)
         self.monochrome = monochrome
         self.cascade_stop = cascade_stop
-        self.follow = follow
-        self.timestamps = timestamps
-        self.tail = tail
+        self.log_args = log_args
 
     def run(self):
         if not self.containers:
@@ -52,7 +48,7 @@ class LogPrinter(object):
         for color_func, container in zip(color_funcs, self.containers):
             generator_func = get_log_generator(container)
             prefix = color_func(build_log_prefix(container, prefix_width))
-            yield generator_func(container, prefix, color_func, self.follow, self.timestamps, self.tail)
+            yield generator_func(container, prefix, color_func, self.log_args)
 
 
 def build_log_prefix(container, prefix_width):
@@ -75,30 +71,29 @@ def get_log_generator(container):
     return build_no_log_generator
 
 
-def build_no_log_generator(container, prefix, color_func, follow, timestamps, tail):
+def build_no_log_generator(container, prefix, color_func, log_args):
     """Return a generator that prints a warning about logs and waits for
     container to exit.
     """
     yield "{} WARNING: no logs are available with the '{}' log driver\n".format(
         prefix,
         container.log_driver)
-    if follow:
+    if log_args.get('follow'):
         yield color_func(wait_on_exit(container))
 
 
-def build_log_generator(container, prefix, color_func, follow, timestamps, tail):
+def build_log_generator(container, prefix, color_func, log_args):
     # if the container doesn't have a log_stream we need to attach to container
     # before log printer starts running
     if container.log_stream is None:
-        stream = container.logs(stdout=True, stderr=True, stream=True,
-                                follow=follow, timestamps=timestamps, tail=tail)
+        stream = container.logs(stdout=True, stderr=True, stream=True, **log_args)
         line_generator = split_buffer(stream)
     else:
         line_generator = split_buffer(container.log_stream)
 
     for line in line_generator:
         yield prefix + line
-    if follow:
+    if log_args.get('follow'):
         yield color_func(wait_on_exit(container))
 
 
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 8cbdce01..a3aabd7a 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -337,16 +337,19 @@ class TopLevelCommand(DocoptCommand):
         containers = project.containers(service_names=options['SERVICE'], stopped=True)
 
         monochrome = options['--no-color']
-        follow = options['--follow']
-        timestamps = options['--timestamps']
         tail = options['--tail']
         if tail is not None:
             if tail.isdigit():
                 tail = int(tail)
             elif tail != 'all':
                 raise UserError("tail flag must be all or a number")
+        log_args = {
+            'follow': options['--follow'],
+            'tail': tail,
+            'timestamps': options['--timestamps']
+        }
         print("Attaching to", list_containers(containers))
-        LogPrinter(containers, monochrome=monochrome, follow=follow, timestamps=timestamps, tail=tail).run()
+        LogPrinter(containers, monochrome=monochrome, log_args=log_args).run()
 
     def pause(self, project, options):
         """
@@ -672,8 +675,8 @@ class TopLevelCommand(DocoptCommand):
 
             if detached:
                 return
-            log_printer = build_log_printer(to_attach, service_names, monochrome, cascade_stop,
-                                            follow=True)
+            log_args = {'follow': True}
+            log_printer = build_log_printer(to_attach, service_names, monochrome, cascade_stop, log_args)
             print("Attaching to", list_containers(log_printer.containers))
             log_printer.run()
 
@@ -771,13 +774,13 @@ def run_one_off_container(container_options, project, service, options):
     sys.exit(exit_code)
 
 
-def build_log_printer(containers, service_names, monochrome, cascade_stop, follow):
+def build_log_printer(containers, service_names, monochrome, cascade_stop, log_args):
     if service_names:
         containers = [
             container
             for container in containers if container.service in service_names
         ]
-    return LogPrinter(containers, monochrome=monochrome, cascade_stop=cascade_stop, follow=follow)
+    return LogPrinter(containers, monochrome=monochrome, cascade_stop=cascade_stop, log_args=log_args)
 
 
 @contextlib.contextmanager
diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py
index d5593639..54fef0b2 100644
--- a/tests/unit/cli/log_printer_test.py
+++ b/tests/unit/cli/log_printer_test.py
@@ -39,7 +39,7 @@ def mock_container():
 class TestLogPrinter(object):
 
     def test_single_container(self, output_stream, mock_container):
-        LogPrinter([mock_container], output=output_stream, follow=True).run()
+        LogPrinter([mock_container], output=output_stream, log_args={'follow': True}).run()
 
         output = output_stream.getvalue()
         assert 'hello' in output
@@ -48,7 +48,7 @@ class TestLogPrinter(object):
         assert output_stream.flush.call_count == 3
 
     def test_single_container_without_stream(self, output_stream, mock_container):
-        LogPrinter([mock_container], output=output_stream, follow=False).run()
+        LogPrinter([mock_container], output=output_stream).run()
 
         output = output_stream.getvalue()
         assert 'hello' in output
diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py
index bddb9f17..e7c52003 100644
--- a/tests/unit/cli/main_test.py
+++ b/tests/unit/cli/main_test.py
@@ -33,7 +33,7 @@ class CLIMainTestCase(unittest.TestCase):
             mock_container('another', 1),
         ]
         service_names = ['web', 'db']
-        log_printer = build_log_printer(containers, service_names, True, False, True)
+        log_printer = build_log_printer(containers, service_names, True, False, {'follow': True})
         self.assertEqual(log_printer.containers, containers[:3])
 
     def test_build_log_printer_all_services(self):
@@ -43,7 +43,7 @@ class CLIMainTestCase(unittest.TestCase):
             mock_container('other', 1),
         ]
         service_names = []
-        log_printer = build_log_printer(containers, service_names, True, False, True)
+        log_printer = build_log_printer(containers, service_names, True, False, {'follow': True})
         self.assertEqual(log_printer.containers, containers)
 
 

From ed4473c849cc3e9029dc7894ade716d791c918c6 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 1 Mar 2016 16:39:43 -0500
Subject: [PATCH 0870/1265] Fix signal handling with pyinstaller.

Raise a ShutdownException instead of a KeyboardInterupt when a thread.error
is caught. This thread.error is only raised when run from a pyinstaller
binary (for reasons unknown).

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py        |  2 +-
 compose/cli/multiplexer.py |  3 ++-
 compose/parallel.py        | 36 +++++++++++++++++++++++-------------
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 2c0fda1c..0a917720 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -54,7 +54,7 @@ def main():
     try:
         command = TopLevelCommand()
         command.sys_dispatch()
-    except KeyboardInterrupt:
+    except (KeyboardInterrupt, signals.ShutdownException):
         log.error("Aborting.")
         sys.exit(1)
     except (UserError, NoSuchService, ConfigurationError) as e:
diff --git a/compose/cli/multiplexer.py b/compose/cli/multiplexer.py
index e6e63f24..ae8aa591 100644
--- a/compose/cli/multiplexer.py
+++ b/compose/cli/multiplexer.py
@@ -10,6 +10,7 @@ try:
 except ImportError:
     from queue import Queue, Empty  # Python 3.x
 
+from compose.cli.signals import ShutdownException
 
 STOP = object()
 
@@ -47,7 +48,7 @@ class Multiplexer(object):
                 pass
             # See https://github.com/docker/compose/issues/189
             except thread.error:
-                raise KeyboardInterrupt()
+                raise ShutdownException()
 
     def _init_readers(self):
         for iterator in self.iterators:
diff --git a/compose/parallel.py b/compose/parallel.py
index b8415e5e..4810a106 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -6,9 +6,11 @@ import sys
 from threading import Thread
 
 from docker.errors import APIError
+from six.moves import _thread as thread
 from six.moves.queue import Empty
 from six.moves.queue import Queue
 
+from compose.cli.signals import ShutdownException
 from compose.utils import get_output_stream
 
 
@@ -26,19 +28,7 @@ def parallel_execute(objects, func, index_func, msg):
     objects = list(objects)
     stream = get_output_stream(sys.stderr)
     writer = ParallelStreamWriter(stream, msg)
-
-    for obj in objects:
-        writer.initialize(index_func(obj))
-
-    q = Queue()
-
-    # TODO: limit the number of threads #1828
-    for obj in objects:
-        t = Thread(
-            target=perform_operation,
-            args=(func, obj, q.put, index_func(obj)))
-        t.daemon = True
-        t.start()
+    q = setup_queue(writer, objects, func, index_func)
 
     done = 0
     errors = {}
@@ -48,6 +38,9 @@ def parallel_execute(objects, func, index_func, msg):
             msg_index, result = q.get(timeout=1)
         except Empty:
             continue
+        # See https://github.com/docker/compose/issues/189
+        except thread.error:
+            raise ShutdownException()
 
         if isinstance(result, APIError):
             errors[msg_index] = "error", result.explanation
@@ -68,6 +61,23 @@ def parallel_execute(objects, func, index_func, msg):
             raise error
 
 
+def setup_queue(writer, objects, func, index_func):
+    for obj in objects:
+        writer.initialize(index_func(obj))
+
+    q = Queue()
+
+    # TODO: limit the number of threads #1828
+    for obj in objects:
+        t = Thread(
+            target=perform_operation,
+            args=(func, obj, q.put, index_func(obj)))
+        t.daemon = True
+        t.start()
+
+    return q
+
+
 class ParallelStreamWriter(object):
     """Write out messages for operations happening in parallel.
 

From aa7b862f4c7f10337fc0b586d70aae5392b51f6c Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 29 Feb 2016 15:53:04 -0800
Subject: [PATCH 0871/1265] Clarify depends_on logic

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/compose-file.md  |  5 +++
 docs/faq.md           | 68 +--------------------------------
 docs/startup-order.md | 88 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+), 66 deletions(-)
 create mode 100644 docs/startup-order.md

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 3e7acf70..24e45160 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -203,6 +203,11 @@ Simple example:
       db:
         image: postgres
 
+> **Note:** `depends_on` will not wait for `db` and `redis` to be "ready" before
+> starting `web` - only until they have been started. If you need to wait
+> for a service to be ready, see [Controlling startup order](startup-order.md)
+> for more on this problem and strategies for solving it.
+
 ### dns
 
 Custom DNS servers. Can be a single value or a list.
diff --git a/docs/faq.md b/docs/faq.md
index 201549f1..45885255 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -16,73 +16,9 @@ If you don’t see your question here, feel free to drop by `#docker-compose` on
 freenode IRC and ask the community.
 
 
-## How do I control the order of service startup? I need my database to be ready before my application starts.
+## Can I control service startup order?
 
-You can control the order of service startup with the
-[depends_on](compose-file.md#depends-on) option. Compose always starts
-containers in dependency order, where dependencies are determined by
-`depends_on`, `links`, `volumes_from` and `network_mode: "service:..."`.
-
-However, Compose will not wait until a container is "ready" (whatever that means
-for your particular application) - only until it's running. There's a good
-reason for this.
-
-The problem of waiting for a database to be ready is really just a subset of a
-much larger problem of distributed systems. In production, your database could
-become unavailable or move hosts at any time. Your application needs to be
-resilient to these types of failures.
-
-To handle this, your application should attempt to re-establish a connection to
-the database after a failure. If the application retries the connection,
-it should eventually be able to connect to the database.
-
-The best solution is to perform this check in your application code, both at
-startup and whenever a connection is lost for any reason. However, if you don't
-need this level of resilience, you can work around the problem with a wrapper
-script:
-
--   Use a tool such as [wait-for-it](https://github.com/vishnubob/wait-for-it)
-    or [dockerize](https://github.com/jwilder/dockerize). These are small
-    wrapper scripts which you can include in your application's image and will
-    poll a given host and port until it's accepting TCP connections.
-
-    Supposing your application's image has a `CMD` set in its Dockerfile, you
-    can wrap it by setting the entrypoint in `docker-compose.yml`:
-
-        version: "2"
-        services:
-          web:
-            build: .
-            ports:
-              - "80:8000"
-            depends_on:
-              - "db"
-            entrypoint: ./wait-for-it.sh db:5432
-          db:
-            image: postgres
-
--   Write your own wrapper script to perform a more application-specific health
-    check. For example, you might want to wait until Postgres is definitely
-    ready to accept commands:
-
-        #!/bin/bash
-
-        set -e
-
-        host="$1"
-        shift
-        cmd="$@"
-
-        until psql -h "$host" -U "postgres" -c '\l'; do
-          >&2 echo "Postgres is unavailable - sleeping"
-          sleep 1
-        done
-
-        >&2 echo "Postgres is up - executing command"
-        exec $cmd
-
-    You can use this as a wrapper script as in the previous example, by setting
-    `entrypoint: ./wait-for-postgres.sh db`.
+Yes - see [Controlling startup order](startup-order.md).
 
 
 ## Why do my services take 10 seconds to recreate or stop?
diff --git a/docs/startup-order.md b/docs/startup-order.md
new file mode 100644
index 00000000..c67e1829
--- /dev/null
+++ b/docs/startup-order.md
@@ -0,0 +1,88 @@
+<!--[metadata]>
++++
+title = "Controlling startup order"
+description = "How to control service startup order in Docker Compose"
+keywords = "documentation, docs,  docker, compose, startup, order"
+[menu.main]
+parent="workw_compose"
+weight=90
++++
+<![end-metadata]-->
+
+# Controlling startup order in Compose
+
+You can control the order of service startup with the
+[depends_on](compose-file.md#depends-on) option. Compose always starts
+containers in dependency order, where dependencies are determined by
+`depends_on`, `links`, `volumes_from` and `network_mode: "service:..."`.
+
+However, Compose will not wait until a container is "ready" (whatever that means
+for your particular application) - only until it's running. There's a good
+reason for this.
+
+The problem of waiting for a database (for example) to be ready is really just
+a subset of a much larger problem of distributed systems. In production, your
+database could become unavailable or move hosts at any time. Your application
+needs to be resilient to these types of failures.
+
+To handle this, your application should attempt to re-establish a connection to
+the database after a failure. If the application retries the connection,
+it should eventually be able to connect to the database.
+
+The best solution is to perform this check in your application code, both at
+startup and whenever a connection is lost for any reason. However, if you don't
+need this level of resilience, you can work around the problem with a wrapper
+script:
+
+-   Use a tool such as [wait-for-it](https://github.com/vishnubob/wait-for-it)
+    or [dockerize](https://github.com/jwilder/dockerize). These are small
+    wrapper scripts which you can include in your application's image and will
+    poll a given host and port until it's accepting TCP connections.
+
+    Supposing your application's image has a `CMD` set in its Dockerfile, you
+    can wrap it by setting the entrypoint in `docker-compose.yml`:
+
+        version: "2"
+        services:
+          web:
+            build: .
+            ports:
+              - "80:8000"
+            depends_on:
+              - "db"
+            entrypoint: ./wait-for-it.sh db:5432
+          db:
+            image: postgres
+
+-   Write your own wrapper script to perform a more application-specific health
+    check. For example, you might want to wait until Postgres is definitely
+    ready to accept commands:
+
+        #!/bin/bash
+
+        set -e
+
+        host="$1"
+        shift
+        cmd="$@"
+
+        until psql -h "$host" -U "postgres" -c '\l'; do
+          >&2 echo "Postgres is unavailable - sleeping"
+          sleep 1
+        done
+
+        >&2 echo "Postgres is up - executing command"
+        exec $cmd
+
+    You can use this as a wrapper script as in the previous example, by setting
+    `entrypoint: ./wait-for-postgres.sh db`.
+
+
+## Compose documentation
+
+- [Installing Compose](install.md)
+- [Get started with Django](django.md)
+- [Get started with Rails](rails.md)
+- [Get started with WordPress](wordpress.md)
+- [Command line reference](./reference/index.md)
+- [Compose file reference](compose-file.md)

From 00497436153cd60c5b43f396659cc697fda770e2 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Wed, 2 Mar 2016 21:12:19 +0100
Subject: [PATCH 0872/1265] add support for multiple compose files to bash
 completion

Since 1.6.0, Compose supports multiple compose files specified with `-f`.
These need to be passed to the docker invocations done by the
completion.

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 3b135311..d926d648 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -18,7 +18,11 @@
 
 
 __docker_compose_q() {
-	docker-compose 2>/dev/null ${compose_file:+-f $compose_file} ${compose_project:+-p $compose_project} "$@"
+	local file_args
+	if [ ${#compose_files[@]} -ne 0 ] ; then
+		file_args="${compose_files[@]/#/-f }"
+	fi
+	docker-compose 2>/dev/null $file_args ${compose_project:+-p $compose_project} "$@"
 }
 
 # suppress trailing whitespace
@@ -456,14 +460,14 @@ _docker_compose() {
 	# special treatment of some top-level options
 	local command='docker_compose'
 	local counter=1
-	local compose_file compose_project
+	local compose_files=() compose_project
 	while [ $counter -lt $cword ]; do
 		case "${words[$counter]}" in
 			--file|-f)
 				(( counter++ ))
-				compose_file="${words[$counter]}"
+				compose_files+=(${words[$counter]})
 				;;
-			--project-name|p)
+			--project-name|-p)
 				(( counter++ ))
 				compose_project="${words[$counter]}"
 				;;

From b7fb3a6d9b2f96df47e4133b1bbf8d8d478b9373 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 25 Feb 2016 16:39:58 -0800
Subject: [PATCH 0873/1265] Add --build flag for up and create

Also adds a warning when up builds an image without the --build flag
so that users know it wont happen on the next up.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py        | 24 ++++++++++++++++++++----
 compose/project.py         | 10 ++++++++--
 compose/service.py         | 37 +++++++++++++++++++++++++++----------
 tests/unit/service_test.py | 38 ++++++++++++++++++++++++++++++++++----
 4 files changed, 89 insertions(+), 20 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index be33ce52..afb777be 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -25,6 +25,7 @@ from ..const import HTTP_TIMEOUT
 from ..const import IS_WINDOWS_PLATFORM
 from ..progress_stream import StreamOutputError
 from ..project import NoSuchService
+from ..service import BuildAction
 from ..service import BuildError
 from ..service import ConvergenceStrategy
 from ..service import ImageType
@@ -249,14 +250,15 @@ class TopLevelCommand(DocoptCommand):
                                    image haven't changed. Incompatible with --no-recreate.
             --no-recreate          If containers already exist, don't recreate them.
                                    Incompatible with --force-recreate.
-            --no-build             Don't build an image, even if it's missing
+            --no-build             Don't build an image, even if it's missing.
+            --build                Build images before creating containers.
         """
         service_names = options['SERVICE']
 
         project.create(
             service_names=service_names,
             strategy=convergence_strategy_from_opts(options),
-            do_build=not options['--no-build']
+            do_build=build_action_from_opts(options),
         )
 
     def down(self, project, options):
@@ -699,7 +701,8 @@ class TopLevelCommand(DocoptCommand):
                                        Incompatible with --no-recreate.
             --no-recreate              If containers already exist, don't recreate them.
                                        Incompatible with --force-recreate.
-            --no-build                 Don't build an image, even if it's missing
+            --no-build                 Don't build an image, even if it's missing.
+            --build                    Build images before starting containers.
             --abort-on-container-exit  Stops all containers if any container was stopped.
                                        Incompatible with -d.
             -t, --timeout TIMEOUT      Use this timeout in seconds for container shutdown
@@ -721,7 +724,7 @@ class TopLevelCommand(DocoptCommand):
                 service_names=service_names,
                 start_deps=start_deps,
                 strategy=convergence_strategy_from_opts(options),
-                do_build=not options['--no-build'],
+                do_build=build_action_from_opts(options),
                 timeout=timeout,
                 detached=detached)
 
@@ -775,6 +778,19 @@ def image_type_from_opt(flag, value):
         raise UserError("%s flag must be one of: all, local" % flag)
 
 
+def build_action_from_opts(options):
+    if options['--build'] and options['--no-build']:
+        raise UserError("--build and --no-build can not be combined.")
+
+    if options['--build']:
+        return BuildAction.force
+
+    if options['--no-build']:
+        return BuildAction.skip
+
+    return BuildAction.none
+
+
 def run_one_off_container(container_options, project, service, options):
     if not options['--no-deps']:
         deps = service.get_dependency_names()
diff --git a/compose/project.py b/compose/project.py
index cfb11aa0..c964417f 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -21,6 +21,7 @@ from .container import Container
 from .network import build_networks
 from .network import get_networks
 from .network import ProjectNetworks
+from .service import BuildAction
 from .service import ContainerNetworkMode
 from .service import ConvergenceStrategy
 from .service import NetworkMode
@@ -249,7 +250,12 @@ class Project(object):
             else:
                 log.info('%s uses an image, skipping' % service.name)
 
-    def create(self, service_names=None, strategy=ConvergenceStrategy.changed, do_build=True):
+    def create(
+        self,
+        service_names=None,
+        strategy=ConvergenceStrategy.changed,
+        do_build=BuildAction.none,
+    ):
         services = self.get_services_without_duplicate(service_names, include_deps=True)
 
         plans = self._get_convergence_plans(services, strategy)
@@ -298,7 +304,7 @@ class Project(object):
            service_names=None,
            start_deps=True,
            strategy=ConvergenceStrategy.changed,
-           do_build=True,
+           do_build=BuildAction.none,
            timeout=DEFAULT_TIMEOUT,
            detached=False):
 
diff --git a/compose/service.py b/compose/service.py
index a24b9733..e2ddeb5a 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -104,6 +104,14 @@ class ImageType(enum.Enum):
     all = 2
 
 
+@enum.unique
+class BuildAction(enum.Enum):
+    """Enumeration for the possible build actions."""
+    none = 0
+    force = 1
+    skip = 2
+
+
 class Service(object):
     def __init__(
         self,
@@ -243,7 +251,7 @@ class Service(object):
 
     def create_container(self,
                          one_off=False,
-                         do_build=True,
+                         do_build=BuildAction.none,
                          previous_container=None,
                          number=None,
                          quiet=False,
@@ -266,20 +274,29 @@ class Service(object):
 
         return Container.create(self.client, **container_options)
 
-    def ensure_image_exists(self, do_build=True):
+    def ensure_image_exists(self, do_build=BuildAction.none):
+        if self.can_be_built() and do_build == BuildAction.force:
+            self.build()
+            return
+
         try:
             self.image()
             return
         except NoSuchImageError:
             pass
 
-        if self.can_be_built():
-            if do_build:
-                self.build()
-            else:
-                raise NeedsBuildError(self)
-        else:
+        if not self.can_be_built():
             self.pull()
+            return
+
+        if do_build == BuildAction.skip:
+            raise NeedsBuildError(self)
+
+        self.build()
+        log.warn(
+            "Image for service {} was build because it was not found. To "
+            "rebuild this image you must use the `build` command or the "
+            "--build flag.".format(self.name))
 
     def image(self):
         try:
@@ -343,7 +360,7 @@ class Service(object):
 
     def execute_convergence_plan(self,
                                  plan,
-                                 do_build=True,
+                                 do_build=BuildAction.none,
                                  timeout=DEFAULT_TIMEOUT,
                                  detached=False,
                                  start=True):
@@ -392,7 +409,7 @@ class Service(object):
     def recreate_container(
             self,
             container,
-            do_build=False,
+            do_build=BuildAction.none,
             timeout=DEFAULT_TIMEOUT,
             attach_logs=False,
             start_new_container=True):
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 4f1e065e..8631aa92 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import docker
+import pytest
 from docker.errors import APIError
 
 from .. import mock
@@ -15,6 +16,7 @@ from compose.const import LABEL_SERVICE
 from compose.container import Container
 from compose.service import build_ulimits
 from compose.service import build_volume_binding
+from compose.service import BuildAction
 from compose.service import ContainerNetworkMode
 from compose.service import get_container_data_volumes
 from compose.service import ImageType
@@ -427,7 +429,12 @@ class ServiceTest(unittest.TestCase):
             '{"stream": "Successfully built abcd"}',
         ]
 
-        service.create_container(do_build=True)
+        with mock.patch('compose.service.log', autospec=True) as mock_log:
+            service.create_container(do_build=BuildAction.none)
+            assert mock_log.warn.called
+            _, args, _ = mock_log.warn.mock_calls[0]
+            assert 'was build because it was not found' in args[0]
+
         self.mock_client.build.assert_called_once_with(
             tag='default_foo',
             dockerfile=None,
@@ -444,14 +451,37 @@ class ServiceTest(unittest.TestCase):
         service = Service('foo', client=self.mock_client, build={'context': '.'})
         self.mock_client.inspect_image.return_value = {'Id': 'abc123'}
 
-        service.create_container(do_build=False)
+        service.create_container(do_build=BuildAction.skip)
         self.assertFalse(self.mock_client.build.called)
 
     def test_create_container_no_build_but_needs_build(self):
         service = Service('foo', client=self.mock_client, build={'context': '.'})
         self.mock_client.inspect_image.side_effect = NoSuchImageError
-        with self.assertRaises(NeedsBuildError):
-            service.create_container(do_build=False)
+        with pytest.raises(NeedsBuildError):
+            service.create_container(do_build=BuildAction.skip)
+
+    def test_create_container_force_build(self):
+        service = Service('foo', client=self.mock_client, build={'context': '.'})
+        self.mock_client.inspect_image.return_value = {'Id': 'abc123'}
+        self.mock_client.build.return_value = [
+            '{"stream": "Successfully built abcd"}',
+        ]
+
+        with mock.patch('compose.service.log', autospec=True) as mock_log:
+            service.create_container(do_build=BuildAction.force)
+
+        assert not mock_log.warn.called
+        self.mock_client.build.assert_called_once_with(
+            tag='default_foo',
+            dockerfile=None,
+            stream=True,
+            path='.',
+            pull=False,
+            forcerm=False,
+            nocache=False,
+            rm=True,
+            buildargs=None,
+        )
 
     def test_build_does_not_pull(self):
         self.mock_client.build.return_value = [

From e1b87d7be0aa11f5f87762635a9e24d4e8849e77 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 26 Feb 2016 15:03:53 -0800
Subject: [PATCH 0874/1265] Update reference docs for the new flag.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py         |  6 +++---
 docs/reference/create.md   | 15 ++++++++-------
 docs/reference/up.md       | 34 ++++++++++++++++++----------------
 tests/unit/service_test.py |  2 +-
 4 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index e2ddeb5a..7ee441f2 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -294,9 +294,9 @@ class Service(object):
 
         self.build()
         log.warn(
-            "Image for service {} was build because it was not found. To "
-            "rebuild this image you must use the `build` command or the "
-            "--build flag.".format(self.name))
+            "Image for service {} was built because it did not already exist. To "
+            "rebuild this image you must use `docker-compose build` or "
+            "`docker-compose up --build`.".format(self.name))
 
     def image(self):
         try:
diff --git a/docs/reference/create.md b/docs/reference/create.md
index a785e2c7..5065e8be 100644
--- a/docs/reference/create.md
+++ b/docs/reference/create.md
@@ -12,14 +12,15 @@ parent = "smn_compose_cli"
 # create
 
 ```
+Creates containers for a service.
+
 Usage: create [options] [SERVICE...]
 
 Options:
---force-recreate       Recreate containers even if their configuration and
-                       image haven't changed. Incompatible with --no-recreate.
---no-recreate          If containers already exist, don't recreate them.
-                       Incompatible with --force-recreate.
---no-build             Don't build an image, even if it's missing
+    --force-recreate       Recreate containers even if their configuration and
+                           image haven't changed. Incompatible with --no-recreate.
+    --no-recreate          If containers already exist, don't recreate them.
+                           Incompatible with --force-recreate.
+    --no-build             Don't build an image, even if it's missing.
+    --build                Build images before creating containers.
 ```
-
-Creates containers for a service.
diff --git a/docs/reference/up.md b/docs/reference/up.md
index a02358ec..07ee82f9 100644
--- a/docs/reference/up.md
+++ b/docs/reference/up.md
@@ -15,22 +15,24 @@ parent = "smn_compose_cli"
 Usage: up [options] [SERVICE...]
 
 Options:
--d                         Detached mode: Run containers in the background,
-                           print new container names.
-                           Incompatible with --abort-on-container-exit.
---no-color                 Produce monochrome output.
---no-deps                  Don't start linked services.
---force-recreate           Recreate containers even if their configuration
-                           and image haven't changed.
-                           Incompatible with --no-recreate.
---no-recreate              If containers already exist, don't recreate them.
-                           Incompatible with --force-recreate.
---no-build                 Don't build an image, even if it's missing
---abort-on-container-exit  Stops all containers if any container was stopped.
-                           Incompatible with -d.
--t, --timeout TIMEOUT      Use this timeout in seconds for container shutdown
-                           when attached or when containers are already
-                           running. (default: 10)
+    -d                         Detached mode: Run containers in the background,
+                               print new container names.
+                               Incompatible with --abort-on-container-exit.
+    --no-color                 Produce monochrome output.
+    --no-deps                  Don't start linked services.
+    --force-recreate           Recreate containers even if their configuration
+                               and image haven't changed.
+                               Incompatible with --no-recreate.
+    --no-recreate              If containers already exist, don't recreate them.
+                               Incompatible with --force-recreate.
+    --no-build                 Don't build an image, even if it's missing.
+    --build                    Build images before starting containers.
+    --abort-on-container-exit  Stops all containers if any container was stopped.
+                               Incompatible with -d.
+    -t, --timeout TIMEOUT      Use this timeout in seconds for container shutdown
+                               when attached or when containers are already
+                               running. (default: 10)
+
 ```
 
 Builds, (re)creates, starts, and attaches to containers for a service.
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 8631aa92..199aeeb4 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -433,7 +433,7 @@ class ServiceTest(unittest.TestCase):
             service.create_container(do_build=BuildAction.none)
             assert mock_log.warn.called
             _, args, _ = mock_log.warn.mock_calls[0]
-            assert 'was build because it was not found' in args[0]
+            assert 'was built because it did not already exist' in args[0]
 
         self.mock_client.build.assert_called_once_with(
             tag='default_foo',

From 2c75a8fdf556329acf1a8442cd9ac5f1e94be8cc Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 5 Feb 2016 17:03:05 +0000
Subject: [PATCH 0875/1265] Extract helper methods for building config objects
 from dicts

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 .pre-commit-config.yaml           |  2 +-
 tests/helpers.py                  | 16 ++++++++++++
 tests/integration/project_test.py | 43 +++++++++++++------------------
 tests/unit/config/config_test.py  |  7 +----
 4 files changed, 36 insertions(+), 32 deletions(-)
 create mode 100644 tests/helpers.py

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index db2b6506..e37677c6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@
     - id: end-of-file-fixer
     - id: flake8
     - id: name-tests-test
-      exclude: 'tests/integration/testcases.py'
+      exclude: 'tests/(helpers\.py|integration/testcases\.py)'
     - id: requirements-txt-fixer
     - id: trailing-whitespace
 - repo: git://github.com/asottile/reorder_python_imports
diff --git a/tests/helpers.py b/tests/helpers.py
new file mode 100644
index 00000000..dd0b668e
--- /dev/null
+++ b/tests/helpers.py
@@ -0,0 +1,16 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+from compose.config.config import ConfigDetails
+from compose.config.config import ConfigFile
+from compose.config.config import load
+
+
+def build_config(contents, **kwargs):
+    return load(build_config_details(contents, **kwargs))
+
+
+def build_config_details(contents, working_dir='working_dir', filename='filename.yml'):
+    return ConfigDetails(
+        working_dir,
+        [ConfigFile(filename, contents)])
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 8915733c..8400ba1f 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -7,6 +7,7 @@ import py
 import pytest
 from docker.errors import NotFound
 
+from ..helpers import build_config
 from .testcases import DockerClientTestCase
 from compose.config import config
 from compose.config import ConfigurationError
@@ -20,13 +21,6 @@ from compose.service import ConvergenceStrategy
 from tests.integration.testcases import v2_only
 
 
-def build_service_dicts(service_config):
-    return config.load(
-        config.ConfigDetails(
-            'working_dir',
-            [config.ConfigFile(None, service_config)]))
-
-
 class ProjectTest(DockerClientTestCase):
 
     def test_containers(self):
@@ -67,19 +61,18 @@ class ProjectTest(DockerClientTestCase):
         )
 
     def test_volumes_from_service(self):
-        service_dicts = build_service_dicts({
-            'data': {
-                'image': 'busybox:latest',
-                'volumes': ['/var/data'],
-            },
-            'db': {
-                'image': 'busybox:latest',
-                'volumes_from': ['data'],
-            },
-        })
         project = Project.from_config(
             name='composetest',
-            config_data=service_dicts,
+            config_data=build_config({
+                'data': {
+                    'image': 'busybox:latest',
+                    'volumes': ['/var/data'],
+                },
+                'db': {
+                    'image': 'busybox:latest',
+                    'volumes_from': ['data'],
+                },
+            }),
             client=self.client,
         )
         db = project.get_service('db')
@@ -96,7 +89,7 @@ class ProjectTest(DockerClientTestCase):
         )
         project = Project.from_config(
             name='composetest',
-            config_data=build_service_dicts({
+            config_data=build_config({
                 'db': {
                     'image': 'busybox:latest',
                     'volumes_from': ['composetest_data_container'],
@@ -112,7 +105,7 @@ class ProjectTest(DockerClientTestCase):
         project = Project.from_config(
             name='composetest',
             client=self.client,
-            config_data=build_service_dicts({
+            config_data=build_config({
                 'version': V2_0,
                 'services': {
                     'net': {
@@ -139,7 +132,7 @@ class ProjectTest(DockerClientTestCase):
         def get_project():
             return Project.from_config(
                 name='composetest',
-                config_data=build_service_dicts({
+                config_data=build_config({
                     'version': V2_0,
                     'services': {
                         'web': {
@@ -174,7 +167,7 @@ class ProjectTest(DockerClientTestCase):
     def test_net_from_service_v1(self):
         project = Project.from_config(
             name='composetest',
-            config_data=build_service_dicts({
+            config_data=build_config({
                 'net': {
                     'image': 'busybox:latest',
                     'command': ["top"]
@@ -198,7 +191,7 @@ class ProjectTest(DockerClientTestCase):
         def get_project():
             return Project.from_config(
                 name='composetest',
-                config_data=build_service_dicts({
+                config_data=build_config({
                     'web': {
                         'image': 'busybox:latest',
                         'net': 'container:composetest_net_container'
@@ -469,7 +462,7 @@ class ProjectTest(DockerClientTestCase):
     def test_project_up_starts_depends(self):
         project = Project.from_config(
             name='composetest',
-            config_data=build_service_dicts({
+            config_data=build_config({
                 'console': {
                     'image': 'busybox:latest',
                     'command': ["top"],
@@ -504,7 +497,7 @@ class ProjectTest(DockerClientTestCase):
     def test_project_up_with_no_deps(self):
         project = Project.from_config(
             name='composetest',
-            config_data=build_service_dicts({
+            config_data=build_config({
                 'console': {
                     'image': 'busybox:latest',
                     'command': ["top"],
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index c2ca8e6e..04f299c6 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -11,6 +11,7 @@ from operator import itemgetter
 import py
 import pytest
 
+from ...helpers import build_config_details
 from compose.config import config
 from compose.config.config import resolve_build_args
 from compose.config.config import resolve_environment
@@ -43,12 +44,6 @@ def service_sort(services):
     return sorted(services, key=itemgetter('name'))
 
 
-def build_config_details(contents, working_dir='working_dir', filename='filename.yml'):
-    return config.ConfigDetails(
-        working_dir,
-        [config.ConfigFile(filename, contents)])
-
-
 class ConfigTest(unittest.TestCase):
     def test_load(self):
         service_dicts = config.load(

From 575b48749d1eb8f8a583a5b1d2336003a6f12383 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 5 Feb 2016 17:53:35 +0000
Subject: [PATCH 0876/1265] Remove unused global_options arg from dispatch()

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/docopt_command.py | 8 ++++----
 tests/unit/cli_test.py        | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compose/cli/docopt_command.py b/compose/cli/docopt_command.py
index d2900b39..5b50189c 100644
--- a/compose/cli/docopt_command.py
+++ b/compose/cli/docopt_command.py
@@ -20,12 +20,12 @@ class DocoptCommand(object):
         return {'options_first': True}
 
     def sys_dispatch(self):
-        self.dispatch(sys.argv[1:], None)
+        self.dispatch(sys.argv[1:])
 
-    def dispatch(self, argv, global_options):
-        self.perform_command(*self.parse(argv, global_options))
+    def dispatch(self, argv):
+        self.perform_command(*self.parse(argv))
 
-    def parse(self, argv, global_options):
+    def parse(self, argv):
         options = docopt_full_help(getdoc(self), argv, **self.docopt_options())
         command = options['COMMAND']
 
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 26ae4e30..3fc0a985 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -66,17 +66,17 @@ class CLITestCase(unittest.TestCase):
     def test_help(self):
         command = TopLevelCommand()
         with self.assertRaises(SystemExit):
-            command.dispatch(['-h'], None)
+            command.dispatch(['-h'])
 
     def test_command_help(self):
         with self.assertRaises(SystemExit) as ctx:
-            TopLevelCommand().dispatch(['help', 'up'], None)
+            TopLevelCommand().dispatch(['help', 'up'])
 
         self.assertIn('Usage: up', str(ctx.exception))
 
     def test_command_help_nonexistent(self):
         with self.assertRaises(NoSuchCommand):
-            TopLevelCommand().dispatch(['help', 'nonexistent'], None)
+            TopLevelCommand().dispatch(['help', 'nonexistent'])
 
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason="requires dockerpty")
     @mock.patch('compose.cli.main.RunOperation', autospec=True)

From 4644f2c0f998d7f3a27464cb965265c041a17e2a Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 5 Feb 2016 13:12:43 +0000
Subject: [PATCH 0877/1265] Remove environment-overriding unit test for 'run'

There's already an acceptance test for it

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/unit/cli_test.py | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 3fc0a985..cf3c8e8f 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -110,39 +110,6 @@ class CLITestCase(unittest.TestCase):
         _, _, call_kwargs = mock_run_operation.mock_calls[0]
         assert call_kwargs['logs'] is False
 
-    @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason="requires dockerpty")
-    @mock.patch('compose.cli.main.PseudoTerminal', autospec=True)
-    def test_run_with_environment_merged_with_options_list(self, mock_pseudo_terminal):
-        command = TopLevelCommand()
-        mock_client = mock.create_autospec(docker.Client)
-        mock_project = mock.Mock(client=mock_client)
-        mock_project.get_service.return_value = Service(
-            'service',
-            client=mock_client,
-            environment=['FOO=ONE', 'BAR=TWO'],
-            image='someimage')
-
-        command.run(mock_project, {
-            'SERVICE': 'service',
-            'COMMAND': None,
-            '-e': ['BAR=NEW', 'OTHER=bär'.encode('utf-8')],
-            '--user': None,
-            '--no-deps': None,
-            '-d': True,
-            '-T': None,
-            '--entrypoint': None,
-            '--service-ports': None,
-            '--publish': [],
-            '--rm': None,
-            '--name': None,
-        })
-
-        _, _, call_kwargs = mock_client.create_container.mock_calls[0]
-        assert (
-            sorted(call_kwargs['environment']) ==
-            sorted(['FOO=ONE', 'BAR=NEW', 'OTHER=bär'])
-        )
-
     def test_run_service_with_restart_always(self):
         command = TopLevelCommand()
         mock_client = mock.create_autospec(docker.Client)

From 20caf02bf6a99d316615769af558c7212e25927b Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 5 Feb 2016 17:09:07 +0000
Subject: [PATCH 0878/1265] Create real Project objects in CLI unit tests

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/unit/cli_test.py | 62 +++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index cf3c8e8f..cbe9ea6f 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -10,13 +10,14 @@ import pytest
 
 from .. import mock
 from .. import unittest
+from ..helpers import build_config
 from compose.cli.command import get_project
 from compose.cli.command import get_project_name
 from compose.cli.docopt_command import NoSuchCommand
 from compose.cli.errors import UserError
 from compose.cli.main import TopLevelCommand
 from compose.const import IS_WINDOWS_PLATFORM
-from compose.service import Service
+from compose.project import Project
 
 
 class CLITestCase(unittest.TestCase):
@@ -84,18 +85,19 @@ class CLITestCase(unittest.TestCase):
     def test_run_interactive_passes_logs_false(self, mock_pseudo_terminal, mock_run_operation):
         command = TopLevelCommand()
         mock_client = mock.create_autospec(docker.Client)
-        mock_project = mock.Mock(client=mock_client)
-        mock_project.get_service.return_value = Service(
-            'service',
+        project = Project.from_config(
+            name='composetest',
             client=mock_client,
-            environment=['FOO=ONE', 'BAR=TWO'],
-            image='someimage')
+            config_data=build_config({
+                'service': {'image': 'busybox'}
+            }),
+        )
 
         with pytest.raises(SystemExit):
-            command.run(mock_project, {
+            command.run(project, {
                 'SERVICE': 'service',
                 'COMMAND': None,
-                '-e': ['BAR=NEW', 'OTHER=bär'.encode('utf-8')],
+                '-e': [],
                 '--user': None,
                 '--no-deps': None,
                 '-d': False,
@@ -111,15 +113,21 @@ class CLITestCase(unittest.TestCase):
         assert call_kwargs['logs'] is False
 
     def test_run_service_with_restart_always(self):
-        command = TopLevelCommand()
         mock_client = mock.create_autospec(docker.Client)
-        mock_project = mock.Mock(client=mock_client)
-        mock_project.get_service.return_value = Service(
-            'service',
+
+        project = Project.from_config(
+            name='composetest',
             client=mock_client,
-            restart={'Name': 'always', 'MaximumRetryCount': 0},
-            image='someimage')
-        command.run(mock_project, {
+            config_data=build_config({
+                'service': {
+                    'image': 'busybox',
+                    'restart': 'always',
+                }
+            }),
+        )
+
+        command = TopLevelCommand()
+        command.run(project, {
             'SERVICE': 'service',
             'COMMAND': None,
             '-e': [],
@@ -140,14 +148,7 @@ class CLITestCase(unittest.TestCase):
         )
 
         command = TopLevelCommand()
-        mock_client = mock.create_autospec(docker.Client)
-        mock_project = mock.Mock(client=mock_client)
-        mock_project.get_service.return_value = Service(
-            'service',
-            client=mock_client,
-            restart='always',
-            image='someimage')
-        command.run(mock_project, {
+        command.run(project, {
             'SERVICE': 'service',
             'COMMAND': None,
             '-e': [],
@@ -168,17 +169,16 @@ class CLITestCase(unittest.TestCase):
 
     def test_command_manula_and_service_ports_together(self):
         command = TopLevelCommand()
-        mock_client = mock.create_autospec(docker.Client)
-        mock_project = mock.Mock(client=mock_client)
-        mock_project.get_service.return_value = Service(
-            'service',
-            client=mock_client,
-            restart='always',
-            image='someimage',
+        project = Project.from_config(
+            name='composetest',
+            client=None,
+            config_data=build_config({
+                'service': {'image': 'busybox'},
+            }),
         )
 
         with self.assertRaises(UserError):
-            command.run(mock_project, {
+            command.run(project, {
                 'SERVICE': 'service',
                 'COMMAND': None,
                 '-e': [],

From 53a3d14046e00b6489ae4aadeb0e3325cb5169b1 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 26 Feb 2016 15:55:06 -0800
Subject: [PATCH 0879/1265] Support multiple files in COMPOSE_FILE env var.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/command.py         |  6 ++++--
 docs/reference/envvars.md      | 13 +++++++++----
 tests/unit/cli/command_test.py | 35 ++++++++++++++++++++++++++++++++--
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 2a0d8698..98de2104 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -58,8 +58,10 @@ def get_config_path_from_options(options):
     if file_option:
         return file_option
 
-    config_file = os.environ.get('COMPOSE_FILE')
-    return [config_file] if config_file else None
+    config_files = os.environ.get('COMPOSE_FILE')
+    if config_files:
+        return config_files.split(os.pathsep)
+    return None
 
 
 def get_client(verbose=False, version=None):
diff --git a/docs/reference/envvars.md b/docs/reference/envvars.md
index 6360fe54..e1170be9 100644
--- a/docs/reference/envvars.md
+++ b/docs/reference/envvars.md
@@ -27,10 +27,15 @@ defaults to the `basename` of the project directory. See also the `-p`
 
 ## COMPOSE\_FILE
 
-Specify the file containing the compose configuration. If not provided,
-Compose looks for a file named  `docker-compose.yml` in the current directory
-and then each parent directory in succession until a file by that name is
-found. See also the `-f` [command-line option](overview.md).
+Specify the path to a Compose file. If not provided, Compose looks for a file named
+`docker-compose.yml` in the current directory and then each parent directory in
+succession until a file by that name is found.
+
+This variable supports multiple compose files separate by a path separator (on
+Linux and OSX the path separator is `:`, on Windows it is `;`). For example:
+`COMPOSE_FILE=docker-compose.yml:docker-compose.prod.yml`
+
+See also the `-f` [command-line option](overview.md).
 
 ## COMPOSE\_API\_VERSION
 
diff --git a/tests/unit/cli/command_test.py b/tests/unit/cli/command_test.py
index 18044672..1ca671fe 100644
--- a/tests/unit/cli/command_test.py
+++ b/tests/unit/cli/command_test.py
@@ -1,16 +1,19 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import os
+
 import pytest
 from requests.exceptions import ConnectionError
 
 from compose.cli import errors
 from compose.cli.command import friendly_error_message
+from compose.cli.command import get_config_path_from_options
+from compose.const import IS_WINDOWS_PLATFORM
 from tests import mock
-from tests import unittest
 
 
-class FriendlyErrorMessageTestCase(unittest.TestCase):
+class TestFriendlyErrorMessage(object):
 
     def test_dispatch_generic_connection_error(self):
         with pytest.raises(errors.ConnectionErrorGeneric):
@@ -21,3 +24,31 @@ class FriendlyErrorMessageTestCase(unittest.TestCase):
             ):
                 with friendly_error_message():
                     raise ConnectionError()
+
+
+class TestGetConfigPathFromOptions(object):
+
+    def test_path_from_options(self):
+        paths = ['one.yml', 'two.yml']
+        opts = {'--file': paths}
+        assert get_config_path_from_options(opts) == paths
+
+    def test_single_path_from_env(self):
+        with mock.patch.dict(os.environ):
+            os.environ['COMPOSE_FILE'] = 'one.yml'
+            assert get_config_path_from_options({}) == ['one.yml']
+
+    @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='posix separator')
+    def test_multiple_path_from_env(self):
+        with mock.patch.dict(os.environ):
+            os.environ['COMPOSE_FILE'] = 'one.yml:two.yml'
+            assert get_config_path_from_options({}) == ['one.yml', 'two.yml']
+
+    @pytest.mark.skipif(not IS_WINDOWS_PLATFORM, reason='windows separator')
+    def test_multiple_path_from_env_windows(self):
+        with mock.patch.dict(os.environ):
+            os.environ['COMPOSE_FILE'] = 'one.yml;two.yml'
+            assert get_config_path_from_options({}) == ['one.yml', 'two.yml']
+
+    def test_no_path(self):
+        assert not get_config_path_from_options({})

From 81b7fba33e55005041699da5a782cf55272f1d66 Mon Sep 17 00:00:00 2001
From: Dimitar Bonev <dimitar.bonev@gmail.com>
Date: Sun, 28 Feb 2016 16:54:01 +0200
Subject: [PATCH 0880/1265] Allowing null for build args

Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
---
 compose/config/config_schema_v2.0.json | 15 +-------------
 tests/unit/config/config_test.py       | 27 +++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/compose/config/config_schema_v2.0.json b/compose/config/config_schema_v2.0.json
index 28209ced..a4a30a5f 100644
--- a/compose/config/config_schema_v2.0.json
+++ b/compose/config/config_schema_v2.0.json
@@ -58,20 +58,7 @@
               "properties": {
                 "context": {"type": "string"},
                 "dockerfile": {"type": "string"},
-                "args": {
-                  "oneOf": [
-                    {"$ref": "#/definitions/list_of_strings"},
-                    {
-                      "type": "object",
-                      "patternProperties": {
-                        "^.+$": {
-                          "type": ["string", "number"]
-                        }
-                      },
-                      "additionalProperties": false
-                    }
-                  ]
-                }
+                "args": {"$ref": "#/definitions/list_or_dict"}
               },
               "additionalProperties": false
             }
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 08d52553..d0e82420 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -404,7 +404,7 @@ class ConfigTest(unittest.TestCase):
             config.load(config_details)
         assert (
             "services.web.build.args contains an invalid type, it should be an "
-            "array, or an object" in exc.exconly()
+            "object, or an array" in exc.exconly()
         )
 
     def test_config_integer_service_name_raise_validation_error(self):
@@ -689,6 +689,31 @@ class ConfigTest(unittest.TestCase):
         assert service['build']['args']['opt1'] == '42'
         assert service['build']['args']['opt2'] == 'foobar'
 
+    def test_build_args_allow_empty_properties(self):
+        service = config.load(
+            build_config_details(
+                {
+                    'version': '2',
+                    'services': {
+                        'web': {
+                            'build': {
+                                'context': '.',
+                                'dockerfile': 'Dockerfile-alt',
+                                'args': {
+                                    'foo': None
+                                }
+                            }
+                        }
+                    }
+                },
+                'tests/fixtures/extends',
+                'filename.yml'
+            )
+        ).services[0]
+        assert 'args' in service['build']
+        assert 'foo' in service['build']['args']
+        assert service['build']['args']['foo'] == 'None'
+
     def test_load_with_multiple_files_mismatched_networks_format(self):
         base_file = config.ConfigFile(
             'base.yaml',

From 698998c410ba5d8895eafeb5050901e32fe6e4bb Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 2 Mar 2016 15:15:50 -0800
Subject: [PATCH 0881/1265] Don't call create on existing volumes

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/volume.py | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/compose/volume.py b/compose/volume.py
index 26fbda96..254c2c28 100644
--- a/compose/volume.py
+++ b/compose/volume.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 
 import logging
 
-from docker.errors import APIError
 from docker.errors import NotFound
 
 from .config import ConfigurationError
@@ -82,12 +81,13 @@ class ProjectVolumes(object):
     def initialize(self):
         try:
             for volume in self.volumes.values():
+                volume_exists = volume.exists()
                 if volume.external:
                     log.debug(
                         'Volume {0} declared as external. No new '
                         'volume will be created.'.format(volume.name)
                     )
-                    if not volume.exists():
+                    if not volume_exists:
                         raise ConfigurationError(
                             'Volume {name} declared as external, but could'
                             ' not be found. Please create the volume manually'
@@ -97,28 +97,32 @@ class ProjectVolumes(object):
                             )
                         )
                     continue
-                log.info(
-                    'Creating volume "{0}" with {1} driver'.format(
-                        volume.full_name, volume.driver or 'default'
+
+                if not volume_exists:
+                    log.info(
+                        'Creating volume "{0}" with {1} driver'.format(
+                            volume.full_name, volume.driver or 'default'
+                        )
                     )
-                )
-                volume.create()
+                    volume.create()
+                else:
+                    driver = volume.inspect()['Driver']
+                    if driver != volume.driver:
+                        raise ConfigurationError(
+                            'Configuration for volume {0} specifies driver '
+                            '{1}, but a volume with the same name uses a '
+                            'different driver ({3}). If you wish to use the '
+                            'new configuration, please remove the existing '
+                            'volume "{2}" first:\n'
+                            '$ docker volume rm {2}'.format(
+                                volume.name, volume.driver, volume.full_name,
+                                volume.inspect()['Driver']
+                            )
+                        )
         except NotFound:
             raise ConfigurationError(
                 'Volume %s specifies nonexistent driver %s' % (volume.name, volume.driver)
             )
-        except APIError as e:
-            if 'Choose a different volume name' in str(e):
-                raise ConfigurationError(
-                    'Configuration for volume {0} specifies driver {1}, but '
-                    'a volume with the same name uses a different driver '
-                    '({3}). If you wish to use the new configuration, please '
-                    'remove the existing volume "{2}" first:\n'
-                    '$ docker volume rm {2}'.format(
-                        volume.name, volume.driver, volume.full_name,
-                        volume.inspect()['Driver']
-                    )
-                )
 
     def namespace_spec(self, volume_spec):
         if not volume_spec.is_named_volume:

From d2b065e6156e502f2d3be4e5d0ca620a20ecb3d3 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 7 Mar 2016 18:07:41 -0800
Subject: [PATCH 0882/1265] Don't raise ConfigurationError for volume driver
 mismatch when driver is unspecified

Add testcase

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/volume.py                 |  2 +-
 tests/integration/project_test.py | 38 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/compose/volume.py b/compose/volume.py
index 254c2c28..17e90087 100644
--- a/compose/volume.py
+++ b/compose/volume.py
@@ -107,7 +107,7 @@ class ProjectVolumes(object):
                     volume.create()
                 else:
                     driver = volume.inspect()['Driver']
-                    if driver != volume.driver:
+                    if volume.driver is not None and driver != volume.driver:
                         raise ConfigurationError(
                             'Configuration for volume {0} specifies driver '
                             '{1}, but a volume with the same name uses a '
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 8400ba1f..daeb9c81 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -839,6 +839,44 @@ class ProjectTest(DockerClientTestCase):
             vol_name
         ) in str(e.exception)
 
+    @v2_only()
+    def test_initialize_volumes_updated_blank_driver(self):
+        vol_name = '{0:x}'.format(random.getrandbits(32))
+        full_vol_name = 'composetest_{0}'.format(vol_name)
+
+        config_data = config.Config(
+            version=V2_0,
+            services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'command': 'top'
+            }],
+            volumes={vol_name: {'driver': 'local'}},
+            networks={},
+        )
+        project = Project.from_config(
+            name='composetest',
+            config_data=config_data, client=self.client
+        )
+        project.volumes.initialize()
+
+        volume_data = self.client.inspect_volume(full_vol_name)
+        self.assertEqual(volume_data['Name'], full_vol_name)
+        self.assertEqual(volume_data['Driver'], 'local')
+
+        config_data = config_data._replace(
+            volumes={vol_name: {}}
+        )
+        project = Project.from_config(
+            name='composetest',
+            config_data=config_data,
+            client=self.client
+        )
+        project.volumes.initialize()
+        volume_data = self.client.inspect_volume(full_vol_name)
+        self.assertEqual(volume_data['Name'], full_vol_name)
+        self.assertEqual(volume_data['Driver'], 'local')
+
     @v2_only()
     def test_initialize_volumes_external_volumes(self):
         # Use composetest_ prefix so it gets garbage-collected in tearDown()

From 88a719b4b685be62a4bcc354a07f9ecd42e1282f Mon Sep 17 00:00:00 2001
From: Louis Tiao <ltiao@users.noreply.github.com>
Date: Tue, 8 Mar 2016 15:48:42 +1100
Subject: [PATCH 0883/1265] Fixed indentation level in example.

Signed-off-by: Louis Tiao <louistiao@gmail.com>
---
 docs/overview.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/overview.md b/docs/overview.md
index 2efb715a..03ade356 100644
--- a/docs/overview.md
+++ b/docs/overview.md
@@ -46,10 +46,10 @@ A `docker-compose.yml` looks like this:
         - logvolume01:/var/log
         links:
         - redis
-        redis:
-          image: redis
-        volumes:
-          logvolume01: {}
+      redis:
+        image: redis
+    volumes:
+      logvolume01: {}
 
 For more information about the Compose file, see the
 [Compose file reference](compose-file.md)

From 000eaee16ab19608ee4d96f2ceb48cf24a763d76 Mon Sep 17 00:00:00 2001
From: wenchma <wenchma@cn.ibm.com>
Date: Tue, 8 Mar 2016 17:09:28 +0800
Subject: [PATCH 0884/1265] Update image format for service conf reference

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
---
 docs/compose-file.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 24e45160..d8e98fbc 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -59,13 +59,13 @@ optionally [dockerfile](#dockerfile) and [args](#args).
       args:
         buildno: 1
 
-If you specify `image` as well as `build`, then Compose tags the built image
-with the tag specified in `image`:
+If you specify `image` as well as `build`, then Compose names the built image
+with the `webapp` and optional `tag` specified in `image`:
 
     build: ./dir
-    image: webapp
+    image: webapp:tag
 
-This will result in an image tagged `webapp`, built from `./dir`.
+This will result in an image named `webapp` and tagged `tag`, built from `./dir`.
 
 > **Note**: In the [version 1 file format](#version-1), `build` is different in
 > two ways:

From e700d7ca6ad4d38cff6ecb5b855c703a98d163e3 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 8 Mar 2016 18:15:18 +0100
Subject: [PATCH 0885/1265] Fix version in docs example

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/compose-file.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 24e45160..d6cb92cf 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -518,7 +518,7 @@ The general format is shown here.
 
 In the example below, three services are provided (`web`, `worker`, and `db`), along with two networks (`new` and `legacy`). The `db` service is reachable at the hostname `db` or `database` on the `new` network, and at `db` or `mysql` on the `legacy` network.
 
-    version: 2
+    version: '2'
 
     services:
       web:

From 53bea8a72040ad4b96777e9d020029ce363f9ee7 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 29 Feb 2016 14:35:23 -0800
Subject: [PATCH 0886/1265] Refactor command dispatch to improve unit testing
 and support better error messages.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/docopt_command.py | 39 ++++++++---------
 compose/cli/main.py           | 79 +++++++++++++++++++++--------------
 tests/unit/cli_test.py        | 23 ++++------
 3 files changed, 75 insertions(+), 66 deletions(-)

diff --git a/compose/cli/docopt_command.py b/compose/cli/docopt_command.py
index 5b50189c..809a4b74 100644
--- a/compose/cli/docopt_command.py
+++ b/compose/cli/docopt_command.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import sys
 from inspect import getdoc
 
 from docopt import docopt
@@ -15,24 +14,21 @@ def docopt_full_help(docstring, *args, **kwargs):
         raise SystemExit(docstring)
 
 
-class DocoptCommand(object):
-    def docopt_options(self):
-        return {'options_first': True}
+class DocoptDispatcher(object):
 
-    def sys_dispatch(self):
-        self.dispatch(sys.argv[1:])
-
-    def dispatch(self, argv):
-        self.perform_command(*self.parse(argv))
+    def __init__(self, command_class, options):
+        self.command_class = command_class
+        self.options = options
 
     def parse(self, argv):
-        options = docopt_full_help(getdoc(self), argv, **self.docopt_options())
+        command_help = getdoc(self.command_class)
+        options = docopt_full_help(command_help, argv, **self.options)
         command = options['COMMAND']
 
         if command is None:
-            raise SystemExit(getdoc(self))
+            raise SystemExit(command_help)
 
-        handler = self.get_handler(command)
+        handler = get_handler(self.command_class, command)
         docstring = getdoc(handler)
 
         if docstring is None:
@@ -41,17 +37,18 @@ class DocoptCommand(object):
         command_options = docopt_full_help(docstring, options['ARGS'], options_first=True)
         return options, handler, command_options
 
-    def get_handler(self, command):
-        command = command.replace('-', '_')
-        # we certainly want to have "exec" command, since that's what docker client has
-        # but in python exec is a keyword
-        if command == "exec":
-            command = "exec_command"
 
-        if not hasattr(self, command):
-            raise NoSuchCommand(command, self)
+def get_handler(command_class, command):
+    command = command.replace('-', '_')
+    # we certainly want to have "exec" command, since that's what docker client has
+    # but in python exec is a keyword
+    if command == "exec":
+        command = "exec_command"
 
-        return getattr(self, command)
+    if not hasattr(command_class, command):
+        raise NoSuchCommand(command, command_class)
+
+    return getattr(command_class, command)
 
 
 class NoSuchCommand(Exception):
diff --git a/compose/cli/main.py b/compose/cli/main.py
index afb777be..0584bf1a 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -3,6 +3,7 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 import contextlib
+import functools
 import json
 import logging
 import re
@@ -33,7 +34,8 @@ from ..service import NeedsBuildError
 from .command import friendly_error_message
 from .command import get_config_path_from_options
 from .command import project_from_options
-from .docopt_command import DocoptCommand
+from .docopt_command import DocoptDispatcher
+from .docopt_command import get_handler
 from .docopt_command import NoSuchCommand
 from .errors import UserError
 from .formatter import ConsoleWarningFormatter
@@ -52,19 +54,16 @@ console_handler = logging.StreamHandler(sys.stderr)
 
 def main():
     setup_logging()
+    command = dispatch()
+
     try:
-        command = TopLevelCommand()
-        command.sys_dispatch()
+        command()
     except (KeyboardInterrupt, signals.ShutdownException):
         log.error("Aborting.")
         sys.exit(1)
     except (UserError, NoSuchService, ConfigurationError) as e:
         log.error(e.msg)
         sys.exit(1)
-    except NoSuchCommand as e:
-        commands = "\n".join(parse_doc_section("commands:", getdoc(e.supercommand)))
-        log.error("No such command: %s\n\n%s", e.command, commands)
-        sys.exit(1)
     except APIError as e:
         log_api_error(e)
         sys.exit(1)
@@ -88,6 +87,40 @@ def main():
         sys.exit(1)
 
 
+def dispatch():
+    dispatcher = DocoptDispatcher(
+        TopLevelCommand,
+        {'options_first': True, 'version': get_version_info('compose')})
+
+    try:
+        options, handler, command_options = dispatcher.parse(sys.argv[1:])
+    except NoSuchCommand as e:
+        commands = "\n".join(parse_doc_section("commands:", getdoc(e.supercommand)))
+        log.error("No such command: %s\n\n%s", e.command, commands)
+        sys.exit(1)
+
+    setup_console_handler(console_handler, options.get('--verbose'))
+    return functools.partial(perform_command, options, handler, command_options)
+
+
+def perform_command(options, handler, command_options):
+    if options['COMMAND'] in ('help', 'version'):
+        # Skip looking up the compose file.
+        handler(command_options)
+        return
+
+    if options['COMMAND'] == 'config':
+        command = TopLevelCommand(None)
+        handler(command, options, command_options)
+        return
+
+    project = project_from_options('.', options)
+    command = TopLevelCommand(project)
+    with friendly_error_message():
+        # TODO: use self.project
+        handler(command, project, command_options)
+
+
 def log_api_error(e):
     if 'client is newer than server' in e.explanation:
         # we need JSON formatted errors. In the meantime...
@@ -134,7 +167,7 @@ def parse_doc_section(name, source):
     return [s.strip() for s in pattern.findall(source)]
 
 
-class TopLevelCommand(DocoptCommand):
+class TopLevelCommand(object):
     """Define and run multi-container applications with Docker.
 
     Usage:
@@ -173,26 +206,8 @@ class TopLevelCommand(DocoptCommand):
     """
     base_dir = '.'
 
-    def docopt_options(self):
-        options = super(TopLevelCommand, self).docopt_options()
-        options['version'] = get_version_info('compose')
-        return options
-
-    def perform_command(self, options, handler, command_options):
-        setup_console_handler(console_handler, options.get('--verbose'))
-
-        if options['COMMAND'] in ('help', 'version'):
-            # Skip looking up the compose file.
-            handler(None, command_options)
-            return
-
-        if options['COMMAND'] == 'config':
-            handler(options, command_options)
-            return
-
-        project = project_from_options(self.base_dir, options)
-        with friendly_error_message():
-            handler(project, command_options)
+    def __init__(self, project):
+        self.project = project
 
     def build(self, project, options):
         """
@@ -352,13 +367,14 @@ class TopLevelCommand(DocoptCommand):
         exit_code = project.client.exec_inspect(exec_id).get("ExitCode")
         sys.exit(exit_code)
 
-    def help(self, project, options):
+    @classmethod
+    def help(cls, options):
         """
         Get help on a command.
 
         Usage: help COMMAND
         """
-        handler = self.get_handler(options['COMMAND'])
+        handler = get_handler(cls, options['COMMAND'])
         raise SystemExit(getdoc(handler))
 
     def kill(self, project, options):
@@ -739,7 +755,8 @@ class TopLevelCommand(DocoptCommand):
                 print("Aborting on container exit...")
                 project.stop(service_names=service_names, timeout=timeout)
 
-    def version(self, project, options):
+    @classmethod
+    def version(cls, options):
         """
         Show version informations
 
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index cbe9ea6f..c609d832 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -64,26 +64,20 @@ class CLITestCase(unittest.TestCase):
         self.assertTrue(project.client)
         self.assertTrue(project.services)
 
-    def test_help(self):
-        command = TopLevelCommand()
-        with self.assertRaises(SystemExit):
-            command.dispatch(['-h'])
-
     def test_command_help(self):
-        with self.assertRaises(SystemExit) as ctx:
-            TopLevelCommand().dispatch(['help', 'up'])
+        with pytest.raises(SystemExit) as exc:
+            TopLevelCommand.help({'COMMAND': 'up'})
 
-        self.assertIn('Usage: up', str(ctx.exception))
+        assert 'Usage: up' in exc.exconly()
 
     def test_command_help_nonexistent(self):
-        with self.assertRaises(NoSuchCommand):
-            TopLevelCommand().dispatch(['help', 'nonexistent'])
+        with pytest.raises(NoSuchCommand):
+            TopLevelCommand.help({'COMMAND': 'nonexistent'})
 
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason="requires dockerpty")
     @mock.patch('compose.cli.main.RunOperation', autospec=True)
     @mock.patch('compose.cli.main.PseudoTerminal', autospec=True)
     def test_run_interactive_passes_logs_false(self, mock_pseudo_terminal, mock_run_operation):
-        command = TopLevelCommand()
         mock_client = mock.create_autospec(docker.Client)
         project = Project.from_config(
             name='composetest',
@@ -92,6 +86,7 @@ class CLITestCase(unittest.TestCase):
                 'service': {'image': 'busybox'}
             }),
         )
+        command = TopLevelCommand(project)
 
         with pytest.raises(SystemExit):
             command.run(project, {
@@ -126,7 +121,7 @@ class CLITestCase(unittest.TestCase):
             }),
         )
 
-        command = TopLevelCommand()
+        command = TopLevelCommand(project)
         command.run(project, {
             'SERVICE': 'service',
             'COMMAND': None,
@@ -147,7 +142,7 @@ class CLITestCase(unittest.TestCase):
             'always'
         )
 
-        command = TopLevelCommand()
+        command = TopLevelCommand(project)
         command.run(project, {
             'SERVICE': 'service',
             'COMMAND': None,
@@ -168,7 +163,6 @@ class CLITestCase(unittest.TestCase):
         )
 
     def test_command_manula_and_service_ports_together(self):
-        command = TopLevelCommand()
         project = Project.from_config(
             name='composetest',
             client=None,
@@ -176,6 +170,7 @@ class CLITestCase(unittest.TestCase):
                 'service': {'image': 'busybox'},
             }),
         )
+        command = TopLevelCommand(project)
 
         with self.assertRaises(UserError):
             command.run(project, {

From 9f9dcc098a8f5df7168e8c9574ab2aebe8bf808a Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 8 Mar 2016 14:35:54 -0500
Subject: [PATCH 0887/1265] Make TopLevelCommand use the project field.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py    | 101 ++++++++++++++++++++---------------------
 tests/unit/cli_test.py |   8 ++--
 2 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 0584bf1a..b020a14b 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -117,8 +117,7 @@ def perform_command(options, handler, command_options):
     project = project_from_options('.', options)
     command = TopLevelCommand(project)
     with friendly_error_message():
-        # TODO: use self.project
-        handler(command, project, command_options)
+        handler(command, command_options)
 
 
 def log_api_error(e):
@@ -204,12 +203,12 @@ class TopLevelCommand(object):
       up                 Create and start containers
       version            Show the Docker-Compose version information
     """
-    base_dir = '.'
 
-    def __init__(self, project):
+    def __init__(self, project, project_dir='.'):
         self.project = project
+        self.project_dir = '.'
 
-    def build(self, project, options):
+    def build(self, options):
         """
         Build or rebuild services.
 
@@ -224,7 +223,7 @@ class TopLevelCommand(object):
             --no-cache  Do not use cache when building the image.
             --pull      Always attempt to pull a newer version of the image.
         """
-        project.build(
+        self.project.build(
             service_names=options['SERVICE'],
             no_cache=bool(options.get('--no-cache', False)),
             pull=bool(options.get('--pull', False)),
@@ -243,7 +242,7 @@ class TopLevelCommand(object):
 
         """
         config_path = get_config_path_from_options(config_options)
-        compose_config = config.load(config.find(self.base_dir, config_path))
+        compose_config = config.load(config.find(self.project_dir, config_path))
 
         if options['--quiet']:
             return
@@ -254,7 +253,7 @@ class TopLevelCommand(object):
 
         print(serialize_config(compose_config))
 
-    def create(self, project, options):
+    def create(self, options):
         """
         Creates containers for a service.
 
@@ -270,13 +269,13 @@ class TopLevelCommand(object):
         """
         service_names = options['SERVICE']
 
-        project.create(
+        self.project.create(
             service_names=service_names,
             strategy=convergence_strategy_from_opts(options),
             do_build=build_action_from_opts(options),
         )
 
-    def down(self, project, options):
+    def down(self, options):
         """
         Stop containers and remove containers, networks, volumes, and images
         created by `up`. Only containers and networks are removed by default.
@@ -290,9 +289,9 @@ class TopLevelCommand(object):
             -v, --volumes   Remove data volumes
         """
         image_type = image_type_from_opt('--rmi', options['--rmi'])
-        project.down(image_type, options['--volumes'])
+        self.project.down(image_type, options['--volumes'])
 
-    def events(self, project, options):
+    def events(self, options):
         """
         Receive real time events from containers.
 
@@ -311,12 +310,12 @@ class TopLevelCommand(object):
             event['time'] = event['time'].isoformat()
             return json.dumps(event)
 
-        for event in project.events():
+        for event in self.project.events():
             formatter = json_format_event if options['--json'] else format_event
             print(formatter(event))
             sys.stdout.flush()
 
-    def exec_command(self, project, options):
+    def exec_command(self, options):
         """
         Execute a command in a running container
 
@@ -332,7 +331,7 @@ class TopLevelCommand(object):
                               instances of a service [default: 1]
         """
         index = int(options.get('--index'))
-        service = project.get_service(options['SERVICE'])
+        service = self.project.get_service(options['SERVICE'])
         try:
             container = service.get_container(number=index)
         except ValueError as e:
@@ -356,15 +355,15 @@ class TopLevelCommand(object):
         signals.set_signal_handler_to_shutdown()
         try:
             operation = ExecOperation(
-                    project.client,
+                    self.project.client,
                     exec_id,
                     interactive=tty,
             )
-            pty = PseudoTerminal(project.client, operation)
+            pty = PseudoTerminal(self.project.client, operation)
             pty.start()
         except signals.ShutdownException:
             log.info("received shutdown exception: closing")
-        exit_code = project.client.exec_inspect(exec_id).get("ExitCode")
+        exit_code = self.project.client.exec_inspect(exec_id).get("ExitCode")
         sys.exit(exit_code)
 
     @classmethod
@@ -377,7 +376,7 @@ class TopLevelCommand(object):
         handler = get_handler(cls, options['COMMAND'])
         raise SystemExit(getdoc(handler))
 
-    def kill(self, project, options):
+    def kill(self, options):
         """
         Force stop service containers.
 
@@ -389,9 +388,9 @@ class TopLevelCommand(object):
         """
         signal = options.get('-s', 'SIGKILL')
 
-        project.kill(service_names=options['SERVICE'], signal=signal)
+        self.project.kill(service_names=options['SERVICE'], signal=signal)
 
-    def logs(self, project, options):
+    def logs(self, options):
         """
         View output from containers.
 
@@ -404,7 +403,7 @@ class TopLevelCommand(object):
             --tail="all"        Number of lines to show from the end of the logs
                                 for each container.
         """
-        containers = project.containers(service_names=options['SERVICE'], stopped=True)
+        containers = self.project.containers(service_names=options['SERVICE'], stopped=True)
 
         monochrome = options['--no-color']
         tail = options['--tail']
@@ -421,16 +420,16 @@ class TopLevelCommand(object):
         print("Attaching to", list_containers(containers))
         LogPrinter(containers, monochrome=monochrome, log_args=log_args).run()
 
-    def pause(self, project, options):
+    def pause(self, options):
         """
         Pause services.
 
         Usage: pause [SERVICE...]
         """
-        containers = project.pause(service_names=options['SERVICE'])
+        containers = self.project.pause(service_names=options['SERVICE'])
         exit_if(not containers, 'No containers to pause', 1)
 
-    def port(self, project, options):
+    def port(self, options):
         """
         Print the public port for a port binding.
 
@@ -442,7 +441,7 @@ class TopLevelCommand(object):
                               instances of a service [default: 1]
         """
         index = int(options.get('--index'))
-        service = project.get_service(options['SERVICE'])
+        service = self.project.get_service(options['SERVICE'])
         try:
             container = service.get_container(number=index)
         except ValueError as e:
@@ -451,7 +450,7 @@ class TopLevelCommand(object):
             options['PRIVATE_PORT'],
             protocol=options.get('--protocol') or 'tcp') or '')
 
-    def ps(self, project, options):
+    def ps(self, options):
         """
         List containers.
 
@@ -461,8 +460,8 @@ class TopLevelCommand(object):
             -q    Only display IDs
         """
         containers = sorted(
-            project.containers(service_names=options['SERVICE'], stopped=True) +
-            project.containers(service_names=options['SERVICE'], one_off=True),
+            self.project.containers(service_names=options['SERVICE'], stopped=True) +
+            self.project.containers(service_names=options['SERVICE'], one_off=True),
             key=attrgetter('name'))
 
         if options['-q']:
@@ -488,7 +487,7 @@ class TopLevelCommand(object):
                 ])
             print(Formatter().table(headers, rows))
 
-    def pull(self, project, options):
+    def pull(self, options):
         """
         Pulls images for services.
 
@@ -497,12 +496,12 @@ class TopLevelCommand(object):
         Options:
             --ignore-pull-failures  Pull what it can and ignores images with pull failures.
         """
-        project.pull(
+        self.project.pull(
             service_names=options['SERVICE'],
             ignore_pull_failures=options.get('--ignore-pull-failures')
         )
 
-    def rm(self, project, options):
+    def rm(self, options):
         """
         Remove stopped service containers.
 
@@ -517,21 +516,21 @@ class TopLevelCommand(object):
             -f, --force   Don't ask to confirm removal
             -v            Remove volumes associated with containers
         """
-        all_containers = project.containers(service_names=options['SERVICE'], stopped=True)
+        all_containers = self.project.containers(service_names=options['SERVICE'], stopped=True)
         stopped_containers = [c for c in all_containers if not c.is_running]
 
         if len(stopped_containers) > 0:
             print("Going to remove", list_containers(stopped_containers))
             if options.get('--force') \
                     or yesno("Are you sure? [yN] ", default=False):
-                project.remove_stopped(
+                self.project.remove_stopped(
                     service_names=options['SERVICE'],
                     v=options.get('-v', False)
                 )
         else:
             print("No stopped containers")
 
-    def run(self, project, options):
+    def run(self, options):
         """
         Run a one-off command on a service.
 
@@ -560,7 +559,7 @@ class TopLevelCommand(object):
             -T                    Disable pseudo-tty allocation. By default `docker-compose run`
                                   allocates a TTY.
         """
-        service = project.get_service(options['SERVICE'])
+        service = self.project.get_service(options['SERVICE'])
         detach = options['-d']
 
         if IS_WINDOWS_PLATFORM and not detach:
@@ -608,9 +607,9 @@ class TopLevelCommand(object):
         if options['--name']:
             container_options['name'] = options['--name']
 
-        run_one_off_container(container_options, project, service, options)
+        run_one_off_container(container_options, self.project, service, options)
 
-    def scale(self, project, options):
+    def scale(self, options):
         """
         Set number of containers to run for a service.
 
@@ -636,18 +635,18 @@ class TopLevelCommand(object):
             except ValueError:
                 raise UserError('Number of containers for service "%s" is not a '
                                 'number' % service_name)
-            project.get_service(service_name).scale(num, timeout=timeout)
+            self.project.get_service(service_name).scale(num, timeout=timeout)
 
-    def start(self, project, options):
+    def start(self, options):
         """
         Start existing containers.
 
         Usage: start [SERVICE...]
         """
-        containers = project.start(service_names=options['SERVICE'])
+        containers = self.project.start(service_names=options['SERVICE'])
         exit_if(not containers, 'No containers to start', 1)
 
-    def stop(self, project, options):
+    def stop(self, options):
         """
         Stop running containers without removing them.
 
@@ -660,9 +659,9 @@ class TopLevelCommand(object):
                                      (default: 10)
         """
         timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
-        project.stop(service_names=options['SERVICE'], timeout=timeout)
+        self.project.stop(service_names=options['SERVICE'], timeout=timeout)
 
-    def restart(self, project, options):
+    def restart(self, options):
         """
         Restart running containers.
 
@@ -673,19 +672,19 @@ class TopLevelCommand(object):
                                      (default: 10)
         """
         timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
-        containers = project.restart(service_names=options['SERVICE'], timeout=timeout)
+        containers = self.project.restart(service_names=options['SERVICE'], timeout=timeout)
         exit_if(not containers, 'No containers to restart', 1)
 
-    def unpause(self, project, options):
+    def unpause(self, options):
         """
         Unpause services.
 
         Usage: unpause [SERVICE...]
         """
-        containers = project.unpause(service_names=options['SERVICE'])
+        containers = self.project.unpause(service_names=options['SERVICE'])
         exit_if(not containers, 'No containers to unpause', 1)
 
-    def up(self, project, options):
+    def up(self, options):
         """
         Builds, (re)creates, starts, and attaches to containers for a service.
 
@@ -735,8 +734,8 @@ class TopLevelCommand(object):
         if detached and cascade_stop:
             raise UserError("--abort-on-container-exit and -d cannot be combined.")
 
-        with up_shutdown_context(project, service_names, timeout, detached):
-            to_attach = project.up(
+        with up_shutdown_context(self.project, service_names, timeout, detached):
+            to_attach = self.project.up(
                 service_names=service_names,
                 start_deps=start_deps,
                 strategy=convergence_strategy_from_opts(options),
@@ -753,7 +752,7 @@ class TopLevelCommand(object):
 
             if cascade_stop:
                 print("Aborting on container exit...")
-                project.stop(service_names=service_names, timeout=timeout)
+                self.project.stop(service_names=service_names, timeout=timeout)
 
     @classmethod
     def version(cls, options):
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index c609d832..1d7c13e7 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -89,7 +89,7 @@ class CLITestCase(unittest.TestCase):
         command = TopLevelCommand(project)
 
         with pytest.raises(SystemExit):
-            command.run(project, {
+            command.run({
                 'SERVICE': 'service',
                 'COMMAND': None,
                 '-e': [],
@@ -122,7 +122,7 @@ class CLITestCase(unittest.TestCase):
         )
 
         command = TopLevelCommand(project)
-        command.run(project, {
+        command.run({
             'SERVICE': 'service',
             'COMMAND': None,
             '-e': [],
@@ -143,7 +143,7 @@ class CLITestCase(unittest.TestCase):
         )
 
         command = TopLevelCommand(project)
-        command.run(project, {
+        command.run({
             'SERVICE': 'service',
             'COMMAND': None,
             '-e': [],
@@ -173,7 +173,7 @@ class CLITestCase(unittest.TestCase):
         command = TopLevelCommand(project)
 
         with self.assertRaises(UserError):
-            command.run(project, {
+            command.run({
                 'SERVICE': 'service',
                 'COMMAND': None,
                 '-e': [],

From 886328640f5665c337bb9dd1f065cc0e350364f0 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 8 Mar 2016 14:42:51 -0500
Subject: [PATCH 0888/1265] Convert some cli tests to pytest.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/unit/cli/main_test.py | 67 +++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py
index e7c52003..9b24776f 100644
--- a/tests/unit/cli/main_test.py
+++ b/tests/unit/cli/main_test.py
@@ -3,6 +3,8 @@ from __future__ import unicode_literals
 
 import logging
 
+import pytest
+
 from compose import container
 from compose.cli.errors import UserError
 from compose.cli.formatter import ConsoleWarningFormatter
@@ -11,7 +13,6 @@ from compose.cli.main import convergence_strategy_from_opts
 from compose.cli.main import setup_console_handler
 from compose.service import ConvergenceStrategy
 from tests import mock
-from tests import unittest
 
 
 def mock_container(service, number):
@@ -22,7 +23,14 @@ def mock_container(service, number):
         name_without_project='{0}_{1}'.format(service, number))
 
 
-class CLIMainTestCase(unittest.TestCase):
+@pytest.fixture
+def logging_handler():
+    stream = mock.Mock()
+    stream.isatty.return_value = True
+    return logging.StreamHandler(stream=stream)
+
+
+class TestCLIMainTestCase(object):
 
     def test_build_log_printer(self):
         containers = [
@@ -34,7 +42,7 @@ class CLIMainTestCase(unittest.TestCase):
         ]
         service_names = ['web', 'db']
         log_printer = build_log_printer(containers, service_names, True, False, {'follow': True})
-        self.assertEqual(log_printer.containers, containers[:3])
+        assert log_printer.containers == containers[:3]
 
     def test_build_log_printer_all_services(self):
         containers = [
@@ -44,58 +52,53 @@ class CLIMainTestCase(unittest.TestCase):
         ]
         service_names = []
         log_printer = build_log_printer(containers, service_names, True, False, {'follow': True})
-        self.assertEqual(log_printer.containers, containers)
+        assert log_printer.containers == containers
 
 
-class SetupConsoleHandlerTestCase(unittest.TestCase):
+class TestSetupConsoleHandlerTestCase(object):
 
-    def setUp(self):
-        self.stream = mock.Mock()
-        self.stream.isatty.return_value = True
-        self.handler = logging.StreamHandler(stream=self.stream)
+    def test_with_tty_verbose(self, logging_handler):
+        setup_console_handler(logging_handler, True)
+        assert type(logging_handler.formatter) == ConsoleWarningFormatter
+        assert '%(name)s' in logging_handler.formatter._fmt
+        assert '%(funcName)s' in logging_handler.formatter._fmt
 
-    def test_with_tty_verbose(self):
-        setup_console_handler(self.handler, True)
-        assert type(self.handler.formatter) == ConsoleWarningFormatter
-        assert '%(name)s' in self.handler.formatter._fmt
-        assert '%(funcName)s' in self.handler.formatter._fmt
+    def test_with_tty_not_verbose(self, logging_handler):
+        setup_console_handler(logging_handler, False)
+        assert type(logging_handler.formatter) == ConsoleWarningFormatter
+        assert '%(name)s' not in logging_handler.formatter._fmt
+        assert '%(funcName)s' not in logging_handler.formatter._fmt
 
-    def test_with_tty_not_verbose(self):
-        setup_console_handler(self.handler, False)
-        assert type(self.handler.formatter) == ConsoleWarningFormatter
-        assert '%(name)s' not in self.handler.formatter._fmt
-        assert '%(funcName)s' not in self.handler.formatter._fmt
-
-    def test_with_not_a_tty(self):
-        self.stream.isatty.return_value = False
-        setup_console_handler(self.handler, False)
-        assert type(self.handler.formatter) == logging.Formatter
+    def test_with_not_a_tty(self, logging_handler):
+        logging_handler.stream.isatty.return_value = False
+        setup_console_handler(logging_handler, False)
+        assert type(logging_handler.formatter) == logging.Formatter
 
 
-class ConvergeStrategyFromOptsTestCase(unittest.TestCase):
+class TestConvergeStrategyFromOptsTestCase(object):
 
     def test_invalid_opts(self):
         options = {'--force-recreate': True, '--no-recreate': True}
-        with self.assertRaises(UserError):
+        with pytest.raises(UserError):
             convergence_strategy_from_opts(options)
 
     def test_always(self):
         options = {'--force-recreate': True, '--no-recreate': False}
-        self.assertEqual(
-            convergence_strategy_from_opts(options),
+        assert (
+            convergence_strategy_from_opts(options) ==
             ConvergenceStrategy.always
         )
 
     def test_never(self):
         options = {'--force-recreate': False, '--no-recreate': True}
-        self.assertEqual(
-            convergence_strategy_from_opts(options),
+        assert (
+            convergence_strategy_from_opts(options) ==
             ConvergenceStrategy.never
         )
 
     def test_changed(self):
         options = {'--force-recreate': False, '--no-recreate': False}
-        self.assertEqual(
-            convergence_strategy_from_opts(options),
+        assert (
+            convergence_strategy_from_opts(options) ==
             ConvergenceStrategy.changed
         )

From 0a091055d24bec9501e918353fe1c5009f88dc0c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 8 Mar 2016 15:39:11 -0500
Subject: [PATCH 0889/1265] Improve handling of connection errors and error
 messages.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/command.py         |  35 ++-------
 compose/cli/errors.py          | 125 +++++++++++++++++++++++++--------
 compose/cli/main.py            |  39 ++--------
 tests/unit/cli/command_test.py |  16 -----
 tests/unit/cli/errors_test.py  |  51 ++++++++++++++
 5 files changed, 153 insertions(+), 113 deletions(-)
 create mode 100644 tests/unit/cli/errors_test.py

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 98de2104..55f6df01 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -1,52 +1,25 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import contextlib
 import logging
 import os
 import re
 
 import six
-from requests.exceptions import ConnectionError
-from requests.exceptions import SSLError
 
-from . import errors
 from . import verbose_proxy
 from .. import config
 from ..const import API_VERSIONS
 from ..project import Project
 from .docker_client import docker_client
-from .utils import call_silently
 from .utils import get_version_info
-from .utils import is_mac
-from .utils import is_ubuntu
 
 log = logging.getLogger(__name__)
 
 
-@contextlib.contextmanager
-def friendly_error_message():
-    try:
-        yield
-    except SSLError as e:
-        raise errors.UserError('SSL error: %s' % e)
-    except ConnectionError:
-        if call_silently(['which', 'docker']) != 0:
-            if is_mac():
-                raise errors.DockerNotFoundMac()
-            elif is_ubuntu():
-                raise errors.DockerNotFoundUbuntu()
-            else:
-                raise errors.DockerNotFoundGeneric()
-        elif call_silently(['which', 'docker-machine']) == 0:
-            raise errors.ConnectionErrorDockerMachine()
-        else:
-            raise errors.ConnectionErrorGeneric(get_client().base_url)
-
-
-def project_from_options(base_dir, options):
+def project_from_options(project_dir, options):
     return get_project(
-        base_dir,
+        project_dir,
         get_config_path_from_options(options),
         project_name=options.get('--project-name'),
         verbose=options.get('--verbose'),
@@ -76,8 +49,8 @@ def get_client(verbose=False, version=None):
     return client
 
 
-def get_project(base_dir, config_path=None, project_name=None, verbose=False):
-    config_details = config.find(base_dir, config_path)
+def get_project(project_dir, config_path=None, project_name=None, verbose=False):
+    config_details = config.find(project_dir, config_path)
     project_name = get_project_name(config_details.working_dir, project_name)
     config_data = config.load(config_details)
 
diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index 03d6a50c..a16cad2f 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -1,10 +1,27 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import contextlib
+import logging
 from textwrap import dedent
 
+from docker.errors import APIError
+from requests.exceptions import ConnectionError as RequestsConnectionError
+from requests.exceptions import ReadTimeout
+from requests.exceptions import SSLError
+
+from ..const import API_VERSION_TO_ENGINE_VERSION
+from ..const import HTTP_TIMEOUT
+from .utils import call_silently
+from .utils import is_mac
+from .utils import is_ubuntu
+
+
+log = logging.getLogger(__name__)
+
 
 class UserError(Exception):
+
     def __init__(self, msg):
         self.msg = dedent(msg).strip()
 
@@ -14,44 +31,90 @@ class UserError(Exception):
     __str__ = __unicode__
 
 
-class DockerNotFoundMac(UserError):
-    def __init__(self):
-        super(DockerNotFoundMac, self).__init__("""
-        Couldn't connect to Docker daemon. You might need to install docker-osx:
-
-        https://github.com/noplay/docker-osx
-        """)
+class ConnectionError(Exception):
+    pass
 
 
-class DockerNotFoundUbuntu(UserError):
-    def __init__(self):
-        super(DockerNotFoundUbuntu, self).__init__("""
-        Couldn't connect to Docker daemon. You might need to install Docker:
-
-        https://docs.docker.com/engine/installation/ubuntulinux/
-        """)
+@contextlib.contextmanager
+def handle_connection_errors(client):
+    try:
+        yield
+    except SSLError as e:
+        log.error('SSL error: %s' % e)
+        raise ConnectionError()
+    except RequestsConnectionError:
+        if call_silently(['which', 'docker']) != 0:
+            if is_mac():
+                exit_with_error(docker_not_found_mac)
+            if is_ubuntu():
+                exit_with_error(docker_not_found_ubuntu)
+            exit_with_error(docker_not_found_generic)
+        if call_silently(['which', 'docker-machine']) == 0:
+            exit_with_error(conn_error_docker_machine)
+        exit_with_error(conn_error_generic.format(url=client.base_url))
+    except APIError as e:
+        log_api_error(e, client.api_version)
+        raise ConnectionError()
+    except ReadTimeout as e:
+        log.error(
+            "An HTTP request took too long to complete. Retry with --verbose to "
+            "obtain debug information.\n"
+            "If you encounter this issue regularly because of slow network "
+            "conditions, consider setting COMPOSE_HTTP_TIMEOUT to a higher "
+            "value (current value: %s)." % HTTP_TIMEOUT)
+        raise ConnectionError()
 
 
-class DockerNotFoundGeneric(UserError):
-    def __init__(self):
-        super(DockerNotFoundGeneric, self).__init__("""
-        Couldn't connect to Docker daemon. You might need to install Docker:
+def log_api_error(e, client_version):
+    if 'client is newer than server' not in e.explanation:
+        log.error(e.explanation)
+        return
 
-        https://docs.docker.com/engine/installation/
-        """)
+    version = API_VERSION_TO_ENGINE_VERSION.get(client_version)
+    if not version:
+        # They've set a custom API version
+        log.error(e.explanation)
+        return
+
+    log.error(
+        "The Docker Engine version is less than the minimum required by "
+        "Compose. Your current project requires a Docker Engine of "
+        "version {version} or greater.".format(version=version))
 
 
-class ConnectionErrorDockerMachine(UserError):
-    def __init__(self):
-        super(ConnectionErrorDockerMachine, self).__init__("""
-        Couldn't connect to Docker daemon - you might need to run `docker-machine start default`.
-        """)
+def exit_with_error(msg):
+    log.error(dedent(msg).strip())
+    raise ConnectionError()
 
 
-class ConnectionErrorGeneric(UserError):
-    def __init__(self, url):
-        super(ConnectionErrorGeneric, self).__init__("""
-        Couldn't connect to Docker daemon at %s - is it running?
+docker_not_found_mac = """
+    Couldn't connect to Docker daemon. You might need to install docker-osx:
 
-        If it's at a non-standard location, specify the URL with the DOCKER_HOST environment variable.
-        """ % url)
+    https://github.com/noplay/docker-osx
+"""
+
+
+docker_not_found_ubuntu = """
+    Couldn't connect to Docker daemon. You might need to install Docker:
+
+    https://docs.docker.com/engine/installation/ubuntulinux/
+"""
+
+
+docker_not_found_generic = """
+    Couldn't connect to Docker daemon. You might need to install Docker:
+
+    https://docs.docker.com/engine/installation/
+"""
+
+
+conn_error_docker_machine = """
+    Couldn't connect to Docker daemon - you might need to run `docker-machine start default`.
+"""
+
+
+conn_error_generic = """
+    Couldn't connect to Docker daemon at {url} - is it running?
+
+    If it's at a non-standard location, specify the URL with the DOCKER_HOST environment variable.
+"""
diff --git a/compose/cli/main.py b/compose/cli/main.py
index b020a14b..66362168 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -11,18 +11,14 @@ import sys
 from inspect import getdoc
 from operator import attrgetter
 
-from docker.errors import APIError
-from requests.exceptions import ReadTimeout
-
+from . import errors
 from . import signals
 from .. import __version__
 from ..config import config
 from ..config import ConfigurationError
 from ..config import parse_environment
 from ..config.serialize import serialize_config
-from ..const import API_VERSION_TO_ENGINE_VERSION
 from ..const import DEFAULT_TIMEOUT
-from ..const import HTTP_TIMEOUT
 from ..const import IS_WINDOWS_PLATFORM
 from ..progress_stream import StreamOutputError
 from ..project import NoSuchService
@@ -31,7 +27,6 @@ from ..service import BuildError
 from ..service import ConvergenceStrategy
 from ..service import ImageType
 from ..service import NeedsBuildError
-from .command import friendly_error_message
 from .command import get_config_path_from_options
 from .command import project_from_options
 from .docopt_command import DocoptDispatcher
@@ -53,7 +48,6 @@ console_handler = logging.StreamHandler(sys.stderr)
 
 
 def main():
-    setup_logging()
     command = dispatch()
 
     try:
@@ -64,9 +58,6 @@ def main():
     except (UserError, NoSuchService, ConfigurationError) as e:
         log.error(e.msg)
         sys.exit(1)
-    except APIError as e:
-        log_api_error(e)
-        sys.exit(1)
     except BuildError as e:
         log.error("Service '%s' failed to build: %s" % (e.service.name, e.reason))
         sys.exit(1)
@@ -76,18 +67,12 @@ def main():
     except NeedsBuildError as e:
         log.error("Service '%s' needs to be built, but --no-build was passed." % e.service.name)
         sys.exit(1)
-    except ReadTimeout as e:
-        log.error(
-            "An HTTP request took too long to complete. Retry with --verbose to "
-            "obtain debug information.\n"
-            "If you encounter this issue regularly because of slow network "
-            "conditions, consider setting COMPOSE_HTTP_TIMEOUT to a higher "
-            "value (current value: %s)." % HTTP_TIMEOUT
-        )
+    except errors.ConnectionError:
         sys.exit(1)
 
 
 def dispatch():
+    setup_logging()
     dispatcher = DocoptDispatcher(
         TopLevelCommand,
         {'options_first': True, 'version': get_version_info('compose')})
@@ -116,26 +101,10 @@ def perform_command(options, handler, command_options):
 
     project = project_from_options('.', options)
     command = TopLevelCommand(project)
-    with friendly_error_message():
+    with errors.handle_connection_errors(project.client):
         handler(command, command_options)
 
 
-def log_api_error(e):
-    if 'client is newer than server' in e.explanation:
-        # we need JSON formatted errors. In the meantime...
-        # TODO: fix this by refactoring project dispatch
-        # http://github.com/docker/compose/pull/2832#commitcomment-15923800
-        client_version = e.explanation.split('client API version: ')[1].split(',')[0]
-        log.error(
-            "The engine version is lesser than the minimum required by "
-            "compose. Your current project requires a Docker Engine of "
-            "version {version} or superior.".format(
-                version=API_VERSION_TO_ENGINE_VERSION[client_version]
-            ))
-    else:
-        log.error(e.explanation)
-
-
 def setup_logging():
     root_logger = logging.getLogger()
     root_logger.addHandler(console_handler)
diff --git a/tests/unit/cli/command_test.py b/tests/unit/cli/command_test.py
index 1ca671fe..b524a5f3 100644
--- a/tests/unit/cli/command_test.py
+++ b/tests/unit/cli/command_test.py
@@ -4,28 +4,12 @@ from __future__ import unicode_literals
 import os
 
 import pytest
-from requests.exceptions import ConnectionError
 
-from compose.cli import errors
-from compose.cli.command import friendly_error_message
 from compose.cli.command import get_config_path_from_options
 from compose.const import IS_WINDOWS_PLATFORM
 from tests import mock
 
 
-class TestFriendlyErrorMessage(object):
-
-    def test_dispatch_generic_connection_error(self):
-        with pytest.raises(errors.ConnectionErrorGeneric):
-            with mock.patch(
-                'compose.cli.command.call_silently',
-                autospec=True,
-                side_effect=[0, 1]
-            ):
-                with friendly_error_message():
-                    raise ConnectionError()
-
-
 class TestGetConfigPathFromOptions(object):
 
     def test_path_from_options(self):
diff --git a/tests/unit/cli/errors_test.py b/tests/unit/cli/errors_test.py
new file mode 100644
index 00000000..a99356b4
--- /dev/null
+++ b/tests/unit/cli/errors_test.py
@@ -0,0 +1,51 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import pytest
+from docker.errors import APIError
+from requests.exceptions import ConnectionError
+
+from compose.cli import errors
+from compose.cli.errors import handle_connection_errors
+from tests import mock
+
+
+@pytest.yield_fixture
+def mock_logging():
+    with mock.patch('compose.cli.errors.log', autospec=True) as mock_log:
+        yield mock_log
+
+
+def patch_call_silently(side_effect):
+    return mock.patch(
+        'compose.cli.errors.call_silently',
+        autospec=True,
+        side_effect=side_effect)
+
+
+class TestHandleConnectionErrors(object):
+
+    def test_generic_connection_error(self, mock_logging):
+        with pytest.raises(errors.ConnectionError):
+            with patch_call_silently([0, 1]):
+                with handle_connection_errors(mock.Mock()):
+                    raise ConnectionError()
+
+        _, args, _ = mock_logging.error.mock_calls[0]
+        assert "Couldn't connect to Docker daemon at" in args[0]
+
+    def test_api_error_version_mismatch(self, mock_logging):
+        with pytest.raises(errors.ConnectionError):
+            with handle_connection_errors(mock.Mock(api_version='1.22')):
+                raise APIError(None, None, "client is newer than server")
+
+        _, args, _ = mock_logging.error.mock_calls[0]
+        assert "Docker Engine of version 1.10.0 or greater" in args[0]
+
+    def test_api_error_version_other(self, mock_logging):
+        msg = "Something broke!"
+        with pytest.raises(errors.ConnectionError):
+            with handle_connection_errors(mock.Mock(api_version='1.22')):
+                raise APIError(None, None, msg)
+
+        mock_logging.error.assert_called_once_with(msg)

From ee136446a2e5d1a2b108f586e872f40d801485d6 Mon Sep 17 00:00:00 2001
From: Matt Daue <mattdaue@gmail.com>
Date: Tue, 23 Feb 2016 21:19:11 -0500
Subject: [PATCH 0890/1265] Fix #2804: Add ipv4 and ipv6 static addressing

- Added ipv4_network and ipv6_network to the networks section in the
  service section for each configured network
- Added feature documentation
- Added unit tests

Signed-off-by: Matt Daue <mattdaue@gmail.com>
---
 compose/config/config_schema_v2.0.json        |  4 +-
 compose/network.py                            | 10 +-
 compose/service.py                            |  9 +-
 docs/networking.md                            | 24 +++++
 requirements.txt                              |  2 +-
 tests/acceptance/cli_test.py                  | 24 +++++
 .../networks/network-static-addresses.yml     | 23 +++++
 tests/integration/project_test.py             | 91 +++++++++++++++++++
 8 files changed, 178 insertions(+), 9 deletions(-)
 create mode 100755 tests/fixtures/networks/network-static-addresses.yml

diff --git a/compose/config/config_schema_v2.0.json b/compose/config/config_schema_v2.0.json
index a4a30a5f..33afc9b2 100644
--- a/compose/config/config_schema_v2.0.json
+++ b/compose/config/config_schema_v2.0.json
@@ -152,7 +152,9 @@
                     {
                       "type": "object",
                       "properties": {
-                        "aliases": {"$ref": "#/definitions/list_of_strings"}
+                        "aliases": {"$ref": "#/definitions/list_of_strings"},
+                        "ipv4_address": {"type": "string"},
+                        "ipv6_address": {"type": "string"}
                       },
                       "additionalProperties": false
                     },
diff --git a/compose/network.py b/compose/network.py
index 135502cc..81e3b5bf 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -159,26 +159,26 @@ class ProjectNetworks(object):
             network.ensure()
 
 
-def get_network_aliases_for_service(service_dict):
+def get_network_defs_for_service(service_dict):
     if 'network_mode' in service_dict:
         return {}
     networks = service_dict.get('networks', {'default': None})
     return dict(
-        (net, (config or {}).get('aliases', []))
+        (net, (config or {}))
         for net, config in networks.items()
     )
 
 
 def get_network_names_for_service(service_dict):
-    return get_network_aliases_for_service(service_dict).keys()
+    return get_network_defs_for_service(service_dict).keys()
 
 
 def get_networks(service_dict, network_definitions):
     networks = {}
-    for name, aliases in get_network_aliases_for_service(service_dict).items():
+    for name, netdef in get_network_defs_for_service(service_dict).items():
         network = network_definitions.get(name)
         if network:
-            networks[network.full_name] = aliases
+            networks[network.full_name] = netdef
         else:
             raise ConfigurationError(
                 'Service "{}" uses an undefined network "{}"'
diff --git a/compose/service.py b/compose/service.py
index 7ee441f2..fad1c4d9 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -451,7 +451,10 @@ class Service(object):
     def connect_container_to_networks(self, container):
         connected_networks = container.get('NetworkSettings.Networks')
 
-        for network, aliases in self.networks.items():
+        for network, netdefs in self.networks.items():
+            aliases = netdefs.get('aliases', [])
+            ipv4_address = netdefs.get('ipv4_address', None)
+            ipv6_address = netdefs.get('ipv6_address', None)
             if network in connected_networks:
                 self.client.disconnect_container_from_network(
                     container.id, network)
@@ -459,7 +462,9 @@ class Service(object):
             self.client.connect_container_to_network(
                 container.id, network,
                 aliases=list(self._get_aliases(container).union(aliases)),
-                links=self._get_links(False),
+                ipv4_address=ipv4_address,
+                ipv6_address=ipv6_address,
+                links=self._get_links(False)
             )
 
     def remove_duplicate_containers(self, timeout=DEFAULT_TIMEOUT):
diff --git a/docs/networking.md b/docs/networking.md
index 1fd6c116..e38e5690 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -116,6 +116,30 @@ Here's an example Compose file defining two custom networks. The `proxy` service
           foo: "1"
           bar: "2"
 
+Networks can be configured with static IP addresses by setting the ipv4_address and/or ipv6_address for each attached network. The corresponding `network` section must have an `ipam` config entry with subnet and gateway configurations for each static address. If IPv6 addressing is desired, the `com.docker.network.enable_ipv6` driver option must be set to `true`. An example:
+
+    version: '2'
+
+    services:
+      app:
+        networks:
+          app_net:
+            ipv4_address: 172.16.238.10
+            ipv6_address: 2001:3984:3989::10
+
+    networks:
+      app_net:
+        driver: bridge
+        driver_opts:
+          com.docker.network.enable_ipv6: "true"
+        ipam:
+          driver: default
+          config:
+          - subnet: 172.16.238.0/24
+            gateway: 172.16.238.1
+          - subnet: 2001:3984:3989::/64
+            gateway: 2001:3984:3989::1
+
 For full details of the network configuration options available, see the following references:
 
 - [Top-level `networks` key](compose-file.md#network-configuration-reference)
diff --git a/requirements.txt b/requirements.txt
index b31840c8..074864d4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ cached-property==1.2.0
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
-git+https://github.com/docker/docker-py.git@81d8caaf36159bf1accd86eab2e157bf8dd071a9#egg=docker-py
+git+https://github.com/docker/docker-py.git@d8be3e0fce60fbe25be088b64bccbcee83effdb1#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 24682125..c94578a1 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -475,6 +475,30 @@ class CLITestCase(DockerClientTestCase):
         assert 'forward_facing' in front_aliases
         assert 'ahead' in front_aliases
 
+    @v2_only()
+    def test_up_with_network_static_addresses(self):
+        filename = 'network-static-addresses.yml'
+        ipv4_address = '172.16.100.100'
+        ipv6_address = 'fe80::1001:100'
+        self.base_dir = 'tests/fixtures/networks'
+        self.dispatch(['-f', filename, 'up', '-d'], None)
+        static_net = '{}_static_test'.format(self.project.name)
+
+        networks = [
+            n for n in self.client.networks()
+            if n['Name'].startswith('{}_'.format(self.project.name))
+        ]
+
+        # One networks was created: front
+        assert sorted(n['Name'] for n in networks) == [static_net]
+        web_container = self.project.get_service('web').containers()[0]
+
+        ipam_config = web_container.get(
+            'NetworkSettings.Networks.{}.IPAMConfig'.format(static_net)
+        )
+        assert ipv4_address in ipam_config.values()
+        assert ipv6_address in ipam_config.values()
+
     @v2_only()
     def test_up_with_networks(self):
         self.base_dir = 'tests/fixtures/networks'
diff --git a/tests/fixtures/networks/network-static-addresses.yml b/tests/fixtures/networks/network-static-addresses.yml
new file mode 100755
index 00000000..f820ff6a
--- /dev/null
+++ b/tests/fixtures/networks/network-static-addresses.yml
@@ -0,0 +1,23 @@
+version: "2"
+
+services:
+  web:
+    image: busybox
+    command: top
+    networks:
+      static_test:
+        ipv4_address: 172.16.100.100
+        ipv6_address: fe80::1001:100
+
+networks:
+  static_test:
+    driver: bridge
+    driver_opts:
+      com.docker.network.enable_ipv6: "true"
+    ipam:
+      driver: default
+      config:
+      - subnet: 172.16.100.0/24
+        gateway: 172.16.100.1
+      - subnet: fe80::/64
+        gateway: fe80::1001:1
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index daeb9c81..710da9a3 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -5,6 +5,7 @@ import random
 
 import py
 import pytest
+from docker.errors import APIError
 from docker.errors import NotFound
 
 from ..helpers import build_config
@@ -650,6 +651,96 @@ class ProjectTest(DockerClientTestCase):
             }],
         }
 
+    @v2_only()
+    def test_up_with_network_static_addresses(self):
+        config_data = config.Config(
+            version=V2_0,
+            services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'networks': {
+                    'static_test': {
+                        'ipv4_address': '172.16.100.100',
+                        'ipv6_address': 'fe80::1001:102'
+                    }
+                },
+            }],
+            volumes={},
+            networks={
+                'static_test': {
+                    'driver': 'bridge',
+                    'driver_opts': {
+                        "com.docker.network.enable_ipv6": "true",
+                    },
+                    'ipam': {
+                        'driver': 'default',
+                        'config': [
+                            {"subnet": "172.16.100.0/24",
+                             "gateway": "172.16.100.1"},
+                            {"subnet": "fe80::/64",
+                             "gateway": "fe80::1001:1"}
+                        ]
+                    }
+                }
+            }
+        )
+        project = Project.from_config(
+            client=self.client,
+            name='composetest',
+            config_data=config_data,
+        )
+        project.up()
+
+        network = self.client.networks(names=['static_test'])[0]
+        service_container = project.get_service('web').containers()[0]
+
+        assert network['Options'] == {
+            "com.docker.network.enable_ipv6": "true"
+        }
+
+        IPAMConfig = (service_container.inspect().get('NetworkSettings', {}).
+                      get('Networks', {}).get('composetest_static_test', {}).
+                      get('IPAMConfig', {}))
+        assert IPAMConfig.get('IPv4Address') == '172.16.100.100'
+        assert IPAMConfig.get('IPv6Address') == 'fe80::1001:102'
+
+    @v2_only()
+    def test_up_with_network_static_addresses_missing_subnet(self):
+        config_data = config.Config(
+            version=V2_0,
+            services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'networks': {
+                    'static_test': {
+                        'ipv4_address': '172.16.100.100',
+                        'ipv6_address': 'fe80::1001:101'
+                    }
+                },
+            }],
+            volumes={},
+            networks={
+                'static_test': {
+                    'driver': 'bridge',
+                    'driver_opts': {
+                        "com.docker.network.enable_ipv6": "true",
+                    },
+                    'ipam': {
+                        'driver': 'default',
+                    },
+                },
+            },
+        )
+
+        project = Project.from_config(
+            client=self.client,
+            name='composetest',
+            config_data=config_data,
+        )
+
+        with self.assertRaises(APIError):
+            project.up()
+
     @v2_only()
     def test_project_up_volumes(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))

From 1485a56c758ff77ea5bab07bf9d4b0ac3efb2472 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Wed, 9 Mar 2016 14:58:34 -0800
Subject: [PATCH 0891/1265] Better Compose in production docs

The Compose/Swarm integration has been working really well for
users, so it seems pretty safe to remove the scary warnings about
it not being ready.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 docs/production.md | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/docs/production.md b/docs/production.md
index 40ce1e66..9acf64e5 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -12,13 +12,18 @@ weight=22
 
 ## Using Compose in production
 
-> Compose is still primarily aimed at development and testing environments.
-> Compose may be used for smaller production deployments, but is probably
-> not yet suitable for larger deployments.
+When you define your app with Compose in development, you can use this
+definition to run your application in different environments such as CI,
+staging, and production.
 
-When deploying to production, you'll almost certainly want to make changes to
-your app configuration that are more appropriate to a live environment. These
-changes may include:
+The easiest way to deploy an application is to run it on a single server,
+similar to how you would run your development environment. If you want to scale
+up your application, you can run Compose apps on a Swarm cluster.
+
+### Modify your Compose file for production
+
+You'll almost certainly want to make changes to your app configuration that are
+more appropriate to a live environment. These changes may include:
 
 - Removing any volume bindings for application code, so that code stays inside
   the container and can't be changed from outside
@@ -73,8 +78,8 @@ commands will work with no further configuration.
 system, exposes the same API as a single Docker host, which means you can use
 Compose against a Swarm instance and run your apps across multiple hosts.
 
-Compose/Swarm integration is still in the experimental stage, but if you'd like
-to explore and experiment, check out the [integration guide](swarm.md).
+Read more about the Compose/Swarm integration in the
+[integration guide](swarm.md).
 
 ## Compose documentation
 

From f933381a1253f5195406f80be746812a5bfa45a7 Mon Sep 17 00:00:00 2001
From: Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
Date: Thu, 10 Mar 2016 23:32:15 +0300
Subject: [PATCH 0892/1265] Dependency-ordered start/stop/up

Signed-off-by: Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
---
 compose/parallel.py          | 106 +++++++++++++++++++++++------------
 compose/project.py           |  60 +++++++++++++++++---
 compose/service.py           |   5 +-
 tests/acceptance/cli_test.py |   3 +-
 4 files changed, 128 insertions(+), 46 deletions(-)

diff --git a/compose/parallel.py b/compose/parallel.py
index 4810a106..439f0f44 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -14,68 +14,98 @@ from compose.cli.signals import ShutdownException
 from compose.utils import get_output_stream
 
 
-def perform_operation(func, arg, callback, index):
-    try:
-        callback((index, func(arg)))
-    except Exception as e:
-        callback((index, e))
+def parallel_execute(objects, func, get_name, msg, get_deps=None):
+    """Runs func on objects in parallel while ensuring that func is
+    ran on object only after it is ran on all its dependencies.
 
-
-def parallel_execute(objects, func, index_func, msg):
-    """For a given list of objects, call the callable passing in the first
-    object we give it.
+    get_deps called on object must return a collection with its dependencies.
+    get_name called on object must return its name.
     """
     objects = list(objects)
     stream = get_output_stream(sys.stderr)
+
     writer = ParallelStreamWriter(stream, msg)
-    q = setup_queue(writer, objects, func, index_func)
+    for obj in objects:
+        writer.initialize(get_name(obj))
+
+    q = setup_queue(objects, func, get_deps, get_name)
 
     done = 0
     errors = {}
+    error_to_reraise = None
+    returned = [None] * len(objects)
 
     while done < len(objects):
         try:
-            msg_index, result = q.get(timeout=1)
+            obj, result, exception = q.get(timeout=1)
         except Empty:
             continue
         # See https://github.com/docker/compose/issues/189
         except thread.error:
             raise ShutdownException()
 
-        if isinstance(result, APIError):
-            errors[msg_index] = "error", result.explanation
-            writer.write(msg_index, 'error')
-        elif isinstance(result, Exception):
-            errors[msg_index] = "unexpected_exception", result
+        if exception is None:
+            writer.write(get_name(obj), 'done')
+            returned[objects.index(obj)] = result
+        elif isinstance(exception, APIError):
+            errors[get_name(obj)] = exception.explanation
+            writer.write(get_name(obj), 'error')
         else:
-            writer.write(msg_index, 'done')
+            errors[get_name(obj)] = exception
+            error_to_reraise = exception
+
         done += 1
 
-    if not errors:
-        return
+    for obj_name, error in errors.items():
+        stream.write("\nERROR: for {}  {}\n".format(obj_name, error))
 
-    stream.write("\n")
-    for msg_index, (result, error) in errors.items():
-        stream.write("ERROR: for {}  {} \n".format(msg_index, error))
-        if result == 'unexpected_exception':
-            raise error
+    if error_to_reraise:
+        raise error_to_reraise
+
+    return returned
 
 
-def setup_queue(writer, objects, func, index_func):
-    for obj in objects:
-        writer.initialize(index_func(obj))
+def _no_deps(x):
+    return []
 
-    q = Queue()
 
-    # TODO: limit the number of threads #1828
-    for obj in objects:
-        t = Thread(
-            target=perform_operation,
-            args=(func, obj, q.put, index_func(obj)))
-        t.daemon = True
-        t.start()
+def setup_queue(objects, func, get_deps, get_name):
+    if get_deps is None:
+        get_deps = _no_deps
 
-    return q
+    results = Queue()
+
+    started = set()   # objects, threads were started for
+    finished = set()  # already finished objects
+
+    def do_op(obj):
+        try:
+            result = func(obj)
+            results.put((obj, result, None))
+        except Exception as e:
+            results.put((obj, None, e))
+
+        finished.add(obj)
+        feed()
+
+    def ready(obj):
+        # Is object ready for performing operation
+        return obj not in started and all(
+            dep not in objects or dep in finished
+            for dep in get_deps(obj)
+        )
+
+    def feed():
+        ready_objects = [o for o in objects if ready(o)]
+        for obj in ready_objects:
+            started.add(obj)
+            t = Thread(target=do_op,
+                       args=(obj,))
+            t.daemon = True
+            t.start()
+
+    feed()
+    return results
 
 
 class ParallelStreamWriter(object):
@@ -91,11 +121,15 @@ class ParallelStreamWriter(object):
         self.lines = []
 
     def initialize(self, obj_index):
+        if self.msg is None:
+            return
         self.lines.append(obj_index)
         self.stream.write("{} {} ... \r\n".format(self.msg, obj_index))
         self.stream.flush()
 
     def write(self, obj_index, status):
+        if self.msg is None:
+            return
         position = self.lines.index(obj_index)
         diff = len(self.lines) - position
         # move up
diff --git a/compose/project.py b/compose/project.py
index c964417f..3de68b2c 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 import datetime
 import logging
+import operator
 from functools import reduce
 
 from docker.errors import APIError
@@ -200,13 +201,40 @@ class Project(object):
 
     def start(self, service_names=None, **options):
         containers = []
-        for service in self.get_services(service_names):
-            service_containers = service.start(**options)
+
+        def start_service(service):
+            service_containers = service.start(quiet=True, **options)
             containers.extend(service_containers)
+
+        services = self.get_services(service_names)
+
+        def get_deps(service):
+            return {self.get_service(dep) for dep in service.get_dependency_names()}
+
+        parallel.parallel_execute(
+            services,
+            start_service,
+            operator.attrgetter('name'),
+            'Starting',
+            get_deps)
+
         return containers
 
     def stop(self, service_names=None, **options):
-        parallel.parallel_stop(self.containers(service_names), options)
+        containers = self.containers(service_names)
+
+        def get_deps(container):
+            # actually returning inversed dependencies
+            return {other for other in containers
+                    if container.service in
+                    self.get_service(other.service).get_dependency_names()}
+
+        parallel.parallel_execute(
+            containers,
+            operator.methodcaller('stop', **options),
+            operator.attrgetter('name'),
+            'Stopping',
+            get_deps)
 
     def pause(self, service_names=None, **options):
         containers = self.containers(service_names)
@@ -314,15 +342,33 @@ class Project(object):
             include_deps=start_deps)
 
         plans = self._get_convergence_plans(services, strategy)
-        return [
-            container
-            for service in services
-            for container in service.execute_convergence_plan(
+
+        for svc in services:
+            svc.ensure_image_exists(do_build=do_build)
+
+        def do(service):
+            return service.execute_convergence_plan(
                 plans[service.name],
                 do_build=do_build,
                 timeout=timeout,
                 detached=detached
             )
+
+        def get_deps(service):
+            return {self.get_service(dep) for dep in service.get_dependency_names()}
+
+        results = parallel.parallel_execute(
+            services,
+            do,
+            operator.attrgetter('name'),
+            None,
+            get_deps
+        )
+        return [
+            container
+            for svc_containers in results
+            if svc_containers is not None
+            for container in svc_containers
         ]
 
     def initialize(self):
diff --git a/compose/service.py b/compose/service.py
index fad1c4d9..30d28e4c 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -436,9 +436,10 @@ class Service(object):
         container.remove()
         return new_container
 
-    def start_container_if_stopped(self, container, attach_logs=False):
+    def start_container_if_stopped(self, container, attach_logs=False, quiet=False):
         if not container.is_running:
-            log.info("Starting %s" % container.name)
+            if not quiet:
+                log.info("Starting %s" % container.name)
             if attach_logs:
                 container.attach_log_stream()
             return self.start_container(container)
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index c94578a1..825b97be 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -8,6 +8,7 @@ import shlex
 import signal
 import subprocess
 import time
+from collections import Counter
 from collections import namedtuple
 from operator import attrgetter
 
@@ -1346,7 +1347,7 @@ class CLITestCase(DockerClientTestCase):
         os.kill(events_proc.pid, signal.SIGINT)
         result = wait_on_process(events_proc, returncode=1)
         lines = [json.loads(line) for line in result.stdout.rstrip().split('\n')]
-        assert [e['action'] for e in lines] == ['create', 'start', 'create', 'start']
+        assert Counter(e['action'] for e in lines) == {'create': 2, 'start': 2}
 
     def test_events_human_readable(self):
         events_proc = start_process(self.base_dir, ['events'])

From 5df774bd10b68f801368548609ab36ff9eb4885f Mon Sep 17 00:00:00 2001
From: Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
Date: Fri, 11 Mar 2016 12:59:24 +0300
Subject: [PATCH 0893/1265] Fixed testing error handling by `up`

Signed-off-by: Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
---
 tests/integration/project_test.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 710da9a3..393f4f11 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -5,7 +5,6 @@ import random
 
 import py
 import pytest
-from docker.errors import APIError
 from docker.errors import NotFound
 
 from ..helpers import build_config
@@ -738,8 +737,7 @@ class ProjectTest(DockerClientTestCase):
             config_data=config_data,
         )
 
-        with self.assertRaises(APIError):
-            project.up()
+        assert len(project.up()) == 0
 
     @v2_only()
     def test_project_up_volumes(self):

From 34de1f0a4ca5ea8ba404b4ca34a0a488d2fccb9c Mon Sep 17 00:00:00 2001
From: Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
Date: Mon, 14 Mar 2016 22:56:58 +0300
Subject: [PATCH 0894/1265] Removed unused parallel.parallel_stop

Signed-off-by: Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
---
 compose/parallel.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/compose/parallel.py b/compose/parallel.py
index 439f0f44..879d183e 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -155,10 +155,6 @@ def parallel_remove(containers, options):
     parallel_operation(stopped_containers, 'remove', options, 'Removing')
 
 
-def parallel_stop(containers, options):
-    parallel_operation(containers, 'stop', options, 'Stopping')
-
-
 def parallel_start(containers, options):
     parallel_operation(containers, 'start', options, 'Starting')
 

From 65797558f8740fb2bab5333395e903264a4f1042 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 1 Mar 2016 17:44:25 -0500
Subject: [PATCH 0895/1265] Refactor log printing to support containers that
 are started later.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/log_printer.py         | 174 ++++++++++++++++++++++-------
 compose/cli/multiplexer.py         |  66 -----------
 compose/project.py                 |   3 +-
 tests/unit/cli/log_printer_test.py |  39 +++++++
 tests/unit/multiplexer_test.py     |  61 ----------
 tests/unit/project_test.py         |   3 +
 6 files changed, 176 insertions(+), 170 deletions(-)
 delete mode 100644 compose/cli/multiplexer.py
 delete mode 100644 tests/unit/multiplexer_test.py

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 326676ba..29a6159d 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -3,66 +3,127 @@ from __future__ import unicode_literals
 
 import sys
 from itertools import cycle
+from threading import Thread
+
+from six.moves import _thread as thread
+from six.moves.queue import Empty
+from six.moves.queue import Queue
 
 from . import colors
-from .multiplexer import Multiplexer
 from compose import utils
+from compose.cli.signals import ShutdownException
 from compose.utils import split_buffer
 
 
+STOP = object()
+
+
+class LogPresenter(object):
+
+    def __init__(self, prefix_width, color_func):
+        self.prefix_width = prefix_width
+        self.color_func = color_func
+
+    def present(self, container, line):
+        prefix = container.name_without_project.ljust(self.prefix_width)
+        return '{prefix} {line}'.format(
+            prefix=self.color_func(prefix + ' |'),
+            line=line)
+
+
+def build_log_presenters(service_names, monochrome):
+    """Return an iterable of functions.
+
+    Each function can be used to format the logs output of a container.
+    """
+    prefix_width = max_name_width(service_names)
+
+    def no_color(text):
+        return text
+
+    for color_func in cycle([no_color] if monochrome else colors.rainbow()):
+        yield LogPresenter(prefix_width, color_func)
+
+
+def max_name_width(service_names, max_index_width=3):
+    """Calculate the maximum width of container names so we can make the log
+    prefixes line up like so:
+
+    db_1  | Listening
+    web_1 | Listening
+    """
+    return max(len(name) for name in service_names) + max_index_width
+
+
 class LogPrinter(object):
     """Print logs from many containers to a single output stream."""
 
     def __init__(self,
                  containers,
+                 presenters,
+                 event_stream,
                  output=sys.stdout,
-                 monochrome=False,
                  cascade_stop=False,
                  log_args=None):
-        log_args = log_args or {}
         self.containers = containers
+        self.presenters = presenters
+        self.event_stream = event_stream
         self.output = utils.get_output_stream(output)
-        self.monochrome = monochrome
         self.cascade_stop = cascade_stop
-        self.log_args = log_args
+        self.log_args = log_args or {}
 
     def run(self):
         if not self.containers:
             return
 
-        prefix_width = max_name_width(self.containers)
-        generators = list(self._make_log_generators(self.monochrome, prefix_width))
-        for line in Multiplexer(generators, cascade_stop=self.cascade_stop).loop():
+        queue = Queue()
+        thread_args = queue, self.log_args
+        thread_map = build_thread_map(self.containers, self.presenters, thread_args)
+        start_producer_thread(
+            thread_map,
+            self.event_stream,
+            self.presenters,
+            thread_args)
+
+        for line in consume_queue(queue, self.cascade_stop):
             self.output.write(line)
             self.output.flush()
 
-    def _make_log_generators(self, monochrome, prefix_width):
-        def no_color(text):
-            return text
-
-        if monochrome:
-            color_funcs = cycle([no_color])
-        else:
-            color_funcs = cycle(colors.rainbow())
-
-        for color_func, container in zip(color_funcs, self.containers):
-            generator_func = get_log_generator(container)
-            prefix = color_func(build_log_prefix(container, prefix_width))
-            yield generator_func(container, prefix, color_func, self.log_args)
+            # TODO: this needs more logic
+            # TODO: does consume_queue need to yield Nones to get to this point?
+            if not thread_map:
+                return
 
 
-def build_log_prefix(container, prefix_width):
-    return container.name_without_project.ljust(prefix_width) + ' | '
+def build_thread_map(initial_containers, presenters, thread_args):
+    def build_thread(container):
+        tailer = Thread(
+            target=tail_container_logs,
+            args=(container, presenters.next()) + thread_args)
+        tailer.daemon = True
+        tailer.start()
+        return tailer
+
+    return {
+        container.id: build_thread(container)
+        for container in initial_containers
+    }
 
 
-def max_name_width(containers):
-    """Calculate the maximum width of container names so we can make the log
-    prefixes line up like so:
+def tail_container_logs(container, presenter, queue, log_args):
+    generator = get_log_generator(container)
 
-    db_1  | Listening
-    web_1 | Listening
-    """
-    return max(len(container.name_without_project) for container in containers)
+    try:
+        for item in generator(container, log_args):
+            queue.put((item, None))
+
+        if log_args.get('follow'):
+            yield presenter.color_func(wait_on_exit(container))
+
+        queue.put((STOP, None))
+
+    except Exception as e:
+        queue.put((None, e))
 
 
 def get_log_generator(container):
@@ -71,32 +132,61 @@ def get_log_generator(container):
     return build_no_log_generator
 
 
-def build_no_log_generator(container, prefix, color_func, log_args):
+def build_no_log_generator(container, log_args):
     """Return a generator that prints a warning about logs and waits for
     container to exit.
     """
-    yield "{} WARNING: no logs are available with the '{}' log driver\n".format(
-        prefix,
+    yield "WARNING: no logs are available with the '{}' log driver\n".format(
         container.log_driver)
-    if log_args.get('follow'):
-        yield color_func(wait_on_exit(container))
 
 
-def build_log_generator(container, prefix, color_func, log_args):
+def build_log_generator(container, log_args):
     # if the container doesn't have a log_stream we need to attach to container
     # before log printer starts running
     if container.log_stream is None:
         stream = container.logs(stdout=True, stderr=True, stream=True, **log_args)
-        line_generator = split_buffer(stream)
     else:
-        line_generator = split_buffer(container.log_stream)
+        stream = container.log_stream
 
-    for line in line_generator:
-        yield prefix + line
-    if log_args.get('follow'):
-        yield color_func(wait_on_exit(container))
+    return split_buffer(stream)
 
 
 def wait_on_exit(container):
     exit_code = container.wait()
     return "%s exited with code %s\n" % (container.name, exit_code)
+
+
+def start_producer_thread(thread_map, event_stream, presenters, thread_args):
+    queue, log_args = thread_args
+
+    def watch_events():
+        for event in event_stream:
+            # TODO: handle start and stop events
+            pass
+
+    producer = Thread(target=watch_events)
+    producer.daemon = True
+    producer.start()
+
+
+def consume_queue(queue, cascade_stop):
+    """Consume the queue by reading lines off of it and yielding them."""
+    while True:
+        try:
+            item, exception = queue.get(timeout=0.1)
+        except Empty:
+            pass
+        # See https://github.com/docker/compose/issues/189
+        except thread.error:
+            raise ShutdownException()
+
+        if exception:
+            raise exception
+
+        if item is STOP:
+            if cascade_stop:
+                raise StopIteration
+            else:
+                continue
+
+        yield item
diff --git a/compose/cli/multiplexer.py b/compose/cli/multiplexer.py
deleted file mode 100644
index ae8aa591..00000000
--- a/compose/cli/multiplexer.py
+++ /dev/null
@@ -1,66 +0,0 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-from threading import Thread
-
-from six.moves import _thread as thread
-
-try:
-    from Queue import Queue, Empty
-except ImportError:
-    from queue import Queue, Empty  # Python 3.x
-
-from compose.cli.signals import ShutdownException
-
-STOP = object()
-
-
-class Multiplexer(object):
-    """
-    Create a single iterator from several iterators by running all of them in
-    parallel and yielding results as they come in.
-    """
-
-    def __init__(self, iterators, cascade_stop=False):
-        self.iterators = iterators
-        self.cascade_stop = cascade_stop
-        self._num_running = len(iterators)
-        self.queue = Queue()
-
-    def loop(self):
-        self._init_readers()
-
-        while self._num_running > 0:
-            try:
-                item, exception = self.queue.get(timeout=0.1)
-
-                if exception:
-                    raise exception
-
-                if item is STOP:
-                    if self.cascade_stop is True:
-                        break
-                    else:
-                        self._num_running -= 1
-                else:
-                    yield item
-            except Empty:
-                pass
-            # See https://github.com/docker/compose/issues/189
-            except thread.error:
-                raise ShutdownException()
-
-    def _init_readers(self):
-        for iterator in self.iterators:
-            t = Thread(target=_enqueue_output, args=(iterator, self.queue))
-            t.daemon = True
-            t.start()
-
-
-def _enqueue_output(iterator, queue):
-    try:
-        for item in iterator:
-            queue.put((item, None))
-        queue.put((STOP, None))
-    except Exception as e:
-        queue.put((None, e))
diff --git a/compose/project.py b/compose/project.py
index 3de68b2c..1169f7db 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -309,7 +309,8 @@ class Project(object):
                 'attributes': {
                     'name': container.name,
                     'image': event['from'],
-                }
+                },
+                'container': container,
             }
 
         service_names = set(self.service_names)
diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py
index 54fef0b2..81c69412 100644
--- a/tests/unit/cli/log_printer_test.py
+++ b/tests/unit/cli/log_printer_test.py
@@ -3,8 +3,11 @@ from __future__ import unicode_literals
 
 import pytest
 import six
+from six.moves.queue import Queue
 
+from compose.cli.log_printer import consume_queue
 from compose.cli.log_printer import LogPrinter
+from compose.cli.log_printer import STOP
 from compose.cli.log_printer import wait_on_exit
 from compose.container import Container
 from tests import mock
@@ -36,6 +39,7 @@ def mock_container():
     return build_mock_container(reader)
 
 
+@pytest.mark.skipif(True, reason="wip")
 class TestLogPrinter(object):
 
     def test_single_container(self, output_stream, mock_container):
@@ -96,3 +100,38 @@ class TestLogPrinter(object):
         output = output_stream.getvalue()
         assert "WARNING: no logs are available with the 'none' log driver\n" in output
         assert "exited with code" not in output
+
+
+class TestConsumeQueue(object):
+
+    def test_item_is_an_exception(self):
+
+        class Problem(Exception):
+            pass
+
+        queue = Queue()
+        error = Problem('oops')
+        for item in ('a', None), ('b', None), (None, error):
+            queue.put(item)
+
+        generator = consume_queue(queue, False)
+        assert generator.next() == 'a'
+        assert generator.next() == 'b'
+        with pytest.raises(Problem):
+            generator.next()
+
+    def test_item_is_stop_without_cascade_stop(self):
+        queue = Queue()
+        for item in (STOP, None), ('a', None), ('b', None):
+            queue.put(item)
+
+        generator = consume_queue(queue, False)
+        assert generator.next() == 'a'
+        assert generator.next() == 'b'
+
+    def test_item_is_stop_with_cascade_stop(self):
+        queue = Queue()
+        for item in (STOP, None), ('a', None), ('b', None):
+            queue.put(item)
+
+        assert list(consume_queue(queue, True)) == []
diff --git a/tests/unit/multiplexer_test.py b/tests/unit/multiplexer_test.py
deleted file mode 100644
index 737ba25d..00000000
--- a/tests/unit/multiplexer_test.py
+++ /dev/null
@@ -1,61 +0,0 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-import unittest
-from time import sleep
-
-from compose.cli.multiplexer import Multiplexer
-
-
-class MultiplexerTest(unittest.TestCase):
-    def test_no_iterators(self):
-        mux = Multiplexer([])
-        self.assertEqual([], list(mux.loop()))
-
-    def test_empty_iterators(self):
-        mux = Multiplexer([
-            (x for x in []),
-            (x for x in []),
-        ])
-
-        self.assertEqual([], list(mux.loop()))
-
-    def test_aggregates_output(self):
-        mux = Multiplexer([
-            (x for x in [0, 2, 4]),
-            (x for x in [1, 3, 5]),
-        ])
-
-        self.assertEqual(
-            [0, 1, 2, 3, 4, 5],
-            sorted(list(mux.loop())),
-        )
-
-    def test_exception(self):
-        class Problem(Exception):
-            pass
-
-        def problematic_iterator():
-            yield 0
-            yield 2
-            raise Problem(":(")
-
-        mux = Multiplexer([
-            problematic_iterator(),
-            (x for x in [1, 3, 5]),
-        ])
-
-        with self.assertRaises(Problem):
-            list(mux.loop())
-
-    def test_cascade_stop(self):
-        def fast_stream():
-            for num in range(3):
-                yield "stream1 %s" % num
-
-        def slow_stream():
-            sleep(5)
-            yield "stream2 FAIL"
-
-        mux = Multiplexer([fast_stream(), slow_stream()], cascade_stop=True)
-        assert "stream2 FAIL" not in set(mux.loop())
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index c28c2152..a815acda 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -307,6 +307,7 @@ class ProjectTest(unittest.TestCase):
                     'image': 'example/image',
                 },
                 'time': dt_with_microseconds(1420092061, 2),
+                'container': Container(None, {'Id': 'abcde'}),
             },
             {
                 'type': 'container',
@@ -318,6 +319,7 @@ class ProjectTest(unittest.TestCase):
                     'image': 'example/image',
                 },
                 'time': dt_with_microseconds(1420092061, 3),
+                'container': Container(None, {'Id': 'abcde'}),
             },
             {
                 'type': 'container',
@@ -329,6 +331,7 @@ class ProjectTest(unittest.TestCase):
                     'image': 'example/db',
                 },
                 'time': dt_with_microseconds(1420092061, 4),
+                'container': Container(None, {'Id': 'ababa'}),
             },
         ]
 

From 44c1747127d320fe35b407aad775cb1a41fd77a4 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 2 Mar 2016 17:04:52 -0500
Subject: [PATCH 0896/1265] Add tests for reactive log printing.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/log_printer.py         | 114 ++++++++++++++++---------
 compose/cli/main.py                |  56 ++++++++++---
 compose/project.py                 |   1 +
 tests/acceptance/cli_test.py       |  38 ++++++---
 tests/unit/cli/log_printer_test.py | 128 +++++++++++++++--------------
 tests/unit/cli/main_test.py        |  14 ++--
 6 files changed, 218 insertions(+), 133 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 29a6159d..fc36a6bc 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import sys
+from collections import namedtuple
 from itertools import cycle
 from threading import Thread
 
@@ -15,9 +16,6 @@ from compose.cli.signals import ShutdownException
 from compose.utils import split_buffer
 
 
-STOP = object()
-
-
 class LogPresenter(object):
 
     def __init__(self, prefix_width, color_func):
@@ -79,51 +77,74 @@ class LogPrinter(object):
         queue = Queue()
         thread_args = queue, self.log_args
         thread_map = build_thread_map(self.containers, self.presenters, thread_args)
-        start_producer_thread(
+        start_producer_thread((
             thread_map,
             self.event_stream,
             self.presenters,
-            thread_args)
+            thread_args))
 
         for line in consume_queue(queue, self.cascade_stop):
+            remove_stopped_threads(thread_map)
+
+            if not line:
+                if not thread_map:
+                    return
+                continue
+
             self.output.write(line)
             self.output.flush()
 
-            # TODO: this needs more logic
-            # TODO: does consume_queue need to yield Nones to get to this point?
-            if not thread_map:
-                return
+
+def remove_stopped_threads(thread_map):
+    for container_id, tailer_thread in list(thread_map.items()):
+        if not tailer_thread.is_alive():
+            thread_map.pop(container_id, None)
+
+
+def build_thread(container, presenter, queue, log_args):
+    tailer = Thread(
+        target=tail_container_logs,
+        args=(container, presenter, queue, log_args))
+    tailer.daemon = True
+    tailer.start()
+    return tailer
 
 
 def build_thread_map(initial_containers, presenters, thread_args):
-    def build_thread(container):
-        tailer = Thread(
-            target=tail_container_logs,
-            args=(container, presenters.next()) + thread_args)
-        tailer.daemon = True
-        tailer.start()
-        return tailer
-
     return {
-        container.id: build_thread(container)
+        container.id: build_thread(container, presenters.next(), *thread_args)
         for container in initial_containers
     }
 
 
+class QueueItem(namedtuple('_QueueItem', 'item is_stop exc')):
+
+    @classmethod
+    def new(cls, item):
+        return cls(item, None, None)
+
+    @classmethod
+    def exception(cls, exc):
+        return cls(None, None, exc)
+
+    @classmethod
+    def stop(cls):
+        return cls(None, True, None)
+
+
 def tail_container_logs(container, presenter, queue, log_args):
     generator = get_log_generator(container)
 
     try:
         for item in generator(container, log_args):
-            queue.put((item, None))
-
-        if log_args.get('follow'):
-            yield presenter.color_func(wait_on_exit(container))
-
-        queue.put((STOP, None))
-
+            queue.put(QueueItem.new(presenter.present(container, item)))
     except Exception as e:
-        queue.put((None, e))
+        queue.put(QueueItem.exception(e))
+        return
+
+    if log_args.get('follow'):
+        queue.put(QueueItem.new(presenter.color_func(wait_on_exit(container))))
+    queue.put(QueueItem.stop())
 
 
 def get_log_generator(container):
@@ -156,37 +177,48 @@ def wait_on_exit(container):
     return "%s exited with code %s\n" % (container.name, exit_code)
 
 
-def start_producer_thread(thread_map, event_stream, presenters, thread_args):
-    queue, log_args = thread_args
-
-    def watch_events():
-        for event in event_stream:
-            # TODO: handle start and stop events
-            pass
-
-    producer = Thread(target=watch_events)
+def start_producer_thread(thread_args):
+    producer = Thread(target=watch_events, args=thread_args)
     producer.daemon = True
     producer.start()
 
 
+def watch_events(thread_map, event_stream, presenters, thread_args):
+    for event in event_stream:
+        if event['action'] != 'start':
+            continue
+
+        if event['id'] in thread_map:
+            if thread_map[event['id']].is_alive():
+                continue
+            # Container was stopped and started, we need a new thread
+            thread_map.pop(event['id'], None)
+
+        thread_map[event['id']] = build_thread(
+            event['container'],
+            presenters.next(),
+            *thread_args)
+
+
 def consume_queue(queue, cascade_stop):
     """Consume the queue by reading lines off of it and yielding them."""
     while True:
         try:
-            item, exception = queue.get(timeout=0.1)
+            item = queue.get(timeout=0.1)
         except Empty:
-            pass
+            yield None
+            continue
         # See https://github.com/docker/compose/issues/189
         except thread.error:
             raise ShutdownException()
 
-        if exception:
-            raise exception
+        if item.exc:
+            raise item.exc
 
-        if item is STOP:
+        if item.is_stop:
             if cascade_stop:
                 raise StopIteration
             else:
                 continue
 
-        yield item
+        yield item.item
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 66362168..da622bc1 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -35,6 +35,7 @@ from .docopt_command import NoSuchCommand
 from .errors import UserError
 from .formatter import ConsoleWarningFormatter
 from .formatter import Formatter
+from .log_printer import build_log_presenters
 from .log_printer import LogPrinter
 from .utils import get_version_info
 from .utils import yesno
@@ -277,6 +278,7 @@ class TopLevelCommand(object):
 
         def json_format_event(event):
             event['time'] = event['time'].isoformat()
+            event.pop('container')
             return json.dumps(event)
 
         for event in self.project.events():
@@ -374,7 +376,6 @@ class TopLevelCommand(object):
         """
         containers = self.project.containers(service_names=options['SERVICE'], stopped=True)
 
-        monochrome = options['--no-color']
         tail = options['--tail']
         if tail is not None:
             if tail.isdigit():
@@ -387,7 +388,11 @@ class TopLevelCommand(object):
             'timestamps': options['--timestamps']
         }
         print("Attaching to", list_containers(containers))
-        LogPrinter(containers, monochrome=monochrome, log_args=log_args).run()
+        log_printer_from_project(
+            project,
+            containers,
+            options['--no-color'],
+            log_args).run()
 
     def pause(self, options):
         """
@@ -693,7 +698,6 @@ class TopLevelCommand(object):
                                        when attached or when containers are already
                                        running. (default: 10)
         """
-        monochrome = options['--no-color']
         start_deps = not options['--no-deps']
         cascade_stop = options['--abort-on-container-exit']
         service_names = options['SERVICE']
@@ -704,7 +708,10 @@ class TopLevelCommand(object):
             raise UserError("--abort-on-container-exit and -d cannot be combined.")
 
         with up_shutdown_context(self.project, service_names, timeout, detached):
-            to_attach = self.project.up(
+            # start the event stream first so we don't lose any events
+            event_stream = project.events()
+
+            to_attach = project.up(
                 service_names=service_names,
                 start_deps=start_deps,
                 strategy=convergence_strategy_from_opts(options),
@@ -714,8 +721,14 @@ class TopLevelCommand(object):
 
             if detached:
                 return
-            log_args = {'follow': True}
-            log_printer = build_log_printer(to_attach, service_names, monochrome, cascade_stop, log_args)
+
+            log_printer = log_printer_from_project(
+                project,
+                filter_containers_to_service_names(to_attach, service_names),
+                options['--no-color'],
+                {'follow': True},
+                cascade_stop,
+                event_stream=event_stream)
             print("Attaching to", list_containers(log_printer.containers))
             log_printer.run()
 
@@ -827,13 +840,30 @@ def run_one_off_container(container_options, project, service, options):
     sys.exit(exit_code)
 
 
-def build_log_printer(containers, service_names, monochrome, cascade_stop, log_args):
-    if service_names:
-        containers = [
-            container
-            for container in containers if container.service in service_names
-        ]
-    return LogPrinter(containers, monochrome=monochrome, cascade_stop=cascade_stop, log_args=log_args)
+def log_printer_from_project(
+    project,
+    containers,
+    monochrome,
+    log_args,
+    cascade_stop=False,
+    event_stream=None,
+):
+    return LogPrinter(
+        containers,
+        build_log_presenters(project.service_names, monochrome),
+        event_stream or project.events(),
+        cascade_stop=cascade_stop,
+        log_args=log_args)
+
+
+def filter_containers_to_service_names(containers, service_names):
+    if not service_names:
+        return containers
+
+    return [
+        container
+        for container in containers if container.service in service_names
+    ]
 
 
 @contextlib.contextmanager
diff --git a/compose/project.py b/compose/project.py
index 1169f7db..b40a9c38 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -324,6 +324,7 @@ class Project(object):
                 continue
 
             # TODO: get labels from the API v1.22 , see github issue 2618
+            # TODO: this can fail if the conatiner is removed, wrap in try/except
             container = Container.from_id(self.client, event['id'])
             if container.service not in service_names:
                 continue
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 825b97be..c2116553 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1188,7 +1188,7 @@ class CLITestCase(DockerClientTestCase):
 
     def test_logs_follow(self):
         self.base_dir = 'tests/fixtures/echo-services'
-        self.dispatch(['up', '-d'], None)
+        self.dispatch(['up', '-d'])
 
         result = self.dispatch(['logs', '-f'])
 
@@ -1197,29 +1197,43 @@ class CLITestCase(DockerClientTestCase):
         assert 'another' in result.stdout
         assert 'exited with code 0' in result.stdout
 
-    def test_logs_unfollow(self):
+    def test_logs_follow_logs_from_new_containers(self):
         self.base_dir = 'tests/fixtures/logs-composefile'
-        self.dispatch(['up', '-d'], None)
+        self.dispatch(['up', '-d', 'simple'])
+
+        proc = start_process(self.base_dir, ['logs', '-f'])
+
+        self.dispatch(['up', '-d', 'another'])
+        wait_on_condition(ContainerStateCondition(
+            self.project.client,
+            'logscomposefile_another_1',
+            running=False))
+
+        os.kill(proc.pid, signal.SIGINT)
+        result = wait_on_process(proc, returncode=1)
+        assert 'test' in result.stdout
+
+    def test_logs_default(self):
+        self.base_dir = 'tests/fixtures/logs-composefile'
+        self.dispatch(['up', '-d'])
 
         result = self.dispatch(['logs'])
-
-        assert result.stdout.count('\n') >= 1
-        assert 'exited with code 0' not in result.stdout
+        assert 'hello' in result.stdout
+        assert 'test' in result.stdout
+        assert 'exited with' not in result.stdout
 
     def test_logs_timestamps(self):
         self.base_dir = 'tests/fixtures/echo-services'
-        self.dispatch(['up', '-d'], None)
-
-        result = self.dispatch(['logs', '-f', '-t'], None)
+        self.dispatch(['up', '-d'])
 
+        result = self.dispatch(['logs', '-f', '-t'])
         self.assertRegexpMatches(result.stdout, '(\d{4})-(\d{2})-(\d{2})T(\d{2})\:(\d{2})\:(\d{2})')
 
     def test_logs_tail(self):
         self.base_dir = 'tests/fixtures/logs-tail-composefile'
-        self.dispatch(['up'], None)
-
-        result = self.dispatch(['logs', '--tail', '2'], None)
+        self.dispatch(['up'])
 
+        result = self.dispatch(['logs', '--tail', '2'])
         assert result.stdout.count('\n') == 3
 
     def test_kill(self):
diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py
index 81c69412..7be1d303 100644
--- a/tests/unit/cli/log_printer_test.py
+++ b/tests/unit/cli/log_printer_test.py
@@ -5,9 +5,11 @@ import pytest
 import six
 from six.moves.queue import Queue
 
+from compose.cli.log_printer import build_log_generator
+from compose.cli.log_printer import build_log_presenters
+from compose.cli.log_printer import build_no_log_generator
 from compose.cli.log_printer import consume_queue
-from compose.cli.log_printer import LogPrinter
-from compose.cli.log_printer import STOP
+from compose.cli.log_printer import QueueItem
 from compose.cli.log_printer import wait_on_exit
 from compose.container import Container
 from tests import mock
@@ -34,72 +36,73 @@ def output_stream():
 
 @pytest.fixture
 def mock_container():
-    def reader(*args, **kwargs):
-        yield b"hello\nworld"
-    return build_mock_container(reader)
+    return mock.Mock(spec=Container, name_without_project='web_1')
 
 
-@pytest.mark.skipif(True, reason="wip")
-class TestLogPrinter(object):
+class TestLogPresenter(object):
 
-    def test_single_container(self, output_stream, mock_container):
-        LogPrinter([mock_container], output=output_stream, log_args={'follow': True}).run()
+    def test_monochrome(self, mock_container):
+        presenters = build_log_presenters(['foo', 'bar'], True)
+        presenter = presenters.next()
+        actual = presenter.present(mock_container, "this line")
+        assert actual == "web_1  | this line"
 
-        output = output_stream.getvalue()
-        assert 'hello' in output
-        assert 'world' in output
-        # Call count is 2 lines + "container exited line"
-        assert output_stream.flush.call_count == 3
+    def test_polychrome(self, mock_container):
+        presenters = build_log_presenters(['foo', 'bar'], False)
+        presenter = presenters.next()
+        actual = presenter.present(mock_container, "this line")
+        assert '\033[' in actual
 
-    def test_single_container_without_stream(self, output_stream, mock_container):
-        LogPrinter([mock_container], output=output_stream).run()
 
-        output = output_stream.getvalue()
-        assert 'hello' in output
-        assert 'world' in output
-        # Call count is 2 lines
-        assert output_stream.flush.call_count == 2
+def test_wait_on_exit():
+    exit_status = 3
+    mock_container = mock.Mock(
+        spec=Container,
+        name='cname',
+        wait=mock.Mock(return_value=exit_status))
 
-    def test_monochrome(self, output_stream, mock_container):
-        LogPrinter([mock_container], output=output_stream, monochrome=True).run()
-        assert '\033[' not in output_stream.getvalue()
+    expected = '{} exited with code {}\n'.format(mock_container.name, exit_status)
+    assert expected == wait_on_exit(mock_container)
 
-    def test_polychrome(self, output_stream, mock_container):
-        LogPrinter([mock_container], output=output_stream).run()
-        assert '\033[' in output_stream.getvalue()
+
+def test_build_no_log_generator(mock_container):
+    mock_container.has_api_logs = False
+    mock_container.log_driver = 'none'
+    output, = build_no_log_generator(mock_container, None)
+    assert "WARNING: no logs are available with the 'none' log driver\n" in output
+    assert "exited with code" not in output
+
+
+class TestBuildLogGenerator(object):
+
+    def test_no_log_stream(self, mock_container):
+        mock_container.log_stream = None
+        mock_container.logs.return_value = iter([b"hello\nworld"])
+        log_args = {'follow': True}
+
+        generator = build_log_generator(mock_container, log_args)
+        assert generator.next() == "hello\n"
+        assert generator.next() == "world"
+        mock_container.logs.assert_called_once_with(
+            stdout=True,
+            stderr=True,
+            stream=True,
+            **log_args)
+
+    def test_with_log_stream(self, mock_container):
+        mock_container.log_stream = iter([b"hello\nworld"])
+        log_args = {'follow': True}
+
+        generator = build_log_generator(mock_container, log_args)
+        assert generator.next() == "hello\n"
+        assert generator.next() == "world"
 
     def test_unicode(self, output_stream):
-        glyph = u'\u2022'
+        glyph = u'\u2022\n'
+        mock_container.log_stream = iter([glyph.encode('utf-8')])
 
-        def reader(*args, **kwargs):
-            yield glyph.encode('utf-8') + b'\n'
-
-        container = build_mock_container(reader)
-        LogPrinter([container], output=output_stream).run()
-        output = output_stream.getvalue()
-        if six.PY2:
-            output = output.decode('utf-8')
-
-        assert glyph in output
-
-    def test_wait_on_exit(self):
-        exit_status = 3
-        mock_container = mock.Mock(
-            spec=Container,
-            name='cname',
-            wait=mock.Mock(return_value=exit_status))
-
-        expected = '{} exited with code {}\n'.format(mock_container.name, exit_status)
-        assert expected == wait_on_exit(mock_container)
-
-    def test_generator_with_no_logs(self, mock_container, output_stream):
-        mock_container.has_api_logs = False
-        mock_container.log_driver = 'none'
-        LogPrinter([mock_container], output=output_stream).run()
-
-        output = output_stream.getvalue()
-        assert "WARNING: no logs are available with the 'none' log driver\n" in output
-        assert "exited with code" not in output
+        generator = build_log_generator(mock_container, {})
+        assert generator.next() == glyph
 
 
 class TestConsumeQueue(object):
@@ -111,7 +114,7 @@ class TestConsumeQueue(object):
 
         queue = Queue()
         error = Problem('oops')
-        for item in ('a', None), ('b', None), (None, error):
+        for item in QueueItem.new('a'), QueueItem.new('b'), QueueItem.exception(error):
             queue.put(item)
 
         generator = consume_queue(queue, False)
@@ -122,7 +125,7 @@ class TestConsumeQueue(object):
 
     def test_item_is_stop_without_cascade_stop(self):
         queue = Queue()
-        for item in (STOP, None), ('a', None), ('b', None):
+        for item in QueueItem.stop(), QueueItem.new('a'), QueueItem.new('b'):
             queue.put(item)
 
         generator = consume_queue(queue, False)
@@ -131,7 +134,12 @@ class TestConsumeQueue(object):
 
     def test_item_is_stop_with_cascade_stop(self):
         queue = Queue()
-        for item in (STOP, None), ('a', None), ('b', None):
+        for item in QueueItem.stop(), QueueItem.new('a'), QueueItem.new('b'):
             queue.put(item)
 
         assert list(consume_queue(queue, True)) == []
+
+    def test_item_is_none_when_timeout_is_hit(self):
+        queue = Queue()
+        generator = consume_queue(queue, False)
+        assert generator.next() is None
diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py
index 9b24776f..dc527880 100644
--- a/tests/unit/cli/main_test.py
+++ b/tests/unit/cli/main_test.py
@@ -8,8 +8,8 @@ import pytest
 from compose import container
 from compose.cli.errors import UserError
 from compose.cli.formatter import ConsoleWarningFormatter
-from compose.cli.main import build_log_printer
 from compose.cli.main import convergence_strategy_from_opts
+from compose.cli.main import filter_containers_to_service_names
 from compose.cli.main import setup_console_handler
 from compose.service import ConvergenceStrategy
 from tests import mock
@@ -32,7 +32,7 @@ def logging_handler():
 
 class TestCLIMainTestCase(object):
 
-    def test_build_log_printer(self):
+    def test_filter_containers_to_service_names(self):
         containers = [
             mock_container('web', 1),
             mock_container('web', 2),
@@ -41,18 +41,18 @@ class TestCLIMainTestCase(object):
             mock_container('another', 1),
         ]
         service_names = ['web', 'db']
-        log_printer = build_log_printer(containers, service_names, True, False, {'follow': True})
-        assert log_printer.containers == containers[:3]
+        actual = filter_containers_to_service_names(containers, service_names)
+        assert actual == containers[:3]
 
-    def test_build_log_printer_all_services(self):
+    def test_filter_containers_to_service_names_all(self):
         containers = [
             mock_container('web', 1),
             mock_container('db', 1),
             mock_container('other', 1),
         ]
         service_names = []
-        log_printer = build_log_printer(containers, service_names, True, False, {'follow': True})
-        assert log_printer.containers == containers
+        actual = filter_containers_to_service_names(containers, service_names)
+        assert actual == containers
 
 
 class TestSetupConsoleHandlerTestCase(object):

From 4cad2a0c5f973c51675e26b67cb84bb1fa03b0f8 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 3 Mar 2016 18:53:47 -0500
Subject: [PATCH 0897/1265] Handle events for removed containers.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/project.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index b40a9c38..9a2b46e1 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -324,8 +324,11 @@ class Project(object):
                 continue
 
             # TODO: get labels from the API v1.22 , see github issue 2618
-            # TODO: this can fail if the conatiner is removed, wrap in try/except
-            container = Container.from_id(self.client, event['id'])
+            try:
+                # this can fail if the conatiner has been removed
+                container = Container.from_id(self.client, event['id'])
+            except APIError:
+                continue
             if container.service not in service_names:
                 continue
             yield build_container_event(event, container)

From 4312c93eae2594aafacb695be50480ac6b0341d5 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 3 Mar 2016 18:57:07 -0500
Subject: [PATCH 0898/1265] Add an acceptance test to show logs behaves
 properly for stopped containers.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/acceptance/cli_test.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index c2116553..d3d4b3c0 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1222,6 +1222,15 @@ class CLITestCase(DockerClientTestCase):
         assert 'test' in result.stdout
         assert 'exited with' not in result.stdout
 
+    def test_logs_on_stopped_containers_exits(self):
+        self.base_dir = 'tests/fixtures/echo-services'
+        self.dispatch(['up'])
+
+        result = self.dispatch(['logs'])
+        assert 'simple' in result.stdout
+        assert 'another' in result.stdout
+        assert 'exited with' not in result.stdout
+
     def test_logs_timestamps(self):
         self.base_dir = 'tests/fixtures/echo-services'
         self.dispatch(['up', '-d'])

From 48ed68eeaa371ee31b8aac7186681d86eb84015e Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 7 Mar 2016 14:56:14 -0500
Subject: [PATCH 0899/1265] Fix geneartors for python3.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/log_printer.py         |  4 ++--
 tests/unit/cli/log_printer_test.py | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index fc36a6bc..22312c00 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -112,7 +112,7 @@ def build_thread(container, presenter, queue, log_args):
 
 def build_thread_map(initial_containers, presenters, thread_args):
     return {
-        container.id: build_thread(container, presenters.next(), *thread_args)
+        container.id: build_thread(container, next(presenters), *thread_args)
         for container in initial_containers
     }
 
@@ -196,7 +196,7 @@ def watch_events(thread_map, event_stream, presenters, thread_args):
 
         thread_map[event['id']] = build_thread(
             event['container'],
-            presenters.next(),
+            next(presenters),
             *thread_args)
 
 
diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py
index 7be1d303..33b2f166 100644
--- a/tests/unit/cli/log_printer_test.py
+++ b/tests/unit/cli/log_printer_test.py
@@ -43,13 +43,13 @@ class TestLogPresenter(object):
 
     def test_monochrome(self, mock_container):
         presenters = build_log_presenters(['foo', 'bar'], True)
-        presenter = presenters.next()
+        presenter = next(presenters)
         actual = presenter.present(mock_container, "this line")
         assert actual == "web_1  | this line"
 
     def test_polychrome(self, mock_container):
         presenters = build_log_presenters(['foo', 'bar'], False)
-        presenter = presenters.next()
+        presenter = next(presenters)
         actual = presenter.present(mock_container, "this line")
         assert '\033[' in actual
 
@@ -81,8 +81,8 @@ class TestBuildLogGenerator(object):
         log_args = {'follow': True}
 
         generator = build_log_generator(mock_container, log_args)
-        assert generator.next() == "hello\n"
-        assert generator.next() == "world"
+        assert next(generator) == "hello\n"
+        assert next(generator) == "world"
         mock_container.logs.assert_called_once_with(
             stdout=True,
             stderr=True,
@@ -94,15 +94,15 @@ class TestBuildLogGenerator(object):
         log_args = {'follow': True}
 
         generator = build_log_generator(mock_container, log_args)
-        assert generator.next() == "hello\n"
-        assert generator.next() == "world"
+        assert next(generator) == "hello\n"
+        assert next(generator) == "world"
 
     def test_unicode(self, output_stream):
         glyph = u'\u2022\n'
         mock_container.log_stream = iter([glyph.encode('utf-8')])
 
         generator = build_log_generator(mock_container, {})
-        assert generator.next() == glyph
+        assert next(generator) == glyph
 
 
 class TestConsumeQueue(object):
@@ -118,10 +118,10 @@ class TestConsumeQueue(object):
             queue.put(item)
 
         generator = consume_queue(queue, False)
-        assert generator.next() == 'a'
-        assert generator.next() == 'b'
+        assert next(generator) == 'a'
+        assert next(generator) == 'b'
         with pytest.raises(Problem):
-            generator.next()
+            next(generator)
 
     def test_item_is_stop_without_cascade_stop(self):
         queue = Queue()
@@ -129,8 +129,8 @@ class TestConsumeQueue(object):
             queue.put(item)
 
         generator = consume_queue(queue, False)
-        assert generator.next() == 'a'
-        assert generator.next() == 'b'
+        assert next(generator) == 'a'
+        assert next(generator) == 'b'
 
     def test_item_is_stop_with_cascade_stop(self):
         queue = Queue()
@@ -142,4 +142,4 @@ class TestConsumeQueue(object):
     def test_item_is_none_when_timeout_is_hit(self):
         queue = Queue()
         generator = consume_queue(queue, False)
-        assert generator.next() is None
+        assert next(generator) is None

From 3f7e5bf76895413048ed5af88279899261394b32 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 7 Mar 2016 15:04:42 -0500
Subject: [PATCH 0900/1265] Filter logs by service names.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py | 2 +-
 compose/project.py  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index da622bc1..468e10c4 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -709,7 +709,7 @@ class TopLevelCommand(object):
 
         with up_shutdown_context(self.project, service_names, timeout, detached):
             # start the event stream first so we don't lose any events
-            event_stream = project.events()
+            event_stream = project.events(service_names=service_names)
 
             to_attach = project.up(
                 service_names=service_names,
diff --git a/compose/project.py b/compose/project.py
index 9a2b46e1..4e25e498 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -295,7 +295,7 @@ class Project(object):
                 detached=True,
                 start=False)
 
-    def events(self):
+    def events(self, service_names=None):
         def build_container_event(event, container):
             time = datetime.datetime.fromtimestamp(event['time'])
             time = time.replace(
@@ -313,7 +313,7 @@ class Project(object):
                 'container': container,
             }
 
-        service_names = set(self.service_names)
+        service_names = set(service_names or self.service_names)
         for event in self.client.events(
             filters={'label': self.labels()},
             decode=True

From 8d9adc0902bf7c4b056007d7e6fb6188f2193fdf Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 7 Mar 2016 15:08:31 -0500
Subject: [PATCH 0901/1265] Fix flaky log test by using container status,
 instead of boolean state.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/acceptance/cli_test.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index d3d4b3c0..095fb3f1 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -78,21 +78,20 @@ class ContainerCountCondition(object):
 
 class ContainerStateCondition(object):
 
-    def __init__(self, client, name, running):
+    def __init__(self, client, name, status):
         self.client = client
         self.name = name
-        self.running = running
+        self.status = status
 
     def __call__(self):
         try:
             container = self.client.inspect_container(self.name)
-            return container['State']['Running'] == self.running
+            return container['State']['Status'] == self.status
         except errors.APIError:
             return False
 
     def __str__(self):
-        state = 'running' if self.running else 'stopped'
-        return "waiting for container to be %s" % state
+        return "waiting for container to be %s" % self.status
 
 
 class CLITestCase(DockerClientTestCase):
@@ -1073,26 +1072,26 @@ class CLITestCase(DockerClientTestCase):
         wait_on_condition(ContainerStateCondition(
             self.project.client,
             'simplecomposefile_simple_run_1',
-            running=True))
+            'running'))
 
         os.kill(proc.pid, signal.SIGINT)
         wait_on_condition(ContainerStateCondition(
             self.project.client,
             'simplecomposefile_simple_run_1',
-            running=False))
+            'exited'))
 
     def test_run_handles_sigterm(self):
         proc = start_process(self.base_dir, ['run', '-T', 'simple', 'top'])
         wait_on_condition(ContainerStateCondition(
             self.project.client,
             'simplecomposefile_simple_run_1',
-            running=True))
+            'running'))
 
         os.kill(proc.pid, signal.SIGTERM)
         wait_on_condition(ContainerStateCondition(
             self.project.client,
             'simplecomposefile_simple_run_1',
-            running=False))
+            'exited'))
 
     def test_rm(self):
         service = self.project.get_service('simple')
@@ -1207,7 +1206,7 @@ class CLITestCase(DockerClientTestCase):
         wait_on_condition(ContainerStateCondition(
             self.project.client,
             'logscomposefile_another_1',
-            running=False))
+            'exited'))
 
         os.kill(proc.pid, signal.SIGINT)
         result = wait_on_process(proc, returncode=1)

From e8a93821d43753f19f0511ae8903fe05dac534d5 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 7 Mar 2016 15:34:53 -0500
Subject: [PATCH 0902/1265] Fix race condition where a container stopping and
 starting again would cause logs to miss logs.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/log_printer.py         |  3 ++
 tests/unit/cli/log_printer_test.py | 56 +++++++++++++++++++++++-------
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 22312c00..367a534e 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -185,6 +185,9 @@ def start_producer_thread(thread_args):
 
 def watch_events(thread_map, event_stream, presenters, thread_args):
     for event in event_stream:
+        if event['action'] == 'stop':
+            thread_map.pop(event['id'], None)
+
         if event['action'] != 'start':
             continue
 
diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py
index 33b2f166..ab48eefc 100644
--- a/tests/unit/cli/log_printer_test.py
+++ b/tests/unit/cli/log_printer_test.py
@@ -1,6 +1,8 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import itertools
+
 import pytest
 import six
 from six.moves.queue import Queue
@@ -11,22 +13,11 @@ from compose.cli.log_printer import build_no_log_generator
 from compose.cli.log_printer import consume_queue
 from compose.cli.log_printer import QueueItem
 from compose.cli.log_printer import wait_on_exit
+from compose.cli.log_printer import watch_events
 from compose.container import Container
 from tests import mock
 
 
-def build_mock_container(reader):
-    return mock.Mock(
-        spec=Container,
-        name='myapp_web_1',
-        name_without_project='web_1',
-        has_api_logs=True,
-        log_stream=None,
-        logs=reader,
-        wait=mock.Mock(return_value=0),
-    )
-
-
 @pytest.fixture
 def output_stream():
     output = six.StringIO()
@@ -105,6 +96,47 @@ class TestBuildLogGenerator(object):
         assert next(generator) == glyph
 
 
+@pytest.fixture
+def thread_map():
+    return {'cid': mock.Mock()}
+
+
+@pytest.fixture
+def mock_presenters():
+    return itertools.cycle([mock.Mock()])
+
+
+class TestWatchEvents(object):
+
+    def test_stop_event(self, thread_map, mock_presenters):
+        event_stream = [{'action': 'stop', 'id': 'cid'}]
+        watch_events(thread_map, event_stream, mock_presenters, ())
+        assert not thread_map
+
+    def test_start_event(self, thread_map, mock_presenters):
+        container_id = 'abcd'
+        event = {'action': 'start', 'id': container_id, 'container': mock.Mock()}
+        event_stream = [event]
+        thread_args = 'foo', 'bar'
+
+        with mock.patch(
+            'compose.cli.log_printer.build_thread',
+            autospec=True
+        ) as mock_build_thread:
+            watch_events(thread_map, event_stream, mock_presenters, thread_args)
+            mock_build_thread.assert_called_once_with(
+                event['container'],
+                next(mock_presenters),
+                *thread_args)
+        assert container_id in thread_map
+
+    def test_other_event(self, thread_map, mock_presenters):
+        container_id = 'abcd'
+        event_stream = [{'action': 'create', 'id': container_id}]
+        watch_events(thread_map, event_stream, mock_presenters, ())
+        assert container_id not in thread_map
+
+
 class TestConsumeQueue(object):
 
     def test_item_is_an_exception(self):

From e5529a89e19fb2325c73c479e23962dbe9e5ef36 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 15 Mar 2016 12:43:37 -0400
Subject: [PATCH 0903/1265] Make down idempotent, continue to remove resources
 if one is missing.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/network.py         |  5 ++++-
 compose/volume.py          |  5 ++++-
 tests/unit/project_test.py | 22 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/compose/network.py b/compose/network.py
index 81e3b5bf..affba7c2 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -149,7 +149,10 @@ class ProjectNetworks(object):
         if not self.use_networking:
             return
         for network in self.networks.values():
-            network.remove()
+            try:
+                network.remove()
+            except NotFound:
+                log.warn("Network %s not found.", network.full_name)
 
     def initialize(self):
         if not self.use_networking:
diff --git a/compose/volume.py b/compose/volume.py
index 17e90087..f440ba40 100644
--- a/compose/volume.py
+++ b/compose/volume.py
@@ -76,7 +76,10 @@ class ProjectVolumes(object):
 
     def remove(self):
         for volume in self.volumes.values():
-            volume.remove()
+            try:
+                volume.remove()
+            except NotFound:
+                log.warn("Volume %s not found.", volume.full_name)
 
     def initialize(self):
         try:
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index c28c2152..bc6421a5 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 import datetime
 
 import docker
+from docker.errors import NotFound
 
 from .. import mock
 from .. import unittest
@@ -12,6 +13,7 @@ from compose.config.types import VolumeFromSpec
 from compose.const import LABEL_SERVICE
 from compose.container import Container
 from compose.project import Project
+from compose.service import ImageType
 from compose.service import Service
 
 
@@ -476,3 +478,23 @@ class ProjectTest(unittest.TestCase):
             ),
         )
         self.assertEqual([c.id for c in project.containers()], ['1'])
+
+    def test_down_with_no_resources(self):
+        project = Project.from_config(
+            name='test',
+            client=self.mock_client,
+            config_data=Config(
+                version='2',
+                services=[{
+                    'name': 'web',
+                    'image': 'busybox:latest',
+                }],
+                networks={'default': {}},
+                volumes={'data': {}},
+            ),
+        )
+        self.mock_client.remove_network.side_effect = NotFound(None, None, 'oops')
+        self.mock_client.remove_volume.side_effect = NotFound(None, None, 'oops')
+
+        project.down(ImageType.all, True)
+        self.mock_client.remove_image.assert_called_once_with("busybox:latest")

From bf96edfe11789d4ce13b869be578cc274794cdfc Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 7 Mar 2016 15:58:25 -0500
Subject: [PATCH 0904/1265] Reduce the args of some functions by including
 presenters as part of the thread_args.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/log_printer.py   |  3 +++
 compose/cli/main.py          | 11 ++++-------
 tests/acceptance/cli_test.py |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index 367a534e..b48462ff 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -88,7 +88,10 @@ class LogPrinter(object):
 
             if not line:
                 if not thread_map:
+                    # There are no running containers left to tail, so exit
                     return
+                # We got an empty line because of a timeout, but there are still
+                # active containers to tail, so continue
                 continue
 
             self.output.write(line)
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 468e10c4..52b4a03b 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -389,7 +389,7 @@ class TopLevelCommand(object):
         }
         print("Attaching to", list_containers(containers))
         log_printer_from_project(
-            project,
+            self.project,
             containers,
             options['--no-color'],
             log_args).run()
@@ -708,10 +708,7 @@ class TopLevelCommand(object):
             raise UserError("--abort-on-container-exit and -d cannot be combined.")
 
         with up_shutdown_context(self.project, service_names, timeout, detached):
-            # start the event stream first so we don't lose any events
-            event_stream = project.events(service_names=service_names)
-
-            to_attach = project.up(
+            to_attach = self.project.up(
                 service_names=service_names,
                 start_deps=start_deps,
                 strategy=convergence_strategy_from_opts(options),
@@ -723,12 +720,12 @@ class TopLevelCommand(object):
                 return
 
             log_printer = log_printer_from_project(
-                project,
+                self.project,
                 filter_containers_to_service_names(to_attach, service_names),
                 options['--no-color'],
                 {'follow': True},
                 cascade_stop,
-                event_stream=event_stream)
+                event_stream=self.project.events(service_names=service_names))
             print("Attaching to", list_containers(log_printer.containers))
             log_printer.run()
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 095fb3f1..ab74f14e 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -396,8 +396,8 @@ class CLITestCase(DockerClientTestCase):
         self.base_dir = 'tests/fixtures/echo-services'
         result = self.dispatch(['up', '--no-color'])
 
-        assert 'simple_1  | simple' in result.stdout
-        assert 'another_1 | another' in result.stdout
+        assert 'simple_1   | simple' in result.stdout
+        assert 'another_1  | another' in result.stdout
         assert 'simple_1 exited with code 0' in result.stdout
         assert 'another_1 exited with code 0' in result.stdout
 

From 658803edf885f490168e223d07b2b1a2cbd22aae Mon Sep 17 00:00:00 2001
From: Simon van der Veldt <simon.vanderveldt@gmail.com>
Date: Mon, 22 Feb 2016 21:05:59 +0100
Subject: [PATCH 0905/1265] Add -w or --workdir to compose run to override
 workdir from commandline

Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com>
---
 compose/cli/main.py                           |  4 ++++
 docs/reference/run.md                         |  1 +
 tests/acceptance/cli_test.py                  | 18 ++++++++++++++++++
 tests/fixtures/run-workdir/docker-compose.yml |  4 ++++
 tests/unit/cli_test.py                        |  3 +++
 5 files changed, 30 insertions(+)
 create mode 100644 tests/fixtures/run-workdir/docker-compose.yml

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 66362168..146b77b4 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -527,6 +527,7 @@ class TopLevelCommand(object):
                                   to the host.
             -T                    Disable pseudo-tty allocation. By default `docker-compose run`
                                   allocates a TTY.
+            -w, --workdir=""      Working directory inside the container
         """
         service = self.project.get_service(options['SERVICE'])
         detach = options['-d']
@@ -576,6 +577,9 @@ class TopLevelCommand(object):
         if options['--name']:
             container_options['name'] = options['--name']
 
+        if options['--workdir']:
+            container_options['working_dir'] = options['--workdir']
+
         run_one_off_container(container_options, self.project, service, options)
 
     def scale(self, options):
diff --git a/docs/reference/run.md b/docs/reference/run.md
index 21890c60..86354424 100644
--- a/docs/reference/run.md
+++ b/docs/reference/run.md
@@ -26,6 +26,7 @@ Options:
 -p, --publish=[]      Publish a container's port(s) to the host
 --service-ports       Run command with the service's ports enabled and mapped to the host.
 -T                    Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.
+-w, --workdir=""      Working directory inside the container
 ```
 
 Runs a one-time command against a service. For example, the following command starts the `web` service and runs `bash` as its command.
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 825b97be..a712de8a 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1025,6 +1025,24 @@ class CLITestCase(DockerClientTestCase):
         container, = service.containers(stopped=True, one_off=True)
         self.assertEqual(container.name, name)
 
+    def test_run_service_with_workdir_overridden(self):
+        self.base_dir = 'tests/fixtures/run-workdir'
+        name = 'service'
+        workdir = '/var'
+        self.dispatch(['run', '--workdir={workdir}'.format(workdir=workdir), name])
+        service = self.project.get_service(name)
+        container = service.containers(stopped=True, one_off=True)[0]
+        self.assertEqual(workdir, container.get('Config.WorkingDir'))
+
+    def test_run_service_with_workdir_overridden_short_form(self):
+        self.base_dir = 'tests/fixtures/run-workdir'
+        name = 'service'
+        workdir = '/var'
+        self.dispatch(['run', '-w', workdir, name])
+        service = self.project.get_service(name)
+        container = service.containers(stopped=True, one_off=True)[0]
+        self.assertEqual(workdir, container.get('Config.WorkingDir'))
+
     @v2_only()
     def test_run_interactive_connects_to_network(self):
         self.base_dir = 'tests/fixtures/networks'
diff --git a/tests/fixtures/run-workdir/docker-compose.yml b/tests/fixtures/run-workdir/docker-compose.yml
new file mode 100644
index 00000000..dc3ea86a
--- /dev/null
+++ b/tests/fixtures/run-workdir/docker-compose.yml
@@ -0,0 +1,4 @@
+service:
+  image: busybox:latest
+  working_dir: /etc
+  command: /bin/true
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 1d7c13e7..e0ada460 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -102,6 +102,7 @@ class CLITestCase(unittest.TestCase):
                 '--publish': [],
                 '--rm': None,
                 '--name': None,
+                '--workdir': None,
             })
 
         _, _, call_kwargs = mock_run_operation.mock_calls[0]
@@ -135,6 +136,7 @@ class CLITestCase(unittest.TestCase):
             '--publish': [],
             '--rm': None,
             '--name': None,
+            '--workdir': None,
         })
 
         self.assertEquals(
@@ -156,6 +158,7 @@ class CLITestCase(unittest.TestCase):
             '--publish': [],
             '--rm': True,
             '--name': None,
+            '--workdir': None,
         })
 
         self.assertFalse(

From 52b791a2647af6e7ace5b2b1ea480fbec16dc08d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 26 Feb 2016 14:24:02 -0800
Subject: [PATCH 0906/1265] Split off build_container_options() to reduce the
 complexity of run

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py | 75 ++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 146b77b4..486fb151 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -538,48 +538,18 @@ class TopLevelCommand(object):
                 "Please pass the -d flag when using `docker-compose run`."
             )
 
-        if options['COMMAND']:
-            command = [options['COMMAND']] + options['ARGS']
-        else:
-            command = service.options.get('command')
-
-        container_options = {
-            'command': command,
-            'tty': not (detach or options['-T'] or not sys.stdin.isatty()),
-            'stdin_open': not detach,
-            'detach': detach,
-        }
-
-        if options['-e']:
-            container_options['environment'] = parse_environment(options['-e'])
-
-        if options['--entrypoint']:
-            container_options['entrypoint'] = options.get('--entrypoint')
-
-        if options['--rm']:
-            container_options['restart'] = None
-
-        if options['--user']:
-            container_options['user'] = options.get('--user')
-
-        if not options['--service-ports']:
-            container_options['ports'] = []
-
-        if options['--publish']:
-            container_options['ports'] = options.get('--publish')
-
         if options['--publish'] and options['--service-ports']:
             raise UserError(
                 'Service port mapping and manual port mapping '
                 'can not be used togather'
             )
 
-        if options['--name']:
-            container_options['name'] = options['--name']
-
-        if options['--workdir']:
-            container_options['working_dir'] = options['--workdir']
+        if options['COMMAND']:
+            command = [options['COMMAND']] + options['ARGS']
+        else:
+            command = service.options.get('command')
 
+        container_options = build_container_options(options, detach, command)
         run_one_off_container(container_options, self.project, service, options)
 
     def scale(self, options):
@@ -780,6 +750,41 @@ def build_action_from_opts(options):
     return BuildAction.none
 
 
+def build_container_options(options, detach, command):
+    container_options = {
+        'command': command,
+        'tty': not (detach or options['-T'] or not sys.stdin.isatty()),
+        'stdin_open': not detach,
+        'detach': detach,
+    }
+
+    if options['-e']:
+        container_options['environment'] = parse_environment(options['-e'])
+
+    if options['--entrypoint']:
+        container_options['entrypoint'] = options.get('--entrypoint')
+
+    if options['--rm']:
+        container_options['restart'] = None
+
+    if options['--user']:
+        container_options['user'] = options.get('--user')
+
+    if not options['--service-ports']:
+        container_options['ports'] = []
+
+    if options['--publish']:
+        container_options['ports'] = options.get('--publish')
+
+    if options['--name']:
+        container_options['name'] = options['--name']
+
+    if options['--workdir']:
+        container_options['working_dir'] = options['--workdir']
+
+    return container_options
+
+
 def run_one_off_container(container_options, project, service, options):
     if not options['--no-deps']:
         deps = service.get_dependency_names()

From 20c29f7e47ade7567ee35f3587790f6235d17d59 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 9 Mar 2016 17:35:56 -0800
Subject: [PATCH 0907/1265] Add flag to up/down to remove orphaned containers
 Add --remove-orphans to CLI reference docs Add --remove-orphans to bash
 completion file Test orphan warning and remove_orphan option in up

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py                    | 24 ++++++++-----
 compose/project.py                     | 48 ++++++++++++++++++++++----
 contrib/completion/bash/docker-compose |  4 +--
 docs/reference/down.md                 | 10 +++---
 docs/reference/up.md                   |  2 ++
 tests/integration/project_test.py      | 39 +++++++++++++++++++++
 6 files changed, 105 insertions(+), 22 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 66362168..110ff6df 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -252,13 +252,15 @@ class TopLevelCommand(object):
         Usage: down [options]
 
         Options:
-            --rmi type      Remove images, type may be one of: 'all' to remove
-                            all images, or 'local' to remove only images that
-                            don't have an custom name set by the `image` field
-            -v, --volumes   Remove data volumes
+            --rmi type          Remove images, type may be one of: 'all' to remove
+                                all images, or 'local' to remove only images that
+                                don't have an custom name set by the `image` field
+            -v, --volumes       Remove data volumes
+            --remove-orphans    Remove containers for services not defined in
+                                the Compose file
         """
         image_type = image_type_from_opt('--rmi', options['--rmi'])
-        self.project.down(image_type, options['--volumes'])
+        self.project.down(image_type, options['--volumes'], options['--remove-orphans'])
 
     def events(self, options):
         """
@@ -324,9 +326,9 @@ class TopLevelCommand(object):
         signals.set_signal_handler_to_shutdown()
         try:
             operation = ExecOperation(
-                    self.project.client,
-                    exec_id,
-                    interactive=tty,
+                self.project.client,
+                exec_id,
+                interactive=tty,
             )
             pty = PseudoTerminal(self.project.client, operation)
             pty.start()
@@ -692,12 +694,15 @@ class TopLevelCommand(object):
             -t, --timeout TIMEOUT      Use this timeout in seconds for container shutdown
                                        when attached or when containers are already
                                        running. (default: 10)
+            --remove-orphans           Remove containers for services not
+                                       defined in the Compose file
         """
         monochrome = options['--no-color']
         start_deps = not options['--no-deps']
         cascade_stop = options['--abort-on-container-exit']
         service_names = options['SERVICE']
         timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
+        remove_orphans = options['--remove-orphans']
         detached = options.get('-d')
 
         if detached and cascade_stop:
@@ -710,7 +715,8 @@ class TopLevelCommand(object):
                 strategy=convergence_strategy_from_opts(options),
                 do_build=build_action_from_opts(options),
                 timeout=timeout,
-                detached=detached)
+                detached=detached,
+                remove_orphans=remove_orphans)
 
             if detached:
                 return
diff --git a/compose/project.py b/compose/project.py
index 3de68b2c..49cbfbf7 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -252,9 +252,11 @@ class Project(object):
     def remove_stopped(self, service_names=None, **options):
         parallel.parallel_remove(self.containers(service_names, stopped=True), options)
 
-    def down(self, remove_image_type, include_volumes):
+    def down(self, remove_image_type, include_volumes, remove_orphans=False):
         self.stop()
+        self.find_orphan_containers(remove_orphans)
         self.remove_stopped(v=include_volumes)
+
         self.networks.remove()
 
         if include_volumes:
@@ -334,7 +336,8 @@ class Project(object):
            strategy=ConvergenceStrategy.changed,
            do_build=BuildAction.none,
            timeout=DEFAULT_TIMEOUT,
-           detached=False):
+           detached=False,
+           remove_orphans=False):
 
         self.initialize()
         services = self.get_services_without_duplicate(
@@ -346,6 +349,8 @@ class Project(object):
         for svc in services:
             svc.ensure_image_exists(do_build=do_build)
 
+        self.find_orphan_containers(remove_orphans)
+
         def do(service):
             return service.execute_convergence_plan(
                 plans[service.name],
@@ -402,23 +407,52 @@ class Project(object):
         for service in self.get_services(service_names, include_deps=False):
             service.pull(ignore_pull_failures)
 
+    def _labeled_containers(self, stopped=False, one_off=False):
+        return list(filter(None, [
+            Container.from_ps(self.client, container)
+            for container in self.client.containers(
+                all=stopped,
+                filters={'label': self.labels(one_off=one_off)})])
+        )
+
     def containers(self, service_names=None, stopped=False, one_off=False):
         if service_names:
             self.validate_service_names(service_names)
         else:
             service_names = self.service_names
 
-        containers = list(filter(None, [
-            Container.from_ps(self.client, container)
-            for container in self.client.containers(
-                all=stopped,
-                filters={'label': self.labels(one_off=one_off)})]))
+        containers = self._labeled_containers(stopped, one_off)
 
         def matches_service_names(container):
             return container.labels.get(LABEL_SERVICE) in service_names
 
         return [c for c in containers if matches_service_names(c)]
 
+    def find_orphan_containers(self, remove_orphans):
+        def _find():
+            containers = self._labeled_containers()
+            for ctnr in containers:
+                service_name = ctnr.labels.get(LABEL_SERVICE)
+                if service_name not in self.service_names:
+                    yield ctnr
+        orphans = list(_find())
+        if not orphans:
+            return
+        if remove_orphans:
+            for ctnr in orphans:
+                log.info('Removing orphan container "{0}"'.format(ctnr.name))
+                ctnr.kill()
+                ctnr.remove(force=True)
+        else:
+            log.warning(
+                'Found orphan containers ({0}) for this project. If '
+                'you removed or renamed this service in your compose '
+                'file, you can run this command with the '
+                '--remove-orphans flag to clean it up.'.format(
+                    ', '.join(["{}".format(ctnr.name) for ctnr in orphans])
+                )
+            )
+
     def _inject_deps(self, acc, service):
         dep_names = service.get_dependency_names()
 
diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index d926d648..0769e657 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -161,7 +161,7 @@ _docker_compose_down() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--help --rmi --volumes -v" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--help --rmi --volumes -v --remove-orphans" -- "$cur" ) )
 			;;
 	esac
 }
@@ -406,7 +406,7 @@ _docker_compose_up() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--abort-on-container-exit -d --force-recreate --help --no-build --no-color --no-deps --no-recreate --timeout -t" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--abort-on-container-exit -d --force-recreate --help --no-build --no-color --no-deps --no-recreate --timeout -t --remove-orphans" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_all
diff --git a/docs/reference/down.md b/docs/reference/down.md
index 2495abea..e8b1db59 100644
--- a/docs/reference/down.md
+++ b/docs/reference/down.md
@@ -18,9 +18,11 @@ created by `up`. Only containers and networks are removed by default.
 Usage: down [options]
 
 Options:
-    --rmi type      Remove images, type may be one of: 'all' to remove
-                    all images, or 'local' to remove only images that
-                    don't have an custom name set by the `image` field
-    -v, --volumes   Remove data volumes
+    --rmi type          Remove images, type may be one of: 'all' to remove
+                        all images, or 'local' to remove only images that
+                        don't have an custom name set by the `image` field
+    -v, --volumes       Remove data volumes
 
+    --remove-orphans    Remove containers for services not defined in the
+                        Compose file
 ```
diff --git a/docs/reference/up.md b/docs/reference/up.md
index 07ee82f9..3951f879 100644
--- a/docs/reference/up.md
+++ b/docs/reference/up.md
@@ -32,6 +32,8 @@ Options:
     -t, --timeout TIMEOUT      Use this timeout in seconds for container shutdown
                                when attached or when containers are already
                                running. (default: 10)
+    --remove-orphans           Remove containers for services not defined in
+                               the Compose file
 
 ```
 
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 393f4f11..9839bf8f 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -7,6 +7,7 @@ import py
 import pytest
 from docker.errors import NotFound
 
+from .. import mock
 from ..helpers import build_config
 from .testcases import DockerClientTestCase
 from compose.config import config
@@ -15,6 +16,7 @@ from compose.config.config import V2_0
 from compose.config.types import VolumeFromSpec
 from compose.config.types import VolumeSpec
 from compose.const import LABEL_PROJECT
+from compose.const import LABEL_SERVICE
 from compose.container import Container
 from compose.project import Project
 from compose.service import ConvergenceStrategy
@@ -1055,3 +1057,40 @@ class ProjectTest(DockerClientTestCase):
         container = service.get_container()
         assert [mount['Name'] for mount in container.get('Mounts')] == [full_vol_name]
         assert next((v for v in engine_volumes if v['Name'] == vol_name), None) is None
+
+    def test_project_up_orphans(self):
+        config_dict = {
+            'service1': {
+                'image': 'busybox:latest',
+                'command': 'top',
+            }
+        }
+
+        config_data = build_config(config_dict)
+        project = Project.from_config(
+            name='composetest', config_data=config_data, client=self.client
+        )
+        project.up()
+        config_dict['service2'] = config_dict['service1']
+        del config_dict['service1']
+
+        config_data = build_config(config_dict)
+        project = Project.from_config(
+            name='composetest', config_data=config_data, client=self.client
+        )
+        with mock.patch('compose.project.log') as mock_log:
+            project.up()
+
+        mock_log.warning.assert_called_once_with(mock.ANY)
+
+        assert len([
+            ctnr for ctnr in project._labeled_containers()
+            if ctnr.labels.get(LABEL_SERVICE) == 'service1'
+        ]) == 1
+
+        project.up(remove_orphans=True)
+
+        assert len([
+            ctnr for ctnr in project._labeled_containers()
+            if ctnr.labels.get(LABEL_SERVICE) == 'service1'
+        ]) == 0

From 92d69b0cb6f2d192b02a85d79fd7d99baedadf79 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 17 Mar 2016 09:56:44 +0000
Subject: [PATCH 0908/1265] Update Mac Engine install URL in error message

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/errors.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index a16cad2f..668f8444 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -88,9 +88,9 @@ def exit_with_error(msg):
 
 
 docker_not_found_mac = """
-    Couldn't connect to Docker daemon. You might need to install docker-osx:
+    Couldn't connect to Docker daemon. You might need to install Docker:
 
-    https://github.com/noplay/docker-osx
+    https://docs.docker.com/engine/installation/mac/
 """
 
 

From 7424938fc8c78eb10f28c5dd0e2b5805f87a4e6e Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 17 Mar 2016 11:32:36 +0000
Subject: [PATCH 0909/1265] Move ipv4_address/ipv6_address docs to reference
 section

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/compose-file.md | 32 ++++++++++++++++++++++++++++++++
 docs/networking.md   | 24 +-----------------------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index d6cb92cf..85875512 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -545,6 +545,38 @@ In the example below, three services are provided (`web`, `worker`, and `db`), a
       new:
       legacy:
 
+#### ipv4_address, ipv6_address
+
+Specify a static IP address for containers for this service when joining the network.
+
+The corresponding network configuration in the [top-level networks section](#network-configuration-reference) must have an `ipam` block with subnet and gateway configurations covering each static address. If IPv6 addressing is desired, the `com.docker.network.enable_ipv6` driver option must be set to `true`.
+
+An example:
+
+    version: '2'
+
+    services:
+      app:
+        image: busybox
+        command: ifconfig
+        networks:
+          app_net:
+            ipv4_address: 172.16.238.10
+            ipv6_address: 2001:3984:3989::10
+
+    networks:
+      app_net:
+        driver: bridge
+        driver_opts:
+          com.docker.network.enable_ipv6: "true"
+        ipam:
+          driver: default
+          config:
+          - subnet: 172.16.238.0/24
+            gateway: 172.16.238.1
+          - subnet: 2001:3984:3989::/64
+            gateway: 2001:3984:3989::1
+
 ### pid
 
     pid: "host"
diff --git a/docs/networking.md b/docs/networking.md
index e38e5690..bc568294 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -116,29 +116,7 @@ Here's an example Compose file defining two custom networks. The `proxy` service
           foo: "1"
           bar: "2"
 
-Networks can be configured with static IP addresses by setting the ipv4_address and/or ipv6_address for each attached network. The corresponding `network` section must have an `ipam` config entry with subnet and gateway configurations for each static address. If IPv6 addressing is desired, the `com.docker.network.enable_ipv6` driver option must be set to `true`. An example:
-
-    version: '2'
-
-    services:
-      app:
-        networks:
-          app_net:
-            ipv4_address: 172.16.238.10
-            ipv6_address: 2001:3984:3989::10
-
-    networks:
-      app_net:
-        driver: bridge
-        driver_opts:
-          com.docker.network.enable_ipv6: "true"
-        ipam:
-          driver: default
-          config:
-          - subnet: 172.16.238.0/24
-            gateway: 172.16.238.1
-          - subnet: 2001:3984:3989::/64
-            gateway: 2001:3984:3989::1
+Networks can be configured with static IP addresses by setting the [ipv4_address and/or ipv6_address](compose-file.md#ipv4-address-ipv6-address) for each attached network.
 
 For full details of the network configuration options available, see the following references:
 

From 20bf05a6e3b79370a680da844dc6c59e77cda293 Mon Sep 17 00:00:00 2001
From: Thomas Grainger <tom.grainger@procensus.com>
Date: Thu, 17 Mar 2016 13:59:51 +0000
Subject: [PATCH 0910/1265] Fix TypeError in Exception handling

Traceback (most recent call last):
  File "/tmp/tmp.02tgGaAGtW/docker-compose/bin/docker-compose", line 11, in <module>
    sys.exit(main())
  File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 68, in main
    log_api_error(e)
  File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 89, in log_api_error
    if 'client is newer than server' in e.explanation:
TypeError: 'str' does not support the buffer interface

Signed-off-by: Thomas Grainger <tagrain@gmail.com>
---
 compose/cli/errors.py         | 2 +-
 tests/unit/cli/errors_test.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index a16cad2f..2f2907ae 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -66,7 +66,7 @@ def handle_connection_errors(client):
 
 
 def log_api_error(e, client_version):
-    if 'client is newer than server' not in e.explanation:
+    if b'client is newer than server' not in e.explanation:
         log.error(e.explanation)
         return
 
diff --git a/tests/unit/cli/errors_test.py b/tests/unit/cli/errors_test.py
index a99356b4..71fa9dee 100644
--- a/tests/unit/cli/errors_test.py
+++ b/tests/unit/cli/errors_test.py
@@ -37,13 +37,13 @@ class TestHandleConnectionErrors(object):
     def test_api_error_version_mismatch(self, mock_logging):
         with pytest.raises(errors.ConnectionError):
             with handle_connection_errors(mock.Mock(api_version='1.22')):
-                raise APIError(None, None, "client is newer than server")
+                raise APIError(None, None, b"client is newer than server")
 
         _, args, _ = mock_logging.error.mock_calls[0]
         assert "Docker Engine of version 1.10.0 or greater" in args[0]
 
     def test_api_error_version_other(self, mock_logging):
-        msg = "Something broke!"
+        msg = b"Something broke!"
         with pytest.raises(errors.ConnectionError):
             with handle_connection_errors(mock.Mock(api_version='1.22')):
                 raise APIError(None, None, msg)

From 10dfd54ebedd900525a7cde6ac52853821965d6b Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 17 Mar 2016 18:09:38 +0000
Subject: [PATCH 0911/1265] Update install page with link to Windows Toolbox
 install instructions

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/install.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/install.md b/docs/install.md
index eee0c203..10841cdf 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -12,21 +12,21 @@ weight=-90
 
 # Install Docker Compose
 
-You can run Compose on OS X and 64-bit Linux.  It is currently not supported on
-the Windows operating system. To install Compose, you'll need to install Docker
-first.
+You can run Compose on OS X, Windows and 64-bit Linux. To install it, you'll need to install Docker first.
 
 To install Compose, do the following:
 
 1. Install Docker Engine:
 
-     * <a href="https://docs.docker.com/engine/installation/mac/" target="_blank">Mac OS X installation</a> (Toolbox installation includes both Engine and Compose)
+     * <a href="https://docs.docker.com/engine/installation/mac/" target="_blank">Mac OS X installation</a>
+
+     * <a href="https://docs.docker.com/engine/installation/windows/" target="_blank">Windows installation</a>
 
      * <a href="https://docs.docker.com/engine/installation/ubuntulinux/" target="_blank">Ubuntu installation</a>
 
      * <a href="https://docs.docker.com/engine/installation/" target="_blank">other system installations</a>
 
-2. Mac OS X users are done installing. Others should continue to the next step.
+2. The Docker Toolbox installation includes both Engine and Compose, so Mac and Windows users are done installing. Others should continue to the next step.
 
 3. Go to the <a href="https://github.com/docker/compose/releases" target="_blank">Compose repository release page on GitHub</a>.
 

From 50fe014ba9f6af3dc75cb5f5548dcf0c9825cd05 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 17 Mar 2016 18:10:32 +0000
Subject: [PATCH 0912/1265] Remove hardcoded host from Engine install URLs

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/install.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/install.md b/docs/install.md
index 10841cdf..95416e7a 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -18,13 +18,13 @@ To install Compose, do the following:
 
 1. Install Docker Engine:
 
-     * <a href="https://docs.docker.com/engine/installation/mac/" target="_blank">Mac OS X installation</a>
+     * <a href="/engine/installation/mac/" target="_blank">Mac OS X installation</a>
 
-     * <a href="https://docs.docker.com/engine/installation/windows/" target="_blank">Windows installation</a>
+     * <a href="/engine/installation/windows/" target="_blank">Windows installation</a>
 
-     * <a href="https://docs.docker.com/engine/installation/ubuntulinux/" target="_blank">Ubuntu installation</a>
+     * <a href="/engine/installation/ubuntulinux/" target="_blank">Ubuntu installation</a>
 
-     * <a href="https://docs.docker.com/engine/installation/" target="_blank">other system installations</a>
+     * <a href="/engine/installation/" target="_blank">other system installations</a>
 
 2. The Docker Toolbox installation includes both Engine and Compose, so Mac and Windows users are done installing. Others should continue to the next step.
 

From e3c1b5886aa8d28a3fa29d9c58b9868c0db2e831 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Fri, 18 Mar 2016 10:47:17 +0100
Subject: [PATCH 0913/1265] bash completion for `docker-compose run --workdir`

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 0769e657..528970b4 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -316,14 +316,14 @@ _docker_compose_run() {
 			__docker_compose_nospace
 			return
 			;;
-		--entrypoint|--name|--user|-u)
+		--entrypoint|--name|--user|-u|--workdir|-w)
 			return
 			;;
 	esac
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "-d --entrypoint -e --help --name --no-deps --publish -p --rm --service-ports -T --user -u" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "-d --entrypoint -e --help --name --no-deps --publish -p --rm --service-ports -T --user -u --workdir -w" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_all

From 25cbc2aae907886d46ff1e55a2c6dea535966e41 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 18 Mar 2016 18:19:16 -0400
Subject: [PATCH 0914/1265] Fix flaky network test.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/integration/project_test.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 9839bf8f..d1732d1e 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -659,6 +659,7 @@ class ProjectTest(DockerClientTestCase):
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
+                'command': 'top',
                 'networks': {
                     'static_test': {
                         'ipv4_address': '172.16.100.100',
@@ -690,7 +691,7 @@ class ProjectTest(DockerClientTestCase):
             name='composetest',
             config_data=config_data,
         )
-        project.up()
+        project.up(detached=True)
 
         network = self.client.networks(names=['static_test'])[0]
         service_container = project.get_service('web').containers()[0]

From f1dce50b3da1ccd4f66939965a749b660a48fe16 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 18 Mar 2016 16:09:44 -0400
Subject: [PATCH 0915/1265] Handle all timeout errors consistently.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/errors.py | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index 96fc5f8f..2c68d36d 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -3,12 +3,14 @@ from __future__ import unicode_literals
 
 import contextlib
 import logging
+import socket
 from textwrap import dedent
 
 from docker.errors import APIError
 from requests.exceptions import ConnectionError as RequestsConnectionError
 from requests.exceptions import ReadTimeout
 from requests.exceptions import SSLError
+from requests.packages.urllib3.exceptions import ReadTimeoutError
 
 from ..const import API_VERSION_TO_ENGINE_VERSION
 from ..const import HTTP_TIMEOUT
@@ -42,7 +44,11 @@ def handle_connection_errors(client):
     except SSLError as e:
         log.error('SSL error: %s' % e)
         raise ConnectionError()
-    except RequestsConnectionError:
+    except RequestsConnectionError as e:
+        if e.args and isinstance(e.args[0], ReadTimeoutError):
+            log_timeout_error()
+            raise ConnectionError()
+
         if call_silently(['which', 'docker']) != 0:
             if is_mac():
                 exit_with_error(docker_not_found_mac)
@@ -55,16 +61,20 @@ def handle_connection_errors(client):
     except APIError as e:
         log_api_error(e, client.api_version)
         raise ConnectionError()
-    except ReadTimeout as e:
-        log.error(
-            "An HTTP request took too long to complete. Retry with --verbose to "
-            "obtain debug information.\n"
-            "If you encounter this issue regularly because of slow network "
-            "conditions, consider setting COMPOSE_HTTP_TIMEOUT to a higher "
-            "value (current value: %s)." % HTTP_TIMEOUT)
+    except (ReadTimeout, socket.timeout) as e:
+        log_timeout_error()
         raise ConnectionError()
 
 
+def log_timeout_error():
+    log.error(
+        "An HTTP request took too long to complete. Retry with --verbose to "
+        "obtain debug information.\n"
+        "If you encounter this issue regularly because of slow network "
+        "conditions, consider setting COMPOSE_HTTP_TIMEOUT to a higher "
+        "value (current value: %s)." % HTTP_TIMEOUT)
+
+
 def log_api_error(e, client_version):
     if b'client is newer than server' not in e.explanation:
         log.error(e.explanation)

From 85c7d3e5ce821c7e8d6a7c85fc0b786f3a60ec93 Mon Sep 17 00:00:00 2001
From: Philip Walls <pawalls@rabidgeek.com>
Date: Sat, 20 Feb 2016 01:18:40 +0000
Subject: [PATCH 0916/1265] Add support for docker run --tmpfs flag.

Signed-off-by: Philip Walls <pawalls@rabidgeek.com>
---
 compose/config/config.py               |  4 ++--
 compose/config/config_schema_v1.json   |  1 +
 compose/config/config_schema_v2.0.json |  1 +
 compose/service.py                     |  1 +
 docs/compose-file.md                   |  9 +++++++++
 docs/extends.md                        |  4 ++--
 requirements.txt                       |  2 +-
 tests/integration/service_test.py      |  5 +++++
 tests/unit/config/config_test.py       | 15 +++++++++++++++
 9 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index f34809a9..961d0b57 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -591,7 +591,7 @@ def process_service(service_config):
     if 'extra_hosts' in service_dict:
         service_dict['extra_hosts'] = parse_extra_hosts(service_dict['extra_hosts'])
 
-    for field in ['dns', 'dns_search']:
+    for field in ['dns', 'dns_search', 'tmpfs']:
         if field in service_dict:
             service_dict[field] = to_list(service_dict[field])
 
@@ -730,7 +730,7 @@ def merge_service_dicts(base, override, version):
     ]:
         md.merge_field(field, operator.add, default=[])
 
-    for field in ['dns', 'dns_search', 'env_file']:
+    for field in ['dns', 'dns_search', 'env_file', 'tmpfs']:
         md.merge_field(field, merge_list_or_string)
 
     for field in set(ALLOWED_KEYS) - set(md):
diff --git a/compose/config/config_schema_v1.json b/compose/config/config_schema_v1.json
index 36a93793..9fad7d00 100644
--- a/compose/config/config_schema_v1.json
+++ b/compose/config/config_schema_v1.json
@@ -104,6 +104,7 @@
         "shm_size": {"type": ["number", "string"]},
         "stdin_open": {"type": "boolean"},
         "stop_signal": {"type": "string"},
+        "tmpfs": {"$ref": "#/definitions/string_or_list"},
         "tty": {"type": "boolean"},
         "ulimits": {
           "type": "object",
diff --git a/compose/config/config_schema_v2.0.json b/compose/config/config_schema_v2.0.json
index 33afc9b2..e84d1317 100644
--- a/compose/config/config_schema_v2.0.json
+++ b/compose/config/config_schema_v2.0.json
@@ -184,6 +184,7 @@
         "shm_size": {"type": ["number", "string"]},
         "stdin_open": {"type": "boolean"},
         "stop_signal": {"type": "string"},
+        "tmpfs": {"$ref": "#/definitions/string_or_list"},
         "tty": {"type": "boolean"},
         "ulimits": {
           "type": "object",
diff --git a/compose/service.py b/compose/service.py
index 30d28e4c..f8b13607 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -668,6 +668,7 @@ class Service(object):
             cgroup_parent=options.get('cgroup_parent'),
             cpu_quota=options.get('cpu_quota'),
             shm_size=options.get('shm_size'),
+            tmpfs=options.get('tmpfs'),
         )
 
     def build(self, no_cache=False, pull=False, force_rm=False):
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 85875512..09de5615 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -226,6 +226,15 @@ Custom DNS search domains. Can be a single value or a list.
       - dc1.example.com
       - dc2.example.com
 
+### tmpfs
+
+Mount a temporary file system inside the container. Can be a single value or a list.
+
+    tmpfs: /run
+    tmpfs:
+      - /run
+      - /tmp
+
 ### entrypoint
 
 Override the default entrypoint.
diff --git a/docs/extends.md b/docs/extends.md
index 9ecccd8a..6f457391 100644
--- a/docs/extends.md
+++ b/docs/extends.md
@@ -302,8 +302,8 @@ replaces the old value.
 > This is because `build` and `image` cannot be used together in a version 1
 > file.
 
-For the **multi-value options** `ports`, `expose`, `external_links`, `dns` and
-`dns_search`, Compose concatenates both sets of values:
+For the **multi-value options** `ports`, `expose`, `external_links`, `dns`,
+`dns_search`, and `tmpfs`, Compose concatenates both sets of values:
 
     # original service
     expose:
diff --git a/requirements.txt b/requirements.txt
index 074864d4..2b7c85e6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ cached-property==1.2.0
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
-git+https://github.com/docker/docker-py.git@d8be3e0fce60fbe25be088b64bccbcee83effdb1#egg=docker-py
+git+https://github.com/docker/docker-py.git@8c4546f8c8f52bb2923834783a17beb5bb89a724#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 6d0c97db..22cbfcee 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -875,6 +875,11 @@ class ServiceTest(DockerClientTestCase):
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.DnsSearch'), ['dc1.example.com', 'dc2.example.com'])
 
+    def test_tmpfs(self):
+        service = self.create_service('web', tmpfs=['/run'])
+        container = create_and_start_container(service)
+        self.assertEqual(container.get('HostConfig.Tmpfs'), {'/run': ''})
+
     def test_working_dir_param(self):
         service = self.create_service('container', working_dir='/working/dir/sample')
         container = service.create_container()
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index d0e82420..e3dac160 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1194,6 +1194,21 @@ class ConfigTest(unittest.TestCase):
             }
         ]
 
+    def test_tmpfs_option(self):
+        actual = config.load(build_config_details({
+            'web': {
+                'image': 'alpine',
+                'tmpfs': '/run',
+            }
+        }))
+        assert actual.services == [
+            {
+                'name': 'web',
+                'image': 'alpine',
+                'tmpfs': ['/run'],
+            }
+        ]
+
     def test_merge_service_dicts_from_files_with_extends_in_base(self):
         base = {
             'volumes': ['.:/app'],

From 089ec6652223acdde9c594aadfc104237e1cfbf8 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 14 Mar 2016 22:02:25 -0400
Subject: [PATCH 0917/1265] Include network settings as part of the service
 config hash.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py         | 2 +-
 tests/unit/service_test.py | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 30d28e4c..3f77ce4e 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -498,7 +498,7 @@ class Service(object):
             'image_id': self.image()['Id'],
             'links': self.get_link_names(),
             'net': self.network_mode.id,
-            'networks': list(self.networks.keys()),
+            'networks': self.networks,
             'volumes_from': [
                 (v.source.name, v.mode)
                 for v in self.volumes_from if isinstance(v.source, Service)
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 199aeeb4..45836e01 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -285,7 +285,7 @@ class ServiceTest(unittest.TestCase):
 
         self.assertEqual(
             opts['labels'][LABEL_CONFIG_HASH],
-            'f8bfa1058ad1f4231372a0b1639f0dfdb574dafff4e8d7938049ae993f7cf1fc')
+            '2524a06fcb3d781aa2c981fc40bcfa08013bb318e4273bfa388df22023e6f2aa')
         assert opts['environment'] == ['also=real']
 
     def test_get_container_create_options_sets_affinity_with_binds(self):
@@ -501,6 +501,7 @@ class ServiceTest(unittest.TestCase):
             image='example.com/foo',
             client=self.mock_client,
             network_mode=ServiceNetworkMode(Service('other')),
+            networks={'default': None},
             links=[(Service('one'), 'one')],
             volumes_from=[VolumeFromSpec(Service('two'), 'rw', 'service')])
 
@@ -510,7 +511,7 @@ class ServiceTest(unittest.TestCase):
             'options': {'image': 'example.com/foo'},
             'links': [('one', 'one')],
             'net': 'other',
-            'networks': [],
+            'networks': {'default': None},
             'volumes_from': [('two', 'rw')],
         }
         assert config_dict == expected
@@ -531,7 +532,7 @@ class ServiceTest(unittest.TestCase):
             'image_id': 'abcd',
             'options': {'image': 'example.com/foo'},
             'links': [],
-            'networks': [],
+            'networks': {},
             'net': 'aaabbb',
             'volumes_from': [],
         }

From dfac48f3f58fb777ae8d5e577f1fb1c6fc000e4c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 16 Mar 2016 22:37:28 -0400
Subject: [PATCH 0918/1265] Make a new flaky test less flaky.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/acceptance/cli_test.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index f06b3280..ee1eed53 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1226,6 +1226,10 @@ class CLITestCase(DockerClientTestCase):
             'logscomposefile_another_1',
             'exited'))
 
+        # sleep for a short period to allow the tailing thread to receive the
+        # event. This is not great, but there isn't an easy way to do this
+        # without being able to stream stdout from the process.
+        time.sleep(0.5)
         os.kill(proc.pid, signal.SIGINT)
         result = wait_on_process(proc, returncode=1)
         assert 'test' in result.stdout

From 7fc40dd7ccb5b839340c666a0902eb7bc47c80a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kalle=20M=C3=B8ller?= <github.com@k-moeller.dk>
Date: Mon, 14 Mar 2016 01:54:15 +0100
Subject: [PATCH 0919/1265] Adding ssl_version to docker_clients kwargs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Select tls version based of COMPOSE_TLS_VERSION

Changed from SSL to TLS

Also did docs - missing default value

Using getattr and raises AttributeError in case of unsupported version

Signed-off-by: Kalle Møller <github.com@k-moeller.dk>
---
 compose/cli/command.py       | 15 ++++++++++++---
 compose/cli/docker_client.py |  4 ++--
 docs/reference/envvars.md    |  4 ++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 55f6df01..7e219e11 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 import logging
 import os
 import re
+import ssl
 
 import six
 
@@ -37,8 +38,8 @@ def get_config_path_from_options(options):
     return None
 
 
-def get_client(verbose=False, version=None):
-    client = docker_client(version=version)
+def get_client(verbose=False, version=None, tls_version=None):
+    client = docker_client(version=version, tls_version=tls_version)
     if verbose:
         version_info = six.iteritems(client.version())
         log.info(get_version_info('full'))
@@ -57,7 +58,15 @@ def get_project(project_dir, config_path=None, project_name=None, verbose=False)
     api_version = os.environ.get(
         'COMPOSE_API_VERSION',
         API_VERSIONS[config_data.version])
-    client = get_client(verbose=verbose, version=api_version)
+    compose_tls_version = os.environ.get(
+        'COMPOSE_TLS_VERSION',
+        None)
+
+    tls_version = None
+    if compose_tls_version:
+        tls_version = ssl.getattr("PROTOCOL_{}".format(compose_tls_version))
+
+    client = get_client(verbose=verbose, version=api_version, tls_version=tls_version)
 
     return Project.from_config(project_name, config_data, client)
 
diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 9e79fe77..5663a57c 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -14,7 +14,7 @@ from .errors import UserError
 log = logging.getLogger(__name__)
 
 
-def docker_client(version=None):
+def docker_client(version=None, tls_version=None):
     """
     Returns a docker-py client configured using environment variables
     according to the same logic as the official Docker client.
@@ -24,7 +24,7 @@ def docker_client(version=None):
                  "Please use COMPOSE_HTTP_TIMEOUT instead.")
 
     try:
-        kwargs = kwargs_from_env(assert_hostname=False)
+        kwargs = kwargs_from_env(assert_hostname=False, ssl_version=tls_version)
     except TLSParameterError:
         raise UserError(
             "TLS configuration is invalid - make sure your DOCKER_TLS_VERIFY "
diff --git a/docs/reference/envvars.md b/docs/reference/envvars.md
index e1170be9..ca88276e 100644
--- a/docs/reference/envvars.md
+++ b/docs/reference/envvars.md
@@ -75,6 +75,10 @@ Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TL
 Configures the time (in seconds) a request to the Docker daemon is allowed to hang before Compose considers
 it failed. Defaults to 60 seconds.
 
+## COMPOSE\_TLS\_VERSION
+
+Configure which TLS version is used for TLS communication with the `docker` daemon, defaults to `TBD`
+Can be `TLSv1`, `TLSv1_1`, `TLSv1_2`.
 
 ## Related Information
 

From 187ea4cd814a3de1201afe5a50097935183d7f9f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 15 Mar 2016 17:00:24 -0700
Subject: [PATCH 0920/1265] Add --all option to rm command - remove one-off
 containers

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py          |  9 +++++++--
 compose/project.py           | 16 ++++++++++------
 docs/reference/rm.md         |  1 +
 tests/acceptance/cli_test.py | 22 ++++++++++++++++++++++
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index ea3054ab..5ca8d23d 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -491,8 +491,12 @@ class TopLevelCommand(object):
         Options:
             -f, --force   Don't ask to confirm removal
             -v            Remove volumes associated with containers
+            -a, --all     Also remove one-off containers
         """
-        all_containers = self.project.containers(service_names=options['SERVICE'], stopped=True)
+        all_containers = self.project.containers(
+            service_names=options['SERVICE'], stopped=True,
+            one_off=(None if options.get('--all') else False)
+        )
         stopped_containers = [c for c in all_containers if not c.is_running]
 
         if len(stopped_containers) > 0:
@@ -501,7 +505,8 @@ class TopLevelCommand(object):
                     or yesno("Are you sure? [yN] ", default=False):
                 self.project.remove_stopped(
                     service_names=options['SERVICE'],
-                    v=options.get('-v', False)
+                    v=options.get('-v', False),
+                    one_off=options.get('--all')
                 )
         else:
             print("No stopped containers")
diff --git a/compose/project.py b/compose/project.py
index dbfe6a12..298396de 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -47,10 +47,12 @@ class Project(object):
         self.networks = networks or ProjectNetworks({}, False)
 
     def labels(self, one_off=False):
-        return [
-            '{0}={1}'.format(LABEL_PROJECT, self.name),
-            '{0}={1}'.format(LABEL_ONE_OFF, "True" if one_off else "False"),
-        ]
+        labels = ['{0}={1}'.format(LABEL_PROJECT, self.name)]
+        if one_off is not None:
+            labels.append(
+                '{0}={1}'.format(LABEL_ONE_OFF, "True" if one_off else "False")
+            )
+        return labels
 
     @classmethod
     def from_config(cls, name, config_data, client):
@@ -249,8 +251,10 @@ class Project(object):
     def kill(self, service_names=None, **options):
         parallel.parallel_kill(self.containers(service_names), options)
 
-    def remove_stopped(self, service_names=None, **options):
-        parallel.parallel_remove(self.containers(service_names, stopped=True), options)
+    def remove_stopped(self, service_names=None, one_off=False, **options):
+        parallel.parallel_remove(self.containers(
+            service_names, stopped=True, one_off=(None if one_off else False)
+        ), options)
 
     def down(self, remove_image_type, include_volumes, remove_orphans=False):
         self.stop()
diff --git a/docs/reference/rm.md b/docs/reference/rm.md
index f8479224..97698b58 100644
--- a/docs/reference/rm.md
+++ b/docs/reference/rm.md
@@ -17,6 +17,7 @@ Usage: rm [options] [SERVICE...]
 Options:
 -f, --force   Don't ask to confirm removal
 -v            Remove volumes associated with containers
+-a, --all     Also remove one-off containers
 ```
 
 Removes stopped service containers.
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index f06b3280..778c8ff4 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1125,6 +1125,28 @@ class CLITestCase(DockerClientTestCase):
         self.dispatch(['rm', '-f'], None)
         self.assertEqual(len(service.containers(stopped=True)), 0)
 
+    def test_rm_all(self):
+        service = self.project.get_service('simple')
+        service.create_container(one_off=False)
+        service.create_container(one_off=True)
+        kill_service(service)
+        self.assertEqual(len(service.containers(stopped=True)), 1)
+        self.assertEqual(len(service.containers(stopped=True, one_off=True)), 1)
+        self.dispatch(['rm', '-f'], None)
+        self.assertEqual(len(service.containers(stopped=True)), 0)
+        self.assertEqual(len(service.containers(stopped=True, one_off=True)), 1)
+        self.dispatch(['rm', '-f', '-a'], None)
+        self.assertEqual(len(service.containers(stopped=True, one_off=True)), 0)
+
+        service.create_container(one_off=False)
+        service.create_container(one_off=True)
+        kill_service(service)
+        self.assertEqual(len(service.containers(stopped=True)), 1)
+        self.assertEqual(len(service.containers(stopped=True, one_off=True)), 1)
+        self.dispatch(['rm', '-f', '--all'], None)
+        self.assertEqual(len(service.containers(stopped=True)), 0)
+        self.assertEqual(len(service.containers(stopped=True, one_off=True)), 0)
+
     def test_stop(self):
         self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')

From 5826a2147b1817c278dd8918e9cc8bbce6844b9e Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 16 Mar 2016 19:47:46 -0700
Subject: [PATCH 0921/1265] Use enum to represent 3 possible states of the
 one_off filter

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py               | 13 ++++++----
 compose/project.py                | 23 +++++++++++++----
 tests/acceptance/cli_test.py      | 43 ++++++++++++++++---------------
 tests/integration/service_test.py |  5 ++--
 tests/unit/service_test.py        |  3 ++-
 5 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 5ca8d23d..f481d584 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -22,6 +22,7 @@ from ..const import DEFAULT_TIMEOUT
 from ..const import IS_WINDOWS_PLATFORM
 from ..progress_stream import StreamOutputError
 from ..project import NoSuchService
+from ..project import OneOffFilter
 from ..service import BuildAction
 from ..service import BuildError
 from ..service import ConvergenceStrategy
@@ -437,7 +438,7 @@ class TopLevelCommand(object):
         """
         containers = sorted(
             self.project.containers(service_names=options['SERVICE'], stopped=True) +
-            self.project.containers(service_names=options['SERVICE'], one_off=True),
+            self.project.containers(service_names=options['SERVICE'], one_off=OneOffFilter.only),
             key=attrgetter('name'))
 
         if options['-q']:
@@ -491,11 +492,13 @@ class TopLevelCommand(object):
         Options:
             -f, --force   Don't ask to confirm removal
             -v            Remove volumes associated with containers
-            -a, --all     Also remove one-off containers
+            -a, --all     Also remove one-off containers created by
+                          docker-compose run
         """
+        one_off = OneOffFilter.include if options.get('--all') else OneOffFilter.exclude
+
         all_containers = self.project.containers(
-            service_names=options['SERVICE'], stopped=True,
-            one_off=(None if options.get('--all') else False)
+            service_names=options['SERVICE'], stopped=True, one_off=one_off
         )
         stopped_containers = [c for c in all_containers if not c.is_running]
 
@@ -506,7 +509,7 @@ class TopLevelCommand(object):
                 self.project.remove_stopped(
                     service_names=options['SERVICE'],
                     v=options.get('-v', False),
-                    one_off=options.get('--all')
+                    one_off=one_off
                 )
         else:
             print("No stopped containers")
diff --git a/compose/project.py b/compose/project.py
index 298396de..aef556e9 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -6,6 +6,7 @@ import logging
 import operator
 from functools import reduce
 
+import enum
 from docker.errors import APIError
 
 from . import parallel
@@ -35,6 +36,20 @@ from .volume import ProjectVolumes
 log = logging.getLogger(__name__)
 
 
+@enum.unique
+class OneOffFilter(enum.Enum):
+    include = 0
+    exclude = 1
+    only = 2
+
+    @classmethod
+    def update_labels(cls, value, labels):
+        if value == cls.only:
+            labels.append('{0}={1}'.format(LABEL_ONE_OFF, "True"))
+        elif value == cls.exclude or value is False:
+            labels.append('{0}={1}'.format(LABEL_ONE_OFF, "False"))
+
+
 class Project(object):
     """
     A collection of services.
@@ -48,10 +63,8 @@ class Project(object):
 
     def labels(self, one_off=False):
         labels = ['{0}={1}'.format(LABEL_PROJECT, self.name)]
-        if one_off is not None:
-            labels.append(
-                '{0}={1}'.format(LABEL_ONE_OFF, "True" if one_off else "False")
-            )
+
+        OneOffFilter.update_labels(one_off, labels)
         return labels
 
     @classmethod
@@ -253,7 +266,7 @@ class Project(object):
 
     def remove_stopped(self, service_names=None, one_off=False, **options):
         parallel.parallel_remove(self.containers(
-            service_names, stopped=True, one_off=(None if one_off else False)
+            service_names, stopped=True, one_off=one_off
         ), options)
 
     def down(self, remove_image_type, include_volumes, remove_orphans=False):
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 778c8ff4..382fa887 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -18,6 +18,7 @@ from docker import errors
 from .. import mock
 from compose.cli.command import get_project
 from compose.container import Container
+from compose.project import OneOffFilter
 from tests.integration.testcases import DockerClientTestCase
 from tests.integration.testcases import get_links
 from tests.integration.testcases import pull_busybox
@@ -105,7 +106,7 @@ class CLITestCase(DockerClientTestCase):
             self.project.kill()
             self.project.remove_stopped()
 
-            for container in self.project.containers(stopped=True, one_off=True):
+            for container in self.project.containers(stopped=True, one_off=OneOffFilter.only):
                 container.remove(force=True)
 
             networks = self.client.networks()
@@ -802,7 +803,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(self.project.containers()), 0)
 
         # Ensure stdin/out was open
-        container = self.project.containers(stopped=True, one_off=True)[0]
+        container = self.project.containers(stopped=True, one_off=OneOffFilter.only)[0]
         config = container.inspect()['Config']
         self.assertTrue(config['AttachStderr'])
         self.assertTrue(config['AttachStdout'])
@@ -852,7 +853,7 @@ class CLITestCase(DockerClientTestCase):
 
         self.dispatch(['run', 'implicit'])
         service = self.project.get_service('implicit')
-        containers = service.containers(stopped=True, one_off=True)
+        containers = service.containers(stopped=True, one_off=OneOffFilter.only)
         self.assertEqual(
             [c.human_readable_command for c in containers],
             [u'/bin/sh -c echo "success"'],
@@ -860,7 +861,7 @@ class CLITestCase(DockerClientTestCase):
 
         self.dispatch(['run', 'explicit'])
         service = self.project.get_service('explicit')
-        containers = service.containers(stopped=True, one_off=True)
+        containers = service.containers(stopped=True, one_off=OneOffFilter.only)
         self.assertEqual(
             [c.human_readable_command for c in containers],
             [u'/bin/true'],
@@ -871,7 +872,7 @@ class CLITestCase(DockerClientTestCase):
         name = 'service'
         self.dispatch(['run', '--entrypoint', '/bin/echo', name, 'helloworld'])
         service = self.project.get_service(name)
-        container = service.containers(stopped=True, one_off=True)[0]
+        container = service.containers(stopped=True, one_off=OneOffFilter.only)[0]
         self.assertEqual(
             shlex.split(container.human_readable_command),
             [u'/bin/echo', u'helloworld'],
@@ -883,7 +884,7 @@ class CLITestCase(DockerClientTestCase):
         user = 'sshd'
         self.dispatch(['run', '--user={user}'.format(user=user), name], returncode=1)
         service = self.project.get_service(name)
-        container = service.containers(stopped=True, one_off=True)[0]
+        container = service.containers(stopped=True, one_off=OneOffFilter.only)[0]
         self.assertEqual(user, container.get('Config.User'))
 
     def test_run_service_with_user_overridden_short_form(self):
@@ -892,7 +893,7 @@ class CLITestCase(DockerClientTestCase):
         user = 'sshd'
         self.dispatch(['run', '-u', user, name], returncode=1)
         service = self.project.get_service(name)
-        container = service.containers(stopped=True, one_off=True)[0]
+        container = service.containers(stopped=True, one_off=OneOffFilter.only)[0]
         self.assertEqual(user, container.get('Config.User'))
 
     def test_run_service_with_environement_overridden(self):
@@ -906,7 +907,7 @@ class CLITestCase(DockerClientTestCase):
             '/bin/true',
         ])
         service = self.project.get_service(name)
-        container = service.containers(stopped=True, one_off=True)[0]
+        container = service.containers(stopped=True, one_off=OneOffFilter.only)[0]
         # env overriden
         self.assertEqual('notbar', container.environment['foo'])
         # keep environement from yaml
@@ -920,7 +921,7 @@ class CLITestCase(DockerClientTestCase):
         # create one off container
         self.base_dir = 'tests/fixtures/ports-composefile'
         self.dispatch(['run', '-d', 'simple'])
-        container = self.project.get_service('simple').containers(one_off=True)[0]
+        container = self.project.get_service('simple').containers(one_off=OneOffFilter.only)[0]
 
         # get port information
         port_random = container.get_local_port(3000)
@@ -937,7 +938,7 @@ class CLITestCase(DockerClientTestCase):
         # create one off container
         self.base_dir = 'tests/fixtures/ports-composefile'
         self.dispatch(['run', '-d', '--service-ports', 'simple'])
-        container = self.project.get_service('simple').containers(one_off=True)[0]
+        container = self.project.get_service('simple').containers(one_off=OneOffFilter.only)[0]
 
         # get port information
         port_random = container.get_local_port(3000)
@@ -958,7 +959,7 @@ class CLITestCase(DockerClientTestCase):
         # create one off container
         self.base_dir = 'tests/fixtures/ports-composefile'
         self.dispatch(['run', '-d', '-p', '30000:3000', '--publish', '30001:3001', 'simple'])
-        container = self.project.get_service('simple').containers(one_off=True)[0]
+        container = self.project.get_service('simple').containers(one_off=OneOffFilter.only)[0]
 
         # get port information
         port_short = container.get_local_port(3000)
@@ -980,7 +981,7 @@ class CLITestCase(DockerClientTestCase):
             '--publish', '127.0.0.1:30001:3001',
             'simple'
         ])
-        container = self.project.get_service('simple').containers(one_off=True)[0]
+        container = self.project.get_service('simple').containers(one_off=OneOffFilter.only)[0]
 
         # get port information
         port_short = container.get_local_port(3000)
@@ -997,7 +998,7 @@ class CLITestCase(DockerClientTestCase):
         # create one off container
         self.base_dir = 'tests/fixtures/expose-composefile'
         self.dispatch(['run', '-d', '--service-ports', 'simple'])
-        container = self.project.get_service('simple').containers(one_off=True)[0]
+        container = self.project.get_service('simple').containers(one_off=OneOffFilter.only)[0]
 
         ports = container.ports
         self.assertEqual(len(ports), 9)
@@ -1021,7 +1022,7 @@ class CLITestCase(DockerClientTestCase):
         self.dispatch(['run', '--name', name, 'service', '/bin/true'])
 
         service = self.project.get_service('service')
-        container, = service.containers(stopped=True, one_off=True)
+        container, = service.containers(stopped=True, one_off=OneOffFilter.only)
         self.assertEqual(container.name, name)
 
     def test_run_service_with_workdir_overridden(self):
@@ -1051,7 +1052,7 @@ class CLITestCase(DockerClientTestCase):
         self.dispatch(['run', 'app', 'nslookup', 'db'])
 
         containers = self.project.get_service('app').containers(
-            stopped=True, one_off=True)
+            stopped=True, one_off=OneOffFilter.only)
         assert len(containers) == 2
 
         for container in containers:
@@ -1071,7 +1072,7 @@ class CLITestCase(DockerClientTestCase):
         self.dispatch(['up', '-d'])
         self.dispatch(['run', '-d', 'app', 'top'])
 
-        container = self.project.get_service('app').containers(one_off=True)[0]
+        container = self.project.get_service('app').containers(one_off=OneOffFilter.only)[0]
         networks = container.get('NetworkSettings.Networks')
 
         assert sorted(list(networks)) == [
@@ -1131,21 +1132,21 @@ class CLITestCase(DockerClientTestCase):
         service.create_container(one_off=True)
         kill_service(service)
         self.assertEqual(len(service.containers(stopped=True)), 1)
-        self.assertEqual(len(service.containers(stopped=True, one_off=True)), 1)
+        self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 1)
         self.dispatch(['rm', '-f'], None)
         self.assertEqual(len(service.containers(stopped=True)), 0)
-        self.assertEqual(len(service.containers(stopped=True, one_off=True)), 1)
+        self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 1)
         self.dispatch(['rm', '-f', '-a'], None)
-        self.assertEqual(len(service.containers(stopped=True, one_off=True)), 0)
+        self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 0)
 
         service.create_container(one_off=False)
         service.create_container(one_off=True)
         kill_service(service)
         self.assertEqual(len(service.containers(stopped=True)), 1)
-        self.assertEqual(len(service.containers(stopped=True, one_off=True)), 1)
+        self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 1)
         self.dispatch(['rm', '-f', '--all'], None)
         self.assertEqual(len(service.containers(stopped=True)), 0)
-        self.assertEqual(len(service.containers(stopped=True, one_off=True)), 0)
+        self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 0)
 
     def test_stop(self):
         self.dispatch(['up', '-d'], None)
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 6d0c97db..2682e59d 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -24,6 +24,7 @@ from compose.const import LABEL_PROJECT
 from compose.const import LABEL_SERVICE
 from compose.const import LABEL_VERSION
 from compose.container import Container
+from compose.project import OneOffFilter
 from compose.service import ConvergencePlan
 from compose.service import ConvergenceStrategy
 from compose.service import NetworkMode
@@ -60,7 +61,7 @@ class ServiceTest(DockerClientTestCase):
         db = self.create_service('db')
         container = db.create_container(one_off=True)
         self.assertEqual(db.containers(stopped=True), [])
-        self.assertEqual(db.containers(one_off=True, stopped=True), [container])
+        self.assertEqual(db.containers(one_off=OneOffFilter.only, stopped=True), [container])
 
     def test_project_is_added_to_container_name(self):
         service = self.create_service('web')
@@ -494,7 +495,7 @@ class ServiceTest(DockerClientTestCase):
         create_and_start_container(db)
         create_and_start_container(db)
 
-        c = create_and_start_container(db, one_off=True)
+        c = create_and_start_container(db, one_off=OneOffFilter.only)
 
         self.assertEqual(
             set(get_links(c)),
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 199aeeb4..0e3e8a86 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -14,6 +14,7 @@ from compose.const import LABEL_ONE_OFF
 from compose.const import LABEL_PROJECT
 from compose.const import LABEL_SERVICE
 from compose.container import Container
+from compose.project import OneOffFilter
 from compose.service import build_ulimits
 from compose.service import build_volume_binding
 from compose.service import BuildAction
@@ -256,7 +257,7 @@ class ServiceTest(unittest.TestCase):
         opts = service._get_container_create_options(
             {'name': name},
             1,
-            one_off=True)
+            one_off=OneOffFilter.only)
         self.assertEqual(opts['name'], name)
 
     def test_get_container_create_options_does_not_mutate_options(self):

From 1bc946967497d848e4ac18a8420fddd793236a31 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 21 Mar 2016 14:42:57 +0000
Subject: [PATCH 0922/1265] Don't allow boolean values for one_off in Project
 methods

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index aef556e9..c3283db9 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -46,8 +46,12 @@ class OneOffFilter(enum.Enum):
     def update_labels(cls, value, labels):
         if value == cls.only:
             labels.append('{0}={1}'.format(LABEL_ONE_OFF, "True"))
-        elif value == cls.exclude or value is False:
+        elif value == cls.exclude:
             labels.append('{0}={1}'.format(LABEL_ONE_OFF, "False"))
+        elif value == cls.include:
+            pass
+        else:
+            raise ValueError("Invalid value for one_off: {}".format(repr(value)))
 
 
 class Project(object):
@@ -61,7 +65,7 @@ class Project(object):
         self.volumes = volumes or ProjectVolumes({})
         self.networks = networks or ProjectNetworks({}, False)
 
-    def labels(self, one_off=False):
+    def labels(self, one_off=OneOffFilter.exclude):
         labels = ['{0}={1}'.format(LABEL_PROJECT, self.name)]
 
         OneOffFilter.update_labels(one_off, labels)
@@ -264,7 +268,7 @@ class Project(object):
     def kill(self, service_names=None, **options):
         parallel.parallel_kill(self.containers(service_names), options)
 
-    def remove_stopped(self, service_names=None, one_off=False, **options):
+    def remove_stopped(self, service_names=None, one_off=OneOffFilter.exclude, **options):
         parallel.parallel_remove(self.containers(
             service_names, stopped=True, one_off=one_off
         ), options)
@@ -429,7 +433,7 @@ class Project(object):
         for service in self.get_services(service_names, include_deps=False):
             service.pull(ignore_pull_failures)
 
-    def _labeled_containers(self, stopped=False, one_off=False):
+    def _labeled_containers(self, stopped=False, one_off=OneOffFilter.exclude):
         return list(filter(None, [
             Container.from_ps(self.client, container)
             for container in self.client.containers(
@@ -437,7 +441,7 @@ class Project(object):
                 filters={'label': self.labels(one_off=one_off)})])
         )
 
-    def containers(self, service_names=None, stopped=False, one_off=False):
+    def containers(self, service_names=None, stopped=False, one_off=OneOffFilter.exclude):
         if service_names:
             self.validate_service_names(service_names)
         else:

From 81f6d86ad9121e022b61c03be8977bd79e1b2fdd Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 21 Mar 2016 15:14:31 +0000
Subject: [PATCH 0923/1265] Warn when --all is not passed to rm

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index f481d584..a978579c 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -495,7 +495,14 @@ class TopLevelCommand(object):
             -a, --all     Also remove one-off containers created by
                           docker-compose run
         """
-        one_off = OneOffFilter.include if options.get('--all') else OneOffFilter.exclude
+        if options.get('--all'):
+            one_off = OneOffFilter.include
+        else:
+            log.warn(
+                'Not including one-off containers created by `docker-compose run`.\n'
+                'To include them, use `docker-compose rm --all`.\n'
+                'This will be the default behavior in the next version of Compose.\n')
+            one_off = OneOffFilter.exclude
 
         all_containers = self.project.containers(
             service_names=options['SERVICE'], stopped=True, one_off=one_off

From a2317dfac26d5709bf460671bd7e054567fc94de Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 21 Mar 2016 16:15:49 +0000
Subject: [PATCH 0924/1265] Remove one-off containers in 'docker-compose down'

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py           | 2 +-
 tests/acceptance/cli_test.py | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/compose/project.py b/compose/project.py
index c3283db9..f0b4f1c6 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -276,7 +276,7 @@ class Project(object):
     def down(self, remove_image_type, include_volumes, remove_orphans=False):
         self.stop()
         self.find_orphan_containers(remove_orphans)
-        self.remove_stopped(v=include_volumes)
+        self.remove_stopped(v=include_volumes, one_off=OneOffFilter.include)
 
         self.networks.remove()
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 382fa887..15351502 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -366,14 +366,19 @@ class CLITestCase(DockerClientTestCase):
     @v2_only()
     def test_down(self):
         self.base_dir = 'tests/fixtures/v2-full'
+
         self.dispatch(['up', '-d'])
         wait_on_condition(ContainerCountCondition(self.project, 2))
 
+        self.dispatch(['run', 'web', 'true'])
+        assert len(self.project.containers(one_off=OneOffFilter.only, stopped=True)) == 1
+
         result = self.dispatch(['down', '--rmi=local', '--volumes'])
         assert 'Stopping v2full_web_1' in result.stderr
         assert 'Stopping v2full_other_1' in result.stderr
         assert 'Removing v2full_web_1' in result.stderr
         assert 'Removing v2full_other_1' in result.stderr
+        assert 'Removing v2full_web_run_1' in result.stderr
         assert 'Removing volume v2full_data' in result.stderr
         assert 'Removing image v2full_web' in result.stderr
         assert 'Removing image busybox' not in result.stderr

From 2bf5e468574f5863ed57a1b5327668e61a578130 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 21 Mar 2016 18:08:07 +0000
Subject: [PATCH 0925/1265] Stop and remove still-running one-off containers in
 'down'

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py           | 6 +++---
 tests/acceptance/cli_test.py | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index f0b4f1c6..8aa48731 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -239,8 +239,8 @@ class Project(object):
 
         return containers
 
-    def stop(self, service_names=None, **options):
-        containers = self.containers(service_names)
+    def stop(self, service_names=None, one_off=OneOffFilter.exclude, **options):
+        containers = self.containers(service_names, one_off=one_off)
 
         def get_deps(container):
             # actually returning inversed dependencies
@@ -274,7 +274,7 @@ class Project(object):
         ), options)
 
     def down(self, remove_image_type, include_volumes, remove_orphans=False):
-        self.stop()
+        self.stop(one_off=OneOffFilter.include)
         self.find_orphan_containers(remove_orphans)
         self.remove_stopped(v=include_volumes, one_off=OneOffFilter.include)
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 15351502..b81af68d 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -371,14 +371,17 @@ class CLITestCase(DockerClientTestCase):
         wait_on_condition(ContainerCountCondition(self.project, 2))
 
         self.dispatch(['run', 'web', 'true'])
-        assert len(self.project.containers(one_off=OneOffFilter.only, stopped=True)) == 1
+        self.dispatch(['run', '-d', 'web', 'tail', '-f', '/dev/null'])
+        assert len(self.project.containers(one_off=OneOffFilter.only, stopped=True)) == 2
 
         result = self.dispatch(['down', '--rmi=local', '--volumes'])
         assert 'Stopping v2full_web_1' in result.stderr
         assert 'Stopping v2full_other_1' in result.stderr
+        assert 'Stopping v2full_web_run_2' in result.stderr
         assert 'Removing v2full_web_1' in result.stderr
         assert 'Removing v2full_other_1' in result.stderr
         assert 'Removing v2full_web_run_1' in result.stderr
+        assert 'Removing v2full_web_run_2' in result.stderr
         assert 'Removing volume v2full_data' in result.stderr
         assert 'Removing image v2full_web' in result.stderr
         assert 'Removing image busybox' not in result.stderr

From be1476f24b5d19eca5078b7305bd6425c7ee7d78 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 21 Mar 2016 14:41:28 -0400
Subject: [PATCH 0926/1265] Only allow tmpfs on v2.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config_schema_v1.json | 1 -
 tests/integration/service_test.py    | 2 ++
 tests/unit/config/config_test.py     | 9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/compose/config/config_schema_v1.json b/compose/config/config_schema_v1.json
index 9fad7d00..36a93793 100644
--- a/compose/config/config_schema_v1.json
+++ b/compose/config/config_schema_v1.json
@@ -104,7 +104,6 @@
         "shm_size": {"type": ["number", "string"]},
         "stdin_open": {"type": "boolean"},
         "stop_signal": {"type": "string"},
-        "tmpfs": {"$ref": "#/definitions/string_or_list"},
         "tty": {"type": "boolean"},
         "ulimits": {
           "type": "object",
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 22cbfcee..e3485346 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -28,6 +28,7 @@ from compose.service import ConvergencePlan
 from compose.service import ConvergenceStrategy
 from compose.service import NetworkMode
 from compose.service import Service
+from tests.integration.testcases import v2_only
 
 
 def create_and_start_container(service, **override_options):
@@ -875,6 +876,7 @@ class ServiceTest(DockerClientTestCase):
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.DnsSearch'), ['dc1.example.com', 'dc2.example.com'])
 
+    @v2_only()
     def test_tmpfs(self):
         service = self.create_service('web', tmpfs=['/run'])
         container = create_and_start_container(service)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index e3dac160..04d82c81 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1196,9 +1196,12 @@ class ConfigTest(unittest.TestCase):
 
     def test_tmpfs_option(self):
         actual = config.load(build_config_details({
-            'web': {
-                'image': 'alpine',
-                'tmpfs': '/run',
+            'version': '2',
+            'services': {
+                'web': {
+                    'image': 'alpine',
+                    'tmpfs': '/run',
+                }
             }
         }))
         assert actual.services == [

From 5c968f9e15e09bb53337a41560ddd2cd517d80c9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 21 Mar 2016 19:07:50 -0400
Subject: [PATCH 0927/1265] Fix flaky partial_change state test.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/parallel.py             | 18 +++++++-----------
 tests/integration/state_test.py |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/compose/parallel.py b/compose/parallel.py
index 879d183e..c629a1ab 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -32,8 +32,8 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None):
 
     done = 0
     errors = {}
+    results = []
     error_to_reraise = None
-    returned = [None] * len(objects)
 
     while done < len(objects):
         try:
@@ -46,14 +46,13 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None):
 
         if exception is None:
             writer.write(get_name(obj), 'done')
-            returned[objects.index(obj)] = result
+            results.append(result)
         elif isinstance(exception, APIError):
             errors[get_name(obj)] = exception.explanation
             writer.write(get_name(obj), 'error')
         else:
             errors[get_name(obj)] = exception
             error_to_reraise = exception
-
         done += 1
 
     for obj_name, error in errors.items():
@@ -62,7 +61,7 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None):
     if error_to_reraise:
         raise error_to_reraise
 
-    return returned
+    return results
 
 
 def _no_deps(x):
@@ -74,9 +73,8 @@ def setup_queue(objects, func, get_deps, get_name):
         get_deps = _no_deps
 
     results = Queue()
-
-    started = set()   # objects, threads were started for
-    finished = set()  # already finished objects
+    started = set()   # objects being processed
+    finished = set()  # objects which have been processed
 
     def do_op(obj):
         try:
@@ -96,11 +94,9 @@ def setup_queue(objects, func, get_deps, get_name):
         )
 
     def feed():
-        ready_objects = [o for o in objects if ready(o)]
-        for obj in ready_objects:
+        for obj in filter(ready, objects):
             started.add(obj)
-            t = Thread(target=do_op,
-                       args=(obj,))
+            t = Thread(target=do_op, args=(obj,))
             t.daemon = True
             t.start()
 
diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py
index 36099d2d..07b28e78 100644
--- a/tests/integration/state_test.py
+++ b/tests/integration/state_test.py
@@ -38,8 +38,8 @@ class BasicProjectTest(ProjectTestCase):
         super(BasicProjectTest, self).setUp()
 
         self.cfg = {
-            'db': {'image': 'busybox:latest'},
-            'web': {'image': 'busybox:latest'},
+            'db': {'image': 'busybox:latest', 'command': 'top'},
+            'web': {'image': 'busybox:latest', 'command': 'top'},
         }
 
     def test_no_change(self):

From 1ac33ea7e5f5c2c4d4facd5b52143f0a962515bc Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 15 Mar 2016 14:19:25 -0700
Subject: [PATCH 0928/1265] Add support for TLS config command-line options

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/command.py       | 15 +++++++++----
 compose/cli/docker_client.py | 41 +++++++++++++++++++++++++++++++++++-
 compose/cli/main.py          |  7 ++++++
 3 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 55f6df01..730cd115 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -12,6 +12,7 @@ from .. import config
 from ..const import API_VERSIONS
 from ..project import Project
 from .docker_client import docker_client
+from .docker_client import TLSArgs
 from .utils import get_version_info
 
 log = logging.getLogger(__name__)
@@ -23,6 +24,8 @@ def project_from_options(project_dir, options):
         get_config_path_from_options(options),
         project_name=options.get('--project-name'),
         verbose=options.get('--verbose'),
+        host=options.get('--host'),
+        tls_args=TLSArgs.from_options(options),
     )
 
 
@@ -37,8 +40,8 @@ def get_config_path_from_options(options):
     return None
 
 
-def get_client(verbose=False, version=None):
-    client = docker_client(version=version)
+def get_client(verbose=False, version=None, tls_args=None, host=None):
+    client = docker_client(version=version, tls_args=tls_args, host=host)
     if verbose:
         version_info = six.iteritems(client.version())
         log.info(get_version_info('full'))
@@ -49,7 +52,8 @@ def get_client(verbose=False, version=None):
     return client
 
 
-def get_project(project_dir, config_path=None, project_name=None, verbose=False):
+def get_project(project_dir, config_path=None, project_name=None, verbose=False,
+                host=None, tls_args=None):
     config_details = config.find(project_dir, config_path)
     project_name = get_project_name(config_details.working_dir, project_name)
     config_data = config.load(config_details)
@@ -57,7 +61,10 @@ def get_project(project_dir, config_path=None, project_name=None, verbose=False)
     api_version = os.environ.get(
         'COMPOSE_API_VERSION',
         API_VERSIONS[config_data.version])
-    client = get_client(verbose=verbose, version=api_version)
+    client = get_client(
+        verbose=verbose, version=api_version, tls_args=tls_args,
+        host=host
+    )
 
     return Project.from_config(project_name, config_data, client)
 
diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 9e79fe77..cff28f8c 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -3,9 +3,11 @@ from __future__ import unicode_literals
 
 import logging
 import os
+from collections import namedtuple
 
 from docker import Client
 from docker.errors import TLSParameterError
+from docker.tls import TLSConfig
 from docker.utils import kwargs_from_env
 
 from ..const import HTTP_TIMEOUT
@@ -14,7 +16,24 @@ from .errors import UserError
 log = logging.getLogger(__name__)
 
 
-def docker_client(version=None):
+class TLSArgs(namedtuple('_TLSArgs', 'tls cert key ca_cert verify')):
+    @classmethod
+    def from_options(cls, options):
+        return cls(
+            tls=options.get('--tls', False),
+            ca_cert=options.get('--tlscacert'),
+            cert=options.get('--tlscert'),
+            key=options.get('--tlskey'),
+            verify=options.get('--tlsverify')
+        )
+
+    # def has_config(self):
+    #     return (
+    #         self.tls or self.ca_cert or self.cert or self.key or self.verify
+    #     )
+
+
+def docker_client(version=None, tls_args=None, host=None):
     """
     Returns a docker-py client configured using environment variables
     according to the same logic as the official Docker client.
@@ -31,6 +50,26 @@ def docker_client(version=None):
             "and DOCKER_CERT_PATH are set correctly.\n"
             "You might need to run `eval \"$(docker-machine env default)\"`")
 
+    if host:
+        kwargs['base_url'] = host
+    if tls_args and any(tls_args):
+        if tls_args.tls is True:
+            kwargs['tls'] = True
+        else:
+            client_cert = None
+            if tls_args.cert or tls_args.key:
+                client_cert = (tls_args.cert, tls_args.key)
+            try:
+                kwargs['tls'] = TLSConfig(
+                    client_cert=client_cert, verify=tls_args.verify,
+                    ca_cert=tls_args.ca_cert
+                )
+            except TLSParameterError as e:
+                raise UserError(
+                    "TLS configuration is invalid. Please double-check the "
+                    "TLS command-line arguments. ({0})".format(e)
+                )
+
     if version:
         kwargs['version'] = version
 
diff --git a/compose/cli/main.py b/compose/cli/main.py
index a978579c..17c2ac45 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -149,6 +149,13 @@ class TopLevelCommand(object):
       -p, --project-name NAME   Specify an alternate project name (default: directory name)
       --verbose                 Show more output
       -v, --version             Print version and exit
+      -H, --host HOST           Daemon socket to connect to
+
+      --tls                     Use TLS; implied by --tlsverify
+      --tlsacert                Trust certs signed only by this CA
+      --tlscert                 Path to TLS certificate file
+      --tlskey                  Path to TLS key file
+      --tlsverify               Use TLS and verify the remote
 
     Commands:
       build              Build or rebuild services

From 7166408d2a9f9972e4a7f60f30228808f2260117 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 16 Mar 2016 13:40:13 -0700
Subject: [PATCH 0929/1265] Fixed typos + simplified TLSConfig creation
 process.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/command.py       | 12 ++++----
 compose/cli/docker_client.py | 53 ++++++++++++++----------------------
 compose/cli/main.py          | 20 +++++++-------
 3 files changed, 36 insertions(+), 49 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 730cd115..63d387f0 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -12,7 +12,7 @@ from .. import config
 from ..const import API_VERSIONS
 from ..project import Project
 from .docker_client import docker_client
-from .docker_client import TLSArgs
+from .docker_client import tls_config_from_options
 from .utils import get_version_info
 
 log = logging.getLogger(__name__)
@@ -25,7 +25,7 @@ def project_from_options(project_dir, options):
         project_name=options.get('--project-name'),
         verbose=options.get('--verbose'),
         host=options.get('--host'),
-        tls_args=TLSArgs.from_options(options),
+        tls_config=tls_config_from_options(options),
     )
 
 
@@ -40,8 +40,8 @@ def get_config_path_from_options(options):
     return None
 
 
-def get_client(verbose=False, version=None, tls_args=None, host=None):
-    client = docker_client(version=version, tls_args=tls_args, host=host)
+def get_client(verbose=False, version=None, tls_config=None, host=None):
+    client = docker_client(version=version, tls_config=tls_config, host=host)
     if verbose:
         version_info = six.iteritems(client.version())
         log.info(get_version_info('full'))
@@ -53,7 +53,7 @@ def get_client(verbose=False, version=None, tls_args=None, host=None):
 
 
 def get_project(project_dir, config_path=None, project_name=None, verbose=False,
-                host=None, tls_args=None):
+                host=None, tls_config=None):
     config_details = config.find(project_dir, config_path)
     project_name = get_project_name(config_details.working_dir, project_name)
     config_data = config.load(config_details)
@@ -62,7 +62,7 @@ def get_project(project_dir, config_path=None, project_name=None, verbose=False,
         'COMPOSE_API_VERSION',
         API_VERSIONS[config_data.version])
     client = get_client(
-        verbose=verbose, version=api_version, tls_args=tls_args,
+        verbose=verbose, version=api_version, tls_config=tls_config,
         host=host
     )
 
diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index cff28f8c..c8159ad4 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 
 import logging
 import os
-from collections import namedtuple
 
 from docker import Client
 from docker.errors import TLSParameterError
@@ -16,24 +15,27 @@ from .errors import UserError
 log = logging.getLogger(__name__)
 
 
-class TLSArgs(namedtuple('_TLSArgs', 'tls cert key ca_cert verify')):
-    @classmethod
-    def from_options(cls, options):
-        return cls(
-            tls=options.get('--tls', False),
-            ca_cert=options.get('--tlscacert'),
-            cert=options.get('--tlscert'),
-            key=options.get('--tlskey'),
-            verify=options.get('--tlsverify')
+def tls_config_from_options(options):
+    tls = options.get('--tls', False)
+    ca_cert = options.get('--tlscacert')
+    cert = options.get('--tlscert')
+    key = options.get('--tlskey')
+    verify = options.get('--tlsverify')
+
+    if tls is True:
+        return True
+    elif any([ca_cert, cert, key, verify]):
+        client_cert = None
+        if cert or key:
+            client_cert = (cert, key)
+        return TLSConfig(
+            client_cert=client_cert, verify=verify, ca_cert=ca_cert
         )
-
-    # def has_config(self):
-    #     return (
-    #         self.tls or self.ca_cert or self.cert or self.key or self.verify
-    #     )
+    else:
+        return None
 
 
-def docker_client(version=None, tls_args=None, host=None):
+def docker_client(version=None, tls_config=None, host=None):
     """
     Returns a docker-py client configured using environment variables
     according to the same logic as the official Docker client.
@@ -52,23 +54,8 @@ def docker_client(version=None, tls_args=None, host=None):
 
     if host:
         kwargs['base_url'] = host
-    if tls_args and any(tls_args):
-        if tls_args.tls is True:
-            kwargs['tls'] = True
-        else:
-            client_cert = None
-            if tls_args.cert or tls_args.key:
-                client_cert = (tls_args.cert, tls_args.key)
-            try:
-                kwargs['tls'] = TLSConfig(
-                    client_cert=client_cert, verify=tls_args.verify,
-                    ca_cert=tls_args.ca_cert
-                )
-            except TLSParameterError as e:
-                raise UserError(
-                    "TLS configuration is invalid. Please double-check the "
-                    "TLS command-line arguments. ({0})".format(e)
-                )
+    if tls_config:
+        kwargs['tls'] = tls_config
 
     if version:
         kwargs['version'] = version
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 17c2ac45..331476e2 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -145,17 +145,17 @@ class TopLevelCommand(object):
       docker-compose -h|--help
 
     Options:
-      -f, --file FILE           Specify an alternate compose file (default: docker-compose.yml)
-      -p, --project-name NAME   Specify an alternate project name (default: directory name)
-      --verbose                 Show more output
-      -v, --version             Print version and exit
-      -H, --host HOST           Daemon socket to connect to
+      -f, --file FILE             Specify an alternate compose file (default: docker-compose.yml)
+      -p, --project-name NAME     Specify an alternate project name (default: directory name)
+      --verbose                   Show more output
+      -v, --version               Print version and exit
+      -H, --host HOST             Daemon socket to connect to
 
-      --tls                     Use TLS; implied by --tlsverify
-      --tlsacert                Trust certs signed only by this CA
-      --tlscert                 Path to TLS certificate file
-      --tlskey                  Path to TLS key file
-      --tlsverify               Use TLS and verify the remote
+      --tls                       Use TLS; implied by --tlsverify
+      --tlscacert CA_PATH         Trust certs signed only by this CA
+      --tlscert CLIENT_CERT_PATH  Path to TLS certificate file
+      --tlskey TLS_KEY_PATH       Path to TLS key file
+      --tlsverify                 Use TLS and verify the remote
 
     Commands:
       build              Build or rebuild services

From 26f3861791a82ddee9171a6710f595b0136c4ab3 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 17 Mar 2016 16:09:45 -0700
Subject: [PATCH 0930/1265] Specifying --tls no longer overrides all other TLS
 options Add an option to skip hostname verification

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/docker_client.py | 9 ++++++---
 compose/cli/main.py          | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index c8159ad4..e2848a90 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -22,14 +22,17 @@ def tls_config_from_options(options):
     key = options.get('--tlskey')
     verify = options.get('--tlsverify')
 
-    if tls is True:
+    advanced_opts = any([ca_cert, cert, key, verify])
+
+    if tls is True and not advanced_opts:
         return True
-    elif any([ca_cert, cert, key, verify]):
+    elif advanced_opts:
         client_cert = None
         if cert or key:
             client_cert = (cert, key)
         return TLSConfig(
-            client_cert=client_cert, verify=verify, ca_cert=ca_cert
+            client_cert=client_cert, verify=verify, ca_cert=ca_cert,
+            assert_hostname=options.get('--skip-hostname-check')
         )
     else:
         return None
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 331476e2..6eada097 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -156,6 +156,9 @@ class TopLevelCommand(object):
       --tlscert CLIENT_CERT_PATH  Path to TLS certificate file
       --tlskey TLS_KEY_PATH       Path to TLS key file
       --tlsverify                 Use TLS and verify the remote
+      --skip-hostname-check       Don't check the daemon's hostname against the name specified
+                                  in the client certificate (for example if your docker host
+                                  is an IP address)
 
     Commands:
       build              Build or rebuild services

From 442dff72b4568656821189e3d45617e3f87f63c9 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 21 Mar 2016 12:06:29 -0700
Subject: [PATCH 0931/1265] Improve assert_hostname setting in
 tls_config_from_options

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/docker_client.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index e2848a90..d47bd2db 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -8,6 +8,7 @@ from docker import Client
 from docker.errors import TLSParameterError
 from docker.tls import TLSConfig
 from docker.utils import kwargs_from_env
+from requests.utils import urlparse
 
 from ..const import HTTP_TIMEOUT
 from .errors import UserError
@@ -21,6 +22,7 @@ def tls_config_from_options(options):
     cert = options.get('--tlscert')
     key = options.get('--tlskey')
     verify = options.get('--tlsverify')
+    hostname = urlparse(options.get('--host', '')).hostname
 
     advanced_opts = any([ca_cert, cert, key, verify])
 
@@ -32,7 +34,9 @@ def tls_config_from_options(options):
             client_cert = (cert, key)
         return TLSConfig(
             client_cert=client_cert, verify=verify, ca_cert=ca_cert,
-            assert_hostname=options.get('--skip-hostname-check')
+            assert_hostname=(
+                hostname or not options.get('--skip-hostname-check', False)
+            )
         )
     else:
         return None

From 472711531749aa3e9909ec8e386e4bd73027530b Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 21 Mar 2016 12:10:00 -0700
Subject: [PATCH 0932/1265] Bump docker-py version to include tcp host fix

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 2b7c85e6..88367353 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ cached-property==1.2.0
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
-git+https://github.com/docker/docker-py.git@8c4546f8c8f52bb2923834783a17beb5bb89a724#egg=docker-py
+git+https://github.com/docker/docker-py.git@5c1c42397cf0fdb74182df2d69822b82df8f2a6a#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3

From 2cc87555cb1e1c1c8322ca4dcae21f00025800aa Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 21 Mar 2016 14:23:31 -0700
Subject: [PATCH 0933/1265] tls_config_from_options unit tests

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/docker_client.py         |  2 +-
 tests/fixtures/tls/ca.pem            |  0
 tests/fixtures/tls/cert.pem          |  0
 tests/fixtures/tls/key.key           |  0
 tests/unit/cli/docker_client_test.py | 89 +++++++++++++++++++++++++++-
 5 files changed, 87 insertions(+), 4 deletions(-)
 create mode 100644 tests/fixtures/tls/ca.pem
 create mode 100644 tests/fixtures/tls/cert.pem
 create mode 100644 tests/fixtures/tls/key.key

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index d47bd2db..deb56866 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -22,7 +22,7 @@ def tls_config_from_options(options):
     cert = options.get('--tlscert')
     key = options.get('--tlskey')
     verify = options.get('--tlsverify')
-    hostname = urlparse(options.get('--host', '')).hostname
+    hostname = urlparse(options.get('--host') or '').hostname
 
     advanced_opts = any([ca_cert, cert, key, verify])
 
diff --git a/tests/fixtures/tls/ca.pem b/tests/fixtures/tls/ca.pem
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/fixtures/tls/cert.pem b/tests/fixtures/tls/cert.pem
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/fixtures/tls/key.key b/tests/fixtures/tls/key.key
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index d497495b..b55f1d17 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -3,7 +3,11 @@ from __future__ import unicode_literals
 
 import os
 
-from compose.cli import docker_client
+import docker
+import pytest
+
+from compose.cli.docker_client import docker_client
+from compose.cli.docker_client import tls_config_from_options
 from tests import mock
 from tests import unittest
 
@@ -13,10 +17,89 @@ class DockerClientTestCase(unittest.TestCase):
     def test_docker_client_no_home(self):
         with mock.patch.dict(os.environ):
             del os.environ['HOME']
-            docker_client.docker_client()
+            docker_client()
 
     def test_docker_client_with_custom_timeout(self):
         timeout = 300
         with mock.patch('compose.cli.docker_client.HTTP_TIMEOUT', 300):
-            client = docker_client.docker_client()
+            client = docker_client()
             self.assertEqual(client.timeout, int(timeout))
+
+
+class TLSConfigTestCase(unittest.TestCase):
+    ca_cert = 'tests/fixtures/tls/ca.pem'
+    client_cert = 'tests/fixtures/tls/cert.pem'
+    key = 'tests/fixtures/tls/key.key'
+
+    def test_simple_tls(self):
+        options = {'--tls': True}
+        result = tls_config_from_options(options)
+        assert result is True
+
+    def test_tls_ca_cert(self):
+        options = {
+            '--tlscacert': self.ca_cert, '--tlsverify': True
+        }
+        result = tls_config_from_options(options)
+        assert isinstance(result, docker.tls.TLSConfig)
+        assert result.ca_cert == options['--tlscacert']
+        assert result.verify is True
+
+    def test_tls_ca_cert_explicit(self):
+        options = {
+            '--tlscacert': self.ca_cert, '--tls': True,
+            '--tlsverify': True
+        }
+        result = tls_config_from_options(options)
+        assert isinstance(result, docker.tls.TLSConfig)
+        assert result.ca_cert == options['--tlscacert']
+        assert result.verify is True
+
+    def test_tls_client_cert(self):
+        options = {
+            '--tlscert': self.client_cert, '--tlskey': self.key
+        }
+        result = tls_config_from_options(options)
+        assert isinstance(result, docker.tls.TLSConfig)
+        assert result.cert == (options['--tlscert'], options['--tlskey'])
+
+    def test_tls_client_cert_explicit(self):
+        options = {
+            '--tlscert': self.client_cert, '--tlskey': self.key,
+            '--tls': True
+        }
+        result = tls_config_from_options(options)
+        assert isinstance(result, docker.tls.TLSConfig)
+        assert result.cert == (options['--tlscert'], options['--tlskey'])
+
+    def test_tls_client_and_ca(self):
+        options = {
+            '--tlscert': self.client_cert, '--tlskey': self.key,
+            '--tlsverify': True, '--tlscacert': self.ca_cert
+        }
+        result = tls_config_from_options(options)
+        assert isinstance(result, docker.tls.TLSConfig)
+        assert result.cert == (options['--tlscert'], options['--tlskey'])
+        assert result.ca_cert == options['--tlscacert']
+        assert result.verify is True
+
+    def test_tls_client_and_ca_explicit(self):
+        options = {
+            '--tlscert': self.client_cert, '--tlskey': self.key,
+            '--tlsverify': True, '--tlscacert': self.ca_cert,
+            '--tls': True
+        }
+        result = tls_config_from_options(options)
+        assert isinstance(result, docker.tls.TLSConfig)
+        assert result.cert == (options['--tlscert'], options['--tlskey'])
+        assert result.ca_cert == options['--tlscacert']
+        assert result.verify is True
+
+    def test_tls_client_missing_key(self):
+        options = {'--tlscert': self.client_cert}
+        with pytest.raises(docker.errors.TLSParameterError):
+            tls_config_from_options(options)
+
+        options = {'--tlskey': self.key}
+        with pytest.raises(docker.errors.TLSParameterError):
+            tls_config_from_options(options)

From a53b29467a681405e51318561ac0167ab2665504 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Tue, 22 Mar 2016 17:17:06 -0700
Subject: [PATCH 0934/1265] Update wordpress example to use official images

The orchardup images are very old and not maintained.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 docs/wordpress.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/wordpress.md b/docs/wordpress.md
index 62f50c24..fcfaef19 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -36,8 +36,10 @@ with Docker containers. This quick-start guide demonstrates how to use Compose t
 
     In this case, your Dockerfile should include these two lines:
 
-        FROM orchardup/php5
+        FROM php:5.6-fpm
+        RUN docker-php-ext-install mysql
         ADD . /code
+        CMD php -S 0.0.0.0:8000 -t /code/wordpress/
 
     This tells the Docker Engine daemon how to build an image defining a container that contains PHP and WordPress.
 
@@ -47,7 +49,6 @@ with Docker containers. This quick-start guide demonstrates how to use Compose t
         services:
           web:
             build: .
-            command: php -S 0.0.0.0:8000 -t /code/wordpress/
             ports:
               - "8000:8000"
             depends_on:
@@ -55,9 +56,12 @@ with Docker containers. This quick-start guide demonstrates how to use Compose t
             volumes:
               - .:/code
           db:
-            image: orchardup/mysql
+            image: mysql
             environment:
+              MYSQL_ROOT_PASSWORD: wordpress
               MYSQL_DATABASE: wordpress
+              MYSQL_USER: wordpress
+              MYSQL_PASSWORD: wordpress
 
 5. Download WordPress into the current directory:
 
@@ -71,8 +75,8 @@ with Docker containers. This quick-start guide demonstrates how to use Compose t
 
         <?php
         define('DB_NAME', 'wordpress');
-        define('DB_USER', 'root');
-        define('DB_PASSWORD', '');
+        define('DB_USER', 'wordpress');
+        define('DB_PASSWORD', 'wordpress');
         define('DB_HOST', "db:3306");
         define('DB_CHARSET', 'utf8');
         define('DB_COLLATE', '');

From d1ea4d72ac81aa7bda7384ce6ee80a6fc6d62de8 Mon Sep 17 00:00:00 2001
From: Victoria Bialas <victoria.bialas@docker.com>
Date: Mon, 21 Mar 2016 18:24:11 -0700
Subject: [PATCH 0935/1265] fixed links showing as build errors per PR #3180

fixed links per build errors

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
---
 docs/compose-file.md | 2 +-
 docs/networking.md   | 6 +++---
 docs/swarm.md        | 9 +++------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 09de5615..e9ec0a2d 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -744,7 +744,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](/engine/reference/commandline/volume_create.md)
+See the [docker volume](https://docs.docker.com/engine/reference/commandline/volume_create/)
 subcommand documentation for more information.
 
 ### driver
diff --git a/docs/networking.md b/docs/networking.md
index bc568294..9739a088 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -15,7 +15,7 @@ weight=21
 > **Note:** This document only applies if you're using [version 2 of the Compose file format](compose-file.md#versioning). Networking features are not supported for version 1 (legacy) Compose files.
 
 By default Compose sets up a single
-[network](/engine/reference/commandline/network_create.md) for your app. Each
+[network](https://docs.docker.com/engine/reference/commandline/network_create/) for your app. Each
 container for a service joins the default network and is both *reachable* by
 other containers on that network, and *discoverable* by them at a hostname
 identical to the container name.
@@ -78,11 +78,11 @@ See the [links reference](compose-file.md#links) for more information.
 
 When [deploying a Compose application to a Swarm cluster](swarm.md), you can make use of the built-in `overlay` driver to enable multi-host communication between containers with no changes to your Compose file or application code.
 
-Consult the [Getting started with multi-host networking](/engine/userguide/networking/get-started-overlay.md) to see how to set up a Swarm cluster. The cluster will use the `overlay` driver by default, but you can specify it explicitly if you prefer - see below for how to do this.
+Consult the [Getting started with multi-host networking](https://docs.docker.com/engine/userguide/networking/get-started-overlay/) to see how to set up a Swarm cluster. The cluster will use the `overlay` driver by default, but you can specify it explicitly if you prefer - see below for how to do this.
 
 ## Specifying custom networks
 
-Instead of just using the default app network, you can specify your own networks with the top-level `networks` key. This lets you create more complex topologies and specify [custom network drivers](/engine/extend/plugins_network.md) and options. You can also use it to connect services to externally-created networks which aren't managed by Compose.
+Instead of just using the default app network, you can specify your own networks with the top-level `networks` key. This lets you create more complex topologies and specify [custom network drivers](https://docs.docker.com/engine/extend/plugins_network/) and options. You can also use it to connect services to externally-created networks which aren't managed by Compose.
 
 Each service can specify what networks to connect to with the *service-level* `networks` key, which is a list of names referencing entries under the *top-level* `networks` key.
 
diff --git a/docs/swarm.md b/docs/swarm.md
index 2b609efa..ece72193 100644
--- a/docs/swarm.md
+++ b/docs/swarm.md
@@ -26,14 +26,11 @@ format](compose-file.md#versioning) you are using:
 
     - subject to the [limitations](#limitations) described below,
 
-    - as long as the Swarm cluster is configured to use the [overlay
-      driver](/engine/userguide/networking/dockernetworks.md#an-overlay-network),
+    - as long as the Swarm cluster is configured to use the [overlay driver](https://docs.docker.com/engine/userguide/networking/dockernetworks/#an-overlay-network),
       or a custom driver which supports multi-host networking.
 
-Read the [Getting started with multi-host
-networking](/engine/userguide/networking/get-started-overlay.md) to see how to
-set up a Swarm cluster with [Docker Machine](/machine/overview) and the overlay driver.
-Once you've got it running, deploying your app to it should be as simple as:
+Read [Get started with multi-host networking](https://docs.docker.com/engine/userguide/networking/get-started-overlay/) to see how to
+set up a Swarm cluster with [Docker Machine](/machine/overview) and the overlay driver. Once you've got it running, deploying your app to it should be as simple as:
 
     $ eval "$(docker-machine env --swarm <name of swarm master machine>)"
     $ docker-compose up

From 9094c4d97de72dc8ba8d607e21823c44f67896aa Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Thu, 24 Mar 2016 10:43:09 +0100
Subject: [PATCH 0936/1265] prepare bash completion for new TLS options

Up to now there were two special top-level options that required special
treatment: --project-name and --file (and their short forms).
For 1.7.0, several TLS related options were added that have to be passed
to secondary docker-compose invocations as well.
This commit introduces a scalable treatment of those options.

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 58 +++++++++++++-------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 528970b4..c1c06045 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -18,11 +18,22 @@
 
 
 __docker_compose_q() {
-	local file_args
-	if [ ${#compose_files[@]} -ne 0 ] ; then
-		file_args="${compose_files[@]/#/-f }"
-	fi
-	docker-compose 2>/dev/null $file_args ${compose_project:+-p $compose_project} "$@"
+	docker-compose 2>/dev/null $daemon_options "$@"
+}
+
+# Transforms a multiline list of strings into a single line string
+# with the words separated by "|".
+__docker_compose_to_alternatives() {
+	local parts=( $1 )
+	local IFS='|'
+	echo "${parts[*]}"
+}
+
+# Transforms a multiline list of options into an extglob pattern
+# suitable for use in case statements.
+__docker_compose_to_extglob() {
+	local extglob=$( __docker_compose_to_alternatives "$1" )
+	echo "@($extglob)"
 }
 
 # suppress trailing whitespace
@@ -31,20 +42,6 @@ __docker_compose_nospace() {
 	type compopt &>/dev/null && compopt -o nospace
 }
 
-# For compatibility reasons, Compose and therefore its completion supports several
-# stack compositon files as listed here, in descending priority.
-# Support for these filenames might be dropped in some future version.
-__docker_compose_compose_file() {
-	local file
-	for file in docker-compose.y{,a}ml ; do
-		[ -e $file ] && {
-			echo $file
-			return
-		}
-	done
-	echo docker-compose.yml
-}
-
 # Extracts all service names from the compose file.
 ___docker_compose_all_services_in_compose_file() {
 	__docker_compose_q config --services
@@ -142,7 +139,7 @@ _docker_compose_docker_compose() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--file -f --help -h --project-name -p --verbose --version -v" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "$daemon_options_with_args --help -h --verbose --version -v" -- "$cur" ) )
 			;;
 		*)
 			COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
@@ -452,6 +449,13 @@ _docker_compose() {
 		version
 	)
 
+	# options for the docker daemon that have to be passed to secondary calls to
+	# docker-compose executed by this script
+	local daemon_options_with_args="
+		--file -f
+		--project-name -p
+	"
+
 	COMPREPLY=()
 	local cur prev words cword
 	_get_comp_words_by_ref -n : cur prev words cword
@@ -459,17 +463,15 @@ _docker_compose() {
 	# search subcommand and invoke its handler.
 	# special treatment of some top-level options
 	local command='docker_compose'
+	local daemon_options=()
 	local counter=1
-	local compose_files=() compose_project
+
 	while [ $counter -lt $cword ]; do
 		case "${words[$counter]}" in
-			--file|-f)
-				(( counter++ ))
-				compose_files+=(${words[$counter]})
-				;;
-			--project-name|-p)
-				(( counter++ ))
-				compose_project="${words[$counter]}"
+			$(__docker_compose_to_extglob "$daemon_options_with_args") )
+				local opt=${words[counter]}
+				local arg=${words[++counter]}
+				daemon_options+=($opt $arg)
 				;;
 			-*)
 				;;

From 5b2c2e332fb5a142b7ed7bdebdcefc4441d0bab9 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Thu, 24 Mar 2016 11:15:25 +0100
Subject: [PATCH 0937/1265] bash completion for TLS options

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index c1c06045..e7dba344 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -128,18 +128,22 @@ _docker_compose_create() {
 
 _docker_compose_docker_compose() {
 	case "$prev" in
+		--tlscacert|--tlscert|--tlskey)
+			_filedir
+			return
+			;;
 		--file|-f)
 			_filedir "y?(a)ml"
 			return
 			;;
-		--project-name|-p)
+		$(__docker_compose_to_extglob "$daemon_options_with_args") )
 			return
 			;;
 	esac
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "$daemon_options_with_args --help -h --verbose --version -v" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "$daemon_boolean_options  $daemon_options_with_args --help -h --verbose --version -v" -- "$cur" ) )
 			;;
 		*)
 			COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
@@ -451,9 +455,18 @@ _docker_compose() {
 
 	# options for the docker daemon that have to be passed to secondary calls to
 	# docker-compose executed by this script
+	local daemon_boolean_options="
+		--skip-hostname-check
+		--tls
+		--tlsverify
+	"
 	local daemon_options_with_args="
 		--file -f
+		--host -H
 		--project-name -p
+		--tlscacert
+		--tlscert
+		--tlskey
 	"
 
 	COMPREPLY=()
@@ -468,6 +481,10 @@ _docker_compose() {
 
 	while [ $counter -lt $cword ]; do
 		case "${words[$counter]}" in
+			$(__docker_compose_to_extglob "$daemon_boolean_options") )
+				local opt=${words[counter]}
+				daemon_options+=($opt)
+				;;
 			$(__docker_compose_to_extglob "$daemon_options_with_args") )
 				local opt=${words[counter]}
 				local arg=${words[++counter]}

From 8282bb1b24cc0f51210ffd94a55edf8876bcb814 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 24 Mar 2016 14:41:51 +0000
Subject: [PATCH 0938/1265] Add TLS flags to CLI reference

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/reference/overview.md | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/reference/overview.md b/docs/reference/overview.md
index 09f2817a..d59fa565 100644
--- a/docs/reference/overview.md
+++ b/docs/reference/overview.md
@@ -25,10 +25,20 @@ Usage:
   docker-compose -h|--help
 
 Options:
-  -f, --file FILE           Specify an alternate compose file (default: docker-compose.yml)
-  -p, --project-name NAME   Specify an alternate project name (default: directory name)
-  --verbose                 Show more output
-  -v, --version             Print version and exit
+  -f, --file FILE             Specify an alternate compose file (default: docker-compose.yml)
+  -p, --project-name NAME     Specify an alternate project name (default: directory name)
+  --verbose                   Show more output
+  -v, --version               Print version and exit
+  -H, --host HOST             Daemon socket to connect to
+
+  --tls                       Use TLS; implied by --tlsverify
+  --tlscacert CA_PATH         Trust certs signed only by this CA
+  --tlscert CLIENT_CERT_PATH  Path to TLS certificate file
+  --tlskey TLS_KEY_PATH       Path to TLS key file
+  --tlsverify                 Use TLS and verify the remote
+  --skip-hostname-check       Don't check the daemon's hostname against the name specified
+                              in the client certificate (for example if your docker host
+                              is an IP address)
 
 Commands:
   build              Build or rebuild services

From d8fb9d8831143c1f037f6a494883cfa9b6d85313 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Thu, 24 Mar 2016 17:11:10 +0100
Subject: [PATCH 0939/1265] bash completion for new `docker logs` options

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index e7dba344..3b9c9aed 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -211,9 +211,15 @@ _docker_compose_kill() {
 
 
 _docker_compose_logs() {
+	case "$prev" in
+		--tail)
+			return
+			;;
+	esac
+
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--help --no-color" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--follow -f --help --no-color --tail --timestamps -t" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_all

From 5416e4c99bea4a5c80705e7813d76bf8fa927578 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Thu, 24 Mar 2016 17:21:56 +0100
Subject: [PATCH 0940/1265] bash completion for `docker-compose up --build`

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index e7dba344..043edafd 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -407,7 +407,7 @@ _docker_compose_up() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--abort-on-container-exit -d --force-recreate --help --no-build --no-color --no-deps --no-recreate --timeout -t --remove-orphans" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--abort-on-container-exit --build -d --force-recreate --help --no-build --no-color --no-deps --no-recreate --timeout -t --remove-orphans" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_all

From b030c3928a3d06cce644542001f41712d3c5fbb1 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Thu, 24 Mar 2016 17:29:04 +0100
Subject: [PATCH 0941/1265] bash completion for `docker-compose rm --all`

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index e7dba344..054ccafc 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -301,7 +301,7 @@ _docker_compose_restart() {
 _docker_compose_rm() {
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help -v" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--all -a --force -f --help -v" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_stopped

From 732531b722453d62a3202d5bbc76a42f30c6e2cc Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 24 Mar 2016 12:07:53 -0400
Subject: [PATCH 0942/1265] Disable a test that is failing against 1.11.0rc1.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/integration/service_test.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index b0541406..e2ef1161 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -6,6 +6,7 @@ import shutil
 import tempfile
 from os import path
 
+import pytest
 from docker.errors import APIError
 from six import StringIO
 from six import text_type
@@ -985,6 +986,7 @@ class ServiceTest(DockerClientTestCase):
         one_off_container = service.create_container(one_off=True)
         self.assertNotEqual(one_off_container.name, 'my-web-container')
 
+    @pytest.mark.skipif(True, reason="Broken on 1.11.0rc1")
     def test_log_drive_invalid(self):
         service = self.create_service('web', logging={'driver': 'xxx'})
         expected_error_msg = "logger: no log driver named 'xxx' is registered"

From c9b02b7b34de0463ff22ee7bfda666543d1f2955 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Thu, 24 Mar 2016 18:02:12 +0100
Subject: [PATCH 0943/1265] bash completion for `docker-compose exec`

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index e7dba344..9476d854 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -186,6 +186,24 @@ _docker_compose_events() {
 }
 
 
+_docker_compose_exec() {
+	case "$prev" in
+		--index|--user)
+			return
+			;;
+	esac
+
+	case "$cur" in
+		-*)
+			COMPREPLY=( $( compgen -W "-d --help --index --privileged -T --user" -- "$cur" ) )
+			;;
+		*)
+			__docker_compose_services_running
+			;;
+	esac
+}
+
+
 _docker_compose_help() {
 	COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
 }
@@ -435,6 +453,7 @@ _docker_compose() {
 		create
 		down
 		events
+		exec
 		help
 		kill
 		logs

From 60470fb9f121eaf690d5594a1a01639f20d152fd Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 23 Mar 2016 16:33:00 -0700
Subject: [PATCH 0944/1265] Require docker-py 1.8.0rc2

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 88367353..91d0487c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 PyYAML==3.11
 cached-property==1.2.0
+docker-py==1.8.0rc2
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
-git+https://github.com/docker/docker-py.git@5c1c42397cf0fdb74182df2d69822b82df8f2a6a#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3
diff --git a/setup.py b/setup.py
index df4172ce..7caae97d 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.8',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.7.0, < 2',
+    'docker-py > 1.7.2, < 2',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

From c69d8a3bd2584044348aa6a444cf22ed1fd5f43d Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 1 Mar 2016 15:49:42 -0800
Subject: [PATCH 0945/1265] Implement environment singleton to be accessed
 throughout the code

Load and parse environment file from working dir

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/command.py                  | 13 +++--
 compose/cli/main.py                     |  2 +-
 compose/config/__init__.py              |  1 +
 compose/config/config.py                | 40 +++++++++-----
 compose/config/environment.py           | 69 +++++++++++++++++++++++++
 compose/config/interpolation.py         | 23 +--------
 tests/acceptance/cli_test.py            |  4 +-
 tests/helpers.py                        | 13 +++++
 tests/integration/service_test.py       |  3 +-
 tests/unit/cli_test.py                  |  7 +--
 tests/unit/config/config_test.py        | 36 +++++++------
 tests/unit/config/interpolation_test.py |  2 +
 tests/unit/interpolation_test.py        |  2 +-
 13 files changed, 151 insertions(+), 64 deletions(-)
 create mode 100644 compose/config/environment.py

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 63d387f0..3fcfbb4b 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -21,7 +21,7 @@ log = logging.getLogger(__name__)
 def project_from_options(project_dir, options):
     return get_project(
         project_dir,
-        get_config_path_from_options(options),
+        get_config_path_from_options(project_dir, options),
         project_name=options.get('--project-name'),
         verbose=options.get('--verbose'),
         host=options.get('--host'),
@@ -29,12 +29,13 @@ def project_from_options(project_dir, options):
     )
 
 
-def get_config_path_from_options(options):
+def get_config_path_from_options(base_dir, options):
     file_option = options.get('--file')
     if file_option:
         return file_option
 
-    config_files = os.environ.get('COMPOSE_FILE')
+    environment = config.environment.get_instance(base_dir)
+    config_files = environment.get('COMPOSE_FILE')
     if config_files:
         return config_files.split(os.pathsep)
     return None
@@ -57,8 +58,9 @@ def get_project(project_dir, config_path=None, project_name=None, verbose=False,
     config_details = config.find(project_dir, config_path)
     project_name = get_project_name(config_details.working_dir, project_name)
     config_data = config.load(config_details)
+    environment = config.environment.get_instance(project_dir)
 
-    api_version = os.environ.get(
+    api_version = environment.get(
         'COMPOSE_API_VERSION',
         API_VERSIONS[config_data.version])
     client = get_client(
@@ -73,7 +75,8 @@ def get_project_name(working_dir, project_name=None):
     def normalize_name(name):
         return re.sub(r'[^a-z0-9]', '', name.lower())
 
-    project_name = project_name or os.environ.get('COMPOSE_PROJECT_NAME')
+    environment = config.environment.get_instance(working_dir)
+    project_name = project_name or environment.get('COMPOSE_PROJECT_NAME')
     if project_name:
         return normalize_name(project_name)
 
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 6eada097..3fa3e3a0 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -222,7 +222,7 @@ class TopLevelCommand(object):
             --services      Print the service names, one per line.
 
         """
-        config_path = get_config_path_from_options(config_options)
+        config_path = get_config_path_from_options(self.project_dir, config_options)
         compose_config = config.load(config.find(self.project_dir, config_path))
 
         if options['--quiet']:
diff --git a/compose/config/__init__.py b/compose/config/__init__.py
index dd01f221..7cf71eb9 100644
--- a/compose/config/__init__.py
+++ b/compose/config/__init__.py
@@ -2,6 +2,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+from . import environment
 from .config import ConfigurationError
 from .config import DOCKER_CONFIG_KEYS
 from .config import find
diff --git a/compose/config/config.py b/compose/config/config.py
index 961d0b57..c9c4e308 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -17,6 +17,7 @@ from cached_property import cached_property
 from ..const import COMPOSEFILE_V1 as V1
 from ..const import COMPOSEFILE_V2_0 as V2_0
 from ..utils import build_string_dict
+from .environment import Environment
 from .errors import CircularReference
 from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
@@ -211,7 +212,8 @@ def find(base_dir, filenames):
     if filenames == ['-']:
         return ConfigDetails(
             os.getcwd(),
-            [ConfigFile(None, yaml.safe_load(sys.stdin))])
+            [ConfigFile(None, yaml.safe_load(sys.stdin))],
+        )
 
     if filenames:
         filenames = [os.path.join(base_dir, f) for f in filenames]
@@ -221,7 +223,8 @@ def find(base_dir, filenames):
     log.debug("Using configuration files: {}".format(",".join(filenames)))
     return ConfigDetails(
         os.path.dirname(filenames[0]),
-        [ConfigFile.from_filename(f) for f in filenames])
+        [ConfigFile.from_filename(f) for f in filenames],
+    )
 
 
 def validate_config_version(config_files):
@@ -288,6 +291,10 @@ def load(config_details):
     """
     validate_config_version(config_details.config_files)
 
+    # load environment in working dir for later use in interpolation
+    # it is done here to avoid having to pass down working_dir
+    Environment.get_instance(config_details.working_dir)
+
     processed_files = [
         process_config_file(config_file)
         for config_file in config_details.config_files
@@ -302,9 +309,8 @@ def load(config_details):
         config_details.config_files, 'get_networks', 'Network'
     )
     service_dicts = load_services(
-        config_details.working_dir,
-        main_file,
-        [file.get_service_dicts() for file in config_details.config_files])
+        config_details, main_file,
+    )
 
     if main_file.version != V1:
         for service_dict in service_dicts:
@@ -348,14 +354,16 @@ def load_mapping(config_files, get_func, entity_type):
     return mapping
 
 
-def load_services(working_dir, config_file, service_configs):
+def load_services(config_details, config_file):
     def build_service(service_name, service_dict, service_names):
         service_config = ServiceConfig.with_abs_paths(
-            working_dir,
+            config_details.working_dir,
             config_file.filename,
             service_name,
             service_dict)
-        resolver = ServiceExtendsResolver(service_config, config_file)
+        resolver = ServiceExtendsResolver(
+            service_config, config_file
+        )
         service_dict = process_service(resolver.run())
 
         service_config = service_config._replace(config=service_dict)
@@ -383,6 +391,10 @@ def load_services(working_dir, config_file, service_configs):
             for name in all_service_names
         }
 
+    service_configs = [
+        file.get_service_dicts() for file in config_details.config_files
+    ]
+
     service_config = service_configs[0]
     for next_config in service_configs[1:]:
         service_config = merge_services(service_config, next_config)
@@ -462,8 +474,8 @@ class ServiceExtendsResolver(object):
         extends_file = ConfigFile.from_filename(config_path)
         validate_config_version([self.config_file, extends_file])
         extended_file = process_config_file(
-            extends_file,
-            service_name=service_name)
+            extends_file, service_name=service_name
+        )
         service_config = extended_file.get_service(service_name)
 
         return config_path, service_config, service_name
@@ -476,7 +488,8 @@ class ServiceExtendsResolver(object):
                 service_name,
                 service_dict),
             self.config_file,
-            already_seen=self.already_seen + [self.signature])
+            already_seen=self.already_seen + [self.signature],
+        )
 
         service_config = resolver.run()
         other_service_dict = process_service(service_config)
@@ -824,10 +837,11 @@ def parse_ulimits(ulimits):
 
 
 def resolve_env_var(key, val):
+    environment = Environment.get_instance()
     if val is not None:
         return key, val
-    elif key in os.environ:
-        return key, os.environ[key]
+    elif key in environment:
+        return key, environment[key]
     else:
         return key, None
 
diff --git a/compose/config/environment.py b/compose/config/environment.py
new file mode 100644
index 00000000..45f1c43f
--- /dev/null
+++ b/compose/config/environment.py
@@ -0,0 +1,69 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import logging
+import os
+
+from .errors import ConfigurationError
+
+log = logging.getLogger(__name__)
+
+
+class BlankDefaultDict(dict):
+    def __init__(self, *args, **kwargs):
+        super(BlankDefaultDict, self).__init__(*args, **kwargs)
+        self.missing_keys = []
+
+    def __getitem__(self, key):
+        try:
+            return super(BlankDefaultDict, self).__getitem__(key)
+        except KeyError:
+            if key not in self.missing_keys:
+                log.warn(
+                    "The {} variable is not set. Defaulting to a blank string."
+                    .format(key)
+                )
+                self.missing_keys.append(key)
+
+            return ""
+
+
+class Environment(BlankDefaultDict):
+    __instance = None
+
+    @classmethod
+    def get_instance(cls, base_dir='.'):
+        if cls.__instance:
+            return cls.__instance
+
+        instance = cls(base_dir)
+        cls.__instance = instance
+        return instance
+
+    @classmethod
+    def reset(cls):
+        cls.__instance = None
+
+    def __init__(self, base_dir):
+        super(Environment, self).__init__()
+        self.load_environment_file(os.path.join(base_dir, '.env'))
+        self.update(os.environ)
+
+    def load_environment_file(self, path):
+        if not os.path.exists(path):
+            return
+        mapping = {}
+        with open(path, 'r') as f:
+            for line in f.readlines():
+                line = line.strip()
+                if '=' not in line:
+                    raise ConfigurationError(
+                        'Invalid environment variable mapping in env file. '
+                        'Missing "=" in "{0}"'.format(line)
+                    )
+                mapping.__setitem__(*line.split('=', 1))
+        self.update(mapping)
+
+
+def get_instance(base_dir=None):
+    return Environment.get_instance(base_dir)
diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index 1e56ebb6..b76638d9 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -2,17 +2,17 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import logging
-import os
 from string import Template
 
 import six
 
+from .environment import Environment
 from .errors import ConfigurationError
 log = logging.getLogger(__name__)
 
 
 def interpolate_environment_variables(config, section):
-    mapping = BlankDefaultDict(os.environ)
+    mapping = Environment.get_instance()
 
     def process_item(name, config_dict):
         return dict(
@@ -60,25 +60,6 @@ def interpolate(string, mapping):
         raise InvalidInterpolation(string)
 
 
-class BlankDefaultDict(dict):
-    def __init__(self, *args, **kwargs):
-        super(BlankDefaultDict, self).__init__(*args, **kwargs)
-        self.missing_keys = []
-
-    def __getitem__(self, key):
-        try:
-            return super(BlankDefaultDict, self).__getitem__(key)
-        except KeyError:
-            if key not in self.missing_keys:
-                log.warn(
-                    "The {} variable is not set. Defaulting to a blank string."
-                    .format(key)
-                )
-                self.missing_keys.append(key)
-
-            return ""
-
-
 class InvalidInterpolation(Exception):
     def __init__(self, string):
         self.string = string
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 707c2492..9d50ea99 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -15,7 +15,7 @@ from operator import attrgetter
 import yaml
 from docker import errors
 
-from .. import mock
+from ..helpers import clear_environment
 from compose.cli.command import get_project
 from compose.container import Container
 from compose.project import OneOffFilter
@@ -1452,7 +1452,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(containers), 1)
         self.assertIn("FOO=1", containers[0].get('Config.Env'))
 
-    @mock.patch.dict(os.environ)
+    @clear_environment
     def test_home_and_env_var_in_volume_path(self):
         os.environ['VOLUME_NAME'] = 'my-volume'
         os.environ['HOME'] = '/tmp/home-dir'
diff --git a/tests/helpers.py b/tests/helpers.py
index dd0b668e..2c3d5a98 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -1,9 +1,14 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import functools
+import os
+
+from . import mock
 from compose.config.config import ConfigDetails
 from compose.config.config import ConfigFile
 from compose.config.config import load
+from compose.config.environment import Environment
 
 
 def build_config(contents, **kwargs):
@@ -14,3 +19,11 @@ def build_config_details(contents, working_dir='working_dir', filename='filename
     return ConfigDetails(
         working_dir,
         [ConfigFile(filename, contents)])
+
+
+def clear_environment(f):
+    @functools.wraps(f)
+    def wrapper(self, *args, **kwargs):
+        Environment.reset()
+        with mock.patch.dict(os.environ):
+            f(self, *args, **kwargs)
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index e2ef1161..a1857b58 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -12,6 +12,7 @@ from six import StringIO
 from six import text_type
 
 from .. import mock
+from ..helpers import clear_environment
 from .testcases import DockerClientTestCase
 from .testcases import get_links
 from .testcases import pull_busybox
@@ -912,7 +913,7 @@ class ServiceTest(DockerClientTestCase):
         }.items():
             self.assertEqual(env[k], v)
 
-    @mock.patch.dict(os.environ)
+    @clear_environment
     def test_resolve_env(self):
         os.environ['FILE_DEF'] = 'E1'
         os.environ['FILE_DEF_EMPTY'] = 'E2'
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index e0ada460..fd8aa95c 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -11,6 +11,7 @@ import pytest
 from .. import mock
 from .. import unittest
 from ..helpers import build_config
+from ..helpers import clear_environment
 from compose.cli.command import get_project
 from compose.cli.command import get_project_name
 from compose.cli.docopt_command import NoSuchCommand
@@ -43,11 +44,11 @@ class CLITestCase(unittest.TestCase):
         project_name = get_project_name(None, project_name=name)
         self.assertEquals('explicitprojectname', project_name)
 
+    @clear_environment
     def test_project_name_from_environment_new_var(self):
         name = 'namefromenv'
-        with mock.patch.dict(os.environ):
-            os.environ['COMPOSE_PROJECT_NAME'] = name
-            project_name = get_project_name(None)
+        os.environ['COMPOSE_PROJECT_NAME'] = name
+        project_name = get_project_name(None)
         self.assertEquals(project_name, name)
 
     def test_project_name_with_empty_environment_var(self):
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 04d82c81..9bd76fb9 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -23,6 +23,7 @@ from compose.config.types import VolumeSpec
 from compose.const import IS_WINDOWS_PLATFORM
 from tests import mock
 from tests import unittest
+from tests.helpers import clear_environment
 
 DEFAULT_VERSION = V2_0
 
@@ -1581,7 +1582,7 @@ class PortsTest(unittest.TestCase):
 
 
 class InterpolationTest(unittest.TestCase):
-    @mock.patch.dict(os.environ)
+    @clear_environment
     def test_config_file_with_environment_variable(self):
         os.environ.update(
             IMAGE="busybox",
@@ -1604,7 +1605,7 @@ class InterpolationTest(unittest.TestCase):
             }
         ])
 
-    @mock.patch.dict(os.environ)
+    @clear_environment
     def test_unset_variable_produces_warning(self):
         os.environ.pop('FOO', None)
         os.environ.pop('BAR', None)
@@ -1628,7 +1629,7 @@ class InterpolationTest(unittest.TestCase):
             self.assertIn('BAR', warnings[0])
             self.assertIn('FOO', warnings[1])
 
-    @mock.patch.dict(os.environ)
+    @clear_environment
     def test_invalid_interpolation(self):
         with self.assertRaises(config.ConfigurationError) as cm:
             config.load(
@@ -1667,7 +1668,7 @@ class VolumeConfigTest(unittest.TestCase):
         d = make_service_dict('foo', {'build': '.', 'volumes': ['/data']}, working_dir='.')
         self.assertEqual(d['volumes'], ['/data'])
 
-    @mock.patch.dict(os.environ)
+    @clear_environment
     def test_volume_binding_with_environment_variable(self):
         os.environ['VOLUME_PATH'] = '/host/path'
 
@@ -1681,7 +1682,7 @@ class VolumeConfigTest(unittest.TestCase):
         self.assertEqual(d['volumes'], [VolumeSpec.parse('/host/path:/container/path')])
 
     @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='posix paths')
-    @mock.patch.dict(os.environ)
+    @clear_environment
     def test_volume_binding_with_home(self):
         os.environ['HOME'] = '/home/user'
         d = make_service_dict('foo', {'build': '.', 'volumes': ['~:/container/path']}, working_dir='.')
@@ -1739,7 +1740,7 @@ class VolumeConfigTest(unittest.TestCase):
             working_dir='c:\\Users\\me\\myproject')
         self.assertEqual(d['volumes'], ['c:\\Users\\me\\otherproject:/data'])
 
-    @mock.patch.dict(os.environ)
+    @clear_environment
     def test_home_directory_with_driver_does_not_expand(self):
         os.environ['NAME'] = 'surprise!'
         d = make_service_dict('foo', {
@@ -2025,7 +2026,7 @@ class EnvTest(unittest.TestCase):
     def test_parse_environment_empty(self):
         self.assertEqual(config.parse_environment(None), {})
 
-    @mock.patch.dict(os.environ)
+    @clear_environment
     def test_resolve_environment(self):
         os.environ['FILE_DEF'] = 'E1'
         os.environ['FILE_DEF_EMPTY'] = 'E2'
@@ -2072,7 +2073,7 @@ class EnvTest(unittest.TestCase):
         assert 'Couldn\'t find env file' in exc.exconly()
         assert 'nonexistent.env' in exc.exconly()
 
-    @mock.patch.dict(os.environ)
+    @clear_environment
     def test_resolve_environment_from_env_file_with_empty_values(self):
         os.environ['FILE_DEF'] = 'E1'
         os.environ['FILE_DEF_EMPTY'] = 'E2'
@@ -2087,7 +2088,7 @@ class EnvTest(unittest.TestCase):
             },
         )
 
-    @mock.patch.dict(os.environ)
+    @clear_environment
     def test_resolve_build_args(self):
         os.environ['env_arg'] = 'value2'
 
@@ -2106,7 +2107,7 @@ class EnvTest(unittest.TestCase):
         )
 
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
-    @mock.patch.dict(os.environ)
+    @clear_environment
     def test_resolve_path(self):
         os.environ['HOSTENV'] = '/tmp'
         os.environ['CONTAINERENV'] = '/host/tmp'
@@ -2393,7 +2394,7 @@ class ExtendsTest(unittest.TestCase):
         assert 'net: container' in excinfo.exconly()
         assert 'cannot be extended' in excinfo.exconly()
 
-    @mock.patch.dict(os.environ)
+    @clear_environment
     def test_load_config_runs_interpolation_in_extended_service(self):
         os.environ.update(HOSTNAME_VALUE="penguin")
         expected_interpolated_value = "host-penguin"
@@ -2465,6 +2466,7 @@ class ExtendsTest(unittest.TestCase):
             },
         ]))
 
+    @clear_environment
     def test_extends_with_environment_and_env_files(self):
         tmpdir = py.test.ensuretemp('test_extends_with_environment')
         self.addCleanup(tmpdir.remove)
@@ -2520,12 +2522,12 @@ class ExtendsTest(unittest.TestCase):
                 },
             },
         ]
-        with mock.patch.dict(os.environ):
-            os.environ['SECRET'] = 'secret'
-            os.environ['THING'] = 'thing'
-            os.environ['COMMON_ENV_FILE'] = 'secret'
-            os.environ['TOP_ENV_FILE'] = 'secret'
-            config = load_from_filename(str(tmpdir.join('docker-compose.yml')))
+
+        os.environ['SECRET'] = 'secret'
+        os.environ['THING'] = 'thing'
+        os.environ['COMMON_ENV_FILE'] = 'secret'
+        os.environ['TOP_ENV_FILE'] = 'secret'
+        config = load_from_filename(str(tmpdir.join('docker-compose.yml')))
 
         assert config == expected
 
diff --git a/tests/unit/config/interpolation_test.py b/tests/unit/config/interpolation_test.py
index 0691e886..b4ba7b40 100644
--- a/tests/unit/config/interpolation_test.py
+++ b/tests/unit/config/interpolation_test.py
@@ -6,12 +6,14 @@ import os
 import mock
 import pytest
 
+from compose.config.environment import Environment
 from compose.config.interpolation import interpolate_environment_variables
 
 
 @pytest.yield_fixture
 def mock_env():
     with mock.patch.dict(os.environ):
+        Environment.reset()
         os.environ['USER'] = 'jenny'
         os.environ['FOO'] = 'bar'
         yield
diff --git a/tests/unit/interpolation_test.py b/tests/unit/interpolation_test.py
index 317982a9..b19fcdac 100644
--- a/tests/unit/interpolation_test.py
+++ b/tests/unit/interpolation_test.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 import unittest
 
-from compose.config.interpolation import BlankDefaultDict as bddict
+from compose.config.environment import BlankDefaultDict as bddict
 from compose.config.interpolation import interpolate
 from compose.config.interpolation import InvalidInterpolation
 

From bf8e501b5e7f255459dd232afa937d065b28f905 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 7 Mar 2016 14:42:17 -0800
Subject: [PATCH 0946/1265] Fix pre-commit config

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e37677c6..1ae45dec 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@
     - id: end-of-file-fixer
     - id: flake8
     - id: name-tests-test
-      exclude: 'tests/(helpers\.py|integration/testcases\.py)'
+      exclude: 'tests/(integration/testcases\.py)|(helpers\.py)'
     - id: requirements-txt-fixer
     - id: trailing-whitespace
 - repo: git://github.com/asottile/reorder_python_imports

From b9ca5188a21f99a2798c5451049e27be3e75ac27 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 7 Mar 2016 17:16:25 -0800
Subject: [PATCH 0947/1265] Remove Environment singleton, instead carry
 instance during config processing

Project name and compose file detection also updated

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/command.py          |  6 +--
 compose/config/config.py        | 69 ++++++++++++++++++++-------------
 compose/config/environment.py   | 22 +----------
 compose/config/interpolation.py |  6 +--
 4 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 3fcfbb4b..8c0bf07f 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -34,7 +34,7 @@ def get_config_path_from_options(base_dir, options):
     if file_option:
         return file_option
 
-    environment = config.environment.get_instance(base_dir)
+    environment = config.environment.Environment(base_dir)
     config_files = environment.get('COMPOSE_FILE')
     if config_files:
         return config_files.split(os.pathsep)
@@ -58,7 +58,7 @@ def get_project(project_dir, config_path=None, project_name=None, verbose=False,
     config_details = config.find(project_dir, config_path)
     project_name = get_project_name(config_details.working_dir, project_name)
     config_data = config.load(config_details)
-    environment = config.environment.get_instance(project_dir)
+    environment = config.environment.Environment(project_dir)
 
     api_version = environment.get(
         'COMPOSE_API_VERSION',
@@ -75,7 +75,7 @@ def get_project_name(working_dir, project_name=None):
     def normalize_name(name):
         return re.sub(r'[^a-z0-9]', '', name.lower())
 
-    environment = config.environment.get_instance(working_dir)
+    environment = config.environment.Environment(working_dir)
     project_name = project_name or environment.get('COMPOSE_PROJECT_NAME')
     if project_name:
         return normalize_name(project_name)
diff --git a/compose/config/config.py b/compose/config/config.py
index c9c4e308..7db66004 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -114,14 +114,24 @@ DEFAULT_OVERRIDE_FILENAME = 'docker-compose.override.yml'
 log = logging.getLogger(__name__)
 
 
-class ConfigDetails(namedtuple('_ConfigDetails', 'working_dir config_files')):
+class ConfigDetails(namedtuple('_ConfigDetails', 'working_dir config_files environment')):
     """
     :param working_dir: the directory to use for relative paths in the config
     :type  working_dir: string
     :param config_files: list of configuration files to load
     :type  config_files: list of :class:`ConfigFile`
+    :param environment: computed environment values for this project
+    :type  environment: :class:`environment.Environment`
      """
 
+    def __new__(cls, working_dir, config_files):
+        return super(ConfigDetails, cls).__new__(
+            cls,
+            working_dir,
+            config_files,
+            Environment(working_dir),
+        )
+
 
 class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
     """
@@ -291,12 +301,8 @@ def load(config_details):
     """
     validate_config_version(config_details.config_files)
 
-    # load environment in working dir for later use in interpolation
-    # it is done here to avoid having to pass down working_dir
-    Environment.get_instance(config_details.working_dir)
-
     processed_files = [
-        process_config_file(config_file)
+        process_config_file(config_file, config_details.environment)
         for config_file in config_details.config_files
     ]
     config_details = config_details._replace(config_files=processed_files)
@@ -362,7 +368,7 @@ def load_services(config_details, config_file):
             service_name,
             service_dict)
         resolver = ServiceExtendsResolver(
-            service_config, config_file
+            service_config, config_file, environment=config_details.environment
         )
         service_dict = process_service(resolver.run())
 
@@ -371,7 +377,8 @@ def load_services(config_details, config_file):
         service_dict = finalize_service(
             service_config,
             service_names,
-            config_file.version)
+            config_file.version,
+            config_details.environment)
         return service_dict
 
     def build_services(service_config):
@@ -402,16 +409,17 @@ def load_services(config_details, config_file):
     return build_services(service_config)
 
 
-def interpolate_config_section(filename, config, section):
+def interpolate_config_section(filename, config, section, environment):
     validate_config_section(filename, config, section)
-    return interpolate_environment_variables(config, section)
+    return interpolate_environment_variables(config, section, environment)
 
 
-def process_config_file(config_file, service_name=None):
+def process_config_file(config_file, environment, service_name=None):
     services = interpolate_config_section(
         config_file.filename,
         config_file.get_service_dicts(),
-        'service')
+        'service',
+        environment,)
 
     if config_file.version == V2_0:
         processed_config = dict(config_file.config)
@@ -419,11 +427,13 @@ def process_config_file(config_file, service_name=None):
         processed_config['volumes'] = interpolate_config_section(
             config_file.filename,
             config_file.get_volumes(),
-            'volume')
+            'volume',
+            environment,)
         processed_config['networks'] = interpolate_config_section(
             config_file.filename,
             config_file.get_networks(),
-            'network')
+            'network',
+            environment,)
 
     if config_file.version == V1:
         processed_config = services
@@ -440,11 +450,12 @@ def process_config_file(config_file, service_name=None):
 
 
 class ServiceExtendsResolver(object):
-    def __init__(self, service_config, config_file, already_seen=None):
+    def __init__(self, service_config, config_file, environment=None, already_seen=None):
         self.service_config = service_config
         self.working_dir = service_config.working_dir
         self.already_seen = already_seen or []
         self.config_file = config_file
+        self.environment = environment or Environment(None)
 
     @property
     def signature(self):
@@ -474,7 +485,7 @@ class ServiceExtendsResolver(object):
         extends_file = ConfigFile.from_filename(config_path)
         validate_config_version([self.config_file, extends_file])
         extended_file = process_config_file(
-            extends_file, service_name=service_name
+            extends_file, self.environment, service_name=service_name
         )
         service_config = extended_file.get_service(service_name)
 
@@ -489,6 +500,7 @@ class ServiceExtendsResolver(object):
                 service_dict),
             self.config_file,
             already_seen=self.already_seen + [self.signature],
+            environment=self.environment
         )
 
         service_config = resolver.run()
@@ -518,7 +530,7 @@ class ServiceExtendsResolver(object):
         return filename
 
 
-def resolve_environment(service_dict):
+def resolve_environment(service_dict, environment=None):
     """Unpack any environment variables from an env_file, if set.
     Interpolate environment values if set.
     """
@@ -527,12 +539,12 @@ def resolve_environment(service_dict):
         env.update(env_vars_from_file(env_file))
 
     env.update(parse_environment(service_dict.get('environment')))
-    return dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
+    return dict(resolve_env_var(k, v, environment) for k, v in six.iteritems(env))
 
 
-def resolve_build_args(build):
+def resolve_build_args(build, environment):
     args = parse_build_arguments(build.get('args'))
-    return dict(resolve_env_var(k, v) for k, v in six.iteritems(args))
+    return dict(resolve_env_var(k, v, environment) for k, v in six.iteritems(args))
 
 
 def validate_extended_service_dict(service_dict, filename, service):
@@ -611,11 +623,11 @@ def process_service(service_config):
     return service_dict
 
 
-def finalize_service(service_config, service_names, version):
+def finalize_service(service_config, service_names, version, environment):
     service_dict = dict(service_config.config)
 
     if 'environment' in service_dict or 'env_file' in service_dict:
-        service_dict['environment'] = resolve_environment(service_dict)
+        service_dict['environment'] = resolve_environment(service_dict, environment)
         service_dict.pop('env_file', None)
 
     if 'volumes_from' in service_dict:
@@ -642,7 +654,7 @@ def finalize_service(service_config, service_names, version):
     if 'restart' in service_dict:
         service_dict['restart'] = parse_restart_spec(service_dict['restart'])
 
-    normalize_build(service_dict, service_config.working_dir)
+    normalize_build(service_dict, service_config.working_dir, environment)
 
     service_dict['name'] = service_config.name
     return normalize_v1_service_format(service_dict)
@@ -836,11 +848,10 @@ def parse_ulimits(ulimits):
         return dict(ulimits)
 
 
-def resolve_env_var(key, val):
-    environment = Environment.get_instance()
+def resolve_env_var(key, val, environment):
     if val is not None:
         return key, val
-    elif key in environment:
+    elif environment and key in environment:
         return key, environment[key]
     else:
         return key, None
@@ -880,7 +891,7 @@ def resolve_volume_path(working_dir, volume):
         return container_path
 
 
-def normalize_build(service_dict, working_dir):
+def normalize_build(service_dict, working_dir, environment):
 
     if 'build' in service_dict:
         build = {}
@@ -890,7 +901,9 @@ def normalize_build(service_dict, working_dir):
         else:
             build.update(service_dict['build'])
             if 'args' in build:
-                build['args'] = build_string_dict(resolve_build_args(build))
+                build['args'] = build_string_dict(
+                    resolve_build_args(build, environment)
+                )
 
         service_dict['build'] = build
 
diff --git a/compose/config/environment.py b/compose/config/environment.py
index 45f1c43f..87b41223 100644
--- a/compose/config/environment.py
+++ b/compose/config/environment.py
@@ -29,24 +29,10 @@ class BlankDefaultDict(dict):
 
 
 class Environment(BlankDefaultDict):
-    __instance = None
-
-    @classmethod
-    def get_instance(cls, base_dir='.'):
-        if cls.__instance:
-            return cls.__instance
-
-        instance = cls(base_dir)
-        cls.__instance = instance
-        return instance
-
-    @classmethod
-    def reset(cls):
-        cls.__instance = None
-
     def __init__(self, base_dir):
         super(Environment, self).__init__()
-        self.load_environment_file(os.path.join(base_dir, '.env'))
+        if base_dir:
+            self.load_environment_file(os.path.join(base_dir, '.env'))
         self.update(os.environ)
 
     def load_environment_file(self, path):
@@ -63,7 +49,3 @@ class Environment(BlankDefaultDict):
                     )
                 mapping.__setitem__(*line.split('=', 1))
         self.update(mapping)
-
-
-def get_instance(base_dir=None):
-    return Environment.get_instance(base_dir)
diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index b76638d9..63020d91 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -6,17 +6,15 @@ from string import Template
 
 import six
 
-from .environment import Environment
 from .errors import ConfigurationError
 log = logging.getLogger(__name__)
 
 
-def interpolate_environment_variables(config, section):
-    mapping = Environment.get_instance()
+def interpolate_environment_variables(config, section, environment):
 
     def process_item(name, config_dict):
         return dict(
-            (key, interpolate_value(name, key, val, section, mapping))
+            (key, interpolate_value(name, key, val, section, environment))
             for key, val in (config_dict or {}).items()
         )
 

From 5831b869e879b1350f0610f41b2dbd58c5e6285f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 7 Mar 2016 17:18:19 -0800
Subject: [PATCH 0948/1265] Update tests for new environment handling

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 .pre-commit-config.yaml                 |  2 +-
 tests/acceptance/cli_test.py            |  4 +--
 tests/helpers.py                        | 13 ---------
 tests/integration/service_test.py       |  3 +--
 tests/integration/testcases.py          |  3 ++-
 tests/unit/cli_test.py                  |  3 +--
 tests/unit/config/config_test.py        | 36 +++++++++++++------------
 tests/unit/config/interpolation_test.py |  9 ++++---
 8 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1ae45dec..462fcc4c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@
     - id: end-of-file-fixer
     - id: flake8
     - id: name-tests-test
-      exclude: 'tests/(integration/testcases\.py)|(helpers\.py)'
+      exclude: 'tests/integration/testcases\.py'
     - id: requirements-txt-fixer
     - id: trailing-whitespace
 - repo: git://github.com/asottile/reorder_python_imports
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 9d50ea99..707c2492 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -15,7 +15,7 @@ from operator import attrgetter
 import yaml
 from docker import errors
 
-from ..helpers import clear_environment
+from .. import mock
 from compose.cli.command import get_project
 from compose.container import Container
 from compose.project import OneOffFilter
@@ -1452,7 +1452,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(containers), 1)
         self.assertIn("FOO=1", containers[0].get('Config.Env'))
 
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_home_and_env_var_in_volume_path(self):
         os.environ['VOLUME_NAME'] = 'my-volume'
         os.environ['HOME'] = '/tmp/home-dir'
diff --git a/tests/helpers.py b/tests/helpers.py
index 2c3d5a98..dd0b668e 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -1,14 +1,9 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import functools
-import os
-
-from . import mock
 from compose.config.config import ConfigDetails
 from compose.config.config import ConfigFile
 from compose.config.config import load
-from compose.config.environment import Environment
 
 
 def build_config(contents, **kwargs):
@@ -19,11 +14,3 @@ def build_config_details(contents, working_dir='working_dir', filename='filename
     return ConfigDetails(
         working_dir,
         [ConfigFile(filename, contents)])
-
-
-def clear_environment(f):
-    @functools.wraps(f)
-    def wrapper(self, *args, **kwargs):
-        Environment.reset()
-        with mock.patch.dict(os.environ):
-            f(self, *args, **kwargs)
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index a1857b58..e2ef1161 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -12,7 +12,6 @@ from six import StringIO
 from six import text_type
 
 from .. import mock
-from ..helpers import clear_environment
 from .testcases import DockerClientTestCase
 from .testcases import get_links
 from .testcases import pull_busybox
@@ -913,7 +912,7 @@ class ServiceTest(DockerClientTestCase):
         }.items():
             self.assertEqual(env[k], v)
 
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_resolve_env(self):
         os.environ['FILE_DEF'] = 'E1'
         os.environ['FILE_DEF_EMPTY'] = 'E2'
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 8e2f2593..aaa002f3 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -12,6 +12,7 @@ from compose.cli.docker_client import docker_client
 from compose.config.config import resolve_environment
 from compose.config.config import V1
 from compose.config.config import V2_0
+from compose.config.environment import Environment
 from compose.const import API_VERSIONS
 from compose.const import LABEL_PROJECT
 from compose.progress_stream import stream_output
@@ -89,7 +90,7 @@ class DockerClientTestCase(unittest.TestCase):
         if 'command' not in kwargs:
             kwargs['command'] = ["top"]
 
-        kwargs['environment'] = resolve_environment(kwargs)
+        kwargs['environment'] = resolve_environment(kwargs, Environment(None))
         labels = dict(kwargs.setdefault('labels', {}))
         labels['com.docker.compose.test-name'] = self.id()
 
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index fd8aa95c..d8e0b33f 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -11,7 +11,6 @@ import pytest
 from .. import mock
 from .. import unittest
 from ..helpers import build_config
-from ..helpers import clear_environment
 from compose.cli.command import get_project
 from compose.cli.command import get_project_name
 from compose.cli.docopt_command import NoSuchCommand
@@ -44,7 +43,7 @@ class CLITestCase(unittest.TestCase):
         project_name = get_project_name(None, project_name=name)
         self.assertEquals('explicitprojectname', project_name)
 
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_project_name_from_environment_new_var(self):
         name = 'namefromenv'
         os.environ['COMPOSE_PROJECT_NAME'] = name
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 9bd76fb9..6dc7dbca 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -17,13 +17,13 @@ from compose.config.config import resolve_build_args
 from compose.config.config import resolve_environment
 from compose.config.config import V1
 from compose.config.config import V2_0
+from compose.config.environment import Environment
 from compose.config.errors import ConfigurationError
 from compose.config.errors import VERSION_EXPLANATION
 from compose.config.types import VolumeSpec
 from compose.const import IS_WINDOWS_PLATFORM
 from tests import mock
 from tests import unittest
-from tests.helpers import clear_environment
 
 DEFAULT_VERSION = V2_0
 
@@ -1582,7 +1582,7 @@ class PortsTest(unittest.TestCase):
 
 
 class InterpolationTest(unittest.TestCase):
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_config_file_with_environment_variable(self):
         os.environ.update(
             IMAGE="busybox",
@@ -1605,7 +1605,7 @@ class InterpolationTest(unittest.TestCase):
             }
         ])
 
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_unset_variable_produces_warning(self):
         os.environ.pop('FOO', None)
         os.environ.pop('BAR', None)
@@ -1621,7 +1621,7 @@ class InterpolationTest(unittest.TestCase):
             None,
         )
 
-        with mock.patch('compose.config.interpolation.log') as log:
+        with mock.patch('compose.config.environment.log') as log:
             config.load(config_details)
 
             self.assertEqual(2, log.warn.call_count)
@@ -1629,7 +1629,7 @@ class InterpolationTest(unittest.TestCase):
             self.assertIn('BAR', warnings[0])
             self.assertIn('FOO', warnings[1])
 
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_invalid_interpolation(self):
         with self.assertRaises(config.ConfigurationError) as cm:
             config.load(
@@ -1668,7 +1668,7 @@ class VolumeConfigTest(unittest.TestCase):
         d = make_service_dict('foo', {'build': '.', 'volumes': ['/data']}, working_dir='.')
         self.assertEqual(d['volumes'], ['/data'])
 
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_volume_binding_with_environment_variable(self):
         os.environ['VOLUME_PATH'] = '/host/path'
 
@@ -1682,7 +1682,7 @@ class VolumeConfigTest(unittest.TestCase):
         self.assertEqual(d['volumes'], [VolumeSpec.parse('/host/path:/container/path')])
 
     @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='posix paths')
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_volume_binding_with_home(self):
         os.environ['HOME'] = '/home/user'
         d = make_service_dict('foo', {'build': '.', 'volumes': ['~:/container/path']}, working_dir='.')
@@ -1740,7 +1740,7 @@ class VolumeConfigTest(unittest.TestCase):
             working_dir='c:\\Users\\me\\myproject')
         self.assertEqual(d['volumes'], ['c:\\Users\\me\\otherproject:/data'])
 
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_home_directory_with_driver_does_not_expand(self):
         os.environ['NAME'] = 'surprise!'
         d = make_service_dict('foo', {
@@ -2026,7 +2026,7 @@ class EnvTest(unittest.TestCase):
     def test_parse_environment_empty(self):
         self.assertEqual(config.parse_environment(None), {})
 
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_resolve_environment(self):
         os.environ['FILE_DEF'] = 'E1'
         os.environ['FILE_DEF_EMPTY'] = 'E2'
@@ -2042,7 +2042,7 @@ class EnvTest(unittest.TestCase):
             },
         }
         self.assertEqual(
-            resolve_environment(service_dict),
+            resolve_environment(service_dict, Environment(None)),
             {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': None},
         )
 
@@ -2073,13 +2073,15 @@ class EnvTest(unittest.TestCase):
         assert 'Couldn\'t find env file' in exc.exconly()
         assert 'nonexistent.env' in exc.exconly()
 
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_resolve_environment_from_env_file_with_empty_values(self):
         os.environ['FILE_DEF'] = 'E1'
         os.environ['FILE_DEF_EMPTY'] = 'E2'
         os.environ['ENV_DEF'] = 'E3'
         self.assertEqual(
-            resolve_environment({'env_file': ['tests/fixtures/env/resolve.env']}),
+            resolve_environment(
+                {'env_file': ['tests/fixtures/env/resolve.env']}, Environment(None)
+            ),
             {
                 'FILE_DEF': u'bär',
                 'FILE_DEF_EMPTY': '',
@@ -2088,7 +2090,7 @@ class EnvTest(unittest.TestCase):
             },
         )
 
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_resolve_build_args(self):
         os.environ['env_arg'] = 'value2'
 
@@ -2102,12 +2104,12 @@ class EnvTest(unittest.TestCase):
             }
         }
         self.assertEqual(
-            resolve_build_args(build),
+            resolve_build_args(build, Environment(build['context'])),
             {'arg1': 'value1', 'empty_arg': '', 'env_arg': 'value2', 'no_env': None},
         )
 
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_resolve_path(self):
         os.environ['HOSTENV'] = '/tmp'
         os.environ['CONTAINERENV'] = '/host/tmp'
@@ -2394,7 +2396,7 @@ class ExtendsTest(unittest.TestCase):
         assert 'net: container' in excinfo.exconly()
         assert 'cannot be extended' in excinfo.exconly()
 
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_load_config_runs_interpolation_in_extended_service(self):
         os.environ.update(HOSTNAME_VALUE="penguin")
         expected_interpolated_value = "host-penguin"
@@ -2466,7 +2468,7 @@ class ExtendsTest(unittest.TestCase):
             },
         ]))
 
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_extends_with_environment_and_env_files(self):
         tmpdir = py.test.ensuretemp('test_extends_with_environment')
         self.addCleanup(tmpdir.remove)
diff --git a/tests/unit/config/interpolation_test.py b/tests/unit/config/interpolation_test.py
index b4ba7b40..f83caea9 100644
--- a/tests/unit/config/interpolation_test.py
+++ b/tests/unit/config/interpolation_test.py
@@ -13,7 +13,6 @@ from compose.config.interpolation import interpolate_environment_variables
 @pytest.yield_fixture
 def mock_env():
     with mock.patch.dict(os.environ):
-        Environment.reset()
         os.environ['USER'] = 'jenny'
         os.environ['FOO'] = 'bar'
         yield
@@ -44,7 +43,9 @@ def test_interpolate_environment_variables_in_services(mock_env):
             }
         }
     }
-    assert interpolate_environment_variables(services, 'service') == expected
+    assert interpolate_environment_variables(
+        services, 'service', Environment(None)
+    ) == expected
 
 
 def test_interpolate_environment_variables_in_volumes(mock_env):
@@ -68,4 +69,6 @@ def test_interpolate_environment_variables_in_volumes(mock_env):
         },
         'other': {},
     }
-    assert interpolate_environment_variables(volumes, 'volume') == expected
+    assert interpolate_environment_variables(
+        volumes, 'volume', Environment(None)
+    ) == expected

From fd020ed2cfa2fb2b03a31a3fe87d6da47edfd713 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 7 Mar 2016 17:46:55 -0800
Subject: [PATCH 0949/1265] Tests use updated get_config_paths_from_options
 signature

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 .pre-commit-config.yaml        |  2 +-
 tests/unit/cli/command_test.py | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 462fcc4c..0e7b9d5f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@
     - id: end-of-file-fixer
     - id: flake8
     - id: name-tests-test
-      exclude: 'tests/integration/testcases\.py'
+      exclude: 'tests/(integration/testcases\.py|helpers\.py)'
     - id: requirements-txt-fixer
     - id: trailing-whitespace
 - repo: git://github.com/asottile/reorder_python_imports
diff --git a/tests/unit/cli/command_test.py b/tests/unit/cli/command_test.py
index b524a5f3..11fea16f 100644
--- a/tests/unit/cli/command_test.py
+++ b/tests/unit/cli/command_test.py
@@ -15,24 +15,24 @@ class TestGetConfigPathFromOptions(object):
     def test_path_from_options(self):
         paths = ['one.yml', 'two.yml']
         opts = {'--file': paths}
-        assert get_config_path_from_options(opts) == paths
+        assert get_config_path_from_options('.', opts) == paths
 
     def test_single_path_from_env(self):
         with mock.patch.dict(os.environ):
             os.environ['COMPOSE_FILE'] = 'one.yml'
-            assert get_config_path_from_options({}) == ['one.yml']
+            assert get_config_path_from_options('.', {}) == ['one.yml']
 
     @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='posix separator')
     def test_multiple_path_from_env(self):
         with mock.patch.dict(os.environ):
             os.environ['COMPOSE_FILE'] = 'one.yml:two.yml'
-            assert get_config_path_from_options({}) == ['one.yml', 'two.yml']
+            assert get_config_path_from_options('.', {}) == ['one.yml', 'two.yml']
 
     @pytest.mark.skipif(not IS_WINDOWS_PLATFORM, reason='windows separator')
     def test_multiple_path_from_env_windows(self):
         with mock.patch.dict(os.environ):
             os.environ['COMPOSE_FILE'] = 'one.yml;two.yml'
-            assert get_config_path_from_options({}) == ['one.yml', 'two.yml']
+            assert get_config_path_from_options('.', {}) == ['one.yml', 'two.yml']
 
     def test_no_path(self):
-        assert not get_config_path_from_options({})
+        assert not get_config_path_from_options('.', {})

From 1801f83bb83f59fd508e5f9ad85b4c14d1f9d1d7 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 8 Mar 2016 16:54:14 -0800
Subject: [PATCH 0950/1265] Environment class cleanup

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/command.py                  |  6 +--
 compose/config/config.py                | 35 ++-----------
 compose/config/environment.py           | 69 +++++++++++++++----------
 tests/integration/testcases.py          |  2 +-
 tests/unit/config/config_test.py        |  6 +--
 tests/unit/config/interpolation_test.py |  4 +-
 tests/unit/interpolation_test.py        |  2 +-
 7 files changed, 58 insertions(+), 66 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 8c0bf07f..07293f74 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -34,7 +34,7 @@ def get_config_path_from_options(base_dir, options):
     if file_option:
         return file_option
 
-    environment = config.environment.Environment(base_dir)
+    environment = config.environment.Environment.from_env_file(base_dir)
     config_files = environment.get('COMPOSE_FILE')
     if config_files:
         return config_files.split(os.pathsep)
@@ -58,7 +58,7 @@ def get_project(project_dir, config_path=None, project_name=None, verbose=False,
     config_details = config.find(project_dir, config_path)
     project_name = get_project_name(config_details.working_dir, project_name)
     config_data = config.load(config_details)
-    environment = config.environment.Environment(project_dir)
+    environment = config.environment.Environment.from_env_file(project_dir)
 
     api_version = environment.get(
         'COMPOSE_API_VERSION',
@@ -75,7 +75,7 @@ def get_project_name(working_dir, project_name=None):
     def normalize_name(name):
         return re.sub(r'[^a-z0-9]', '', name.lower())
 
-    environment = config.environment.Environment(working_dir)
+    environment = config.environment.Environment.from_env_file(working_dir)
     project_name = project_name or environment.get('COMPOSE_PROJECT_NAME')
     if project_name:
         return normalize_name(project_name)
diff --git a/compose/config/config.py b/compose/config/config.py
index 7db66004..a50efdf8 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import codecs
 import functools
 import logging
 import operator
@@ -17,7 +16,9 @@ from cached_property import cached_property
 from ..const import COMPOSEFILE_V1 as V1
 from ..const import COMPOSEFILE_V2_0 as V2_0
 from ..utils import build_string_dict
+from .environment import env_vars_from_file
 from .environment import Environment
+from .environment import split_env
 from .errors import CircularReference
 from .errors import ComposeFileNotFound
 from .errors import ConfigurationError
@@ -129,7 +130,7 @@ class ConfigDetails(namedtuple('_ConfigDetails', 'working_dir config_files envir
             cls,
             working_dir,
             config_files,
-            Environment(working_dir),
+            Environment.from_env_file(working_dir),
         )
 
 
@@ -314,9 +315,7 @@ def load(config_details):
     networks = load_mapping(
         config_details.config_files, 'get_networks', 'Network'
     )
-    service_dicts = load_services(
-        config_details, main_file,
-    )
+    service_dicts = load_services(config_details, main_file)
 
     if main_file.version != V1:
         for service_dict in service_dicts:
@@ -455,7 +454,7 @@ class ServiceExtendsResolver(object):
         self.working_dir = service_config.working_dir
         self.already_seen = already_seen or []
         self.config_file = config_file
-        self.environment = environment or Environment(None)
+        self.environment = environment or Environment()
 
     @property
     def signature(self):
@@ -802,15 +801,6 @@ def merge_environment(base, override):
     return env
 
 
-def split_env(env):
-    if isinstance(env, six.binary_type):
-        env = env.decode('utf-8', 'replace')
-    if '=' in env:
-        return env.split('=', 1)
-    else:
-        return env, None
-
-
 def split_label(label):
     if '=' in label:
         return label.split('=', 1)
@@ -857,21 +847,6 @@ def resolve_env_var(key, val, environment):
         return key, None
 
 
-def env_vars_from_file(filename):
-    """
-    Read in a line delimited file of environment variables.
-    """
-    if not os.path.exists(filename):
-        raise ConfigurationError("Couldn't find env file: %s" % filename)
-    env = {}
-    for line in codecs.open(filename, 'r', 'utf-8'):
-        line = line.strip()
-        if line and not line.startswith('#'):
-            k, v = split_env(line)
-            env[k] = v
-    return env
-
-
 def resolve_volume_paths(working_dir, service_dict):
     return [
         resolve_volume_path(working_dir, volume)
diff --git a/compose/config/environment.py b/compose/config/environment.py
index 87b41223..8066c50f 100644
--- a/compose/config/environment.py
+++ b/compose/config/environment.py
@@ -1,22 +1,62 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import codecs
 import logging
 import os
 
+import six
+
 from .errors import ConfigurationError
 
 log = logging.getLogger(__name__)
 
 
-class BlankDefaultDict(dict):
+def split_env(env):
+    if isinstance(env, six.binary_type):
+        env = env.decode('utf-8', 'replace')
+    if '=' in env:
+        return env.split('=', 1)
+    else:
+        return env, None
+
+
+def env_vars_from_file(filename):
+    """
+    Read in a line delimited file of environment variables.
+    """
+    if not os.path.exists(filename):
+        raise ConfigurationError("Couldn't find env file: %s" % filename)
+    env = {}
+    for line in codecs.open(filename, 'r', 'utf-8'):
+        line = line.strip()
+        if line and not line.startswith('#'):
+            k, v = split_env(line)
+            env[k] = v
+    return env
+
+
+class Environment(dict):
     def __init__(self, *args, **kwargs):
-        super(BlankDefaultDict, self).__init__(*args, **kwargs)
+        super(Environment, self).__init__(*args, **kwargs)
         self.missing_keys = []
+        self.update(os.environ)
+
+    @classmethod
+    def from_env_file(cls, base_dir):
+        result = cls()
+        if base_dir is None:
+            return result
+        env_file_path = os.path.join(base_dir, '.env')
+        try:
+            result.update(env_vars_from_file(env_file_path))
+        except ConfigurationError:
+            pass
+        return result
 
     def __getitem__(self, key):
         try:
-            return super(BlankDefaultDict, self).__getitem__(key)
+            return super(Environment, self).__getitem__(key)
         except KeyError:
             if key not in self.missing_keys:
                 log.warn(
@@ -26,26 +66,3 @@ class BlankDefaultDict(dict):
                 self.missing_keys.append(key)
 
             return ""
-
-
-class Environment(BlankDefaultDict):
-    def __init__(self, base_dir):
-        super(Environment, self).__init__()
-        if base_dir:
-            self.load_environment_file(os.path.join(base_dir, '.env'))
-        self.update(os.environ)
-
-    def load_environment_file(self, path):
-        if not os.path.exists(path):
-            return
-        mapping = {}
-        with open(path, 'r') as f:
-            for line in f.readlines():
-                line = line.strip()
-                if '=' not in line:
-                    raise ConfigurationError(
-                        'Invalid environment variable mapping in env file. '
-                        'Missing "=" in "{0}"'.format(line)
-                    )
-                mapping.__setitem__(*line.split('=', 1))
-        self.update(mapping)
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index aaa002f3..98e0540f 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -90,7 +90,7 @@ class DockerClientTestCase(unittest.TestCase):
         if 'command' not in kwargs:
             kwargs['command'] = ["top"]
 
-        kwargs['environment'] = resolve_environment(kwargs, Environment(None))
+        kwargs['environment'] = resolve_environment(kwargs, Environment())
         labels = dict(kwargs.setdefault('labels', {}))
         labels['com.docker.compose.test-name'] = self.id()
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 6dc7dbca..daf724a8 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -2042,7 +2042,7 @@ class EnvTest(unittest.TestCase):
             },
         }
         self.assertEqual(
-            resolve_environment(service_dict, Environment(None)),
+            resolve_environment(service_dict, Environment()),
             {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': None},
         )
 
@@ -2080,7 +2080,7 @@ class EnvTest(unittest.TestCase):
         os.environ['ENV_DEF'] = 'E3'
         self.assertEqual(
             resolve_environment(
-                {'env_file': ['tests/fixtures/env/resolve.env']}, Environment(None)
+                {'env_file': ['tests/fixtures/env/resolve.env']}, Environment()
             ),
             {
                 'FILE_DEF': u'bär',
@@ -2104,7 +2104,7 @@ class EnvTest(unittest.TestCase):
             }
         }
         self.assertEqual(
-            resolve_build_args(build, Environment(build['context'])),
+            resolve_build_args(build, Environment.from_env_file(build['context'])),
             {'arg1': 'value1', 'empty_arg': '', 'env_arg': 'value2', 'no_env': None},
         )
 
diff --git a/tests/unit/config/interpolation_test.py b/tests/unit/config/interpolation_test.py
index f83caea9..282ba779 100644
--- a/tests/unit/config/interpolation_test.py
+++ b/tests/unit/config/interpolation_test.py
@@ -44,7 +44,7 @@ def test_interpolate_environment_variables_in_services(mock_env):
         }
     }
     assert interpolate_environment_variables(
-        services, 'service', Environment(None)
+        services, 'service', Environment()
     ) == expected
 
 
@@ -70,5 +70,5 @@ def test_interpolate_environment_variables_in_volumes(mock_env):
         'other': {},
     }
     assert interpolate_environment_variables(
-        volumes, 'volume', Environment(None)
+        volumes, 'volume', Environment()
     ) == expected
diff --git a/tests/unit/interpolation_test.py b/tests/unit/interpolation_test.py
index b19fcdac..c3050c2c 100644
--- a/tests/unit/interpolation_test.py
+++ b/tests/unit/interpolation_test.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 import unittest
 
-from compose.config.environment import BlankDefaultDict as bddict
+from compose.config.environment import Environment as bddict
 from compose.config.interpolation import interpolate
 from compose.config.interpolation import InvalidInterpolation
 

From d55fc85feadf51e753c06b34f7cc200305915a54 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 8 Mar 2016 16:55:05 -0800
Subject: [PATCH 0951/1265] Added default env file test.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/fixtures/default-env-file/.env               |  4 ++++
 tests/fixtures/default-env-file/docker-compose.yml |  6 ++++++
 tests/unit/config/config_test.py                   | 13 +++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 tests/fixtures/default-env-file/.env
 create mode 100644 tests/fixtures/default-env-file/docker-compose.yml

diff --git a/tests/fixtures/default-env-file/.env b/tests/fixtures/default-env-file/.env
new file mode 100644
index 00000000..996c886c
--- /dev/null
+++ b/tests/fixtures/default-env-file/.env
@@ -0,0 +1,4 @@
+IMAGE=alpine:latest
+COMMAND=true
+PORT1=5643
+PORT2=9999
\ No newline at end of file
diff --git a/tests/fixtures/default-env-file/docker-compose.yml b/tests/fixtures/default-env-file/docker-compose.yml
new file mode 100644
index 00000000..aa8e4409
--- /dev/null
+++ b/tests/fixtures/default-env-file/docker-compose.yml
@@ -0,0 +1,6 @@
+web:
+    image: ${IMAGE}
+    command: ${COMMAND}
+    ports:
+        - $PORT1
+        - $PORT2
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index daf724a8..913cbed9 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1582,6 +1582,19 @@ class PortsTest(unittest.TestCase):
 
 
 class InterpolationTest(unittest.TestCase):
+    @mock.patch.dict(os.environ)
+    def test_config_file_with_environment_file(self):
+        service_dicts = config.load(
+            config.find('tests/fixtures/default-env-file', None)
+        ).services
+
+        self.assertEqual(service_dicts[0], {
+            'name': 'web',
+            'image': 'alpine:latest',
+            'ports': ['5643', '9999'],
+            'command': 'true'
+        })
+
     @mock.patch.dict(os.environ)
     def test_config_file_with_environment_variable(self):
         os.environ.update(

From f48da96e8b5a732399d5ab18e32c53156934e694 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 8 Mar 2016 17:18:04 -0800
Subject: [PATCH 0952/1265] Test get_project_name from env file

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/environment.py |  2 +-
 tests/unit/cli_test.py        | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/compose/config/environment.py b/compose/config/environment.py
index 8066c50f..17eacf1f 100644
--- a/compose/config/environment.py
+++ b/compose/config/environment.py
@@ -49,7 +49,7 @@ class Environment(dict):
             return result
         env_file_path = os.path.join(base_dir, '.env')
         try:
-            result.update(env_vars_from_file(env_file_path))
+            return cls(env_vars_from_file(env_file_path))
         except ConfigurationError:
             pass
         return result
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index d8e0b33f..bd35dc06 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -3,6 +3,8 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import os
+import shutil
+import tempfile
 
 import docker
 import py
@@ -57,6 +59,22 @@ class CLITestCase(unittest.TestCase):
             project_name = get_project_name(base_dir)
         self.assertEquals('simplecomposefile', project_name)
 
+    @mock.patch.dict(os.environ)
+    def test_project_name_with_environment_file(self):
+        base_dir = tempfile.mkdtemp()
+        try:
+            name = 'namefromenvfile'
+            with open(os.path.join(base_dir, '.env'), 'w') as f:
+                f.write('COMPOSE_PROJECT_NAME={}'.format(name))
+            project_name = get_project_name(base_dir)
+            assert project_name == name
+
+            # Environment has priority over .env file
+            os.environ['COMPOSE_PROJECT_NAME'] = 'namefromenv'
+            assert get_project_name(base_dir) == os.environ['COMPOSE_PROJECT_NAME']
+        finally:
+            shutil.rmtree(base_dir)
+
     def test_get_project(self):
         base_dir = 'tests/fixtures/longer-filename-composefile'
         project = get_project(base_dir)

From 21aa7a0448703e3e59bc39300a82f68ded659f45 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 8 Mar 2016 17:48:23 -0800
Subject: [PATCH 0953/1265] Documentation for .env file

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 docs/env-file.md | 38 ++++++++++++++++++++++++++++++++++++++
 docs/index.md    |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 docs/env-file.md

diff --git a/docs/env-file.md b/docs/env-file.md
new file mode 100644
index 00000000..3dec592f
--- /dev/null
+++ b/docs/env-file.md
@@ -0,0 +1,38 @@
+<!--[metadata]>
++++
+title = "Environment file"
+description = "Declaring default environment variables in file"
+keywords = ["fig, composition, compose, docker, orchestration, environment, env file"]
+[menu.main]
+parent = "workw_compose"
+weight=10
++++
+<![end-metadata]-->
+
+
+# Environment file
+
+Compose supports declaring default environment variables in an environment
+file named `.env` and placed in the same folder as your
+[compose file](compose-file.md).
+
+Compose expects each line in an env file to be in `VAR=VAL` format. Lines
+beginning with `#` (i.e. comments) are ignored, as are blank lines.
+
+> Note: Values present in the environment at runtime will always override
+> those defined inside the `.env` file.
+
+Those environment variables will be used for
+[variable substitution](compose-file.md#variable-substitution) in your Compose
+file, but can also be used to define the following
+[CLI variables](reference/envvars.md):
+
+- `COMPOSE_PROJECT_NAME`
+- `COMPOSE_FILE`
+- `COMPOSE_API_VERSION`
+
+## More Compose documentation
+
+- [User guide](index.md)
+- [Command line reference](./reference/index.md)
+- [Compose file reference](compose-file.md)
diff --git a/docs/index.md b/docs/index.md
index f5d84218..f1b71079 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -23,6 +23,7 @@ Compose is a tool for defining and running multi-container Docker applications.
 - [Frequently asked questions](faq.md)
 - [Command line reference](./reference/index.md)
 - [Compose file reference](compose-file.md)
+- [Environment file](env-file.md)
 
 To see a detailed list of changes for past and current releases of Docker
 Compose, please refer to the

From dcdcf4869b6df77e16e243ace9e49c136d336b78 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 10 Mar 2016 17:29:01 -0800
Subject: [PATCH 0954/1265] Mention environment file in envvars.md

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 docs/reference/envvars.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/reference/envvars.md b/docs/reference/envvars.md
index e1170be9..6f7fb791 100644
--- a/docs/reference/envvars.md
+++ b/docs/reference/envvars.md
@@ -17,6 +17,9 @@ Several environment variables are available for you to configure the Docker Comp
 Variables starting with `DOCKER_` are the same as those used to configure the
 Docker command-line client. If you're using `docker-machine`, then the `eval "$(docker-machine env my-docker-vm)"` command should set them to their correct values. (In this example, `my-docker-vm` is the name of a machine you created.)
 
+> Note: Some of these variables can also be provided using an
+> [environment file](../env-file.md)
+
 ## COMPOSE\_PROJECT\_NAME
 
 Sets the project name. This value is prepended along with the service name to the container container on start up. For example, if you project name is `myapp` and it includes two services `db` and `web` then compose starts containers named  `myapp_db_1` and `myapp_web_1` respectively.
@@ -81,3 +84,4 @@ it failed. Defaults to 60 seconds.
 - [User guide](../index.md)
 - [Installing Compose](../install.md)
 - [Compose file reference](../compose-file.md)
+- [Environment file](../env-file.md)

From 0ff53d9668670efe99736e045d4476bccf9435ca Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 14 Mar 2016 13:02:55 -0700
Subject: [PATCH 0955/1265] Less verbose environment invocation

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/command.py | 7 ++++---
 docs/env-file.md       | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 07293f74..d726c7b3 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -9,6 +9,7 @@ import six
 
 from . import verbose_proxy
 from .. import config
+from ..config.environment import Environment
 from ..const import API_VERSIONS
 from ..project import Project
 from .docker_client import docker_client
@@ -34,7 +35,7 @@ def get_config_path_from_options(base_dir, options):
     if file_option:
         return file_option
 
-    environment = config.environment.Environment.from_env_file(base_dir)
+    environment = Environment.from_env_file(base_dir)
     config_files = environment.get('COMPOSE_FILE')
     if config_files:
         return config_files.split(os.pathsep)
@@ -58,7 +59,7 @@ def get_project(project_dir, config_path=None, project_name=None, verbose=False,
     config_details = config.find(project_dir, config_path)
     project_name = get_project_name(config_details.working_dir, project_name)
     config_data = config.load(config_details)
-    environment = config.environment.Environment.from_env_file(project_dir)
+    environment = Environment.from_env_file(project_dir)
 
     api_version = environment.get(
         'COMPOSE_API_VERSION',
@@ -75,7 +76,7 @@ def get_project_name(working_dir, project_name=None):
     def normalize_name(name):
         return re.sub(r'[^a-z0-9]', '', name.lower())
 
-    environment = config.environment.Environment.from_env_file(working_dir)
+    environment = Environment.from_env_file(working_dir)
     project_name = project_name or environment.get('COMPOSE_PROJECT_NAME')
     if project_name:
         return normalize_name(project_name)
diff --git a/docs/env-file.md b/docs/env-file.md
index 3dec592f..6d12d228 100644
--- a/docs/env-file.md
+++ b/docs/env-file.md
@@ -20,7 +20,8 @@ Compose expects each line in an env file to be in `VAR=VAL` format. Lines
 beginning with `#` (i.e. comments) are ignored, as are blank lines.
 
 > Note: Values present in the environment at runtime will always override
-> those defined inside the `.env` file.
+> those defined inside the `.env` file. Similarly, values passed via
+> command-line arguments take precedence as well.
 
 Those environment variables will be used for
 [variable substitution](compose-file.md#variable-substitution) in your Compose

From 36f1b4589cd0dfd343c0b597abe56824d95cea09 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 21 Mar 2016 16:08:07 -0700
Subject: [PATCH 0956/1265] Limit occurrences of creating an environment
 object. .env file is always read from the project_dir

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/command.py           | 23 ++++++++++++++---------
 compose/cli/main.py              | 10 ++++++++--
 compose/config/config.py         | 14 +++++++-------
 tests/helpers.py                 |  3 ++-
 tests/unit/cli/command_test.py   | 20 +++++++++++++++-----
 tests/unit/config/config_test.py | 14 +++++++++++---
 6 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index d726c7b3..73eccc96 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -20,22 +20,23 @@ log = logging.getLogger(__name__)
 
 
 def project_from_options(project_dir, options):
+    environment = Environment.from_env_file(project_dir)
     return get_project(
         project_dir,
-        get_config_path_from_options(project_dir, options),
+        get_config_path_from_options(project_dir, options, environment),
         project_name=options.get('--project-name'),
         verbose=options.get('--verbose'),
         host=options.get('--host'),
         tls_config=tls_config_from_options(options),
+        environment=environment
     )
 
 
-def get_config_path_from_options(base_dir, options):
+def get_config_path_from_options(base_dir, options, environment):
     file_option = options.get('--file')
     if file_option:
         return file_option
 
-    environment = Environment.from_env_file(base_dir)
     config_files = environment.get('COMPOSE_FILE')
     if config_files:
         return config_files.split(os.pathsep)
@@ -55,11 +56,14 @@ def get_client(verbose=False, version=None, tls_config=None, host=None):
 
 
 def get_project(project_dir, config_path=None, project_name=None, verbose=False,
-                host=None, tls_config=None):
-    config_details = config.find(project_dir, config_path)
-    project_name = get_project_name(config_details.working_dir, project_name)
+                host=None, tls_config=None, environment=None):
+    if not environment:
+        environment = Environment.from_env_file(project_dir)
+    config_details = config.find(project_dir, config_path, environment)
+    project_name = get_project_name(
+        config_details.working_dir, project_name, environment
+    )
     config_data = config.load(config_details)
-    environment = Environment.from_env_file(project_dir)
 
     api_version = environment.get(
         'COMPOSE_API_VERSION',
@@ -72,11 +76,12 @@ def get_project(project_dir, config_path=None, project_name=None, verbose=False,
     return Project.from_config(project_name, config_data, client)
 
 
-def get_project_name(working_dir, project_name=None):
+def get_project_name(working_dir, project_name=None, environment=None):
     def normalize_name(name):
         return re.sub(r'[^a-z0-9]', '', name.lower())
 
-    environment = Environment.from_env_file(working_dir)
+    if not environment:
+        environment = Environment.from_env_file(working_dir)
     project_name = project_name or environment.get('COMPOSE_PROJECT_NAME')
     if project_name:
         return normalize_name(project_name)
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 3fa3e3a0..8348b8c3 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -17,6 +17,7 @@ from .. import __version__
 from ..config import config
 from ..config import ConfigurationError
 from ..config import parse_environment
+from ..config.environment import Environment
 from ..config.serialize import serialize_config
 from ..const import DEFAULT_TIMEOUT
 from ..const import IS_WINDOWS_PLATFORM
@@ -222,8 +223,13 @@ class TopLevelCommand(object):
             --services      Print the service names, one per line.
 
         """
-        config_path = get_config_path_from_options(self.project_dir, config_options)
-        compose_config = config.load(config.find(self.project_dir, config_path))
+        environment = Environment.from_env_file(self.project_dir)
+        config_path = get_config_path_from_options(
+            self.project_dir, config_options, environment
+        )
+        compose_config = config.load(
+            config.find(self.project_dir, config_path, environment)
+        )
 
         if options['--quiet']:
             return
diff --git a/compose/config/config.py b/compose/config/config.py
index a50efdf8..47cb2331 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -124,13 +124,11 @@ class ConfigDetails(namedtuple('_ConfigDetails', 'working_dir config_files envir
     :param environment: computed environment values for this project
     :type  environment: :class:`environment.Environment`
      """
-
-    def __new__(cls, working_dir, config_files):
+    def __new__(cls, working_dir, config_files, environment=None):
+        if environment is None:
+            environment = Environment.from_env_file(working_dir)
         return super(ConfigDetails, cls).__new__(
-            cls,
-            working_dir,
-            config_files,
-            Environment.from_env_file(working_dir),
+            cls, working_dir, config_files, environment
         )
 
 
@@ -219,11 +217,12 @@ class ServiceConfig(namedtuple('_ServiceConfig', 'working_dir filename name conf
             config)
 
 
-def find(base_dir, filenames):
+def find(base_dir, filenames, environment):
     if filenames == ['-']:
         return ConfigDetails(
             os.getcwd(),
             [ConfigFile(None, yaml.safe_load(sys.stdin))],
+            environment
         )
 
     if filenames:
@@ -235,6 +234,7 @@ def find(base_dir, filenames):
     return ConfigDetails(
         os.path.dirname(filenames[0]),
         [ConfigFile.from_filename(f) for f in filenames],
+        environment
     )
 
 
diff --git a/tests/helpers.py b/tests/helpers.py
index dd0b668e..4b422a6a 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -13,4 +13,5 @@ def build_config(contents, **kwargs):
 def build_config_details(contents, working_dir='working_dir', filename='filename.yml'):
     return ConfigDetails(
         working_dir,
-        [ConfigFile(filename, contents)])
+        [ConfigFile(filename, contents)],
+    )
diff --git a/tests/unit/cli/command_test.py b/tests/unit/cli/command_test.py
index 11fea16f..3502d636 100644
--- a/tests/unit/cli/command_test.py
+++ b/tests/unit/cli/command_test.py
@@ -6,6 +6,7 @@ import os
 import pytest
 
 from compose.cli.command import get_config_path_from_options
+from compose.config.environment import Environment
 from compose.const import IS_WINDOWS_PLATFORM
 from tests import mock
 
@@ -15,24 +16,33 @@ class TestGetConfigPathFromOptions(object):
     def test_path_from_options(self):
         paths = ['one.yml', 'two.yml']
         opts = {'--file': paths}
-        assert get_config_path_from_options('.', opts) == paths
+        environment = Environment.from_env_file('.')
+        assert get_config_path_from_options('.', opts, environment) == paths
 
     def test_single_path_from_env(self):
         with mock.patch.dict(os.environ):
             os.environ['COMPOSE_FILE'] = 'one.yml'
-            assert get_config_path_from_options('.', {}) == ['one.yml']
+            environment = Environment.from_env_file('.')
+            assert get_config_path_from_options('.', {}, environment) == ['one.yml']
 
     @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='posix separator')
     def test_multiple_path_from_env(self):
         with mock.patch.dict(os.environ):
             os.environ['COMPOSE_FILE'] = 'one.yml:two.yml'
-            assert get_config_path_from_options('.', {}) == ['one.yml', 'two.yml']
+            environment = Environment.from_env_file('.')
+            assert get_config_path_from_options(
+                '.', {}, environment
+            ) == ['one.yml', 'two.yml']
 
     @pytest.mark.skipif(not IS_WINDOWS_PLATFORM, reason='windows separator')
     def test_multiple_path_from_env_windows(self):
         with mock.patch.dict(os.environ):
             os.environ['COMPOSE_FILE'] = 'one.yml;two.yml'
-            assert get_config_path_from_options('.', {}) == ['one.yml', 'two.yml']
+            environment = Environment.from_env_file('.')
+            assert get_config_path_from_options(
+                '.', {}, environment
+            ) == ['one.yml', 'two.yml']
 
     def test_no_path(self):
-        assert not get_config_path_from_options('.', {})
+        environment = Environment.from_env_file('.')
+        assert not get_config_path_from_options('.', {}, environment)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 913cbed9..11152871 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1584,8 +1584,11 @@ class PortsTest(unittest.TestCase):
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)
     def test_config_file_with_environment_file(self):
+        project_dir = 'tests/fixtures/default-env-file'
         service_dicts = config.load(
-            config.find('tests/fixtures/default-env-file', None)
+            config.find(
+                project_dir, None, Environment.from_env_file(project_dir)
+            )
         ).services
 
         self.assertEqual(service_dicts[0], {
@@ -1597,6 +1600,7 @@ class InterpolationTest(unittest.TestCase):
 
     @mock.patch.dict(os.environ)
     def test_config_file_with_environment_variable(self):
+        project_dir = 'tests/fixtures/environment-interpolation'
         os.environ.update(
             IMAGE="busybox",
             HOST_PORT="80",
@@ -1604,7 +1608,9 @@ class InterpolationTest(unittest.TestCase):
         )
 
         service_dicts = config.load(
-            config.find('tests/fixtures/environment-interpolation', None),
+            config.find(
+                project_dir, None, Environment.from_env_file(project_dir)
+            )
         ).services
 
         self.assertEqual(service_dicts, [
@@ -2149,7 +2155,9 @@ class EnvTest(unittest.TestCase):
 
 
 def load_from_filename(filename):
-    return config.load(config.find('.', [filename])).services
+    return config.load(
+        config.find('.', [filename], Environment.from_env_file('.'))
+    ).services
 
 
 class ExtendsTest(unittest.TestCase):

From c7afe16419945d74f956fa065f7b9f79712ed626 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 21 Mar 2016 16:33:58 -0700
Subject: [PATCH 0957/1265] Account for case-insensitive env on windows
 platform

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/environment.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/compose/config/environment.py b/compose/config/environment.py
index 17eacf1f..7f7269b7 100644
--- a/compose/config/environment.py
+++ b/compose/config/environment.py
@@ -7,6 +7,7 @@ import os
 
 import six
 
+from ..const import IS_WINDOWS_PLATFORM
 from .errors import ConfigurationError
 
 log = logging.getLogger(__name__)
@@ -58,6 +59,11 @@ class Environment(dict):
         try:
             return super(Environment, self).__getitem__(key)
         except KeyError:
+            if IS_WINDOWS_PLATFORM:
+                try:
+                    return super(Environment, self).__getitem__(key.upper())
+                except KeyError:
+                    pass
             if key not in self.missing_keys:
                 log.warn(
                     "The {} variable is not set. Defaulting to a blank string."

From b99037b4a61e10c9377dd707e35860cec298a268 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 21 Mar 2016 18:32:13 -0700
Subject: [PATCH 0958/1265] Add support for DOCKER_* variables in .env file

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/command.py               |  9 ++++++---
 compose/cli/docker_client.py         | 13 ++++++++-----
 compose/const.py                     |  2 +-
 docs/env-file.md                     |  8 ++++++--
 tests/integration/testcases.py       |  2 +-
 tests/unit/cli/docker_client_test.py |  4 ++--
 6 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 73eccc96..b7160dee 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -43,8 +43,11 @@ def get_config_path_from_options(base_dir, options, environment):
     return None
 
 
-def get_client(verbose=False, version=None, tls_config=None, host=None):
-    client = docker_client(version=version, tls_config=tls_config, host=host)
+def get_client(environment, verbose=False, version=None, tls_config=None, host=None):
+    client = docker_client(
+        version=version, tls_config=tls_config, host=host,
+        environment=environment
+    )
     if verbose:
         version_info = six.iteritems(client.version())
         log.info(get_version_info('full'))
@@ -70,7 +73,7 @@ def get_project(project_dir, config_path=None, project_name=None, verbose=False,
         API_VERSIONS[config_data.version])
     client = get_client(
         verbose=verbose, version=api_version, tls_config=tls_config,
-        host=host
+        host=host, environment=environment
     )
 
     return Project.from_config(project_name, config_data, client)
diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index deb56866..f782a1ae 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -2,7 +2,6 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import logging
-import os
 
 from docker import Client
 from docker.errors import TLSParameterError
@@ -42,17 +41,17 @@ def tls_config_from_options(options):
         return None
 
 
-def docker_client(version=None, tls_config=None, host=None):
+def docker_client(environment, version=None, tls_config=None, host=None):
     """
     Returns a docker-py client configured using environment variables
     according to the same logic as the official Docker client.
     """
-    if 'DOCKER_CLIENT_TIMEOUT' in os.environ:
+    if 'DOCKER_CLIENT_TIMEOUT' in environment:
         log.warn("The DOCKER_CLIENT_TIMEOUT environment variable is deprecated.  "
                  "Please use COMPOSE_HTTP_TIMEOUT instead.")
 
     try:
-        kwargs = kwargs_from_env(assert_hostname=False)
+        kwargs = kwargs_from_env(assert_hostname=False, environment=environment)
     except TLSParameterError:
         raise UserError(
             "TLS configuration is invalid - make sure your DOCKER_TLS_VERIFY "
@@ -67,6 +66,10 @@ def docker_client(version=None, tls_config=None, host=None):
     if version:
         kwargs['version'] = version
 
-    kwargs['timeout'] = HTTP_TIMEOUT
+    timeout = environment.get('COMPOSE_HTTP_TIMEOUT')
+    if timeout:
+        kwargs['timeout'] = int(timeout)
+    else:
+        kwargs['timeout'] = HTTP_TIMEOUT
 
     return Client(**kwargs)
diff --git a/compose/const.py b/compose/const.py
index db5e2fb4..9e00d96e 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -5,7 +5,7 @@ import os
 import sys
 
 DEFAULT_TIMEOUT = 10
-HTTP_TIMEOUT = int(os.environ.get('COMPOSE_HTTP_TIMEOUT', os.environ.get('DOCKER_CLIENT_TIMEOUT', 60)))
+HTTP_TIMEOUT = int(os.environ.get('DOCKER_CLIENT_TIMEOUT', 60))
 IMAGE_EVENTS = ['delete', 'import', 'pull', 'push', 'tag', 'untag']
 IS_WINDOWS_PLATFORM = (sys.platform == "win32")
 LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
diff --git a/docs/env-file.md b/docs/env-file.md
index 6d12d228..a285a790 100644
--- a/docs/env-file.md
+++ b/docs/env-file.md
@@ -28,9 +28,13 @@ Those environment variables will be used for
 file, but can also be used to define the following
 [CLI variables](reference/envvars.md):
 
-- `COMPOSE_PROJECT_NAME`
-- `COMPOSE_FILE`
 - `COMPOSE_API_VERSION`
+- `COMPOSE_FILE`
+- `COMPOSE_HTTP_TIMEOUT`
+- `COMPOSE_PROJECT_NAME`
+- `DOCKER_CERT_PATH`
+- `DOCKER_HOST`
+- `DOCKER_TLS_VERIFY`
 
 ## More Compose documentation
 
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 98e0540f..e8b2f35d 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -61,7 +61,7 @@ class DockerClientTestCase(unittest.TestCase):
         else:
             version = API_VERSIONS[V2_0]
 
-        cls.client = docker_client(version)
+        cls.client = docker_client(Environment(), version)
 
     def tearDown(self):
         for c in self.client.containers(
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index b55f1d17..56bab19c 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -17,12 +17,12 @@ class DockerClientTestCase(unittest.TestCase):
     def test_docker_client_no_home(self):
         with mock.patch.dict(os.environ):
             del os.environ['HOME']
-            docker_client()
+            docker_client(os.environ)
 
     def test_docker_client_with_custom_timeout(self):
         timeout = 300
         with mock.patch('compose.cli.docker_client.HTTP_TIMEOUT', 300):
-            client = docker_client()
+            client = docker_client(os.environ)
             self.assertEqual(client.timeout, int(timeout))
 
 

From 1506f997def80fdfc4cf6e0377a1cabeaad35d43 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 22 Mar 2016 11:43:03 -0700
Subject: [PATCH 0959/1265] Better windows support for Environment class

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/environment.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/compose/config/environment.py b/compose/config/environment.py
index 7f7269b7..8d2f5e36 100644
--- a/compose/config/environment.py
+++ b/compose/config/environment.py
@@ -72,3 +72,19 @@ class Environment(dict):
                 self.missing_keys.append(key)
 
             return ""
+
+    def __contains__(self, key):
+        result = super(Environment, self).__contains__(key)
+        if IS_WINDOWS_PLATFORM:
+            return (
+                result or super(Environment, self).__contains__(key.upper())
+            )
+        return result
+
+    def get(self, key, *args, **kwargs):
+        if IS_WINDOWS_PLATFORM:
+            return super(Environment, self).get(
+                key,
+                super(Environment, self).get(key.upper(), *args, **kwargs)
+            )
+        return super(Environment, self).get(key, *args, **kwargs)

From 12ad3ff30194e8b4cd5d5e8874fffba297f09dc4 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 22 Mar 2016 15:42:30 -0700
Subject: [PATCH 0960/1265] Injecting os.environ in Environment instance
 happens outside of init method

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py                |  4 ++--
 compose/config/environment.py           | 21 ++++++++++++---------
 tests/integration/testcases.py          |  4 +++-
 tests/unit/config/config_test.py        | 11 ++++++++---
 tests/unit/config/interpolation_test.py |  8 ++++----
 5 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 47cb2331..dc3f56ea 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -449,12 +449,12 @@ def process_config_file(config_file, environment, service_name=None):
 
 
 class ServiceExtendsResolver(object):
-    def __init__(self, service_config, config_file, environment=None, already_seen=None):
+    def __init__(self, service_config, config_file, environment, already_seen=None):
         self.service_config = service_config
         self.working_dir = service_config.working_dir
         self.already_seen = already_seen or []
         self.config_file = config_file
-        self.environment = environment or Environment()
+        self.environment = environment
 
     @property
     def signature(self):
diff --git a/compose/config/environment.py b/compose/config/environment.py
index 8d2f5e36..ad5c0b3d 100644
--- a/compose/config/environment.py
+++ b/compose/config/environment.py
@@ -41,19 +41,22 @@ class Environment(dict):
     def __init__(self, *args, **kwargs):
         super(Environment, self).__init__(*args, **kwargs)
         self.missing_keys = []
-        self.update(os.environ)
 
     @classmethod
     def from_env_file(cls, base_dir):
-        result = cls()
-        if base_dir is None:
+        def _initialize():
+            result = cls()
+            if base_dir is None:
+                return result
+            env_file_path = os.path.join(base_dir, '.env')
+            try:
+                return cls(env_vars_from_file(env_file_path))
+            except ConfigurationError:
+                pass
             return result
-        env_file_path = os.path.join(base_dir, '.env')
-        try:
-            return cls(env_vars_from_file(env_file_path))
-        except ConfigurationError:
-            pass
-        return result
+        instance = _initialize()
+        instance.update(os.environ)
+        return instance
 
     def __getitem__(self, key):
         try:
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index e8b2f35d..8d69d531 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -90,7 +90,9 @@ class DockerClientTestCase(unittest.TestCase):
         if 'command' not in kwargs:
             kwargs['command'] = ["top"]
 
-        kwargs['environment'] = resolve_environment(kwargs, Environment())
+        kwargs['environment'] = resolve_environment(
+            kwargs, Environment.from_env_file(None)
+        )
         labels = dict(kwargs.setdefault('labels', {}))
         labels['com.docker.compose.test-name'] = self.id()
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 11152871..2bbbe614 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -37,7 +37,9 @@ def make_service_dict(name, service_dict, working_dir, filename=None):
             filename=filename,
             name=name,
             config=service_dict),
-        config.ConfigFile(filename=filename, config={}))
+        config.ConfigFile(filename=filename, config={}),
+        environment=Environment.from_env_file(working_dir)
+    )
     return config.process_service(resolver.run())
 
 
@@ -2061,7 +2063,9 @@ class EnvTest(unittest.TestCase):
             },
         }
         self.assertEqual(
-            resolve_environment(service_dict, Environment()),
+            resolve_environment(
+                service_dict, Environment.from_env_file(None)
+            ),
             {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': None},
         )
 
@@ -2099,7 +2103,8 @@ class EnvTest(unittest.TestCase):
         os.environ['ENV_DEF'] = 'E3'
         self.assertEqual(
             resolve_environment(
-                {'env_file': ['tests/fixtures/env/resolve.env']}, Environment()
+                {'env_file': ['tests/fixtures/env/resolve.env']},
+                Environment.from_env_file(None)
             ),
             {
                 'FILE_DEF': u'bär',
diff --git a/tests/unit/config/interpolation_test.py b/tests/unit/config/interpolation_test.py
index 282ba779..42b5db6e 100644
--- a/tests/unit/config/interpolation_test.py
+++ b/tests/unit/config/interpolation_test.py
@@ -20,7 +20,7 @@ def mock_env():
 
 def test_interpolate_environment_variables_in_services(mock_env):
     services = {
-        'servivea': {
+        'servicea': {
             'image': 'example:${USER}',
             'volumes': ['$FOO:/target'],
             'logging': {
@@ -32,7 +32,7 @@ def test_interpolate_environment_variables_in_services(mock_env):
         }
     }
     expected = {
-        'servivea': {
+        'servicea': {
             'image': 'example:jenny',
             'volumes': ['bar:/target'],
             'logging': {
@@ -44,7 +44,7 @@ def test_interpolate_environment_variables_in_services(mock_env):
         }
     }
     assert interpolate_environment_variables(
-        services, 'service', Environment()
+        services, 'service', Environment.from_env_file(None)
     ) == expected
 
 
@@ -70,5 +70,5 @@ def test_interpolate_environment_variables_in_volumes(mock_env):
         'other': {},
     }
     assert interpolate_environment_variables(
-        volumes, 'volume', Environment()
+        volumes, 'volume', Environment.from_env_file(None)
     ) == expected

From 0f1fb42326cb000efe6f06f7c1974430c474afe0 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Fri, 25 Mar 2016 18:52:28 +0100
Subject: [PATCH 0961/1265] Add zsh completion for 'docker-compose rm -a --all'

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index f67bc9f6..64e79428 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -266,6 +266,7 @@ __docker-compose_subcommand() {
         (rm)
             _arguments \
                 $opts_help \
+                '(-a --all)'{-a,--all}"[Also remove one-off containers]" \
                 '(-f --force)'{-f,--force}"[Don't ask to confirm removal]" \
                 '-v[Remove volumes associated with containers]' \
                 '*:stopped services:__docker-compose_stoppedservices' && ret=0

From 63b448120a960194d3d0f23f751ec5e5534e397e Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Fri, 25 Mar 2016 19:03:36 +0100
Subject: [PATCH 0962/1265] Add zsh completion for 'docker-compose exec'
 command

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index f67bc9f6..a40f1010 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -223,6 +223,18 @@ __docker-compose_subcommand() {
                 '--json[Output events as a stream of json objects.]' \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
+        (exec)
+            _arguments \
+                $opts_help \
+                '-d[Detached mode: Run command in the background.]' \
+                '--privileged[Give extended privileges to the process.]' \
+                '--user=[Run the command as this user.]:username:_users' \
+                '-T[Disable pseudo-tty allocation. By default `docker-compose exec` allocates a TTY.]' \
+                '--index=[Index of the container if there are multiple instances of a service (default: 1)]:index: ' \
+                '(-):running services:__docker-compose_runningservices' \
+                '(-):command: _command_names -e' \
+                '*::arguments: _normal' && ret=0
+            ;;
         (help)
             _arguments ':subcommand:__docker-compose_commands' && ret=0
             ;;

From 9d58b19ecc21c56c5b6763361265fe66c2652601 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Fri, 25 Mar 2016 19:09:53 +0100
Subject: [PATCH 0963/1265] Add zsh completion for 'docker-compose logs -f
 --follow --tail -t --timestamps'

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index f67bc9f6..ecd8db93 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -235,7 +235,10 @@ __docker-compose_subcommand() {
         (logs)
             _arguments \
                 $opts_help \
+                '(-f --follow)'{-f,--follow}'[Follow log output]' \
                 '--no-color[Produce monochrome output.]' \
+                '--tail=[Number of lines to show from the end of the logs for each container.]:number of lines: ' \
+                '(-t --timestamps)'{-t,--timestamps}'[Show timestamps]' \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
         (pause)

From 9729c0d3c72f0c16932efd9dd2574d08f3d5a3a7 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Fri, 25 Mar 2016 19:15:34 +0100
Subject: [PATCH 0964/1265] Add zsh completion for 'docker-compose up --build'

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index f67bc9f6..d837e61e 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -313,6 +313,7 @@ __docker-compose_subcommand() {
             _arguments \
                 $opts_help \
                 '(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names.]' \
+                '--build[Build images before starting containers.]' \
                 '--no-color[Produce monochrome output.]' \
                 "--no-deps[Don't start linked services.]" \
                 "--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \

From 8ae8f7ed4befe40578eddb005907f49943a063cb Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Fri, 25 Mar 2016 19:25:33 +0100
Subject: [PATCH 0965/1265] Add zsh completion for 'docker-compose run -w
 --workdir'

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index f67bc9f6..3e3f24d0 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -274,15 +274,16 @@ __docker-compose_subcommand() {
             _arguments \
                 $opts_help \
                 '-d[Detached mode: Run container in the background, print new container name.]' \
-                '--name[Assign a name to the container]:name: ' \
-                '--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
                 '*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
-                '(-u --user)'{-u,--user=-}'[Run as specified username or uid]:username or uid:_users' \
+                '--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
+                '--name[Assign a name to the container]:name: ' \
                 "--no-deps[Don't start linked services.]" \
+                '(-p --publish)'{-p,--publish=-}"[Run command with manually mapped container's port(s) to the host.]" \
                 '--rm[Remove container after run. Ignored in detached mode.]' \
                 "--service-ports[Run command with the service's ports enabled and mapped to the host.]" \
-                '(-p --publish)'{-p,--publish=-}"[Run command with manually mapped container's port(s) to the host.]" \
                 '-T[Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.]' \
+                '(-u --user)'{-u,--user=-}'[Run as specified username or uid]:username or uid:_users' \
+                '(-w --workdir)'{-w=,--workdir=}'[Working directory inside the container]:workdir: ' \
                 '(-):services:__docker-compose_services' \
                 '(-):command: _command_names -e' \
                 '*::arguments: _normal' && ret=0

From 93901ec4805b0a72ba71ae910d3214e4856cd876 Mon Sep 17 00:00:00 2001
From: Jon Lemmon <jon.lemmon@enspiral.com>
Date: Mon, 28 Mar 2016 13:29:01 +1300
Subject: [PATCH 0966/1265] Rails Docs: Add nodejs to apt-get install command

When using the latest version of Rails, the tutorial currently errors when running `docker-compose up` with the following error:

```
/usr/local/lib/ruby/gems/2.3.0/gems/bundler-1.11.2/lib/bundler/runtime.rb:80:in `rescue in block (2 levels) in require': There was an error while trying to load the gem 'uglifier'. (Bundler::GemRequireError)
```

Installing nodejs in the build fixes the issue.

Signed-off-by: Jon Lemmon <jon.lemmon@enspiral.com>
---
 docs/rails.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/rails.md b/docs/rails.md
index a8fc383e..eef6b2f4 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -22,7 +22,7 @@ container. This is done using a file called `Dockerfile`. To begin with, the
 Dockerfile consists of:
 
     FROM ruby:2.2.0
-    RUN apt-get update -qq && apt-get install -y build-essential libpq-dev
+    RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
     RUN mkdir /myapp
     WORKDIR /myapp
     ADD Gemfile /myapp/Gemfile

From 7116aefe4310c77a6d8f80a9f928ce6437e8bb49 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 28 Mar 2016 17:39:20 -0700
Subject: [PATCH 0967/1265] Fix assert_hostname logic in
 tls_config_from_options

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/docker_client.py         | 27 ++++++++++++++++++++-------
 tests/unit/cli/docker_client_test.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index f782a1ae..83cd8626 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -21,24 +21,37 @@ def tls_config_from_options(options):
     cert = options.get('--tlscert')
     key = options.get('--tlskey')
     verify = options.get('--tlsverify')
-    hostname = urlparse(options.get('--host') or '').hostname
+    host = options.get('--host')
+    skip_hostname_check = options.get('--skip-hostname-check', False)
+
+    if not skip_hostname_check:
+        hostname = urlparse(host).hostname if host else None
+        # If the protocol is omitted, urlparse fails to extract the hostname.
+        # Make another attempt by appending a protocol.
+        if not hostname and host:
+            hostname = urlparse('tcp://{0}'.format(host)).hostname
 
     advanced_opts = any([ca_cert, cert, key, verify])
 
     if tls is True and not advanced_opts:
         return True
-    elif advanced_opts:
+    elif advanced_opts:  # --tls is a noop
         client_cert = None
         if cert or key:
             client_cert = (cert, key)
+
+        assert_hostname = None
+        if skip_hostname_check:
+            assert_hostname = False
+        elif hostname:
+            assert_hostname = hostname
+
         return TLSConfig(
             client_cert=client_cert, verify=verify, ca_cert=ca_cert,
-            assert_hostname=(
-                hostname or not options.get('--skip-hostname-check', False)
-            )
+            assert_hostname=assert_hostname
         )
-    else:
-        return None
+
+    return None
 
 
 def docker_client(environment, version=None, tls_config=None, host=None):
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index 56bab19c..f4476ad3 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -103,3 +103,31 @@ class TLSConfigTestCase(unittest.TestCase):
         options = {'--tlskey': self.key}
         with pytest.raises(docker.errors.TLSParameterError):
             tls_config_from_options(options)
+
+    def test_assert_hostname_explicit_host(self):
+        options = {
+            '--tlscacert': self.ca_cert, '--host': 'tcp://foobar.co.uk:1254'
+        }
+        result = tls_config_from_options(options)
+        assert isinstance(result, docker.tls.TLSConfig)
+        assert result.assert_hostname == 'foobar.co.uk'
+
+    def test_assert_hostname_explicit_host_no_proto(self):
+        options = {
+            '--tlscacert': self.ca_cert, '--host': 'foobar.co.uk:1254'
+        }
+        result = tls_config_from_options(options)
+        assert isinstance(result, docker.tls.TLSConfig)
+        assert result.assert_hostname == 'foobar.co.uk'
+
+    def test_assert_hostname_implicit_host(self):
+        options = {'--tlscacert': self.ca_cert}
+        result = tls_config_from_options(options)
+        assert isinstance(result, docker.tls.TLSConfig)
+        assert result.assert_hostname is None
+
+    def test_assert_hostname_explicit_skip(self):
+        options = {'--tlscacert': self.ca_cert, '--skip-hostname-check': True}
+        result = tls_config_from_options(options)
+        assert isinstance(result, docker.tls.TLSConfig)
+        assert result.assert_hostname is False

From 71c86acaa4af0af5dec9baf7f1f4d7b236f249a3 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 29 Mar 2016 18:01:27 -0700
Subject: [PATCH 0968/1265] Update docker-py version to include match_hostname
 fix Removed unnecessary assert_hostname computation in
 tls_config_from_options

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/docker_client.py | 17 +----------------
 requirements.txt             |  2 +-
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 83cd8626..e9f39d01 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -7,7 +7,6 @@ from docker import Client
 from docker.errors import TLSParameterError
 from docker.tls import TLSConfig
 from docker.utils import kwargs_from_env
-from requests.utils import urlparse
 
 from ..const import HTTP_TIMEOUT
 from .errors import UserError
@@ -21,16 +20,8 @@ def tls_config_from_options(options):
     cert = options.get('--tlscert')
     key = options.get('--tlskey')
     verify = options.get('--tlsverify')
-    host = options.get('--host')
     skip_hostname_check = options.get('--skip-hostname-check', False)
 
-    if not skip_hostname_check:
-        hostname = urlparse(host).hostname if host else None
-        # If the protocol is omitted, urlparse fails to extract the hostname.
-        # Make another attempt by appending a protocol.
-        if not hostname and host:
-            hostname = urlparse('tcp://{0}'.format(host)).hostname
-
     advanced_opts = any([ca_cert, cert, key, verify])
 
     if tls is True and not advanced_opts:
@@ -40,15 +31,9 @@ def tls_config_from_options(options):
         if cert or key:
             client_cert = (cert, key)
 
-        assert_hostname = None
-        if skip_hostname_check:
-            assert_hostname = False
-        elif hostname:
-            assert_hostname = hostname
-
         return TLSConfig(
             client_cert=client_cert, verify=verify, ca_cert=ca_cert,
-            assert_hostname=assert_hostname
+            assert_hostname=False if skip_hostname_check else None
         )
 
     return None
diff --git a/requirements.txt b/requirements.txt
index 91d0487c..4bee21ef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 PyYAML==3.11
 cached-property==1.2.0
-docker-py==1.8.0rc2
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
+git+https://github.com/docker/docker-py.git@ac3d4aae2c525b052e661f42307223676ca1b313#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3

From d27b82207cc0ef4364b56a3d1e823b47791836ba Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 29 Mar 2016 18:05:37 -0700
Subject: [PATCH 0969/1265] Remove obsolete assert_hostname tests

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt                     |  2 +-
 tests/unit/cli/docker_client_test.py | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4bee21ef..898df373 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 PyYAML==3.11
 cached-property==1.2.0
+docker-py==1.8.0rc3
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
-git+https://github.com/docker/docker-py.git@ac3d4aae2c525b052e661f42307223676ca1b313#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index f4476ad3..5334a944 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -104,28 +104,6 @@ class TLSConfigTestCase(unittest.TestCase):
         with pytest.raises(docker.errors.TLSParameterError):
             tls_config_from_options(options)
 
-    def test_assert_hostname_explicit_host(self):
-        options = {
-            '--tlscacert': self.ca_cert, '--host': 'tcp://foobar.co.uk:1254'
-        }
-        result = tls_config_from_options(options)
-        assert isinstance(result, docker.tls.TLSConfig)
-        assert result.assert_hostname == 'foobar.co.uk'
-
-    def test_assert_hostname_explicit_host_no_proto(self):
-        options = {
-            '--tlscacert': self.ca_cert, '--host': 'foobar.co.uk:1254'
-        }
-        result = tls_config_from_options(options)
-        assert isinstance(result, docker.tls.TLSConfig)
-        assert result.assert_hostname == 'foobar.co.uk'
-
-    def test_assert_hostname_implicit_host(self):
-        options = {'--tlscacert': self.ca_cert}
-        result = tls_config_from_options(options)
-        assert isinstance(result, docker.tls.TLSConfig)
-        assert result.assert_hostname is None
-
     def test_assert_hostname_explicit_skip(self):
         options = {'--tlscacert': self.ca_cert, '--skip-hostname-check': True}
         result = tls_config_from_options(options)

From 78a8be07adc0f83ec627d6865eb17da5c69093fa Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 30 Mar 2016 11:11:19 -0700
Subject: [PATCH 0970/1265] Re-enabling assert_hostname when instantiating
 docker_client from the environment.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/docker_client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index e9f39d01..0c0113bb 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -49,7 +49,7 @@ def docker_client(environment, version=None, tls_config=None, host=None):
                  "Please use COMPOSE_HTTP_TIMEOUT instead.")
 
     try:
-        kwargs = kwargs_from_env(assert_hostname=False, environment=environment)
+        kwargs = kwargs_from_env(environment=environment)
     except TLSParameterError:
         raise UserError(
             "TLS configuration is invalid - make sure your DOCKER_TLS_VERIFY "

From 3034803258612e66bff99cdcc718253633da6bb3 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 31 Mar 2016 15:45:14 +0100
Subject: [PATCH 0971/1265] Better variable substitution example

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/compose-file.md | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index e9ec0a2d..5aef5aca 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -1089,21 +1089,24 @@ It's more complicated if you're using particular configuration features:
 ## Variable substitution
 
 Your configuration options can contain environment variables. Compose uses the
-variable values from the shell environment in which `docker-compose` is run. For
-example, suppose the shell contains `POSTGRES_VERSION=9.3` and you supply this
-configuration:
+variable values from the shell environment in which `docker-compose` is run.
+For example, suppose the shell contains `EXTERNAL_PORT=8000` and you supply
+this configuration:
 
-    db:
-      image: "postgres:${POSTGRES_VERSION}"
+    web:
+      build: .
+      ports:
+        - "${EXTERNAL_PORT}:5000"
 
-When you run `docker-compose up` with this configuration, Compose looks for the
-`POSTGRES_VERSION` environment variable in the shell and substitutes its value
-in. For this example, Compose resolves the `image` to `postgres:9.3` before
-running the configuration.
+When you run `docker-compose up` with this configuration, Compose looks for
+the `EXTERNAL_PORT` environment variable in the shell and substitutes its
+value in. In this example, Compose resolves the port mapping to `"8000:5000"`
+before creating the `web` container.
 
 If an environment variable is not set, Compose substitutes with an empty
-string. In the example above, if `POSTGRES_VERSION` is not set, the value for
-the `image` option is `postgres:`.
+string. In the example above, if `EXTERNAL_PORT` is not set, the value for the
+port mapping is `:5000` (which is of course an invalid port mapping, and will
+result in an error when attempting to create the container).
 
 Both `$VARIABLE` and `${VARIABLE}` syntax are supported. Extended shell-style
 features, such as `${VARIABLE-default}` and `${VARIABLE/foo/bar}`, are not

From 1a7a65f84da129cb3491c2dec3f37367444ce807 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 30 Mar 2016 11:58:28 -0700
Subject: [PATCH 0972/1265] Include docker-py requirements fix

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 898df373..76f224fb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 PyYAML==3.11
 cached-property==1.2.0
-docker-py==1.8.0rc3
+docker-py==1.8.0rc5
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4

From c1026e815a114b1210070d2daa56599d62d9a76e Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Sun, 10 Jan 2016 12:50:38 +0000
Subject: [PATCH 0973/1265] Update roadmap

Bring it inline with current plans:

- Use in production is not necessarily about the command-line
  tool, but also improving file format, integrations, new tools,
  etc.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 ROADMAP.md | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 67903492..c57397bd 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,13 +1,21 @@
 # Roadmap
 
+## An even better tool for development environments
+
+Compose is a great tool for development environments, but it could be even better. For example:
+
+- It should be possible to define hostnames for containers which work from the host machine, e.g. “mywebcontainer.local”. This is needed by apps comprising multiple web services which generate links to one another (e.g. a frontend website and a separate admin webapp)
+
 ## More than just development environments
 
-Over time we will extend Compose's remit to cover test, staging and production environments. This is not a simple task, and will take many incremental improvements such as:
+Compose currently works really well in development, but we want to make the Compose file format better for test, staging, and production environments. To support these use cases, there will need to be improvements to the file format, improvements to the command-line tool, integrations with other tools, and perhaps new tools altogether.
+
+Some specific things we are considering:
 
 - Compose currently will attempt to get your application into the correct state when running `up`, but it has a number of shortcomings:
   - It should roll back to a known good state if it fails.
   - It should allow a user to check the actions it is about to perform before running them.
-- It should be possible to partially modify the config file for different environments (dev/test/staging/prod), passing in e.g. custom ports or volume mount paths. ([#1377](https://github.com/docker/compose/issues/1377))
+- It should be possible to partially modify the config file for different environments (dev/test/staging/prod), passing in e.g. custom ports, volume mount paths, or volume drivers. ([#1377](https://github.com/docker/compose/issues/1377))
 - Compose should recommend a technique for zero-downtime deploys.
 - It should be possible to continuously attempt to keep an application in the correct state, instead of just performing `up` a single time.
 
@@ -23,9 +31,3 @@ Compose works well for applications that are in a single repository and depend o
 
 There are several ideas about how this could work, such as [including external files](https://github.com/docker/fig/issues/318).
 
-## An even better tool for development environments
-
-Compose is a great tool for development environments, but it could be even better. For example:
-
-- [Compose could watch your code and automatically kick off builds when something changes.](https://github.com/docker/fig/issues/184)
-- It should be possible to define hostnames for containers which work from the host machine, e.g. “mywebcontainer.local”. This is needed by apps comprising multiple web services which generate links to one another (e.g. a frontend website and a separate admin webapp)

From 129fb5b356eddbb9d4939bd04e6944559f905672 Mon Sep 17 00:00:00 2001
From: Tony Witherspoon <tony.witherspoon@gmail.com>
Date: Mon, 4 Apr 2016 13:15:28 -0400
Subject: [PATCH 0974/1265] Added code to output the top level command options
 if docker-compose help with no command options provided

Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
---
 compose/cli/main.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 6eada097..cf92a57b 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -355,10 +355,14 @@ class TopLevelCommand(object):
         """
         Get help on a command.
 
-        Usage: help COMMAND
+        Usage: help [COMMAND]
         """
-        handler = get_handler(cls, options['COMMAND'])
-        raise SystemExit(getdoc(handler))
+        if options['COMMAND']:
+            subject = get_handler(cls, options['COMMAND'])
+        else:
+            subject = cls
+
+        print(getdoc(subject))
 
     def kill(self, options):
         """

From b33d7b3dd88dbadbcd4230e38dc0a5504f9a6297 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 5 Apr 2016 11:26:23 -0400
Subject: [PATCH 0975/1265] Prevent unnecessary inspection of containers when
 created from an inspect.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 ROADMAP.md                        |  1 -
 compose/container.py              |  2 +-
 tests/integration/service_test.py | 12 ++++++------
 tests/unit/project_test.py        |  9 +++++++++
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index c57397bd..287e5468 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -30,4 +30,3 @@ The current state of integration is documented in [SWARM.md](SWARM.md).
 Compose works well for applications that are in a single repository and depend on services that are hosted on Docker Hub. If your application depends on another application within your organisation, Compose doesn't work as well.
 
 There are several ideas about how this could work, such as [including external files](https://github.com/docker/fig/issues/318).
-
diff --git a/compose/container.py b/compose/container.py
index 6dac9499..2c16863d 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -39,7 +39,7 @@ class Container(object):
 
     @classmethod
     def from_id(cls, client, id):
-        return cls(client, client.inspect_container(id))
+        return cls(client, client.inspect_container(id), has_been_inspected=True)
 
     @classmethod
     def create(cls, client, **options):
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index e2ef1161..0a109ada 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -769,17 +769,17 @@ class ServiceTest(DockerClientTestCase):
         container = service.create_container(number=next_number, quiet=True)
         container.start()
 
-        self.assertTrue(container.is_running)
-        self.assertEqual(len(service.containers()), 1)
+        container.inspect()
+        assert container.is_running
+        assert len(service.containers()) == 1
 
         service.scale(1)
-
-        self.assertEqual(len(service.containers()), 1)
+        assert len(service.containers()) == 1
         container.inspect()
-        self.assertTrue(container.is_running)
+        assert container.is_running
 
         captured_output = mock_log.info.call_args[0]
-        self.assertIn('Desired container number already achieved', captured_output)
+        assert 'Desired container number already achieved' in captured_output
 
     @mock.patch('compose.service.log')
     def test_scale_with_custom_container_name_outputs_warning(self, mock_log):
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 0d381951..b6a52e08 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -270,12 +270,21 @@ class ProjectTest(unittest.TestCase):
                 'time': 1420092061,
                 'timeNano': 14200920610000004000,
             },
+            {
+                'status': 'destroy',
+                'from': 'example/db',
+                'id': 'eeeee',
+                'time': 1420092061,
+                'timeNano': 14200920610000004000,
+            },
         ])
 
         def dt_with_microseconds(dt, us):
             return datetime.datetime.fromtimestamp(dt).replace(microsecond=us)
 
         def get_container(cid):
+            if cid == 'eeeee':
+                raise NotFound(None, None, "oops")
             if cid == 'abcde':
                 name = 'web'
                 labels = {LABEL_SERVICE: name}

From 3ef6b17bfc1d6aeb97b5ef2ac77c3659cd28ac4e Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 6 Apr 2016 13:28:45 -0700
Subject: [PATCH 0976/1265] Use docker-py 1.8.0

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 76f224fb..b9b0f403 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 PyYAML==3.11
 cached-property==1.2.0
-docker-py==1.8.0rc5
+docker-py==1.8.0
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4

From 5d0aab4a8e3a231f6fd548be6f9881ddefc60cfc Mon Sep 17 00:00:00 2001
From: Tony Witherspoon <tony.witherspoon@gmail.com>
Date: Thu, 7 Apr 2016 12:42:14 -0400
Subject: [PATCH 0977/1265] updated cli_test.py to no longer expect raised
 SystemExit exceptions

Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
---
 tests/unit/cli_test.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index e0ada460..b1475f84 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -64,12 +64,6 @@ class CLITestCase(unittest.TestCase):
         self.assertTrue(project.client)
         self.assertTrue(project.services)
 
-    def test_command_help(self):
-        with pytest.raises(SystemExit) as exc:
-            TopLevelCommand.help({'COMMAND': 'up'})
-
-        assert 'Usage: up' in exc.exconly()
-
     def test_command_help_nonexistent(self):
         with pytest.raises(NoSuchCommand):
             TopLevelCommand.help({'COMMAND': 'nonexistent'})

From bcdf541c8c6ccc0070ab011a909f244f501676d6 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 8 Apr 2016 12:58:19 +0100
Subject: [PATCH 0978/1265] Refactor setup_queue()

- Stop sharing set objects across threads
- Use a second queue to signal when producer threads are done
- Use a single consumer thread to check dependencies and kick off new
  producers

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/parallel.py | 64 ++++++++++++++++++++++++++++++---------------
 compose/service.py  |  3 +++
 2 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/compose/parallel.py b/compose/parallel.py
index c629a1ab..79699236 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import logging
 import operator
 import sys
 from threading import Thread
@@ -14,6 +15,9 @@ from compose.cli.signals import ShutdownException
 from compose.utils import get_output_stream
 
 
+log = logging.getLogger(__name__)
+
+
 def parallel_execute(objects, func, get_name, msg, get_deps=None):
     """Runs func on objects in parallel while ensuring that func is
     ran on object only after it is ran on all its dependencies.
@@ -73,35 +77,53 @@ def setup_queue(objects, func, get_deps, get_name):
         get_deps = _no_deps
 
     results = Queue()
-    started = set()   # objects being processed
-    finished = set()  # objects which have been processed
+    output = Queue()
 
-    def do_op(obj):
+    def consumer():
+        started = set()   # objects being processed
+        finished = set()  # objects which have been processed
+
+        def ready(obj):
+            """
+            Returns true if obj is ready to be processed:
+              - all dependencies have been processed
+              - obj is not already being processed
+            """
+            return obj not in started and all(
+                dep not in objects or dep in finished
+                for dep in get_deps(obj)
+            )
+
+        while len(finished) < len(objects):
+            for obj in filter(ready, objects):
+                log.debug('Starting producer thread for {}'.format(obj))
+                t = Thread(target=producer, args=(obj,))
+                t.daemon = True
+                t.start()
+                started.add(obj)
+
+            try:
+                event = results.get(timeout=1)
+            except Empty:
+                continue
+
+            obj = event[0]
+            log.debug('Finished processing: {}'.format(obj))
+            finished.add(obj)
+            output.put(event)
+
+    def producer(obj):
         try:
             result = func(obj)
             results.put((obj, result, None))
         except Exception as e:
             results.put((obj, None, e))
 
-        finished.add(obj)
-        feed()
+    t = Thread(target=consumer)
+    t.daemon = True
+    t.start()
 
-    def ready(obj):
-        # Is object ready for performing operation
-        return obj not in started and all(
-            dep not in objects or dep in finished
-            for dep in get_deps(obj)
-        )
-
-    def feed():
-        for obj in filter(ready, objects):
-            started.add(obj)
-            t = Thread(target=do_op, args=(obj,))
-            t.daemon = True
-            t.start()
-
-    feed()
-    return results
+    return output
 
 
 class ParallelStreamWriter(object):
diff --git a/compose/service.py b/compose/service.py
index ed45f078..05cfc7c6 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -135,6 +135,9 @@ class Service(object):
         self.networks = networks or {}
         self.options = options
 
+    def __repr__(self):
+        return '<Service: {}>'.format(self.name)
+
     def containers(self, stopped=False, one_off=False, filters={}):
         filters.update({'label': self.labels(one_off=one_off)})
 

From 141b96bb312d85753de2189227941512bd42f33e Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 8 Apr 2016 17:46:13 +0100
Subject: [PATCH 0979/1265] Abort operations if their dependencies fail

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/parallel.py         | 102 +++++++++++++++++++++---------------
 tests/unit/parallel_test.py |  73 ++++++++++++++++++++++++++
 2 files changed, 132 insertions(+), 43 deletions(-)
 create mode 100644 tests/unit/parallel_test.py

diff --git a/compose/parallel.py b/compose/parallel.py
index 79699236..745d4635 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -32,7 +32,7 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None):
     for obj in objects:
         writer.initialize(get_name(obj))
 
-    q = setup_queue(objects, func, get_deps, get_name)
+    q = setup_queue(objects, func, get_deps)
 
     done = 0
     errors = {}
@@ -54,6 +54,8 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None):
         elif isinstance(exception, APIError):
             errors[get_name(obj)] = exception.explanation
             writer.write(get_name(obj), 'error')
+        elif isinstance(exception, UpstreamError):
+            writer.write(get_name(obj), 'error')
         else:
             errors[get_name(obj)] = exception
             error_to_reraise = exception
@@ -72,60 +74,74 @@ def _no_deps(x):
     return []
 
 
-def setup_queue(objects, func, get_deps, get_name):
+def setup_queue(objects, func, get_deps):
     if get_deps is None:
         get_deps = _no_deps
 
     results = Queue()
     output = Queue()
 
-    def consumer():
-        started = set()   # objects being processed
-        finished = set()  # objects which have been processed
-
-        def ready(obj):
-            """
-            Returns true if obj is ready to be processed:
-              - all dependencies have been processed
-              - obj is not already being processed
-            """
-            return obj not in started and all(
-                dep not in objects or dep in finished
-                for dep in get_deps(obj)
-            )
-
-        while len(finished) < len(objects):
-            for obj in filter(ready, objects):
-                log.debug('Starting producer thread for {}'.format(obj))
-                t = Thread(target=producer, args=(obj,))
-                t.daemon = True
-                t.start()
-                started.add(obj)
-
-            try:
-                event = results.get(timeout=1)
-            except Empty:
-                continue
-
-            obj = event[0]
-            log.debug('Finished processing: {}'.format(obj))
-            finished.add(obj)
-            output.put(event)
-
-    def producer(obj):
-        try:
-            result = func(obj)
-            results.put((obj, result, None))
-        except Exception as e:
-            results.put((obj, None, e))
-
-    t = Thread(target=consumer)
+    t = Thread(target=queue_consumer, args=(objects, func, get_deps, results, output))
     t.daemon = True
     t.start()
 
     return output
 
 
+def queue_producer(obj, func, results):
+    try:
+        result = func(obj)
+        results.put((obj, result, None))
+    except Exception as e:
+        results.put((obj, None, e))
+
+
+def queue_consumer(objects, func, get_deps, results, output):
+    started = set()   # objects being processed
+    finished = set()  # objects which have been processed
+    failed = set()    # objects which either failed or whose dependencies failed
+
+    while len(finished) + len(failed) < len(objects):
+        pending = set(objects) - started - finished - failed
+        log.debug('Pending: {}'.format(pending))
+
+        for obj in pending:
+            deps = get_deps(obj)
+
+            if any(dep in failed for dep in deps):
+                log.debug('{} has upstream errors - not processing'.format(obj))
+                output.put((obj, None, UpstreamError()))
+                failed.add(obj)
+            elif all(
+                dep not in objects or dep in finished
+                for dep in deps
+            ):
+                log.debug('Starting producer thread for {}'.format(obj))
+                t = Thread(target=queue_producer, args=(obj, func, results))
+                t.daemon = True
+                t.start()
+                started.add(obj)
+
+        try:
+            event = results.get(timeout=1)
+        except Empty:
+            continue
+
+        obj, _, exception = event
+        if exception is None:
+            log.debug('Finished processing: {}'.format(obj))
+            finished.add(obj)
+        else:
+            log.debug('Failed: {}'.format(obj))
+            failed.add(obj)
+
+        output.put(event)
+
+
+class UpstreamError(Exception):
+    pass
+
+
 class ParallelStreamWriter(object):
     """Write out messages for operations happening in parallel.
 
diff --git a/tests/unit/parallel_test.py b/tests/unit/parallel_test.py
new file mode 100644
index 00000000..6be56015
--- /dev/null
+++ b/tests/unit/parallel_test.py
@@ -0,0 +1,73 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import six
+from docker.errors import APIError
+
+from compose.parallel import parallel_execute
+
+
+web = 'web'
+db = 'db'
+data_volume = 'data_volume'
+cache = 'cache'
+
+objects = [web, db, data_volume, cache]
+
+deps = {
+    web: [db, cache],
+    db: [data_volume],
+    data_volume: [],
+    cache: [],
+}
+
+
+def test_parallel_execute():
+    results = parallel_execute(
+        objects=[1, 2, 3, 4, 5],
+        func=lambda x: x * 2,
+        get_name=six.text_type,
+        msg="Doubling",
+    )
+
+    assert sorted(results) == [2, 4, 6, 8, 10]
+
+
+def test_parallel_execute_with_deps():
+    log = []
+
+    def process(x):
+        log.append(x)
+
+    parallel_execute(
+        objects=objects,
+        func=process,
+        get_name=lambda obj: obj,
+        msg="Processing",
+        get_deps=lambda obj: deps[obj],
+    )
+
+    assert sorted(log) == sorted(objects)
+
+    assert log.index(data_volume) < log.index(db)
+    assert log.index(db) < log.index(web)
+    assert log.index(cache) < log.index(web)
+
+
+def test_parallel_execute_with_upstream_errors():
+    log = []
+
+    def process(x):
+        if x is data_volume:
+            raise APIError(None, None, "Something went wrong")
+        log.append(x)
+
+    parallel_execute(
+        objects=objects,
+        func=process,
+        get_name=lambda obj: obj,
+        msg="Processing",
+        get_deps=lambda obj: deps[obj],
+    )
+
+    assert log == [cache]

From af9526fb820f40a8b7eafb16d29f990b1696f4fe Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 8 Apr 2016 18:30:28 +0100
Subject: [PATCH 0980/1265] Move queue logic out of parallel_execute()

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/parallel.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/compose/parallel.py b/compose/parallel.py
index 745d4635..8172d8ea 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -32,22 +32,13 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None):
     for obj in objects:
         writer.initialize(get_name(obj))
 
-    q = setup_queue(objects, func, get_deps)
+    events = parallel_execute_stream(objects, func, get_deps)
 
-    done = 0
     errors = {}
     results = []
     error_to_reraise = None
 
-    while done < len(objects):
-        try:
-            obj, result, exception = q.get(timeout=1)
-        except Empty:
-            continue
-        # See https://github.com/docker/compose/issues/189
-        except thread.error:
-            raise ShutdownException()
-
+    for obj, result, exception in events:
         if exception is None:
             writer.write(get_name(obj), 'done')
             results.append(result)
@@ -59,7 +50,6 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None):
         else:
             errors[get_name(obj)] = exception
             error_to_reraise = exception
-        done += 1
 
     for obj_name, error in errors.items():
         stream.write("\nERROR: for {}  {}\n".format(obj_name, error))
@@ -74,7 +64,7 @@ def _no_deps(x):
     return []
 
 
-def setup_queue(objects, func, get_deps):
+def parallel_execute_stream(objects, func, get_deps):
     if get_deps is None:
         get_deps = _no_deps
 
@@ -85,7 +75,17 @@ def setup_queue(objects, func, get_deps):
     t.daemon = True
     t.start()
 
-    return output
+    done = 0
+
+    while done < len(objects):
+        try:
+            yield output.get(timeout=1)
+            done += 1
+        except Empty:
+            continue
+        # See https://github.com/docker/compose/issues/189
+        except thread.error:
+            raise ShutdownException()
 
 
 def queue_producer(obj, func, results):

From 3720b50c3b8c5534c0b139962f7f6d95dd32a066 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 8 Apr 2016 18:48:07 +0100
Subject: [PATCH 0981/1265] Extract get_deps test helper

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/unit/parallel_test.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/unit/parallel_test.py b/tests/unit/parallel_test.py
index 6be56015..889af4e2 100644
--- a/tests/unit/parallel_test.py
+++ b/tests/unit/parallel_test.py
@@ -22,6 +22,10 @@ deps = {
 }
 
 
+def get_deps(obj):
+    return deps[obj]
+
+
 def test_parallel_execute():
     results = parallel_execute(
         objects=[1, 2, 3, 4, 5],
@@ -44,7 +48,7 @@ def test_parallel_execute_with_deps():
         func=process,
         get_name=lambda obj: obj,
         msg="Processing",
-        get_deps=lambda obj: deps[obj],
+        get_deps=get_deps,
     )
 
     assert sorted(log) == sorted(objects)
@@ -67,7 +71,7 @@ def test_parallel_execute_with_upstream_errors():
         func=process,
         get_name=lambda obj: obj,
         msg="Processing",
-        get_deps=lambda obj: deps[obj],
+        get_deps=get_deps,
     )
 
     assert log == [cache]

From ffab27c0496769fade7f2aa32bd86f66a3c9c0e5 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 8 Apr 2016 18:53:16 +0100
Subject: [PATCH 0982/1265] Test events coming out of parallel_execute_stream
 in error case

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/unit/parallel_test.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/unit/parallel_test.py b/tests/unit/parallel_test.py
index 889af4e2..9ed1b362 100644
--- a/tests/unit/parallel_test.py
+++ b/tests/unit/parallel_test.py
@@ -5,6 +5,8 @@ import six
 from docker.errors import APIError
 
 from compose.parallel import parallel_execute
+from compose.parallel import parallel_execute_stream
+from compose.parallel import UpstreamError
 
 
 web = 'web'
@@ -75,3 +77,14 @@ def test_parallel_execute_with_upstream_errors():
     )
 
     assert log == [cache]
+
+    events = [
+        (obj, result, type(exception))
+        for obj, result, exception
+        in parallel_execute_stream(objects, process, get_deps)
+    ]
+
+    assert (cache, None, type(None)) in events
+    assert (data_volume, None, APIError) in events
+    assert (db, None, UpstreamError) in events
+    assert (web, None, UpstreamError) in events

From 54b6fc42195da8f7ca1b45828e49ce5e378baee0 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 8 Apr 2016 18:54:02 +0100
Subject: [PATCH 0983/1265] Refactor so there's only one queue

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/parallel.py | 79 +++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 45 deletions(-)

diff --git a/compose/parallel.py b/compose/parallel.py
index 8172d8ea..b3ca0153 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -69,24 +69,33 @@ def parallel_execute_stream(objects, func, get_deps):
         get_deps = _no_deps
 
     results = Queue()
-    output = Queue()
 
-    t = Thread(target=queue_consumer, args=(objects, func, get_deps, results, output))
-    t.daemon = True
-    t.start()
+    started = set()   # objects being processed
+    finished = set()  # objects which have been processed
+    failed = set()    # objects which either failed or whose dependencies failed
 
-    done = 0
+    while len(finished) + len(failed) < len(objects):
+        for event in feed_queue(objects, func, get_deps, results, started, finished, failed):
+            yield event
 
-    while done < len(objects):
         try:
-            yield output.get(timeout=1)
-            done += 1
+            event = results.get(timeout=1)
         except Empty:
             continue
         # See https://github.com/docker/compose/issues/189
         except thread.error:
             raise ShutdownException()
 
+        obj, _, exception = event
+        if exception is None:
+            log.debug('Finished processing: {}'.format(obj))
+            finished.add(obj)
+        else:
+            log.debug('Failed: {}'.format(obj))
+            failed.add(obj)
+
+        yield event
+
 
 def queue_producer(obj, func, results):
     try:
@@ -96,46 +105,26 @@ def queue_producer(obj, func, results):
         results.put((obj, None, e))
 
 
-def queue_consumer(objects, func, get_deps, results, output):
-    started = set()   # objects being processed
-    finished = set()  # objects which have been processed
-    failed = set()    # objects which either failed or whose dependencies failed
+def feed_queue(objects, func, get_deps, results, started, finished, failed):
+    pending = set(objects) - started - finished - failed
+    log.debug('Pending: {}'.format(pending))
 
-    while len(finished) + len(failed) < len(objects):
-        pending = set(objects) - started - finished - failed
-        log.debug('Pending: {}'.format(pending))
+    for obj in pending:
+        deps = get_deps(obj)
 
-        for obj in pending:
-            deps = get_deps(obj)
-
-            if any(dep in failed for dep in deps):
-                log.debug('{} has upstream errors - not processing'.format(obj))
-                output.put((obj, None, UpstreamError()))
-                failed.add(obj)
-            elif all(
-                dep not in objects or dep in finished
-                for dep in deps
-            ):
-                log.debug('Starting producer thread for {}'.format(obj))
-                t = Thread(target=queue_producer, args=(obj, func, results))
-                t.daemon = True
-                t.start()
-                started.add(obj)
-
-        try:
-            event = results.get(timeout=1)
-        except Empty:
-            continue
-
-        obj, _, exception = event
-        if exception is None:
-            log.debug('Finished processing: {}'.format(obj))
-            finished.add(obj)
-        else:
-            log.debug('Failed: {}'.format(obj))
+        if any(dep in failed for dep in deps):
+            log.debug('{} has upstream errors - not processing'.format(obj))
+            yield (obj, None, UpstreamError())
             failed.add(obj)
-
-        output.put(event)
+        elif all(
+            dep not in objects or dep in finished
+            for dep in deps
+        ):
+            log.debug('Starting producer thread for {}'.format(obj))
+            t = Thread(target=queue_producer, args=(obj, func, results))
+            t.daemon = True
+            t.start()
+            started.add(obj)
 
 
 class UpstreamError(Exception):

From 5450a67c2d75192b962c3c36cf73a417af4386b3 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 8 Apr 2016 19:06:07 +0100
Subject: [PATCH 0984/1265] Hold state in an object

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/parallel.py | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/compose/parallel.py b/compose/parallel.py
index b3ca0153..f400b223 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -64,18 +64,30 @@ def _no_deps(x):
     return []
 
 
+class State(object):
+    def __init__(self, objects):
+        self.objects = objects
+
+        self.started = set()   # objects being processed
+        self.finished = set()  # objects which have been processed
+        self.failed = set()    # objects which either failed or whose dependencies failed
+
+    def is_done(self):
+        return len(self.finished) + len(self.failed) >= len(self.objects)
+
+    def pending(self):
+        return set(self.objects) - self.started - self.finished - self.failed
+
+
 def parallel_execute_stream(objects, func, get_deps):
     if get_deps is None:
         get_deps = _no_deps
 
     results = Queue()
+    state = State(objects)
 
-    started = set()   # objects being processed
-    finished = set()  # objects which have been processed
-    failed = set()    # objects which either failed or whose dependencies failed
-
-    while len(finished) + len(failed) < len(objects):
-        for event in feed_queue(objects, func, get_deps, results, started, finished, failed):
+    while not state.is_done():
+        for event in feed_queue(objects, func, get_deps, results, state):
             yield event
 
         try:
@@ -89,10 +101,10 @@ def parallel_execute_stream(objects, func, get_deps):
         obj, _, exception = event
         if exception is None:
             log.debug('Finished processing: {}'.format(obj))
-            finished.add(obj)
+            state.finished.add(obj)
         else:
             log.debug('Failed: {}'.format(obj))
-            failed.add(obj)
+            state.failed.add(obj)
 
         yield event
 
@@ -105,26 +117,26 @@ def queue_producer(obj, func, results):
         results.put((obj, None, e))
 
 
-def feed_queue(objects, func, get_deps, results, started, finished, failed):
-    pending = set(objects) - started - finished - failed
+def feed_queue(objects, func, get_deps, results, state):
+    pending = state.pending()
     log.debug('Pending: {}'.format(pending))
 
     for obj in pending:
         deps = get_deps(obj)
 
-        if any(dep in failed for dep in deps):
+        if any(dep in state.failed for dep in deps):
             log.debug('{} has upstream errors - not processing'.format(obj))
             yield (obj, None, UpstreamError())
-            failed.add(obj)
+            state.failed.add(obj)
         elif all(
-            dep not in objects or dep in finished
+            dep not in objects or dep in state.finished
             for dep in deps
         ):
             log.debug('Starting producer thread for {}'.format(obj))
             t = Thread(target=queue_producer, args=(obj, func, results))
             t.daemon = True
             t.start()
-            started.add(obj)
+            state.started.add(obj)
 
 
 class UpstreamError(Exception):

From be27e266da9bbb252e74d71ab22044628c6839d2 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 8 Apr 2016 19:07:40 +0100
Subject: [PATCH 0985/1265] Reduce queue timeout

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/parallel.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/parallel.py b/compose/parallel.py
index f400b223..e360ca35 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -91,7 +91,7 @@ def parallel_execute_stream(objects, func, get_deps):
             yield event
 
         try:
-            event = results.get(timeout=1)
+            event = results.get(timeout=0.1)
         except Empty:
             continue
         # See https://github.com/docker/compose/issues/189

From 83df95d5118a340fca71ca912825b3e9ba89ff96 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 8 Apr 2016 11:59:06 -0400
Subject: [PATCH 0986/1265] Remove extra ensure_image_exists() which causes
 duplicate builds.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/project.py                | 11 +++++------
 compose/service.py                | 11 ++++-------
 tests/integration/service_test.py |  6 ++----
 tests/unit/service_test.py        | 18 +++++++++---------
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/compose/project.py b/compose/project.py
index 8aa48731..0d891e45 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -309,12 +309,13 @@ class Project(object):
     ):
         services = self.get_services_without_duplicate(service_names, include_deps=True)
 
+        for svc in services:
+            svc.ensure_image_exists(do_build=do_build)
         plans = self._get_convergence_plans(services, strategy)
 
         for service in services:
             service.execute_convergence_plan(
                 plans[service.name],
-                do_build,
                 detached=True,
                 start=False)
 
@@ -366,21 +367,19 @@ class Project(object):
            remove_orphans=False):
 
         self.initialize()
+        self.find_orphan_containers(remove_orphans)
+
         services = self.get_services_without_duplicate(
             service_names,
             include_deps=start_deps)
 
-        plans = self._get_convergence_plans(services, strategy)
-
         for svc in services:
             svc.ensure_image_exists(do_build=do_build)
-
-        self.find_orphan_containers(remove_orphans)
+        plans = self._get_convergence_plans(services, strategy)
 
         def do(service):
             return service.execute_convergence_plan(
                 plans[service.name],
-                do_build=do_build,
                 timeout=timeout,
                 detached=detached
             )
diff --git a/compose/service.py b/compose/service.py
index 05cfc7c6..e0f23888 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -254,7 +254,6 @@ class Service(object):
 
     def create_container(self,
                          one_off=False,
-                         do_build=BuildAction.none,
                          previous_container=None,
                          number=None,
                          quiet=False,
@@ -263,7 +262,9 @@ class Service(object):
         Create a container for this service. If the image doesn't exist, attempt to pull
         it.
         """
-        self.ensure_image_exists(do_build=do_build)
+        # This is only necessary for `scale` and `volumes_from`
+        # auto-creating containers to satisfy the dependency.
+        self.ensure_image_exists()
 
         container_options = self._get_container_create_options(
             override_options,
@@ -363,7 +364,6 @@ class Service(object):
 
     def execute_convergence_plan(self,
                                  plan,
-                                 do_build=BuildAction.none,
                                  timeout=DEFAULT_TIMEOUT,
                                  detached=False,
                                  start=True):
@@ -371,7 +371,7 @@ class Service(object):
         should_attach_logs = not detached
 
         if action == 'create':
-            container = self.create_container(do_build=do_build)
+            container = self.create_container()
 
             if should_attach_logs:
                 container.attach_log_stream()
@@ -385,7 +385,6 @@ class Service(object):
             return [
                 self.recreate_container(
                     container,
-                    do_build=do_build,
                     timeout=timeout,
                     attach_logs=should_attach_logs,
                     start_new_container=start
@@ -412,7 +411,6 @@ class Service(object):
     def recreate_container(
             self,
             container,
-            do_build=BuildAction.none,
             timeout=DEFAULT_TIMEOUT,
             attach_logs=False,
             start_new_container=True):
@@ -427,7 +425,6 @@ class Service(object):
         container.stop(timeout=timeout)
         container.rename_to_tmp_name()
         new_container = self.create_container(
-            do_build=do_build,
             previous_container=container,
             number=container.labels.get(LABEL_CONTAINER_NUMBER),
             quiet=True,
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 0a109ada..df50d513 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -1037,12 +1037,10 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(set(service.duplicate_containers()), set([duplicate]))
 
 
-def converge(service,
-             strategy=ConvergenceStrategy.changed,
-             do_build=True):
+def converge(service, strategy=ConvergenceStrategy.changed):
     """Create a converge plan from a strategy and execute the plan."""
     plan = service.convergence_plan(strategy)
-    return service.execute_convergence_plan(plan, do_build=do_build, timeout=1)
+    return service.execute_convergence_plan(plan, timeout=1)
 
 
 class ConfigHashTest(DockerClientTestCase):
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 5231237a..fe3794da 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -420,7 +420,7 @@ class ServiceTest(unittest.TestCase):
             parse_repository_tag("url:5000/repo@sha256:digest"),
             ("url:5000/repo", "sha256:digest", "@"))
 
-    def test_create_container_with_build(self):
+    def test_create_container(self):
         service = Service('foo', client=self.mock_client, build={'context': '.'})
         self.mock_client.inspect_image.side_effect = [
             NoSuchImageError,
@@ -431,7 +431,7 @@ class ServiceTest(unittest.TestCase):
         ]
 
         with mock.patch('compose.service.log', autospec=True) as mock_log:
-            service.create_container(do_build=BuildAction.none)
+            service.create_container()
             assert mock_log.warn.called
             _, args, _ = mock_log.warn.mock_calls[0]
             assert 'was built because it did not already exist' in args[0]
@@ -448,20 +448,20 @@ class ServiceTest(unittest.TestCase):
             buildargs=None,
         )
 
-    def test_create_container_no_build(self):
+    def test_ensure_image_exists_no_build(self):
         service = Service('foo', client=self.mock_client, build={'context': '.'})
         self.mock_client.inspect_image.return_value = {'Id': 'abc123'}
 
-        service.create_container(do_build=BuildAction.skip)
-        self.assertFalse(self.mock_client.build.called)
+        service.ensure_image_exists(do_build=BuildAction.skip)
+        assert not self.mock_client.build.called
 
-    def test_create_container_no_build_but_needs_build(self):
+    def test_ensure_image_exists_no_build_but_needs_build(self):
         service = Service('foo', client=self.mock_client, build={'context': '.'})
         self.mock_client.inspect_image.side_effect = NoSuchImageError
         with pytest.raises(NeedsBuildError):
-            service.create_container(do_build=BuildAction.skip)
+            service.ensure_image_exists(do_build=BuildAction.skip)
 
-    def test_create_container_force_build(self):
+    def test_ensure_image_exists_force_build(self):
         service = Service('foo', client=self.mock_client, build={'context': '.'})
         self.mock_client.inspect_image.return_value = {'Id': 'abc123'}
         self.mock_client.build.return_value = [
@@ -469,7 +469,7 @@ class ServiceTest(unittest.TestCase):
         ]
 
         with mock.patch('compose.service.log', autospec=True) as mock_log:
-            service.create_container(do_build=BuildAction.force)
+            service.ensure_image_exists(do_build=BuildAction.force)
 
         assert not mock_log.warn.called
         self.mock_client.build.assert_called_once_with(

From d4e9a3b6b144d2dd126dee2369c10284ec52cdbc Mon Sep 17 00:00:00 2001
From: Sanyam Kapoor <activatedgeek@users.noreply.github.com>
Date: Wed, 6 Apr 2016 23:05:40 +0530
Subject: [PATCH 0987/1265] Updated Wordpress tutorial

The new tutorial now uses official Wordpress Docker Image.

Signed-off-by: Sanyam Kapoor <1sanyamkapoor@gmail.com>
---
 docs/wordpress.md | 115 +++++++++++-----------------------------------
 1 file changed, 26 insertions(+), 89 deletions(-)

diff --git a/docs/wordpress.md b/docs/wordpress.md
index fcfaef19..c257ad1a 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -22,7 +22,7 @@ with Docker containers. This quick-start guide demonstrates how to use Compose t
 
     You can name the directory something easy for you to remember. This directory is the context for your application image. The directory should only contain resources to build that image.
 
-    This project directory will contain a `Dockerfile`, a `docker-compose.yaml` file, along with a downloaded `wordpress` directory and a custom `wp-config.php`, all of which you will create in the following steps.
+    This project directory will contain a `docker-compose.yaml` file which will be complete in itself for a good starter wordpress project.
 
 2. Change directories into your project directory.
 
@@ -30,113 +30,50 @@ with Docker containers. This quick-start guide demonstrates how to use Compose t
 
         $ cd my-wordpress/
 
-3. Create a `Dockerfile`, a file that defines the environment in which your application will run.
-
-    For more information on how to write Dockerfiles, see the [Docker Engine user guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](https://docs.docker.com/engine/reference/builder/).
-
-    In this case, your Dockerfile should include these two lines:
-
-        FROM php:5.6-fpm
-        RUN docker-php-ext-install mysql
-        ADD . /code
-        CMD php -S 0.0.0.0:8000 -t /code/wordpress/
-
-    This tells the Docker Engine daemon how to build an image defining a container that contains PHP and WordPress.
-
-4. Create a `docker-compose.yml` file that will start your web service and a separate MySQL instance:
+3. Create a `docker-compose.yml` file that will start your `Wordpress` blog and a separate `MySQL` instance with a volume mount for data persistence:
 
         version: '2'
         services:
-          web:
-            build: .
-            ports:
-              - "8000:8000"
-            depends_on:
-              - db
-            volumes:
-              - .:/code
           db:
-            image: mysql
+            image: mysql:5.7
+            volumes:
+              - "./.data/db:/var/lib/mysql"
+            restart: always
             environment:
               MYSQL_ROOT_PASSWORD: wordpress
               MYSQL_DATABASE: wordpress
               MYSQL_USER: wordpress
               MYSQL_PASSWORD: wordpress
 
-5. Download WordPress into the current directory:
+          wordpress:
+            depends_on:
+              - db
+            image: wordpress:latest
+            links:
+              - db
+            ports:
+              - "8000:80"
+            restart: always
+            environment:
+              WORDPRESS_DB_HOST: db:3306
+              WORDPRESS_DB_PASSWORD: wordpress
 
-        $ curl https://wordpress.org/latest.tar.gz | tar -xvzf -
-
-    This creates a directory called `wordpress` in your project directory.
-
-6. Create a `wp-config.php` file within the `wordpress` directory.
-
-    A supporting file is needed to get this working. At the top level of the wordpress directory, add a new file called `wp-config.php` as shown. This is the standard WordPress config file with a single change to point the database configuration at the `db` container:
-
-        <?php
-        define('DB_NAME', 'wordpress');
-        define('DB_USER', 'wordpress');
-        define('DB_PASSWORD', 'wordpress');
-        define('DB_HOST', "db:3306");
-        define('DB_CHARSET', 'utf8');
-        define('DB_COLLATE', '');
-
-        define('AUTH_KEY',         'put your unique phrase here');
-        define('SECURE_AUTH_KEY',  'put your unique phrase here');
-        define('LOGGED_IN_KEY',    'put your unique phrase here');
-        define('NONCE_KEY',        'put your unique phrase here');
-        define('AUTH_SALT',        'put your unique phrase here');
-        define('SECURE_AUTH_SALT', 'put your unique phrase here');
-        define('LOGGED_IN_SALT',   'put your unique phrase here');
-        define('NONCE_SALT',       'put your unique phrase here');
-
-        $table_prefix  = 'wp_';
-        define('WPLANG', '');
-        define('WP_DEBUG', false);
-
-        if ( !defined('ABSPATH') )
-          define('ABSPATH', dirname(__FILE__) . '/');
-
-        require_once(ABSPATH . 'wp-settings.php');
-        ?>
-
-7. Verify the contents and structure of your project directory.
-<!--
-        Dockerfile
-        docker-compose.yaml
-        wordpress/
-          index.php
-          license.txt
-          readme.html
-          wp-activate.php
-          wp-admin/
-          wp-blog-header.php
-          wp-comments-post.php
-          wp-config-sample.php
-          wp-config.php
-          wp-content/
-          wp-cron.php
-          wp-includes/
-          wp-links-opml.php
-          wp-load.php
-          wp-login.php
-          wp-mail.php
-          wp-settings.php
-          wp-signup.php
-          wp-trackback.php
-          xmlrpc.php
-      -->
-
-    ![WordPress files](images/wordpress-files.png)
+    **NOTE**: The folder `./.data/db` will be automatically created in the project directory
+    alongside the `docker-compose.yml` which will persist any updates made by wordpress to the
+    database.
 
 ### Build the project
 
-With those four new files in place, run `docker-compose up` from your project directory. This will pull and build the needed images, and then start the web and database containers.
+Now, run `docker-compose up -d` from your project directory. This will pull the needed images, and then start the wordpress and database containers.
 
 If you're using [Docker Machine](https://docs.docker.com/machine/), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.
 
 At this point, WordPress should be running on port `8000` of your Docker Host, and you can complete the "famous five-minute installation" as a WordPress administrator.
 
+**NOTE**: The Wordpress site will not be immediately available on port `8000` because
+the containers are still being initialized and may take a couple of minutes before the
+first load.
+
 ![Choose language for WordPress install](images/wordpress-lang.png)
 
 ![WordPress Welcome](images/wordpress-welcome.png)

From 4192a009da5cbae5c811b3b965e4ecb4572c95f6 Mon Sep 17 00:00:00 2001
From: Victoria Bialas <victoria.bialas@docker.com>
Date: Fri, 8 Apr 2016 16:40:07 -0700
Subject: [PATCH 0988/1265] added some formatting on the Wordress steps, and
 made heading levels in these sample app topics consistent

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
---
 docs/django.md    |  6 +++---
 docs/wordpress.md | 32 +++++++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/docs/django.md b/docs/django.md
index fb1fa214..6a222697 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -15,7 +15,7 @@ weight=4
 This quick-start guide demonstrates how to use Docker Compose to set up and run a simple Django/PostgreSQL app. Before starting, you'll need to have
 [Compose installed](install.md).
 
-## Define the project components
+### Define the project components
 
 For this project, you need to create a Dockerfile, a Python dependencies file,
 and a `docker-compose.yml` file.
@@ -89,7 +89,7 @@ and a `docker-compose.yml` file.
 
 10. Save and close the `docker-compose.yml` file.
 
-## Create a Django project
+### Create a Django project
 
 In this step, you create a Django started project by building the image from the build context defined in the previous procedure.
 
@@ -137,7 +137,7 @@ In this step, you create a Django started project by building the image from the
         -rw-r--r--  1 user  staff   16 Feb 13 23:01 requirements.txt
 
 
-## Connect the database
+### Connect the database
 
 In this section, you set up the database connection for Django.
 
diff --git a/docs/wordpress.md b/docs/wordpress.md
index c257ad1a..b39a8bbb 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -16,7 +16,7 @@ You can use Docker Compose to easily run WordPress in an isolated environment bu
 with Docker containers. This quick-start guide demonstrates how to use Compose to set up and run WordPress. Before starting, you'll need to have
 [Compose installed](install.md).
 
-## Define the project
+### Define the project
 
 1. Create an empty project directory.
 
@@ -64,15 +64,37 @@ with Docker containers. This quick-start guide demonstrates how to use Compose t
 
 ### Build the project
 
-Now, run `docker-compose up -d` from your project directory. This will pull the needed images, and then start the wordpress and database containers.
+Now, run `docker-compose up -d` from your project directory.
+
+This pulls the needed images, and starts the wordpress and database containers, as shown in the example below.
+
+    $ docker-compose up -d
+    Creating network "my_wordpress_default" with the default driver
+    Pulling db (mysql:5.7)...
+    5.7: Pulling from library/mysql
+    efd26ecc9548: Pull complete
+    a3ed95caeb02: Pull complete
+    ...
+    Digest: sha256:34a0aca88e85f2efa5edff1cea77cf5d3147ad93545dbec99cfe705b03c520de
+    Status: Downloaded newer image for mysql:5.7
+    Pulling wordpress (wordpress:latest)...
+    latest: Pulling from library/wordpress
+    efd26ecc9548: Already exists
+    a3ed95caeb02: Pull complete
+    589a9d9a7c64: Pull complete
+    ...
+    Digest: sha256:ed28506ae44d5def89075fd5c01456610cd6c64006addfe5210b8c675881aff6
+    Status: Downloaded newer image for wordpress:latest
+    Creating my_wordpress_db_1
+    Creating my_wordpress_wordpress_1
+
+### Bring up WordPress in a web browser
 
 If you're using [Docker Machine](https://docs.docker.com/machine/), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.
 
 At this point, WordPress should be running on port `8000` of your Docker Host, and you can complete the "famous five-minute installation" as a WordPress administrator.
 
-**NOTE**: The Wordpress site will not be immediately available on port `8000` because
-the containers are still being initialized and may take a couple of minutes before the
-first load.
+**NOTE**: The Wordpress site will not be immediately available on port `8000` because the containers are still being initialized and may take a couple of minutes before the first load.
 
 ![Choose language for WordPress install](images/wordpress-lang.png)
 

From 0e3db185cf79e6638c2660be8e052af113ed7337 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 11 Apr 2016 12:37:00 +0100
Subject: [PATCH 0989/1265] Small refactor to feed_queue()

Put the event tuple into the results queue rather than yielding it from
the function.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/parallel.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/compose/parallel.py b/compose/parallel.py
index e360ca35..ace1f029 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -87,8 +87,7 @@ def parallel_execute_stream(objects, func, get_deps):
     state = State(objects)
 
     while not state.is_done():
-        for event in feed_queue(objects, func, get_deps, results, state):
-            yield event
+        feed_queue(objects, func, get_deps, results, state)
 
         try:
             event = results.get(timeout=0.1)
@@ -126,7 +125,7 @@ def feed_queue(objects, func, get_deps, results, state):
 
         if any(dep in state.failed for dep in deps):
             log.debug('{} has upstream errors - not processing'.format(obj))
-            yield (obj, None, UpstreamError())
+            results.put((obj, None, UpstreamError()))
             state.failed.add(obj)
         elif all(
             dep not in objects or dep in state.finished

From 0671b8b8c3ce1873db87c4233f88e64876d43c6a Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 11 Apr 2016 12:49:04 +0100
Subject: [PATCH 0990/1265] Document parallel helper functions

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/parallel.py | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/compose/parallel.py b/compose/parallel.py
index ace1f029..d9c24ab6 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -65,12 +65,19 @@ def _no_deps(x):
 
 
 class State(object):
+    """
+    Holds the state of a partially-complete parallel operation.
+
+    state.started:   objects being processed
+    state.finished:  objects which have been processed
+    state.failed:    objects which either failed or whose dependencies failed
+    """
     def __init__(self, objects):
         self.objects = objects
 
-        self.started = set()   # objects being processed
-        self.finished = set()  # objects which have been processed
-        self.failed = set()    # objects which either failed or whose dependencies failed
+        self.started = set()
+        self.finished = set()
+        self.failed = set()
 
     def is_done(self):
         return len(self.finished) + len(self.failed) >= len(self.objects)
@@ -80,6 +87,21 @@ class State(object):
 
 
 def parallel_execute_stream(objects, func, get_deps):
+    """
+    Runs func on objects in parallel while ensuring that func is
+    ran on object only after it is ran on all its dependencies.
+
+    Returns an iterator of tuples which look like:
+
+    # if func returned normally when run on object
+    (object, result, None)
+
+    # if func raised an exception when run on object
+    (object, None, exception)
+
+    # if func raised an exception when run on one of object's dependencies
+    (object, None, UpstreamError())
+    """
     if get_deps is None:
         get_deps = _no_deps
 
@@ -109,6 +131,10 @@ def parallel_execute_stream(objects, func, get_deps):
 
 
 def queue_producer(obj, func, results):
+    """
+    The entry point for a producer thread which runs func on a single object.
+    Places a tuple on the results queue once func has either returned or raised.
+    """
     try:
         result = func(obj)
         results.put((obj, result, None))
@@ -117,6 +143,13 @@ def queue_producer(obj, func, results):
 
 
 def feed_queue(objects, func, get_deps, results, state):
+    """
+    Starts producer threads for any objects which are ready to be processed
+    (i.e. they have no dependencies which haven't been successfully processed).
+
+    Shortcuts any objects whose dependencies have failed and places an
+    (object, None, UpstreamError()) tuple on the results queue.
+    """
     pending = state.pending()
     log.debug('Pending: {}'.format(pending))
 

From 15c5bc2e6c79cdb2edac4f8cab10d7bcbfc175d1 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 11 Apr 2016 13:03:35 +0100
Subject: [PATCH 0991/1265] Rename a couple of functions in parallel.py

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/parallel.py         | 8 ++++----
 tests/unit/parallel_test.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compose/parallel.py b/compose/parallel.py
index d9c24ab6..ee3d5777 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -32,7 +32,7 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None):
     for obj in objects:
         writer.initialize(get_name(obj))
 
-    events = parallel_execute_stream(objects, func, get_deps)
+    events = parallel_execute_iter(objects, func, get_deps)
 
     errors = {}
     results = []
@@ -86,7 +86,7 @@ class State(object):
         return set(self.objects) - self.started - self.finished - self.failed
 
 
-def parallel_execute_stream(objects, func, get_deps):
+def parallel_execute_iter(objects, func, get_deps):
     """
     Runs func on objects in parallel while ensuring that func is
     ran on object only after it is ran on all its dependencies.
@@ -130,7 +130,7 @@ def parallel_execute_stream(objects, func, get_deps):
         yield event
 
 
-def queue_producer(obj, func, results):
+def producer(obj, func, results):
     """
     The entry point for a producer thread which runs func on a single object.
     Places a tuple on the results queue once func has either returned or raised.
@@ -165,7 +165,7 @@ def feed_queue(objects, func, get_deps, results, state):
             for dep in deps
         ):
             log.debug('Starting producer thread for {}'.format(obj))
-            t = Thread(target=queue_producer, args=(obj, func, results))
+            t = Thread(target=producer, args=(obj, func, results))
             t.daemon = True
             t.start()
             state.started.add(obj)
diff --git a/tests/unit/parallel_test.py b/tests/unit/parallel_test.py
index 9ed1b362..45b0db1d 100644
--- a/tests/unit/parallel_test.py
+++ b/tests/unit/parallel_test.py
@@ -5,7 +5,7 @@ import six
 from docker.errors import APIError
 
 from compose.parallel import parallel_execute
-from compose.parallel import parallel_execute_stream
+from compose.parallel import parallel_execute_iter
 from compose.parallel import UpstreamError
 
 
@@ -81,7 +81,7 @@ def test_parallel_execute_with_upstream_errors():
     events = [
         (obj, result, type(exception))
         for obj, result, exception
-        in parallel_execute_stream(objects, process, get_deps)
+        in parallel_execute_iter(objects, process, get_deps)
     ]
 
     assert (cache, None, type(None)) in events

From 3722bb38c66b3c3500e86295a43aafe14a050b50 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 11 Apr 2016 14:26:45 +0100
Subject: [PATCH 0992/1265] Clarify behaviour of rm and down

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py    | 35 +++++++++++++++++++++++------------
 docs/reference/down.md | 26 ++++++++++++++++++--------
 docs/reference/rm.md   | 11 ++++++-----
 3 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 8348b8c3..839d97e8 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -264,18 +264,29 @@ class TopLevelCommand(object):
 
     def down(self, options):
         """
-        Stop containers and remove containers, networks, volumes, and images
-        created by `up`. Only containers and networks are removed by default.
+        Stops containers and removes containers, networks, volumes, and images
+        created by `up`.
+
+        By default, the only things removed are:
+
+        - Containers for services defined in the Compose file
+        - Networks defined in the `networks` section of the Compose file
+        - The default network, if one is used
+
+        Networks and volumes defined as `external` are never removed.
 
         Usage: down [options]
 
         Options:
-            --rmi type          Remove images, type may be one of: 'all' to remove
-                                all images, or 'local' to remove only images that
-                                don't have an custom name set by the `image` field
-            -v, --volumes       Remove data volumes
-            --remove-orphans    Remove containers for services not defined in
-                                the Compose file
+            --rmi type          Remove images. Type must be one of:
+                                'all': Remove all images used by any service.
+                                'local': Remove only images that don't have a custom tag
+                                set by the `image` field.
+            -v, --volumes       Remove named volumes declared in the `volumes` section
+                                of the Compose file and anonymous volumes
+                                attached to containers.
+            --remove-orphans    Remove containers for services not defined in the
+                                Compose file
         """
         image_type = image_type_from_opt('--rmi', options['--rmi'])
         self.project.down(image_type, options['--volumes'], options['--remove-orphans'])
@@ -496,10 +507,10 @@ class TopLevelCommand(object):
 
     def rm(self, options):
         """
-        Remove stopped service containers.
+        Removes stopped service containers.
 
-        By default, volumes attached to containers will not be removed. You can see all
-        volumes with `docker volume ls`.
+        By default, anonymous volumes attached to containers will not be removed. You
+        can override this with `-v`. To list all volumes, use `docker volume ls`.
 
         Any data which is not in a volume will be lost.
 
@@ -507,7 +518,7 @@ class TopLevelCommand(object):
 
         Options:
             -f, --force   Don't ask to confirm removal
-            -v            Remove volumes associated with containers
+            -v            Remove any anonymous volumes attached to containers
             -a, --all     Also remove one-off containers created by
                           docker-compose run
         """
diff --git a/docs/reference/down.md b/docs/reference/down.md
index e8b1db59..ffe88b4e 100644
--- a/docs/reference/down.md
+++ b/docs/reference/down.md
@@ -12,17 +12,27 @@ parent = "smn_compose_cli"
 # down
 
 ```
-Stop containers and remove containers, networks, volumes, and images
-created by `up`. Only containers and networks are removed by default.
-
 Usage: down [options]
 
 Options:
-    --rmi type          Remove images, type may be one of: 'all' to remove
-                        all images, or 'local' to remove only images that
-                        don't have an custom name set by the `image` field
-    -v, --volumes       Remove data volumes
-
+    --rmi type          Remove images. Type must be one of:
+                        'all': Remove all images used by any service.
+                        'local': Remove only images that don't have a custom tag
+                        set by the `image` field.
+    -v, --volumes       Remove named volumes declared in the `volumes` section
+                        of the Compose file and anonymous volumes
+                        attached to containers.
     --remove-orphans    Remove containers for services not defined in the
                         Compose file
 ```
+
+Stops containers and removes containers, networks, volumes, and images
+created by `up`.
+
+By default, the only things removed are:
+
+- Containers for services defined in the Compose file
+- Networks defined in the `networks` section of the Compose file
+- The default network, if one is used
+
+Networks and volumes defined as `external` are never removed.
diff --git a/docs/reference/rm.md b/docs/reference/rm.md
index 97698b58..8285a4ae 100644
--- a/docs/reference/rm.md
+++ b/docs/reference/rm.md
@@ -15,14 +15,15 @@ parent = "smn_compose_cli"
 Usage: rm [options] [SERVICE...]
 
 Options:
--f, --force   Don't ask to confirm removal
--v            Remove volumes associated with containers
--a, --all     Also remove one-off containers
+    -f, --force   Don't ask to confirm removal
+    -v            Remove any anonymous volumes attached to containers
+    -a, --all     Also remove one-off containers created by
+                  docker-compose run
 ```
 
 Removes stopped service containers.
 
-By default, volumes attached to containers will not be removed. You can see all
-volumes with `docker volume ls`.
+By default, anonymous volumes attached to containers will not be removed. You
+can override this with `-v`. To list all volumes, use `docker volume ls`.
 
 Any data which is not in a volume will be lost.

From 7cfb5e7bc9fb93549de0915f378d6cd831835d52 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 11 Apr 2016 17:05:52 +0100
Subject: [PATCH 0993/1265] Fix race condition

If processing of all objects finishes before the queue is drained,
parallel_execute_iter() returns prematurely.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/parallel.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/compose/parallel.py b/compose/parallel.py
index ee3d5777..63417dcb 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -17,6 +17,8 @@ from compose.utils import get_output_stream
 
 log = logging.getLogger(__name__)
 
+STOP = object()
+
 
 def parallel_execute(objects, func, get_name, msg, get_deps=None):
     """Runs func on objects in parallel while ensuring that func is
@@ -108,7 +110,7 @@ def parallel_execute_iter(objects, func, get_deps):
     results = Queue()
     state = State(objects)
 
-    while not state.is_done():
+    while True:
         feed_queue(objects, func, get_deps, results, state)
 
         try:
@@ -119,6 +121,9 @@ def parallel_execute_iter(objects, func, get_deps):
         except thread.error:
             raise ShutdownException()
 
+        if event is STOP:
+            break
+
         obj, _, exception = event
         if exception is None:
             log.debug('Finished processing: {}'.format(obj))
@@ -170,6 +175,9 @@ def feed_queue(objects, func, get_deps, results, state):
             t.start()
             state.started.add(obj)
 
+    if state.is_done():
+        results.put(STOP)
+
 
 class UpstreamError(Exception):
     pass

From 7781f62ddf54fa635890c1772e1729ff5461fd55 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 12 Apr 2016 12:03:16 +0100
Subject: [PATCH 0994/1265] Attempt to fix flaky logs test

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py                       | 13 +++++++------
 tests/fixtures/logs-composefile/docker-compose.yml |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 707c2492..53ff66bb 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1257,13 +1257,14 @@ class CLITestCase(DockerClientTestCase):
             'logscomposefile_another_1',
             'exited'))
 
-        # sleep for a short period to allow the tailing thread to receive the
-        # event. This is not great, but there isn't an easy way to do this
-        # without being able to stream stdout from the process.
-        time.sleep(0.5)
-        os.kill(proc.pid, signal.SIGINT)
-        result = wait_on_process(proc, returncode=1)
+        self.dispatch(['kill', 'simple'])
+
+        result = wait_on_process(proc)
+
+        assert 'hello' in result.stdout
         assert 'test' in result.stdout
+        assert 'logscomposefile_another_1 exited with code 0' in result.stdout
+        assert 'logscomposefile_simple_1 exited with code 137' in result.stdout
 
     def test_logs_default(self):
         self.base_dir = 'tests/fixtures/logs-composefile'
diff --git a/tests/fixtures/logs-composefile/docker-compose.yml b/tests/fixtures/logs-composefile/docker-compose.yml
index 0af9d805..b719c91e 100644
--- a/tests/fixtures/logs-composefile/docker-compose.yml
+++ b/tests/fixtures/logs-composefile/docker-compose.yml
@@ -1,6 +1,6 @@
 simple:
   image: busybox:latest
-  command: sh -c "echo hello && sleep 200"
+  command: sh -c "echo hello && tail -f /dev/null"
 another:
   image: busybox:latest
   command: sh -c "echo test"

From 276738f733c3512b939168c1475a6085a9482c6a Mon Sep 17 00:00:00 2001
From: Tony Witherspoon <tony.witherspoon@gmail.com>
Date: Tue, 12 Apr 2016 11:47:15 -0400
Subject: [PATCH 0995/1265] Updated cli_test.py to validate against the updated
 help command conditions

Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
---
 tests/unit/cli_test.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 182e79ed..9700d592 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 import os
 import shutil
 import tempfile
+from StringIO import StringIO
 
 import docker
 import py
@@ -82,6 +83,12 @@ class CLITestCase(unittest.TestCase):
         self.assertTrue(project.client)
         self.assertTrue(project.services)
 
+    def test_command_help(self):
+        with mock.patch('sys.stdout', new=StringIO()) as fake_stdout:
+            TopLevelCommand.help({'COMMAND': 'up'})
+
+        assert "Usage: up" in fake_stdout.getvalue()
+
     def test_command_help_nonexistent(self):
         with pytest.raises(NoSuchCommand):
             TopLevelCommand.help({'COMMAND': 'nonexistent'})

From ae46bf8907aec818a07167598efef26a778dadaa Mon Sep 17 00:00:00 2001
From: Tony Witherspoon <tony.witherspoon@gmail.com>
Date: Tue, 12 Apr 2016 12:29:59 -0400
Subject: [PATCH 0996/1265] Updated StringIO import to support io module

Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
---
 tests/unit/cli_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 9700d592..2c90b29b 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 import os
 import shutil
 import tempfile
-from StringIO import StringIO
+from io import StringIO
 
 import docker
 import py

From 339ebc0483cfc2ec72efba884c0de84088c2f905 Mon Sep 17 00:00:00 2001
From: Danyal Prout <me@dany.al>
Date: Sun, 10 Apr 2016 15:53:42 +0100
Subject: [PATCH 0997/1265] Fixes #2096: Only show multiple port clash warning
 if multiple containers are about to be started.

Signed-off-by: Danyal Prout <me@dany.al>
---
 compose/service.py         |  2 +-
 tests/unit/service_test.py | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/compose/service.py b/compose/service.py
index e0f23888..054082fc 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -179,7 +179,7 @@ class Service(object):
                      'Remove the custom name to scale the service.'
                      % (self.name, self.custom_container_name))
 
-        if self.specifies_host_port():
+        if self.specifies_host_port() and desired_num > 1:
             log.warn('The "%s" service specifies a port on the host. If multiple containers '
                      'for this service are created on a single host, the port will clash.'
                      % self.name)
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index fe3794da..d3fcb49a 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -642,6 +642,26 @@ class ServiceTest(unittest.TestCase):
         service = Service('foo', project='testing')
         assert service.image_name == 'testing_foo'
 
+    @mock.patch('compose.service.log', autospec=True)
+    def test_only_log_warning_when_host_ports_clash(self, mock_log):
+        self.mock_client.inspect_image.return_value = {'Id': 'abcd'}
+        name = 'foo'
+        service = Service(
+            name,
+            client=self.mock_client,
+            ports=["8080:80"])
+
+        service.scale(0)
+        self.assertFalse(mock_log.warn.called)
+
+        service.scale(1)
+        self.assertFalse(mock_log.warn.called)
+
+        service.scale(2)
+        mock_log.warn.assert_called_once_with(
+            'The "{}" service specifies a port on the host. If multiple containers '
+            'for this service are created on a single host, the port will clash.'.format(name))
+
 
 def sort_by_name(dictionary_list):
     return sorted(dictionary_list, key=lambda k: k['name'])

From 50287722f2dd9df322122395e76e7778e185cdec Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 13 Apr 2016 12:57:22 -0400
Subject: [PATCH 0998/1265] Update release notes and set version to 1.8.0dev

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 CHANGELOG.md        | 88 +++++++++++++++++++++++++++++++++++++++++++++
 compose/__init__.py |  2 +-
 script/run/run.sh   |  2 +-
 3 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b93087f..8ee45386 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,94 @@
 Change log
 ==========
 
+1.7.0 (2016-04-13)
+------------------
+
+**Breaking Changes**
+
+-   `docker-compose logs` no longer follows log output by default. It now
+    matches the behaviour of `docker logs` and exits after the current logs
+    are printed. Use `-f` to get the old default behaviour.
+
+-   Booleans are no longer allows as values for mappings in the Compose file
+    (for keys `environment`, `labels` and `extra_hosts`). Previously this
+    was a warning. Boolean values should be quoted so they become string values.
+
+New Features
+
+-   Compose now looks for a `.env` file in the directory where it's run and
+    reads any environment variables defined inside, if they're not already
+    set in the shell environment. This lets you easily set defaults for
+    variables used in the Compose file, or for any of the `COMPOSE_*` or
+    `DOCKER_*` variables.
+
+-   Added a `--remove-orphans` flag to both `docker-compose up` and
+    `docker-compose down` to remove containers for services that were removed
+    from the Compose file.
+
+-   Added a `--all` flag to `docker-compose rm` to include containers created
+    by `docker-compose run`. This will become the default behavior in the next
+    version of Compose.
+
+-   Added support for all the same TLS configuration flags used by the `docker`
+    client: `--tls`, `--tlscert`, `--tlskey`, etc.
+
+-   Compose files now support the `tmpfs` and `shm_size` options.
+
+-   Added the `--workdir` flag to `docker-compose run`
+
+-   `docker-compose logs` now shows logs for new containers that are created
+    after it starts.
+
+-   The `COMPOSE_FILE` environment variable can now contain multiple files,
+    separated by the host system's standard path separator (`:` on Mac/Linux,
+    `;` on Windows).
+
+-   You can now specify a static IP address when connecting a service to a
+    network with the `ipv4_address` and `ipv6_address` options.
+
+-   Added `--follow`, `--timestamp`, and `--tail` flags to the
+    `docker-compose logs` command.
+
+-   `docker-compose up`, and `docker-compose start` will now start containers
+    in parallel where possible.
+
+-   `docker-compose stop` now stops containers in reverse dependency order
+    instead of all at once.
+
+-   Added the `--build` flag to `docker-compose up` to force it to build a new
+    image. It now shows a warning if an image is automatically built when the
+    flag is not used.
+
+-   Added the `docker-compose exec` command for executing a process in a running
+    container.
+
+
+Bug Fixes
+
+-   `docker-compose down` now removes containers created by
+    `docker-compose run`.
+
+-   A more appropriate error is shown when a timeout is hit during `up` when
+    using a tty.
+
+-   Fixed a bug in `docker-compose down` where it would abort if some resources
+    had already been removed.
+
+-   Fixed a bug where changes to network aliases would not trigger a service
+    to be recreated.
+
+-   Fix a bug where a log message was printed about creating a new volume
+    when it already existed.
+
+-   Fixed a bug where interrupting `up` would not always shut down containers.
+
+-   Fixed a bug where `log_opt` and `log_driver` were not properly carried over
+    when extending services in the v1 Compose file format.
+
+-   Fixed a bug where empty values for build args would cause file validation
+    to fail.
+
 1.6.2 (2016-02-23)
 ------------------
 
diff --git a/compose/__init__.py b/compose/__init__.py
index fedc90ff..1052c067 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.7.0dev'
+__version__ = '1.8.0dev'
diff --git a/script/run/run.sh b/script/run/run.sh
index 212f9b97..98d32c5f 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.6.2"
+VERSION="1.7.0"
 IMAGE="docker/compose:$VERSION"
 
 

From e71c62b8d1ce9202b3df6f156528c403e60efafe Mon Sep 17 00:00:00 2001
From: Callum Rogers <CRogers@users.noreply.github.com>
Date: Thu, 14 Apr 2016 10:49:10 +0100
Subject: [PATCH 0999/1265] Readme should use new docker compose format instead
 of the old one

Signed-off-by: Callum Rogers <callumrogers@hotmail.co.uk>
---
 README.md | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index f8822151..93550f5a 100644
--- a/README.md
+++ b/README.md
@@ -22,16 +22,17 @@ they can be run together in an isolated environment:
 
 A `docker-compose.yml` looks like this:
 
-    web:
-      build: .
-      ports:
-       - "5000:5000"
-      volumes:
-       - .:/code
-      links:
-       - redis
-    redis:
-      image: redis
+    version: '2'
+
+    services:
+      web:
+        build: .
+        ports:
+         - "5000:5000"
+        volumes:
+         - .:/code
+      redis:
+        image: redis
 
 For more information about the Compose file, see the
 [Compose file reference](https://github.com/docker/compose/blob/release/docs/compose-file.md)

From abb5ae7fe4e3693b6099e52d43cf39e57c8e3e42 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 8 Apr 2016 15:45:03 -0400
Subject: [PATCH 1000/1265] Only disconnect if we don't already have the short
 id alias.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 054082fc..49eee104 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -453,20 +453,21 @@ class Service(object):
         connected_networks = container.get('NetworkSettings.Networks')
 
         for network, netdefs in self.networks.items():
-            aliases = netdefs.get('aliases', [])
-            ipv4_address = netdefs.get('ipv4_address', None)
-            ipv6_address = netdefs.get('ipv6_address', None)
             if network in connected_networks:
-                self.client.disconnect_container_from_network(
-                    container.id, network)
+                if short_id_alias_exists(container, network):
+                    continue
 
+                self.client.disconnect_container_from_network(
+                    container.id,
+                    network)
+
+            aliases = netdefs.get('aliases', [])
             self.client.connect_container_to_network(
                 container.id, network,
                 aliases=list(self._get_aliases(container).union(aliases)),
-                ipv4_address=ipv4_address,
-                ipv6_address=ipv6_address,
-                links=self._get_links(False)
-            )
+                ipv4_address=netdefs.get('ipv4_address', None),
+                ipv6_address=netdefs.get('ipv6_address', None),
+                links=self._get_links(False))
 
     def remove_duplicate_containers(self, timeout=DEFAULT_TIMEOUT):
         for c in self.duplicate_containers():
@@ -796,6 +797,12 @@ class Service(object):
                 log.error(six.text_type(e))
 
 
+def short_id_alias_exists(container, network):
+    aliases = container.get(
+        'NetworkSettings.Networks.{net}.Aliases'.format(net=network)) or ()
+    return container.short_id in aliases
+
+
 class NetworkMode(object):
     """A `standard` network mode (ex: host, bridge)"""
 

From e1356e1f6f6240a935c37617f787bded136a2049 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 11 Apr 2016 13:22:37 -0400
Subject: [PATCH 1001/1265] Set networking_config when creating a container.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 49eee104..e6ea9233 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -461,10 +461,9 @@ class Service(object):
                     container.id,
                     network)
 
-            aliases = netdefs.get('aliases', [])
             self.client.connect_container_to_network(
                 container.id, network,
-                aliases=list(self._get_aliases(container).union(aliases)),
+                aliases=self._get_aliases(netdefs, container),
                 ipv4_address=netdefs.get('ipv4_address', None),
                 ipv6_address=netdefs.get('ipv6_address', None),
                 links=self._get_links(False))
@@ -534,11 +533,32 @@ class Service(object):
         numbers = [c.number for c in containers]
         return 1 if not numbers else max(numbers) + 1
 
-    def _get_aliases(self, container):
-        if container.labels.get(LABEL_ONE_OFF) == "True":
+    def _get_aliases(self, network, container=None):
+        if container and container.labels.get(LABEL_ONE_OFF) == "True":
             return set()
 
-        return {self.name, container.short_id}
+        return list(
+            {self.name} |
+            ({container.short_id} if container else set()) |
+            set(network.get('aliases', ()))
+        )
+
+    def build_default_networking_config(self):
+        if not self.networks:
+            return {}
+
+        network = self.networks[self.network_mode.id]
+        endpoint = {
+            'Aliases': self._get_aliases(network),
+            'IPAMConfig': {},
+        }
+
+        if network.get('ipv4_address'):
+            endpoint['IPAMConfig']['IPv4Address'] = network.get('ipv4_address')
+        if network.get('ipv6_address'):
+            endpoint['IPAMConfig']['IPv6Address'] = network.get('ipv6_address')
+
+        return {"EndpointsConfig": {self.network_mode.id: endpoint}}
 
     def _get_links(self, link_to_self):
         links = {}
@@ -634,6 +654,10 @@ class Service(object):
             override_options,
             one_off=one_off)
 
+        networking_config = self.build_default_networking_config()
+        if networking_config:
+            container_options['networking_config'] = networking_config
+
         container_options['environment'] = format_environment(
             container_options['environment'])
         return container_options

From ad306f047969a24ab9fd2d0cf1bdc5ccd01d1bc1 Mon Sep 17 00:00:00 2001
From: johnharris85 <john@johnharris.io>
Date: Fri, 15 Apr 2016 13:30:13 +0100
Subject: [PATCH 1002/1265] Fix CLI docstring to reflect Docopt behaviour.

Signed-off-by: John Harris <john@johnharris.io>
---
 compose/cli/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 839d97e8..29d808ce 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -142,7 +142,7 @@ class TopLevelCommand(object):
     """Define and run multi-container applications with Docker.
 
     Usage:
-      docker-compose [-f=<arg>...] [options] [COMMAND] [ARGS...]
+      docker-compose [-f <arg>...] [options] [COMMAND] [ARGS...]
       docker-compose -h|--help
 
     Options:

From 4702703615ad1876b7f20e577dbb9cde59d1e329 Mon Sep 17 00:00:00 2001
From: Vladimir Lagunov <lagunov@yandex-team.ru>
Date: Fri, 15 Apr 2016 15:11:50 +0300
Subject: [PATCH 1003/1265] Fix #3248: Accidental config_hash change

Signed-off-by: Vladimir Lagunov <lagunov.vladimir@gmail.com>
---
 compose/config/config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index dc3f56ea..bd6e54fa 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -726,7 +726,7 @@ class MergeDict(dict):
 
         merged = parse_sequence_func(self.base.get(field, []))
         merged.update(parse_sequence_func(self.override.get(field, [])))
-        self[field] = [item.repr() for item in merged.values()]
+        self[field] = [item.repr() for item in sorted(merged.values())]
 
     def merge_scalar(self, field):
         if self.needs_merge(field):
@@ -928,7 +928,7 @@ def dict_from_path_mappings(path_mappings):
 
 
 def path_mappings_from_dict(d):
-    return [join_path_mapping(v) for v in d.items()]
+    return [join_path_mapping(v) for v in sorted(d.items())]
 
 
 def split_path_mapping(volume_path):

From 56c6e298199552f630432d6fefd770e35e5d7562 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 15 Apr 2016 15:42:36 -0400
Subject: [PATCH 1004/1265] Unit test for skipping network disconnect.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/service.py                |  2 +-
 tests/integration/project_test.py | 20 ++++++++++++++++----
 tests/unit/service_test.py        | 29 +++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index e6ea9233..8b9f64f0 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -535,7 +535,7 @@ class Service(object):
 
     def _get_aliases(self, network, container=None):
         if container and container.labels.get(LABEL_ONE_OFF) == "True":
-            return set()
+            return []
 
         return list(
             {self.name} |
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index d1732d1e..c413b9aa 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -565,7 +565,11 @@ class ProjectTest(DockerClientTestCase):
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top',
-                'networks': {'foo': None, 'bar': None, 'baz': None},
+                'networks': {
+                    'foo': None,
+                    'bar': None,
+                    'baz': {'aliases': ['extra']},
+                },
             }],
             volumes={},
             networks={
@@ -581,15 +585,23 @@ class ProjectTest(DockerClientTestCase):
             config_data=config_data,
         )
         project.up()
-        self.assertEqual(len(project.containers()), 1)
+
+        containers = project.containers()
+        assert len(containers) == 1
+        container, = containers
 
         for net_name in ['foo', 'bar', 'baz']:
             full_net_name = 'composetest_{}'.format(net_name)
             network_data = self.client.inspect_network(full_net_name)
-            self.assertEqual(network_data['Name'], full_net_name)
+            assert network_data['Name'] == full_net_name
+
+        aliases_key = 'NetworkSettings.Networks.{net}.Aliases'
+        assert 'web' in container.get(aliases_key.format(net='composetest_foo'))
+        assert 'web' in container.get(aliases_key.format(net='composetest_baz'))
+        assert 'extra' in container.get(aliases_key.format(net='composetest_baz'))
 
         foo_data = self.client.inspect_network('composetest_foo')
-        self.assertEqual(foo_data['Driver'], 'bridge')
+        assert foo_data['Driver'] == 'bridge'
 
     @v2_only()
     def test_up_with_ipam_config(self):
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index d3fcb49a..a259c476 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -663,6 +663,35 @@ class ServiceTest(unittest.TestCase):
             'for this service are created on a single host, the port will clash.'.format(name))
 
 
+class TestServiceNetwork(object):
+
+    def test_connect_container_to_networks_short_aliase_exists(self):
+        mock_client = mock.create_autospec(docker.Client)
+        service = Service(
+            'db',
+            mock_client,
+            'myproject',
+            image='foo',
+            networks={'project_default': {}})
+        container = Container(
+            None,
+            {
+                'Id': 'abcdef',
+                'NetworkSettings': {
+                    'Networks': {
+                        'project_default': {
+                            'Aliases': ['analias', 'abcdef'],
+                        },
+                    },
+                },
+            },
+            True)
+        service.connect_container_to_networks(container)
+
+        assert not mock_client.disconnect_container_from_network.call_count
+        assert not mock_client.connect_container_to_network.call_count
+
+
 def sort_by_name(dictionary_list):
     return sorted(dictionary_list, key=lambda k: k['name'])
 

From 68272b021639490929b0cdcca970ebd902ff5f09 Mon Sep 17 00:00:00 2001
From: johnharris85 <john@johnharris.io>
Date: Sun, 17 Apr 2016 14:00:07 -0400
Subject: [PATCH 1005/1265] Config now catches undefined service links Fixes
 issue #2922 Signed-off-by: John Harris <john@johnharris.io>

---
 compose/config/config.py     | 2 ++
 compose/config/validation.py | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/compose/config/config.py b/compose/config/config.py
index dc3f56ea..3f76277c 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -37,6 +37,7 @@ from .validation import validate_against_config_schema
 from .validation import validate_config_section
 from .validation import validate_depends_on
 from .validation import validate_extends_file_path
+from .validation import validate_links
 from .validation import validate_network_mode
 from .validation import validate_service_constraints
 from .validation import validate_top_level_object
@@ -580,6 +581,7 @@ def validate_service(service_config, service_names, version):
     validate_ulimits(service_config)
     validate_network_mode(service_config, service_names)
     validate_depends_on(service_config, service_names)
+    validate_links(service_config, service_names)
 
     if not service_dict.get('image') and has_uppercase(service_name):
         raise ConfigurationError(
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 088bec3f..e4b3a253 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -171,6 +171,14 @@ def validate_network_mode(service_config, service_names):
             "is undefined.".format(s=service_config, dep=dependency))
 
 
+def validate_links(service_config, service_names):
+    for dependency in service_config.config.get('links', []):
+        if dependency not in service_names:
+            raise ConfigurationError(
+                "Service '{s.name}' has a link to service '{dep}' which is "
+                "undefined.".format(s=service_config, dep=dependency))
+
+
 def validate_depends_on(service_config, service_names):
     for dependency in service_config.config.get('depends_on', []):
         if dependency not in service_names:

From 377be5aa1f097166df91c95670f871959654be3a Mon Sep 17 00:00:00 2001
From: johnharris85 <john@johnharris.io>
Date: Sun, 17 Apr 2016 14:01:06 -0400
Subject: [PATCH 1006/1265] Adding tests Signed-off-by: John Harris
 <john@johnharris.io>

---
 tests/unit/config/config_test.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 2bbbe614..8bf41632 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1360,6 +1360,17 @@ class ConfigTest(unittest.TestCase):
             config.load(config_details)
         assert "Service 'one' depends on service 'three'" in exc.exconly()
 
+    def test_linked_service_is_undefined(self):
+        with self.assertRaises(ConfigurationError):
+            config.load(
+                build_config_details({
+                    'version': '2',
+                    'services': {
+                        'web': {'image': 'busybox', 'links': ['db']},
+                    },
+                })
+            )
+
     def test_load_dockerfile_without_context(self):
         config_details = build_config_details({
             'version': '2',

From 6d2805917c8e3f90b20781dfe35513d12e819533 Mon Sep 17 00:00:00 2001
From: johnharris85 <john@johnharris.io>
Date: Sun, 17 Apr 2016 15:25:06 -0400
Subject: [PATCH 1007/1265] Account for aliased links Fix failing tests
 Signed-off-by: John Harris <john@johnharris.io>

---
 compose/config/validation.py             | 8 ++++----
 tests/fixtures/extends/invalid-links.yml | 2 ++
 tests/unit/config/config_test.py         | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index e4b3a253..8c89cdf2 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -172,11 +172,11 @@ def validate_network_mode(service_config, service_names):
 
 
 def validate_links(service_config, service_names):
-    for dependency in service_config.config.get('links', []):
-        if dependency not in service_names:
+    for link in service_config.config.get('links', []):
+        if link.split(':')[0] not in service_names:
             raise ConfigurationError(
-                "Service '{s.name}' has a link to service '{dep}' which is "
-                "undefined.".format(s=service_config, dep=dependency))
+                "Service '{s.name}' has a link to service '{link}' which is "
+                "undefined.".format(s=service_config, link=link))
 
 
 def validate_depends_on(service_config, service_names):
diff --git a/tests/fixtures/extends/invalid-links.yml b/tests/fixtures/extends/invalid-links.yml
index edfeb8b2..cea740cb 100644
--- a/tests/fixtures/extends/invalid-links.yml
+++ b/tests/fixtures/extends/invalid-links.yml
@@ -1,3 +1,5 @@
+mydb:
+  build: '.'
 myweb:
   build: '.'
   extends:
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 8bf41632..48830558 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1366,7 +1366,7 @@ class ConfigTest(unittest.TestCase):
                 build_config_details({
                     'version': '2',
                     'services': {
-                        'web': {'image': 'busybox', 'links': ['db']},
+                        'web': {'image': 'busybox', 'links': ['db:db']},
                     },
                 })
             )

From ba10f1cd55adfbcd228df1b6e1044b5c87ac06c8 Mon Sep 17 00:00:00 2001
From: Patrice FERLET <metal3d@gmail.com>
Date: Wed, 20 Apr 2016 13:23:37 +0200
Subject: [PATCH 1008/1265] Fix the tests from jenkins

Acceptance tests didn't set "help" command to return "0" EXIT_CODE.

close #3354
related #3263

Signed-off-by: Patrice Ferlet <metal3d@gmail.com>
---
 tests/acceptance/cli_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 53ff66bb..0b49efa0 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -140,8 +140,8 @@ class CLITestCase(DockerClientTestCase):
 
     def test_help(self):
         self.base_dir = 'tests/fixtures/no-composefile'
-        result = self.dispatch(['help', 'up'], returncode=1)
-        assert 'Usage: up [options] [SERVICE...]' in result.stderr
+        result = self.dispatch(['help', 'up'], returncode=0)
+        assert 'Usage: up [options] [SERVICE...]' in result.stdout
         # Prevent tearDown from trying to create a project
         self.base_dir = None
 

From 55fcd1c3e32ccbd71caa14462a6239d4bf7a1685 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Wed, 20 Apr 2016 15:58:12 -0700
Subject: [PATCH 1009/1265] Clarify service networks documentation

When jumping straight to this bit of the docs, it's not clear
that these are options under a service rather than the top-level
`networks` key. Added a service to make this super clear.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 docs/compose-file.md | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 5aef5aca..fc806a29 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -502,9 +502,11 @@ the special form `service:[service name]`.
 Networks to join, referencing entries under the
 [top-level `networks` key](#network-configuration-reference).
 
-    networks:
-      - some-network
-      - other-network
+    services:
+      some-service:
+        networks:
+         - some-network
+         - other-network
 
 #### aliases
 
@@ -516,14 +518,16 @@ Since `aliases` is network-scoped, the same service can have different aliases o
 
 The general format is shown here.
 
-    networks:
-      some-network:
-        aliases:
-          - alias1
-          - alias3
-      other-network:
-        aliases:
-          - alias2
+    services:
+      some-service:
+        networks:
+          some-network:
+            aliases:
+             - alias1
+             - alias3
+          other-network:
+            aliases:
+             - alias2
 
 In the example below, three services are provided (`web`, `worker`, and `db`), along with two networks (`new` and `legacy`). The `db` service is reachable at the hostname `db` or `database` on the `new` network, and at `db` or `mysql` on the `legacy` network.
 

From 27628f8655824a0ba96ef552c1b182aa8f48fa7f Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Wed, 20 Apr 2016 16:22:24 -0700
Subject: [PATCH 1010/1265] Make validation error less robotic

"ERROR: Validation failed in file './docker-compose.yml', reason(s):"

is now:

"ERROR: The Compose file './docker-compose.yml' is invalid because:"

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 compose/config/validation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose/config/validation.py b/compose/config/validation.py
index 8c89cdf2..726750a3 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -416,6 +416,6 @@ def handle_errors(errors, format_error_func, filename):
 
     error_msg = '\n'.join(format_error_func(error) for error in errors)
     raise ConfigurationError(
-        "Validation failed{file_msg}, reason(s):\n{error_msg}".format(
-            file_msg=" in file '{}'".format(filename) if filename else "",
+        "The Compose file{file_msg} is invalid because:\n{error_msg}".format(
+            file_msg=" '{}'".format(filename) if filename else "",
             error_msg=error_msg))

From b67f110620bba758ae9b375b9f9743da317cfc45 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Wed, 20 Apr 2016 16:35:22 -0700
Subject: [PATCH 1011/1265] Explain the explanation about file versions

This explanation looked like it was part of the error. Added an
extra new line and a bit of copy to explain the explanation.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 compose/config/errors.py     | 9 +++++----
 compose/config/validation.py | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/compose/config/errors.py b/compose/config/errors.py
index d5df7ae5..d14cbbdd 100644
--- a/compose/config/errors.py
+++ b/compose/config/errors.py
@@ -3,10 +3,11 @@ from __future__ import unicode_literals
 
 
 VERSION_EXPLANATION = (
-    'Either specify a version of "2" (or "2.0") and place your service '
-    'definitions under the `services` key, or omit the `version` key and place '
-    'your service definitions at the root of the file to use version 1.\n'
-    'For more on the Compose file format versions, see '
+    'You might be seeing this error because you\'re using the wrong Compose '
+    'file version. Either specify a version of "2" (or "2.0") and place your '
+    'service definitions under the `services` key, or omit the `version` key '
+    'and place your service definitions at the root of the file to use '
+    'version 1.\nFor more on the Compose file format versions, see '
     'https://docs.docker.com/compose/compose-file/')
 
 
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 726750a3..7452e984 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -219,7 +219,7 @@ def handle_error_for_schema_with_id(error, path):
             return get_unsupported_config_msg(path, invalid_config_key)
 
         if not error.path:
-            return '{}\n{}'.format(error.message, VERSION_EXPLANATION)
+            return '{}\n\n{}'.format(error.message, VERSION_EXPLANATION)
 
 
 def handle_generic_error(error, path):

From 75bcc382d9965208ecb1e8b7e6caa5cc08916cf6 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 19 Apr 2016 17:39:29 -0700
Subject: [PATCH 1012/1265] Force docker-py 1.8.0 or above

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 7caae97d..de009146 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.8',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py > 1.7.2, < 2',
+    'docker-py >= 1.8.0, < 2',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

From 26fe8213aa3edcb6bfb8ec287538f9d8674ae124 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 26 Apr 2016 11:58:41 -0400
Subject: [PATCH 1013/1265] Upgade pip to latest

Hopefully fixes our builds.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index acf9b6ae..63fac3eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,11 +49,11 @@ RUN set -ex; \
 
 # Install pip
 RUN set -ex; \
-    curl -L https://pypi.python.org/packages/source/p/pip/pip-7.0.1.tar.gz | tar -xz; \
-    cd pip-7.0.1; \
+    curl -L https://pypi.python.org/packages/source/p/pip/pip-8.1.1.tar.gz | tar -xz; \
+    cd pip-8.1.1; \
     python setup.py install; \
     cd ..; \
-    rm -rf pip-7.0.1
+    rm -rf pip-8.1.1
 
 # Python3 requires a valid locale
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen

From a4d3dd6197b9e15cf993823d93d321778d2fdcd8 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 18 Mar 2016 13:00:55 +0000
Subject: [PATCH 1014/1265] Remove v2_only decorators on config tests

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 0b49efa0..4d1990be 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -145,15 +145,11 @@ class CLITestCase(DockerClientTestCase):
         # Prevent tearDown from trying to create a project
         self.base_dir = None
 
-    # TODO: this shouldn't be v2-dependent
-    @v2_only()
     def test_config_list_services(self):
         self.base_dir = 'tests/fixtures/v2-full'
         result = self.dispatch(['config', '--services'])
         assert set(result.stdout.rstrip().split('\n')) == {'web', 'other'}
 
-    # TODO: this shouldn't be v2-dependent
-    @v2_only()
     def test_config_quiet_with_error(self):
         self.base_dir = None
         result = self.dispatch([
@@ -162,14 +158,10 @@ class CLITestCase(DockerClientTestCase):
         ], returncode=1)
         assert "'notaservice' must be a mapping" in result.stderr
 
-    # TODO: this shouldn't be v2-dependent
-    @v2_only()
     def test_config_quiet(self):
         self.base_dir = 'tests/fixtures/v2-full'
         assert self.dispatch(['config', '-q']).stdout == ''
 
-    # TODO: this shouldn't be v2-dependent
-    @v2_only()
     def test_config_default(self):
         self.base_dir = 'tests/fixtures/v2-full'
         result = self.dispatch(['config'])

From 84a3e2fe79552ca94172bd3958776b01eed0e31e Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 18 Mar 2016 13:01:35 +0000
Subject: [PATCH 1015/1265] Check full error message in
 test_up_with_net_is_invalid

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 4d1990be..2a5a8604 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -675,9 +675,7 @@ class CLITestCase(DockerClientTestCase):
             ['-f', 'v2-invalid.yml', 'up', '-d'],
             returncode=1)
 
-        # TODO: fix validation error messages for v2 files
-        # assert "Unsupported config option for service 'web': 'net'" in exc.exconly()
-        assert "Unsupported config option" in result.stderr
+        assert "Unsupported config option for services.bar: 'net'" in result.stderr
 
     def test_up_with_net_v1(self):
         self.base_dir = 'tests/fixtures/net-container'

From 6064d200f946c8d9738e1b73a03b1f78f947e2ef Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 18 Mar 2016 13:14:33 +0000
Subject: [PATCH 1016/1265] Fix output of 'config' for v1 files

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/serialize.py                 | 14 ++++++++++--
 tests/acceptance/cli_test.py                | 25 +++++++++++++++++++++
 tests/fixtures/v1-config/docker-compose.yml | 10 +++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 tests/fixtures/v1-config/docker-compose.yml

diff --git a/compose/config/serialize.py b/compose/config/serialize.py
index 06e0a027..be6ba720 100644
--- a/compose/config/serialize.py
+++ b/compose/config/serialize.py
@@ -5,6 +5,8 @@ import six
 import yaml
 
 from compose.config import types
+from compose.config.config import V1
+from compose.config.config import V2_0
 
 
 def serialize_config_type(dumper, data):
@@ -17,12 +19,20 @@ yaml.SafeDumper.add_representer(types.VolumeSpec, serialize_config_type)
 
 
 def serialize_config(config):
+    services = {service.pop('name'): service for service in config.services}
+
+    if config.version == V1:
+        for service_dict in services.values():
+            if 'network_mode' not in service_dict:
+                service_dict['network_mode'] = 'bridge'
+
     output = {
-        'version': config.version,
-        'services': {service.pop('name'): service for service in config.services},
+        'version': V2_0,
+        'services': services,
         'networks': config.networks,
         'volumes': config.volumes,
     }
+
     return yaml.safe_dump(
         output,
         default_flow_style=False,
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 2a5a8604..f7c958dd 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -190,6 +190,31 @@ class CLITestCase(DockerClientTestCase):
         }
         assert output == expected
 
+    def test_config_v1(self):
+        self.base_dir = 'tests/fixtures/v1-config'
+        result = self.dispatch(['config'])
+        assert yaml.load(result.stdout) == {
+            'version': '2.0',
+            'services': {
+                'net': {
+                    'image': 'busybox',
+                    'network_mode': 'bridge',
+                },
+                'volume': {
+                    'image': 'busybox',
+                    'volumes': ['/data:rw'],
+                    'network_mode': 'bridge',
+                },
+                'app': {
+                    'image': 'busybox',
+                    'volumes_from': ['service:volume:rw'],
+                    'network_mode': 'service:net',
+                },
+            },
+            'networks': {},
+            'volumes': {},
+        }
+
     def test_ps(self):
         self.project.get_service('simple').create_container()
         result = self.dispatch(['ps'])
diff --git a/tests/fixtures/v1-config/docker-compose.yml b/tests/fixtures/v1-config/docker-compose.yml
new file mode 100644
index 00000000..8646c4ed
--- /dev/null
+++ b/tests/fixtures/v1-config/docker-compose.yml
@@ -0,0 +1,10 @@
+net:
+  image: busybox
+volume:
+  image: busybox
+  volumes:
+    - /data
+app:
+  image: busybox
+  net: "container:net"
+  volumes_from: ["volume"]

From 756ef14edc824ce2c52a2eb636c4884c95652e1e Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Apr 2016 17:30:04 +0100
Subject: [PATCH 1017/1265] Fix format of 'restart' option in 'config' output

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/serialize.py               | 26 +++++++++++++++++-----
 compose/config/types.py                   |  9 ++++++++
 tests/acceptance/cli_test.py              | 27 +++++++++++++++++++++++
 tests/fixtures/restart/docker-compose.yml | 14 ++++++++++++
 4 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 tests/fixtures/restart/docker-compose.yml

diff --git a/compose/config/serialize.py b/compose/config/serialize.py
index be6ba720..1b498c01 100644
--- a/compose/config/serialize.py
+++ b/compose/config/serialize.py
@@ -19,12 +19,14 @@ yaml.SafeDumper.add_representer(types.VolumeSpec, serialize_config_type)
 
 
 def serialize_config(config):
-    services = {service.pop('name'): service for service in config.services}
-
-    if config.version == V1:
-        for service_dict in services.values():
-            if 'network_mode' not in service_dict:
-                service_dict['network_mode'] = 'bridge'
+    denormalized_services = [
+        denormalize_service_dict(service_dict, config.version)
+        for service_dict in config.services
+    ]
+    services = {
+        service_dict.pop('name'): service_dict
+        for service_dict in denormalized_services
+    }
 
     output = {
         'version': V2_0,
@@ -38,3 +40,15 @@ def serialize_config(config):
         default_flow_style=False,
         indent=2,
         width=80)
+
+
+def denormalize_service_dict(service_dict, version):
+    service_dict = service_dict.copy()
+
+    if 'restart' in service_dict:
+        service_dict['restart'] = types.serialize_restart_spec(service_dict['restart'])
+
+    if version == V1 and 'network_mode' not in service_dict:
+        service_dict['network_mode'] = 'bridge'
+
+    return service_dict
diff --git a/compose/config/types.py b/compose/config/types.py
index fc3347c8..e6a3dea0 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -7,6 +7,8 @@ from __future__ import unicode_literals
 import os
 from collections import namedtuple
 
+import six
+
 from compose.config.config import V1
 from compose.config.errors import ConfigurationError
 from compose.const import IS_WINDOWS_PLATFORM
@@ -89,6 +91,13 @@ def parse_restart_spec(restart_config):
     return {'Name': name, 'MaximumRetryCount': int(max_retry_count)}
 
 
+def serialize_restart_spec(restart_spec):
+    parts = [restart_spec['Name']]
+    if restart_spec['MaximumRetryCount']:
+        parts.append(six.text_type(restart_spec['MaximumRetryCount']))
+    return ':'.join(parts)
+
+
 def parse_extra_hosts(extra_hosts_config):
     if not extra_hosts_config:
         return {}
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index f7c958dd..515acb04 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -190,6 +190,33 @@ class CLITestCase(DockerClientTestCase):
         }
         assert output == expected
 
+    def test_config_restart(self):
+        self.base_dir = 'tests/fixtures/restart'
+        result = self.dispatch(['config'])
+        assert yaml.load(result.stdout) == {
+            'version': '2.0',
+            'services': {
+                'never': {
+                    'image': 'busybox',
+                    'restart': 'no',
+                },
+                'always': {
+                    'image': 'busybox',
+                    'restart': 'always',
+                },
+                'on-failure': {
+                    'image': 'busybox',
+                    'restart': 'on-failure',
+                },
+                'on-failure-5': {
+                    'image': 'busybox',
+                    'restart': 'on-failure:5',
+                },
+            },
+            'networks': {},
+            'volumes': {},
+        }
+
     def test_config_v1(self):
         self.base_dir = 'tests/fixtures/v1-config'
         result = self.dispatch(['config'])
diff --git a/tests/fixtures/restart/docker-compose.yml b/tests/fixtures/restart/docker-compose.yml
new file mode 100644
index 00000000..2d10aa39
--- /dev/null
+++ b/tests/fixtures/restart/docker-compose.yml
@@ -0,0 +1,14 @@
+version: "2"
+services:
+  never:
+    image: busybox
+    restart: "no"
+  always:
+    image: busybox
+    restart: always
+  on-failure:
+    image: busybox
+    restart: on-failure
+  on-failure-5:
+    image: busybox
+    restart: "on-failure:5"

From d3e645488a87840d1fab9660b98c09d2a8ec676f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 25 Apr 2016 17:58:20 -0700
Subject: [PATCH 1018/1265] Define WindowsError on non-win32 platforms

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/utils.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index dd859edc..fff4a543 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -12,6 +12,13 @@ from six.moves import input
 
 import compose
 
+# WindowsError is not defined on non-win32 platforms. Avoid runtime errors by
+# defining it as OSError (its parent class) if missing.
+try:
+    WindowsError
+except NameError:
+    WindowsError = OSError
+
 
 def yesno(prompt, default=None):
     """

From 87ee38ed2c8da3fdee816737b55d7c7eb6e36a26 Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Thu, 28 Apr 2016 12:57:02 +0000
Subject: [PATCH 1019/1265] convert docs Dockerfiles to use docs/base:oss

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 docs/Dockerfile | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/docs/Dockerfile b/docs/Dockerfile
index b16d0d2c..86ed32bc 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -1,18 +1,8 @@
-FROM docs/base:latest
+FROM docs/base:oss
 MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)
 
-RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/engine
-RUN svn checkout https://github.com/docker/swarm/trunk/docs /docs/content/swarm
-RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine
-RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content/registry
-RUN svn checkout https://github.com/docker/notary/trunk/docs /docs/content/notary
-RUN svn checkout https://github.com/docker/kitematic/trunk/docs /docs/content/kitematic
-RUN svn checkout https://github.com/docker/toolbox/trunk/docs /docs/content/toolbox
-RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content/project
-
-
 ENV PROJECT=compose
 # To get the git info for this repo
 COPY . /src
-
+RUN rm -r /docs/content/$PROJECT/
 COPY . /docs/content/$PROJECT/

From 2efcec776c430c527d61069f16bea298d9e4fb37 Mon Sep 17 00:00:00 2001
From: Aaron Nall <aronahl@hotmail.com>
Date: Wed, 27 Apr 2016 22:44:28 +0000
Subject: [PATCH 1020/1265] Add missing log event filter when using
 docker-compose logs.

Signed-off-by: Aaron Nall <aronahl@hotmail.com>
---
 compose/cli/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index ae787c9b..b86c34f8 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -426,7 +426,8 @@ class TopLevelCommand(object):
             self.project,
             containers,
             options['--no-color'],
-            log_args).run()
+            log_args,
+            event_stream=self.project.events(service_names=options['SERVICE'])).run()
 
     def pause(self, options):
         """

From 0b24883cef6ad5737b949815e107a968e96c2a55 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 26 Apr 2016 12:21:47 -0700
Subject: [PATCH 1021/1265] Support combination of shorthand flag and equal
 sign for host option

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/command.py       | 5 ++++-
 tests/acceptance/cli_test.py | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index b7160dee..8ac3aff4 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -21,12 +21,15 @@ log = logging.getLogger(__name__)
 
 def project_from_options(project_dir, options):
     environment = Environment.from_env_file(project_dir)
+    host = options.get('--host')
+    if host is not None:
+        host = host.lstrip('=')
     return get_project(
         project_dir,
         get_config_path_from_options(project_dir, options, environment),
         project_name=options.get('--project-name'),
         verbose=options.get('--verbose'),
-        host=options.get('--host'),
+        host=host,
         tls_config=tls_config_from_options(options),
         environment=environment
     )
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 515acb04..a02d0e99 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -145,6 +145,13 @@ class CLITestCase(DockerClientTestCase):
         # Prevent tearDown from trying to create a project
         self.base_dir = None
 
+    def test_shorthand_host_opt(self):
+        self.dispatch(
+            ['-H={0}'.format(os.environ.get('DOCKER_HOST', 'unix://')),
+             'up', '-d'],
+            returncode=0
+        )
+
     def test_config_list_services(self):
         self.base_dir = 'tests/fixtures/v2-full'
         result = self.dispatch(['config', '--services'])

From 84aa39e978c16877a64f1b097875667ff6eeef95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20R?= <andre.romcke@gmail.com>
Date: Wed, 27 Apr 2016 13:45:59 +0200
Subject: [PATCH 1022/1265] Clarify env-file doc that .env is read from cwd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3381

Signed-off-by: André R <ar@ez.no>
---
 docs/env-file.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/env-file.md b/docs/env-file.md
index a285a790..be2625f8 100644
--- a/docs/env-file.md
+++ b/docs/env-file.md
@@ -13,8 +13,8 @@ weight=10
 # Environment file
 
 Compose supports declaring default environment variables in an environment
-file named `.env` and placed in the same folder as your
-[compose file](compose-file.md).
+file named `.env` placed in the folder `docker-compose` command is executed from
+*(current working directory)*.
 
 Compose expects each line in an env file to be in `VAR=VAL` format. Lines
 beginning with `#` (i.e. comments) are ignored, as are blank lines.

From e4bb678875adf1a5aa5fdc1fe542f00c4e279060 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 29 Apr 2016 16:37:26 -0700
Subject: [PATCH 1023/1265] Require latest docker-py version

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index b9b0f403..eb5275f4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 PyYAML==3.11
 cached-property==1.2.0
-docker-py==1.8.0
+docker-py==1.8.1
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
diff --git a/setup.py b/setup.py
index de009146..0b37c1dd 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.8',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.8.0, < 2',
+    'docker-py >= 1.8.1, < 2',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

From fe17e0f94835aab59f71f33e055f1c52847ce673 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 26 Apr 2016 15:52:25 -0700
Subject: [PATCH 1024/1265] Skip event objects that don't contain a status
 field

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/project.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/compose/project.py b/compose/project.py
index 0d891e45..64ca7be7 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -342,7 +342,10 @@ class Project(object):
             filters={'label': self.labels()},
             decode=True
         ):
-            if event['status'] in IMAGE_EVENTS:
+            # The first part of this condition is a guard against some events
+            # broadcasted by swarm that don't have a status field.
+            # See https://github.com/docker/compose/issues/3316
+            if 'status' not in event or event['status'] in IMAGE_EVENTS:
                 # We don't receive any image events because labels aren't applied
                 # to images
                 continue

From 28fb91b34459dae8e0531370aa005d95321803f1 Mon Sep 17 00:00:00 2001
From: Thom Linton <thom.linton@gmail.com>
Date: Fri, 29 Apr 2016 16:31:19 -0700
Subject: [PATCH 1025/1265] Adds additional validation to 'env_vars_from_file'.

The 'env_file' directive and feature precludes the use of the name
'.env' in the path shared with 'docker-config.yml', regardless of
whether or not it is enabled.

This change adds an additional validation to allow the use of this
path provided it is not a file.

Signed-off-by: Thom Linton <thom.linton@gmail.com>
---
 compose/config/environment.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compose/config/environment.py b/compose/config/environment.py
index ad5c0b3d..ff08b771 100644
--- a/compose/config/environment.py
+++ b/compose/config/environment.py
@@ -28,6 +28,8 @@ def env_vars_from_file(filename):
     """
     if not os.path.exists(filename):
         raise ConfigurationError("Couldn't find env file: %s" % filename)
+    elif not os.path.isfile(filename):
+        raise ConfigurationError("%s is not a file." % (filename))
     env = {}
     for line in codecs.open(filename, 'r', 'utf-8'):
         line = line.strip()

From 310b3d9441c8a63dc7f2685a1eb2d3e83e1584dc Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 29 Apr 2016 19:42:07 -0700
Subject: [PATCH 1026/1265] Properly handle APIError failures in Project.up

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py               |  3 ++-
 compose/parallel.py               |  2 +-
 compose/project.py                | 11 ++++++++++-
 tests/integration/project_test.py |  4 +++-
 tests/unit/parallel_test.py       |  3 ++-
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index b86c34f8..34e7f35c 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -24,6 +24,7 @@ from ..const import IS_WINDOWS_PLATFORM
 from ..progress_stream import StreamOutputError
 from ..project import NoSuchService
 from ..project import OneOffFilter
+from ..project import ProjectError
 from ..service import BuildAction
 from ..service import BuildError
 from ..service import ConvergenceStrategy
@@ -58,7 +59,7 @@ def main():
     except (KeyboardInterrupt, signals.ShutdownException):
         log.error("Aborting.")
         sys.exit(1)
-    except (UserError, NoSuchService, ConfigurationError) as e:
+    except (UserError, NoSuchService, ConfigurationError, ProjectError) as e:
         log.error(e.msg)
         sys.exit(1)
     except BuildError as e:
diff --git a/compose/parallel.py b/compose/parallel.py
index 63417dcb..50b2dbea 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -59,7 +59,7 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None):
     if error_to_reraise:
         raise error_to_reraise
 
-    return results
+    return results, errors
 
 
 def _no_deps(x):
diff --git a/compose/project.py b/compose/project.py
index 64ca7be7..d965c4a3 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -390,13 +390,18 @@ class Project(object):
         def get_deps(service):
             return {self.get_service(dep) for dep in service.get_dependency_names()}
 
-        results = parallel.parallel_execute(
+        results, errors = parallel.parallel_execute(
             services,
             do,
             operator.attrgetter('name'),
             None,
             get_deps
         )
+        if errors:
+            raise ProjectError(
+                'Encountered errors while bringing up the project.'
+            )
+
         return [
             container
             for svc_containers in results
@@ -531,3 +536,7 @@ class NoSuchService(Exception):
 
     def __str__(self):
         return self.msg
+
+
+class ProjectError(Exception):
+    pass
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index c413b9aa..7ef492a5 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -19,6 +19,7 @@ from compose.const import LABEL_PROJECT
 from compose.const import LABEL_SERVICE
 from compose.container import Container
 from compose.project import Project
+from compose.project import ProjectError
 from compose.service import ConvergenceStrategy
 from tests.integration.testcases import v2_only
 
@@ -752,7 +753,8 @@ class ProjectTest(DockerClientTestCase):
             config_data=config_data,
         )
 
-        assert len(project.up()) == 0
+        with self.assertRaises(ProjectError):
+            project.up()
 
     @v2_only()
     def test_project_up_volumes(self):
diff --git a/tests/unit/parallel_test.py b/tests/unit/parallel_test.py
index 45b0db1d..479c0f1d 100644
--- a/tests/unit/parallel_test.py
+++ b/tests/unit/parallel_test.py
@@ -29,7 +29,7 @@ def get_deps(obj):
 
 
 def test_parallel_execute():
-    results = parallel_execute(
+    results, errors = parallel_execute(
         objects=[1, 2, 3, 4, 5],
         func=lambda x: x * 2,
         get_name=six.text_type,
@@ -37,6 +37,7 @@ def test_parallel_execute():
     )
 
     assert sorted(results) == [2, 4, 6, 8, 10]
+    assert errors == {}
 
 
 def test_parallel_execute_with_deps():

From 3b7191f246b5f7cd6b2fbdefa86547492861f025 Mon Sep 17 00:00:00 2001
From: Garrett Seward <spectralsun@users.noreply.github.com>
Date: Wed, 4 May 2016 10:45:04 -0700
Subject: [PATCH 1027/1265] Small typo

Signed-off-by: spectralsun <garrett@spectralsun.com>
---
 docs/compose-file.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index fc806a29..4902e8dd 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -1083,7 +1083,7 @@ It's more complicated if you're using particular configuration features:
           data: {}
 
     By default, Compose creates a volume whose name is prefixed with your
-    project name. If you want it to just be called `data`, declared it as
+    project name. If you want it to just be called `data`, declare it as
     external:
 
         volumes:

From 4b01f6dcd657636a6d05f453dfd58a6d3826ca5e Mon Sep 17 00:00:00 2001
From: Anton Simernia <anton.simernya@gmail.com>
Date: Mon, 9 May 2016 18:15:32 +0700
Subject: [PATCH 1028/1265] add msg attribute to ProjectError class

Signed-off-by: Anton Simernia <anton.simernya@gmail.com>
---
 compose/project.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compose/project.py b/compose/project.py
index d965c4a3..1b7fde23 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -539,4 +539,5 @@ class NoSuchService(Exception):
 
 
 class ProjectError(Exception):
-    pass
+    def __init__(self, msg):
+        self.msg = msg

From 4bf5271ae2d53f8c6467642b6bd4c3372ed52da8 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 12 May 2016 14:41:40 -0400
Subject: [PATCH 1029/1265] Skip invalid git tags in versions.py

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/test/versions.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/script/test/versions.py b/script/test/versions.py
index 98f97ef3..45ead143 100755
--- a/script/test/versions.py
+++ b/script/test/versions.py
@@ -28,6 +28,7 @@ from __future__ import unicode_literals
 import argparse
 import itertools
 import operator
+import sys
 from collections import namedtuple
 
 import requests
@@ -103,6 +104,14 @@ def get_default(versions):
             return version
 
 
+def get_versions(tags):
+    for tag in tags:
+        try:
+            yield Version.parse(tag['name'])
+        except ValueError:
+            print("Skipping invalid tag: {name}".format(**tag), file=sys.stderr)
+
+
 def get_github_releases(project):
     """Query the Github API for a list of version tags and return them in
     sorted order.
@@ -112,7 +121,7 @@ def get_github_releases(project):
     url = '{}/{}/tags'.format(GITHUB_API, project)
     response = requests.get(url)
     response.raise_for_status()
-    versions = [Version.parse(tag['name']) for tag in response.json()]
+    versions = get_versions(response.json())
     return sorted(versions, reverse=True, key=operator.attrgetter('order'))
 
 

From e5645595e3057f7b6eadcde922dd9ae7e0ff9363 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 9 May 2016 16:29:27 -0700
Subject: [PATCH 1030/1265] Fail gracefully when -d is not provided for exec
 command on Win32

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 34e7f35c..3ab2f965 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -334,6 +334,13 @@ class TopLevelCommand(object):
         """
         index = int(options.get('--index'))
         service = self.project.get_service(options['SERVICE'])
+        detach = options['-d']
+
+        if IS_WINDOWS_PLATFORM and not detach:
+            raise UserError(
+                "Interactive mode is not yet supported on Windows.\n"
+                "Please pass the -d flag when using `docker-compose exec`."
+            )
         try:
             container = service.get_container(number=index)
         except ValueError as e:
@@ -350,7 +357,7 @@ class TopLevelCommand(object):
 
         exec_id = container.create_exec(command, **create_exec_options)
 
-        if options['-d']:
+        if detach:
             container.start_exec(exec_id, tty=tty)
             return
 

From 844b7d463f63b4bd3915648b32432c9b3d0243c8 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 16 May 2016 14:59:33 -0700
Subject: [PATCH 1031/1265] Update rm command to always remove one-off
 containers.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py          | 12 +++++-------
 tests/acceptance/cli_test.py |  2 --
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 3ab2f965..afde7150 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -532,17 +532,15 @@ class TopLevelCommand(object):
         Options:
             -f, --force   Don't ask to confirm removal
             -v            Remove any anonymous volumes attached to containers
-            -a, --all     Also remove one-off containers created by
+            -a, --all     Obsolete. Also remove one-off containers created by
                           docker-compose run
         """
         if options.get('--all'):
-            one_off = OneOffFilter.include
-        else:
             log.warn(
-                'Not including one-off containers created by `docker-compose run`.\n'
-                'To include them, use `docker-compose rm --all`.\n'
-                'This will be the default behavior in the next version of Compose.\n')
-            one_off = OneOffFilter.exclude
+                '--all flag is obsolete. This is now the default behavior '
+                'of `docker-compose rm`'
+            )
+        one_off = OneOffFilter.include
 
         all_containers = self.project.containers(
             service_names=options['SERVICE'], stopped=True, one_off=one_off
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index a02d0e99..dfd75625 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1192,8 +1192,6 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 1)
         self.dispatch(['rm', '-f'], None)
         self.assertEqual(len(service.containers(stopped=True)), 0)
-        self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 1)
-        self.dispatch(['rm', '-f', '-a'], None)
         self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 0)
 
         service.create_container(one_off=False)

From db0a6cf2bbcd7a5a673833b9558f0d142a0f304c Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 12 May 2016 17:38:41 -0700
Subject: [PATCH 1032/1265] Always use the Windows version of splitdrive when
 parsing volume mappings

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py         | 3 ++-
 tests/unit/config/config_test.py | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index e52de4bf..6cfce5da 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 import functools
 import logging
+import ntpath
 import operator
 import os
 import string
@@ -944,7 +945,7 @@ def split_path_mapping(volume_path):
     if volume_path.startswith('.') or volume_path.startswith('~'):
         drive, volume_config = '', volume_path
     else:
-        drive, volume_config = os.path.splitdrive(volume_path)
+        drive, volume_config = ntpath.splitdrive(volume_path)
 
     if ':' in volume_config:
         (host, container) = volume_config.split(':', 1)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 48830558..26a1e08a 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -2658,8 +2658,6 @@ class ExpandPathTest(unittest.TestCase):
 
 
 class VolumePathTest(unittest.TestCase):
-
-    @pytest.mark.xfail((not IS_WINDOWS_PLATFORM), reason='does not have a drive')
     def test_split_path_mapping_with_windows_path(self):
         host_path = "c:\\Users\\msamblanet\\Documents\\anvil\\connect\\config"
         windows_volume_path = host_path + ":/opt/connect/config:ro"

From 0c8aeb9e056caaa1fa2d1cc1133f6bd41505ec3c Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 19 May 2016 07:41:02 -0700
Subject: [PATCH 1033/1265] Fix bug where confirmation prompt doesn't show due
 to line buffering

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/utils.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index fff4a543..b58b50ef 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -6,9 +6,9 @@ import os
 import platform
 import ssl
 import subprocess
+import sys
 
 import docker
-from six.moves import input
 
 import compose
 
@@ -42,6 +42,16 @@ def yesno(prompt, default=None):
         return None
 
 
+def input(prompt):
+    """
+    Version of input (raw_input in Python 2) which forces a flush of sys.stdout
+    to avoid problems where the prompt fails to appear due to line buffering
+    """
+    sys.stdout.write(prompt)
+    sys.stdout.flush()
+    return sys.stdin.readline().rstrip(b'\n')
+
+
 def call_silently(*args, **kwargs):
     """
     Like subprocess.call(), but redirects stdout and stderr to /dev/null.

From 2b5b665d3ab47ab7d1bbe0049b02af126f2eaa63 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 19 May 2016 14:53:37 -0700
Subject: [PATCH 1034/1265] Add test for path mapping with Windows containers

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/unit/config/config_test.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 26a1e08a..ccb3bcfe 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -2664,7 +2664,15 @@ class VolumePathTest(unittest.TestCase):
         expected_mapping = ("/opt/connect/config:ro", host_path)
 
         mapping = config.split_path_mapping(windows_volume_path)
-        self.assertEqual(mapping, expected_mapping)
+        assert mapping == expected_mapping
+
+    def test_split_path_mapping_with_windows_path_in_container(self):
+        host_path = 'c:\\Users\\remilia\\data'
+        container_path = 'c:\\scarletdevil\\data'
+        expected_mapping = (container_path, host_path)
+
+        mapping = config.split_path_mapping('{0}:{1}'.format(host_path, container_path))
+        assert mapping == expected_mapping
 
 
 @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')

From 33bed5c7066e53cb147afcbef2e9ab78cb0ab1f0 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 20 May 2016 12:02:45 +0100
Subject: [PATCH 1035/1265] Use latest OpenSSL version (1.0.2h) when building
 Mac binary on Travis

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/setup/osx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/script/setup/osx b/script/setup/osx
index 10bbbecc..39941de2 100755
--- a/script/setup/osx
+++ b/script/setup/osx
@@ -14,9 +14,9 @@ desired_python_version="2.7.9"
 desired_python_brew_version="2.7.9"
 python_formula="https://raw.githubusercontent.com/Homebrew/homebrew/1681e193e4d91c9620c4901efd4458d9b6fcda8e/Library/Formula/python.rb"
 
-desired_openssl_version="1.0.1j"
-desired_openssl_brew_version="1.0.1j_1"
-openssl_formula="https://raw.githubusercontent.com/Homebrew/homebrew/62fc2a1a65e83ba9dbb30b2e0a2b7355831c714b/Library/Formula/openssl.rb"
+desired_openssl_version="1.0.2h"
+desired_openssl_brew_version="1.0.2h"
+openssl_formula="https://raw.githubusercontent.com/Homebrew/homebrew-core/30d3766453347f6e22b3ed6c74bb926d6def2eb5/Formula/openssl.rb"
 
 PATH="/usr/local/bin:$PATH"
 

From 842e372258809b0be035a7857f8577e33850cca7 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 17 May 2016 15:02:29 -0700
Subject: [PATCH 1036/1265] Eliminate duplicates when merging port mappings
 from config files

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py          |  6 +++++-
 tests/integration/project_test.py | 36 +++++++++++++++++++++++++++++++
 tests/unit/config/config_test.py  |  8 +++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 6cfce5da..e1466f06 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -744,6 +744,7 @@ def merge_service_dicts(base, override, version):
     md.merge_mapping('ulimits', parse_ulimits)
     md.merge_mapping('networks', parse_networks)
     md.merge_sequence('links', ServiceLink.parse)
+    md.merge_field('ports', merge_port_mappings, default=[])
 
     for field in ['volumes', 'devices']:
         md.merge_field(field, merge_path_mappings)
@@ -752,7 +753,6 @@ def merge_service_dicts(base, override, version):
         'depends_on',
         'expose',
         'external_links',
-        'ports',
         'volumes_from',
     ]:
         md.merge_field(field, operator.add, default=[])
@@ -771,6 +771,10 @@ def merge_service_dicts(base, override, version):
     return dict(md)
 
 
+def merge_port_mappings(base, override):
+    return list(set().union(base, override))
+
+
 def merge_build(output, base, override):
     def to_dict(service):
         build_config = service.get('build', {})
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 7ef492a5..6e82e931 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -834,6 +834,42 @@ class ProjectTest(DockerClientTestCase):
         self.assertTrue(log_config)
         self.assertEqual(log_config.get('Type'), 'none')
 
+    @v2_only()
+    def test_project_up_port_mappings_with_multiple_files(self):
+        base_file = config.ConfigFile(
+            'base.yml',
+            {
+                'version': V2_0,
+                'services': {
+                    'simple': {
+                        'image': 'busybox:latest',
+                        'command': 'top',
+                        'ports': ['1234:1234']
+                    },
+                },
+
+            })
+        override_file = config.ConfigFile(
+            'override.yml',
+            {
+                'version': V2_0,
+                'services': {
+                    'simple': {
+                        'ports': ['1234:1234']
+                    }
+                }
+
+            })
+        details = config.ConfigDetails('.', [base_file, override_file])
+
+        config_data = config.load(details)
+        project = Project.from_config(
+            name='composetest', config_data=config_data, client=self.client
+        )
+        project.up()
+        containers = project.containers()
+        self.assertEqual(len(containers), 1)
+
     @v2_only()
     def test_initialize_volumes(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index ccb3bcfe..24ece499 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1912,6 +1912,14 @@ class MergePortsTest(unittest.TestCase, MergeListsTest):
     base_config = ['10:8000', '9000']
     override_config = ['20:8000']
 
+    def test_duplicate_port_mappings(self):
+        service_dict = config.merge_service_dicts(
+            {self.config_name: self.base_config},
+            {self.config_name: self.base_config},
+            DEFAULT_VERSION
+        )
+        assert set(service_dict[self.config_name]) == set(self.base_config)
+
 
 class MergeNetworksTest(unittest.TestCase, MergeListsTest):
     config_name = 'networks'

From c4229b469a7fdf37b84fdd7b911508936f442363 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 19 May 2016 15:42:37 -0700
Subject: [PATCH 1037/1265] Improve merging for several service config
 attributes

All uniqueItems lists in the config now receive the same treatment removing
duplicates.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index e1466f06..97c427b9 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -4,7 +4,6 @@ from __future__ import unicode_literals
 import functools
 import logging
 import ntpath
-import operator
 import os
 import string
 import sys
@@ -744,18 +743,15 @@ def merge_service_dicts(base, override, version):
     md.merge_mapping('ulimits', parse_ulimits)
     md.merge_mapping('networks', parse_networks)
     md.merge_sequence('links', ServiceLink.parse)
-    md.merge_field('ports', merge_port_mappings, default=[])
 
     for field in ['volumes', 'devices']:
         md.merge_field(field, merge_path_mappings)
 
     for field in [
-        'depends_on',
-        'expose',
-        'external_links',
-        'volumes_from',
+        'ports', 'cap_add', 'cap_drop', 'expose', 'external_links',
+        'security_opt', 'volumes_from', 'depends_on',
     ]:
-        md.merge_field(field, operator.add, default=[])
+        md.merge_field(field, merge_unique_items_lists, default=[])
 
     for field in ['dns', 'dns_search', 'env_file', 'tmpfs']:
         md.merge_field(field, merge_list_or_string)
@@ -771,8 +767,8 @@ def merge_service_dicts(base, override, version):
     return dict(md)
 
 
-def merge_port_mappings(base, override):
-    return list(set().union(base, override))
+def merge_unique_items_lists(base, override):
+    return sorted(set().union(base, override))
 
 
 def merge_build(output, base, override):

From a34cd5ed543cbc98b703e83c41e13ea1757ad482 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 19 May 2016 17:26:42 +0100
Subject: [PATCH 1038/1265] Add "disambiguation" page for environment variables

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/environment-variables.md | 107 ++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 docs/environment-variables.md

diff --git a/docs/environment-variables.md b/docs/environment-variables.md
new file mode 100644
index 00000000..a2e74f0a
--- /dev/null
+++ b/docs/environment-variables.md
@@ -0,0 +1,107 @@
+<!--[metadata]>
++++
+title = "Environment variables in Compose"
+description = "How to set, use and manage environment variables in Compose"
+keywords = ["fig, composition, compose, docker, orchestration, environment, variables, env file"]
+[menu.main]
+parent = "workw_compose"
+weight=10
++++
+<![end-metadata]-->
+
+# Environment variables in Compose
+
+There are multiple parts of Compose that deal with environment variables in one sense or another. This page should help you find the information you need.
+
+
+## Substituting environment variables in Compose files
+
+It's possible to use environment variables in your shell to populate values inside a Compose file:
+
+    web:
+      image: "webapp:${TAG}"
+
+For more information, see the [Variable substitution](compose-file.md#variable-substitution) section in the Compose file reference.
+
+
+## Setting environment variables in containers
+
+You can set environment variables in a service's containers with the ['environment' key](compose-file.md#environment), just like with `docker run -e VARIABLE=VALUE ...`:
+
+    web:
+      environment:
+        - DEBUG=1
+
+
+## Passing environment variables through to containers
+
+You can pass environment variables from your shell straight through to a service's containers with the ['environment' key](compose-file.md#environment) by not giving them a value, just like with `docker run -e VARIABLE ...`:
+
+    web:
+      environment:
+        - DEBUG
+
+The value of the `DEBUG` variable in the container will be taken from the value for the same variable in the shell in which Compose is run.
+
+
+## The “env_file” configuration option
+
+You can pass multiple environment variables from an external file through to a service's containers with the ['env_file' option](compose-file.md#env-file), just like with `docker run --env-file=FILE ...`:
+
+    web:
+      env_file:
+        - web-variables.env
+
+
+## Setting environment variables with 'docker-compose run'
+
+Just like with `docker run -e`, you can set environment variables on a one-off container with `docker-compose run -e`:
+
+    $ docker-compose run -e DEBUG=1 web python console.py
+
+You can also pass a variable through from the shell by not giving it a value:
+
+    $ docker-compose run -e DEBUG web python console.py
+
+The value of the `DEBUG` variable in the container will be taken from the value for the same variable in the shell in which Compose is run.
+
+
+## The “.env” file
+
+You can set default values for any environment variables referenced in the Compose file, or used to configure Compose, in an [environment file](env-file.md) named `.env`:
+
+    $ cat .env
+    TAG=v1.5
+
+    $ cat docker-compose.yml
+    version: '2.0'
+    services:
+      web:
+        image: "webapp:${TAG}"
+
+When you run `docker-compose up`, the `web` service defined above uses the image `webapp:v1.5`. You can verify this with the [config command](reference/config.md), which prints your resolved application config to the terminal:
+
+    $ docker-compose config
+    version: '2.0'
+    services:
+      web:
+        image: 'webapp:v1.5'
+
+Values in the shell take precedence over those specified in the `.env` file. If you set `TAG` to a different value in your shell, the substitution in `image` uses that instead:
+
+    $ export TAG=v2.0
+
+    $ docker-compose config
+    version: '2.0'
+    services:
+      web:
+        image: 'webapp:v2.0'
+
+## Configuring Compose using environment variables
+
+Several environment variables are available for you to configure the Docker Compose command-line behaviour. They begin with `COMPOSE_` or `DOCKER_`, and are documented in [CLI Environment Variables](reference/envvars.md).
+
+
+## Environment variables created by links
+
+When using the ['links' option](compose-file.md#links) in a [v1 Compose file](compose-file.md#version-1), environment variables will be created for each link. They are documented in the [Link environment variables reference](link-env-deprecated.md). Please note, however, that these variables are deprecated - you should just use the link alias as a hostname instead.

From c46737ed026055411e1249efc96053ee6acfe37a Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Thu, 26 May 2016 12:44:53 -0700
Subject: [PATCH 1039/1265] remove command completion for `docker-compose rm
 --a`

As `--all|-a` is deprecated, there's no use to suggest it any
more in command completion.

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 2 +-
 contrib/completion/zsh/_docker-compose | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 66747fbd..763cafc4 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -325,7 +325,7 @@ _docker_compose_restart() {
 _docker_compose_rm() {
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--all -a --force -f --help -v" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--force -f --help -v" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_stopped
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index ec9cb682..0da217dc 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -281,7 +281,6 @@ __docker-compose_subcommand() {
         (rm)
             _arguments \
                 $opts_help \
-                '(-a --all)'{-a,--all}"[Also remove one-off containers]" \
                 '(-f --force)'{-f,--force}"[Don't ask to confirm removal]" \
                 '-v[Remove volumes associated with containers]' \
                 '*:stopped services:__docker-compose_stoppedservices' && ret=0

From e3e8a619cce64a127df7d7962a2694116914b566 Mon Sep 17 00:00:00 2001
From: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
Date: Fri, 27 May 2016 07:48:13 +0200
Subject: [PATCH 1040/1265] Fix #3281: Unexpected result when using build args
 with default values

Fix the issue when build arg is set to None instead of empty string.
Usecase:

cat docker-compose.yml
....
args:
- http_proxy
- https_proxy
- no_proxy

If http_proxy, https_proxy, no_proxy environment variables are not defined
then http_proxy, https_proxy, no_proxy build args will be set to string None which breaks all downloads

With this change build args will not passed to docker engine if they are equal to string None

Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
---
 compose/service.py         |  8 +++++++-
 tests/unit/service_test.py | 30 ++++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 8b9f64f0..64a46453 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -701,6 +701,12 @@ class Service(object):
 
         build_opts = self.options.get('build', {})
         path = build_opts.get('context')
+        # If build argument is not defined and there is no environment variable
+        # with the same name then build argument value will be None
+        # Moreover it will be sent to the docker engine as None and then
+        # interpreted as string None which in many cases will fail the build
+        # That is why we filter out all pairs with value equal to None
+        buildargs = {k: v for k, v in build_opts.get('args', {}).items() if v != 'None'}
         # python2 os.path() doesn't support unicode, so we need to encode it to
         # a byte string
         if not six.PY3:
@@ -715,7 +721,7 @@ class Service(object):
             pull=pull,
             nocache=no_cache,
             dockerfile=build_opts.get('dockerfile', None),
-            buildargs=build_opts.get('args', None),
+            buildargs=buildargs,
         )
 
         try:
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index a259c476..ae2cab20 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -445,7 +445,7 @@ class ServiceTest(unittest.TestCase):
             forcerm=False,
             nocache=False,
             rm=True,
-            buildargs=None,
+            buildargs={},
         )
 
     def test_ensure_image_exists_no_build(self):
@@ -481,7 +481,33 @@ class ServiceTest(unittest.TestCase):
             forcerm=False,
             nocache=False,
             rm=True,
-            buildargs=None,
+            buildargs={},
+        )
+
+    def test_ensure_filter_out_empty_build_args(self):
+        args = {u'no_proxy': 'None', u'https_proxy': 'something'}
+        service = Service('foo',
+                          client=self.mock_client,
+                          build={'context': '.', 'args': args})
+        self.mock_client.inspect_image.return_value = {'Id': 'abc123'}
+        self.mock_client.build.return_value = [
+            '{"stream": "Successfully built abcd"}',
+        ]
+
+        with mock.patch('compose.service.log', autospec=True) as mock_log:
+            service.ensure_image_exists(do_build=BuildAction.force)
+
+        assert not mock_log.warn.called
+        self.mock_client.build.assert_called_once_with(
+            tag='default_foo',
+            dockerfile=None,
+            stream=True,
+            path='.',
+            pull=False,
+            forcerm=False,
+            nocache=False,
+            rm=True,
+            buildargs={u'https_proxy': 'something'},
         )
 
     def test_build_does_not_pull(self):

From 1298b9aa5d8d9f7b99c2f1130a3d3661bbda2c16 Mon Sep 17 00:00:00 2001
From: Denis Makogon <lildee1991@gmail.com>
Date: Tue, 24 May 2016 15:16:36 +0300
Subject: [PATCH 1041/1265] Issue-3503: Improve timestamp validation in tests

 CLITestCase.test_events_human_readable fails due to
 wrong assumption that host where tests were launched
 will have the same date time as Docker daemon.

 This fix introduces internal method for validating
 timestamp in Docker logs

Signed-off-by: Denys Makogon <lildee1991@gmail.com>
---
 tests/acceptance/cli_test.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index dfd75625..4efaf0cf 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1473,6 +1473,17 @@ class CLITestCase(DockerClientTestCase):
         assert Counter(e['action'] for e in lines) == {'create': 2, 'start': 2}
 
     def test_events_human_readable(self):
+
+        def has_timestamp(string):
+            str_iso_date, str_iso_time, container_info = string.split(' ', 2)
+            try:
+                return isinstance(datetime.datetime.strptime(
+                    '%s %s' % (str_iso_date, str_iso_time),
+                    '%Y-%m-%d %H:%M:%S.%f'),
+                    datetime.datetime)
+            except ValueError:
+                return False
+
         events_proc = start_process(self.base_dir, ['events'])
         self.dispatch(['up', '-d', 'simple'])
         wait_on_condition(ContainerCountCondition(self.project, 1))
@@ -1489,7 +1500,8 @@ class CLITestCase(DockerClientTestCase):
 
         assert expected_template.format('create', container.id) in lines[0]
         assert expected_template.format('start', container.id) in lines[1]
-        assert lines[0].startswith(datetime.date.today().isoformat())
+
+        assert has_timestamp(lines[0])
 
     def test_env_file_relative_to_compose_file(self):
         config_path = os.path.abspath('tests/fixtures/env-file/docker-compose.yml')

From c148849f0e219ff61a7a29164fd88c113faf7ef3 Mon Sep 17 00:00:00 2001
From: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
Date: Fri, 27 May 2016 19:59:27 +0200
Subject: [PATCH 1042/1265] Fix #3281: Unexpected result when using build args
 with default values

Fix the issue when build arg is set to None instead of empty string. Usecase:

cat docker-compose.yml
.... args:
- http_proxy
- https_proxy
- no_proxy

If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads

With this change undefined build args will be set to empty string instead of string None

Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
---
 compose/service.py               |  8 +-------
 compose/utils.py                 |  2 +-
 tests/unit/config/config_test.py |  2 +-
 tests/unit/service_test.py       | 30 ++----------------------------
 4 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 64a46453..8b9f64f0 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -701,12 +701,6 @@ class Service(object):
 
         build_opts = self.options.get('build', {})
         path = build_opts.get('context')
-        # If build argument is not defined and there is no environment variable
-        # with the same name then build argument value will be None
-        # Moreover it will be sent to the docker engine as None and then
-        # interpreted as string None which in many cases will fail the build
-        # That is why we filter out all pairs with value equal to None
-        buildargs = {k: v for k, v in build_opts.get('args', {}).items() if v != 'None'}
         # python2 os.path() doesn't support unicode, so we need to encode it to
         # a byte string
         if not six.PY3:
@@ -721,7 +715,7 @@ class Service(object):
             pull=pull,
             nocache=no_cache,
             dockerfile=build_opts.get('dockerfile', None),
-            buildargs=buildargs,
+            buildargs=build_opts.get('args', None),
         )
 
         try:
diff --git a/compose/utils.py b/compose/utils.py
index 494beea3..1e01fcb6 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -95,4 +95,4 @@ def microseconds_from_time_nano(time_nano):
 
 
 def build_string_dict(source_dict):
-    return dict((k, str(v)) for k, v in source_dict.items())
+    return dict((k, str(v if v else '')) for k, v in source_dict.items())
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 24ece499..3e5a7fac 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -715,7 +715,7 @@ class ConfigTest(unittest.TestCase):
         ).services[0]
         assert 'args' in service['build']
         assert 'foo' in service['build']['args']
-        assert service['build']['args']['foo'] == 'None'
+        assert service['build']['args']['foo'] == ''
 
     def test_load_with_multiple_files_mismatched_networks_format(self):
         base_file = config.ConfigFile(
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index ae2cab20..a259c476 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -445,7 +445,7 @@ class ServiceTest(unittest.TestCase):
             forcerm=False,
             nocache=False,
             rm=True,
-            buildargs={},
+            buildargs=None,
         )
 
     def test_ensure_image_exists_no_build(self):
@@ -481,33 +481,7 @@ class ServiceTest(unittest.TestCase):
             forcerm=False,
             nocache=False,
             rm=True,
-            buildargs={},
-        )
-
-    def test_ensure_filter_out_empty_build_args(self):
-        args = {u'no_proxy': 'None', u'https_proxy': 'something'}
-        service = Service('foo',
-                          client=self.mock_client,
-                          build={'context': '.', 'args': args})
-        self.mock_client.inspect_image.return_value = {'Id': 'abc123'}
-        self.mock_client.build.return_value = [
-            '{"stream": "Successfully built abcd"}',
-        ]
-
-        with mock.patch('compose.service.log', autospec=True) as mock_log:
-            service.ensure_image_exists(do_build=BuildAction.force)
-
-        assert not mock_log.warn.called
-        self.mock_client.build.assert_called_once_with(
-            tag='default_foo',
-            dockerfile=None,
-            stream=True,
-            path='.',
-            pull=False,
-            forcerm=False,
-            nocache=False,
-            rm=True,
-            buildargs={u'https_proxy': 'something'},
+            buildargs=None,
         )
 
     def test_build_does_not_pull(self):

From 90fba58df9caf98b3d1573dbeba34e8d7858d188 Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Fri, 27 May 2016 21:29:47 +0000
Subject: [PATCH 1043/1265] Fix links

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 docs/gettingstarted.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md
index 60482bce..ff944177 100644
--- a/docs/gettingstarted.md
+++ b/docs/gettingstarted.md
@@ -137,8 +137,8 @@ The `redis` service uses the latest public [Redis](https://registry.hub.docker.c
 2. Enter `http://0.0.0.0:5000/` in a browser to see the application running.
 
    If you're using Docker on Linux natively, then the web app should now be
-   listening on port 5000 on your Docker daemon host. If http://0.0.0.0:5000
-   doesn't resolve, you can also try http://localhost:5000.
+   listening on port 5000 on your Docker daemon host. If `http://0.0.0.0:5000`
+   doesn't resolve, you can also try `http://localhost:5000`.
 
    If you're using Docker Machine on a Mac, use `docker-machine ip MACHINE_VM` to get
    the IP address of your Docker host. Then, `open http://MACHINE_VM_IP:5000` in a

From a67ba5536db72203b22fc989b91f54f598e1d1f9 Mon Sep 17 00:00:00 2001
From: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
Date: Sat, 28 May 2016 11:39:41 +0200
Subject: [PATCH 1044/1265] Fix #3281: Unexpected result when using build args
 with default values

Fix the issue when build arg is set to None instead of empty string. Usecase:

cat docker-compose.yml
  .... args:
  - http_proxy
  - https_proxy
  - no_proxy

If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads

With this change undefined build args will be set to empty string instead of string None

Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
---
 compose/utils.py                 |  2 +-
 tests/unit/config/config_test.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/compose/utils.py b/compose/utils.py
index 1e01fcb6..925a8e79 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -95,4 +95,4 @@ def microseconds_from_time_nano(time_nano):
 
 
 def build_string_dict(source_dict):
-    return dict((k, str(v if v else '')) for k, v in source_dict.items())
+    return dict((k, str(v if v is not None else '')) for k, v in source_dict.items())
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 3e5a7fac..0abb8dae 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -717,6 +717,34 @@ class ConfigTest(unittest.TestCase):
         assert 'foo' in service['build']['args']
         assert service['build']['args']['foo'] == ''
 
+    # If build argument is None then it will be converted to the empty
+    # string. Make sure that int zero kept as it is, i.e. not converted to
+    # the empty string
+    def test_build_args_check_zero_preserved(self):
+        service = config.load(
+            build_config_details(
+                {
+                    'version': '2',
+                    'services': {
+                        'web': {
+                            'build': {
+                                'context': '.',
+                                'dockerfile': 'Dockerfile-alt',
+                                'args': {
+                                    'foo': 0
+                                }
+                            }
+                        }
+                    }
+                },
+                'tests/fixtures/extends',
+                'filename.yml'
+            )
+        ).services[0]
+        assert 'args' in service['build']
+        assert 'foo' in service['build']['args']
+        assert service['build']['args']['foo'] == '0'
+
     def test_load_with_multiple_files_mismatched_networks_format(self):
         base_file = config.ConfigFile(
             'base.yaml',

From dd3590180da36f5359d6463003b49ea2fca90315 Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Tue, 31 May 2016 21:18:42 +0000
Subject: [PATCH 1045/1265] more fixes

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 docs/Dockerfile             |  4 ++--
 docs/Makefile               | 27 +++++----------------------
 docs/django.md              |  4 ++--
 docs/gettingstarted.md      |  2 +-
 docs/link-env-deprecated.md |  6 +++---
 docs/overview.md            |  4 ++--
 docs/production.md          |  4 ++--
 docs/rails.md               |  4 ++--
 docs/swarm.md               |  4 ++--
 9 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/docs/Dockerfile b/docs/Dockerfile
index 86ed32bc..7b5a3b24 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -1,8 +1,8 @@
 FROM docs/base:oss
-MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)
+MAINTAINER Docker Docs <docs@docker.com>
 
 ENV PROJECT=compose
 # To get the git info for this repo
 COPY . /src
-RUN rm -r /docs/content/$PROJECT/
+RUN rm -rf /docs/content/$PROJECT/
 COPY . /docs/content/$PROJECT/
diff --git a/docs/Makefile b/docs/Makefile
index b9ef0548..e6629289 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,17 +1,4 @@
-.PHONY: all binary build cross default docs docs-build docs-shell shell test test-unit test-integration test-integration-cli test-docker-py validate
-
-# env vars passed through directly to Docker's build scripts
-# to allow things like `make DOCKER_CLIENTONLY=1 binary` easily
-# `docs/sources/contributing/devenvironment.md ` and `project/PACKAGERS.md` have some limited documentation of some of these
-DOCKER_ENVS := \
-	-e BUILDFLAGS \
-	-e DOCKER_CLIENTONLY \
-	-e DOCKER_EXECDRIVER \
-	-e DOCKER_GRAPHDRIVER \
-	-e TESTDIRS \
-	-e TESTFLAGS \
-	-e TIMEOUT
-# note: we _cannot_ add "-e DOCKER_BUILDTAGS" here because even if it's unset in the shell, that would shadow the "ENV DOCKER_BUILDTAGS" set in our Dockerfile, which is very important for our official builds
+.PHONY: all default docs docs-build docs-shell shell test
 
 # to allow `make DOCSDIR=1 docs-shell` (to create a bind mount in docs)
 DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR):/docs/content/compose)
@@ -25,9 +12,8 @@ HUGO_BASE_URL=$(shell test -z "$(DOCKER_IP)" && echo localhost || echo "$(DOCKER
 HUGO_BIND_IP=0.0.0.0
 
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
-DOCKER_IMAGE := docker$(if $(GIT_BRANCH),:$(GIT_BRANCH))
-DOCKER_DOCS_IMAGE := docs-base$(if $(GIT_BRANCH),:$(GIT_BRANCH))
-
+GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
+DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN))
 
 DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e AWS_S3_BUCKET -e NOCACHE
 
@@ -42,14 +28,11 @@ docs: docs-build
 docs-draft: docs-build
 	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --buildDrafts="true" --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)
 
-
 docs-shell: docs-build
 	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash
 
+test: docs-build
+	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)"
 
 docs-build:
-#	( git remote | grep -v upstream ) || git diff --name-status upstream/release..upstream/docs ./ > ./changed-files
-#	echo "$(GIT_BRANCH)" > GIT_BRANCH
-#	echo "$(AWS_S3_BUCKET)" > AWS_S3_BUCKET
-#	echo "$(GITCOMMIT)" > GITCOMMIT
 	docker build -t "$(DOCKER_DOCS_IMAGE)" .
diff --git a/docs/django.md b/docs/django.md
index 6a222697..b4bcee97 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -29,8 +29,8 @@ and a `docker-compose.yml` file.
     The Dockerfile defines an application's image content via one or more build
     commands that configure that image. Once built, you can run the image in a
     container.  For more information on `Dockerfiles`, see the [Docker user
-    guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile)
-    and the [Dockerfile reference](https://docs.docker.com/engine/reference/builder/).
+    guide](/engine/userguide/containers/dockerimages.md#building-an-image-from-a-dockerfile)
+    and the [Dockerfile reference](/engine/reference/builder.md).
 
 3. Add the following content to the `Dockerfile`.
 
diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md
index ff944177..8c706e4f 100644
--- a/docs/gettingstarted.md
+++ b/docs/gettingstarted.md
@@ -77,7 +77,7 @@ dependencies the Python application requires, including Python itself.
   * Install the Python dependencies.
   * Set the default command for the container to `python app.py`
 
-  For more information on how to write Dockerfiles, see the [Docker user guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](http://docs.docker.com/reference/builder/).
+  For more information on how to write Dockerfiles, see the [Docker user guide](/engine/userguide/containers/dockerimages.md#building-an-image-from-a-dockerfile) and the [Dockerfile reference](/engine/reference/builder.md).
 
 2. Build the image.
 
diff --git a/docs/link-env-deprecated.md b/docs/link-env-deprecated.md
index 55ba5f2d..b1f01b3b 100644
--- a/docs/link-env-deprecated.md
+++ b/docs/link-env-deprecated.md
@@ -16,7 +16,9 @@ weight=89
 >
 > Environment variables will only be populated if you're using the [legacy version 1 Compose file format](compose-file.md#versioning).
 
-Compose uses [Docker links] to expose services' containers to one another. Each linked container injects a set of environment variables, each of which begins with the uppercase name of the container.
+Compose uses [Docker links](/engine/userguide/networking/default_network/dockerlinks.md)
+to expose services' containers to one another. Each linked container injects a set of
+environment variables, each of which begins with the uppercase name of the container.
 
 To see what environment variables are available to a service, run `docker-compose run SERVICE env`.
 
@@ -38,8 +40,6 @@ Protocol (tcp or udp), e.g. `DB_PORT_5432_TCP_PROTO=tcp`
 <b><i>name</i>\_NAME</b><br>
 Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
 
-[Docker links]: https://docs.docker.com/engine/userguide/networking/default_network/dockerlinks/
-
 ## Related Information
 
 - [User guide](index.md)
diff --git a/docs/overview.md b/docs/overview.md
index 03ade356..ef07a45b 100644
--- a/docs/overview.md
+++ b/docs/overview.md
@@ -159,8 +159,8 @@ and destroy isolated testing environments for your test suite. By defining the f
 
 Compose has traditionally been focused on development and testing workflows,
 but with each release we're making progress on more production-oriented features. You can use Compose to deploy to a remote Docker Engine. The Docker Engine may be a single instance provisioned with
-[Docker Machine](https://docs.docker.com/machine/) or an entire
-[Docker Swarm](https://docs.docker.com/swarm/) cluster.
+[Docker Machine](/machine/overview.md) or an entire
+[Docker Swarm](/swarm/overview.md) cluster.
 
 For details on using production-oriented features, see
 [compose in production](production.md) in this documentation.
diff --git a/docs/production.md b/docs/production.md
index 9acf64e5..cfb87293 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -65,7 +65,7 @@ recreating any services which `web` depends on.
 You can use Compose to deploy an app to a remote Docker host by setting the
 `DOCKER_HOST`, `DOCKER_TLS_VERIFY`, and `DOCKER_CERT_PATH` environment variables
 appropriately. For tasks like this,
-[Docker Machine](/machine/overview) makes managing local and
+[Docker Machine](/machine/overview.md) makes managing local and
 remote Docker hosts very easy, and is recommended even if you're not deploying
 remotely.
 
@@ -74,7 +74,7 @@ commands will work with no further configuration.
 
 ### Running Compose on a Swarm cluster
 
-[Docker Swarm](/swarm/overview), a Docker-native clustering
+[Docker Swarm](/swarm/overview.md), a Docker-native clustering
 system, exposes the same API as a single Docker host, which means you can use
 Compose against a Swarm instance and run your apps across multiple hosts.
 
diff --git a/docs/rails.md b/docs/rails.md
index eef6b2f4..f54d8286 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -32,7 +32,7 @@ Dockerfile consists of:
 
 That'll put your application code inside an image that will build a container
 with Ruby, Bundler and all your dependencies inside it. For more information on
-how to write Dockerfiles, see the [Docker user guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](https://docs.docker.com/engine/reference/builder/).
+how to write Dockerfiles, see the [Docker user guide](/engine/userguide/containers/dockerimages.md#building-an-image-from-a-dockerfile) and the [Dockerfile reference](/engine/reference/builder.md).
 
 Next, create a bootstrap `Gemfile` which just loads Rails. It'll be overwritten in a moment by `rails new`.
 
@@ -152,7 +152,7 @@ Finally, you need to create the database. In another terminal, run:
 
     $ docker-compose run web rake db:create
 
-That's it. Your app should now be running on port 3000 on your Docker daemon. If you're using [Docker Machine](https://docs.docker.com/machine/), then `docker-machine ip MACHINE_VM` returns the Docker host IP address.
+That's it. Your app should now be running on port 3000 on your Docker daemon. If you're using [Docker Machine](/machine/overview.md), then `docker-machine ip MACHINE_VM` returns the Docker host IP address.
 
 ![Rails example](images/rails-welcome.png)
 
diff --git a/docs/swarm.md b/docs/swarm.md
index ece72193..bbab6908 100644
--- a/docs/swarm.md
+++ b/docs/swarm.md
@@ -11,7 +11,7 @@ parent="workw_compose"
 
 # Using Compose with Swarm
 
-Docker Compose and [Docker Swarm](/swarm/overview) aim to have full integration, meaning
+Docker Compose and [Docker Swarm](/swarm/overview.md) aim to have full integration, meaning
 you can point a Compose app at a Swarm cluster and have it all just work as if
 you were using a single Docker host.
 
@@ -30,7 +30,7 @@ format](compose-file.md#versioning) you are using:
       or a custom driver which supports multi-host networking.
 
 Read [Get started with multi-host networking](https://docs.docker.com/engine/userguide/networking/get-started-overlay/) to see how to
-set up a Swarm cluster with [Docker Machine](/machine/overview) and the overlay driver. Once you've got it running, deploying your app to it should be as simple as:
+set up a Swarm cluster with [Docker Machine](/machine/overview.md) and the overlay driver. Once you've got it running, deploying your app to it should be as simple as:
 
     $ eval "$(docker-machine env --swarm <name of swarm master machine>)"
     $ docker-compose up

From ea640f38217e5d3796bbca49a5a1870582139d8d Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 17 May 2016 16:32:54 -0700
Subject: [PATCH 1046/1265] Remove external_name from serialized config output

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/serialize.py  |  6 +++++-
 tests/acceptance/cli_test.py | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/compose/config/serialize.py b/compose/config/serialize.py
index 1b498c01..52de77b8 100644
--- a/compose/config/serialize.py
+++ b/compose/config/serialize.py
@@ -27,11 +27,15 @@ def serialize_config(config):
         service_dict.pop('name'): service_dict
         for service_dict in denormalized_services
     }
+    networks = config.networks.copy()
+    for net_name, net_conf in networks.items():
+        if 'external_name' in net_conf:
+            del net_conf['external_name']
 
     output = {
         'version': V2_0,
         'services': services,
-        'networks': config.networks,
+        'networks': networks,
         'volumes': config.volumes,
     }
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index a02d0e99..6bb111ef 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -224,6 +224,20 @@ class CLITestCase(DockerClientTestCase):
             'volumes': {},
         }
 
+    def test_config_external_network(self):
+        self.base_dir = 'tests/fixtures/networks'
+        result = self.dispatch(['-f', 'external-networks.yml', 'config'])
+        json_result = yaml.load(result.stdout)
+        assert 'networks' in json_result
+        assert json_result['networks'] == {
+            'networks_foo': {
+                'external': True  # {'name': 'networks_foo'}
+            },
+            'bar': {
+                'external': {'name': 'networks_bar'}
+            }
+        }
+
     def test_config_v1(self):
         self.base_dir = 'tests/fixtures/v1-config'
         result = self.dispatch(['config'])

From 9ddb7f3c90b64ab801f770b54eab5be569d142f6 Mon Sep 17 00:00:00 2001
From: Adam Chainz <adam@adamj.eu>
Date: Wed, 8 Jun 2016 03:51:03 +0100
Subject: [PATCH 1047/1265] Convert readthedocs links for their .org -> .io
 migration for hosted projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.

Signed-off-by: Adam Chainz <adam@adamj.eu>
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 50e58ddc..16bccf98 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,7 +35,7 @@ that should get you started.
 This step is optional, but recommended. Pre-commit hooks will run style checks
 and in some cases fix style issues for you, when you commit code.
 
-Install the git pre-commit hooks using [tox](https://tox.readthedocs.org) by
+Install the git pre-commit hooks using [tox](https://tox.readthedocs.io) by
 running `tox -e pre-commit` or by following the
 [pre-commit install guide](http://pre-commit.com/#install).
 

From 0287486b14b7b75d0544a029f188a21e972cc8ea Mon Sep 17 00:00:00 2001
From: David Beitey <david@davidjb.com>
Date: Thu, 9 Jun 2016 16:58:34 +1000
Subject: [PATCH 1048/1265] Fix minor YAML typo

Signed-off-by: David Beitey <david@davidjb.com>
---
 docs/compose-file.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index b55f250a..501269b7 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -796,7 +796,7 @@ called `data` and mount it into the `db` service's containers.
 You can also specify the name of the volume separately from the name used to
 refer to it within the Compose file:
 
-    volumes
+    volumes:
       data:
         external:
           name: actual-name-of-volume

From 61324ef30839bdcf99e20e0de2a4bb029e189166 Mon Sep 17 00:00:00 2001
From: Sander Maijers <S.N.Maijers@gmail.com>
Date: Fri, 10 Jun 2016 16:30:46 +0200
Subject: [PATCH 1049/1265] Fix byte/str typing error

Signed-off-by: Sander Maijers <S.N.Maijers@gmail.com>
---
 compose/cli/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index b58b50ef..cc2b680d 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -49,7 +49,7 @@ def input(prompt):
     """
     sys.stdout.write(prompt)
     sys.stdout.flush()
-    return sys.stdin.readline().rstrip(b'\n')
+    return sys.stdin.readline().rstrip('\n')
 
 
 def call_silently(*args, **kwargs):

From 60f7e021ada69b4bdfce397eb2153c6c35eb2428 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 13 Jun 2016 15:32:10 -0700
Subject: [PATCH 1050/1265] Fix split_path_mapping behavior when mounting "/"

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py         | 7 ++++---
 tests/unit/config/config_test.py | 7 +++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 97c427b9..7a2b3d36 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -940,9 +940,10 @@ def split_path_mapping(volume_path):
     path. Using splitdrive so windows absolute paths won't cause issues with
     splitting on ':'.
     """
-    # splitdrive has limitations when it comes to relative paths, so when it's
-    # relative, handle special case to set the drive to ''
-    if volume_path.startswith('.') or volume_path.startswith('~'):
+    # splitdrive is very naive, so handle special cases where we can be sure
+    # the first character is not a drive.
+    if (volume_path.startswith('.') or volume_path.startswith('~') or
+            volume_path.startswith('/')):
         drive, volume_config = '', volume_path
     else:
         drive, volume_config = ntpath.splitdrive(volume_path)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 24ece499..89c424a4 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -2682,6 +2682,13 @@ class VolumePathTest(unittest.TestCase):
         mapping = config.split_path_mapping('{0}:{1}'.format(host_path, container_path))
         assert mapping == expected_mapping
 
+    def test_split_path_mapping_with_root_mount(self):
+        host_path = '/'
+        container_path = '/var/hostroot'
+        expected_mapping = (container_path, host_path)
+        mapping = config.split_path_mapping('{0}:{1}'.format(host_path, container_path))
+        assert mapping == expected_mapping
+
 
 @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class BuildPathTest(unittest.TestCase):

From 68d73183ebcc9db5676d15cdf61ee1494242d099 Mon Sep 17 00:00:00 2001
From: alex <astac1@umbc.edu>
Date: Mon, 13 Jun 2016 23:36:34 -0400
Subject: [PATCH 1051/1265] Fix a typo in a test's name.

---
 tests/integration/service_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index df50d513..1b21e1e9 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -593,12 +593,12 @@ class ServiceTest(DockerClientTestCase):
         service.build()
         assert service.image()
 
-    def test_start_container_stays_unpriviliged(self):
+    def test_start_container_stays_unprivileged(self):
         service = self.create_service('web')
         container = create_and_start_container(service).inspect()
         self.assertEqual(container['HostConfig']['Privileged'], False)
 
-    def test_start_container_becomes_priviliged(self):
+    def test_start_container_becomes_privileged(self):
         service = self.create_service('web', privileged=True)
         container = create_and_start_container(service).inspect()
         self.assertEqual(container['HostConfig']['Privileged'], True)

From 1ea9dda1d3b1db1d2bcb248b4e4eb57a26a06fd4 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 10 May 2016 16:14:54 +0100
Subject: [PATCH 1052/1265] Implement 'docker-compose push' and 'docker-compose
 bundle'

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 .dockerignore               |   1 +
 compose/bundle.py           | 186 ++++++++++++++++++++++++++++++++++++
 compose/cli/command.py      |  10 ++
 compose/cli/main.py         |  60 +++++++++---
 compose/config/serialize.py |   8 +-
 compose/progress_stream.py  |  19 ++++
 compose/project.py          |   4 +
 compose/service.py          |  28 ++++--
 8 files changed, 296 insertions(+), 20 deletions(-)
 create mode 100644 compose/bundle.py

diff --git a/.dockerignore b/.dockerignore
index 055ae7ed..e79da862 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,3 +7,4 @@ coverage-html
 docs/_site
 venv
 .tox
+dist
diff --git a/compose/bundle.py b/compose/bundle.py
new file mode 100644
index 00000000..a6d0d2d1
--- /dev/null
+++ b/compose/bundle.py
@@ -0,0 +1,186 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import json
+import logging
+
+import six
+from docker.utils.ports import split_port
+
+from .cli.errors import UserError
+from .config.serialize import denormalize_config
+from .network import get_network_defs_for_service
+from .service import NoSuchImageError
+from .service import parse_repository_tag
+
+
+log = logging.getLogger(__name__)
+
+
+SERVICE_KEYS = {
+    'command': 'Command',
+    'environment': 'Env',
+    'working_dir': 'WorkingDir',
+}
+
+
+VERSION = '0.1'
+
+
+def serialize_bundle(config, image_digests):
+    if config.networks:
+        log.warn("Unsupported top level key 'networks' - ignoring")
+
+    if config.volumes:
+        log.warn("Unsupported top level key 'volumes' - ignoring")
+
+    return json.dumps(
+        to_bundle(config, image_digests),
+        indent=2,
+        sort_keys=True,
+    )
+
+
+def get_image_digests(project):
+    return {
+        service.name: get_image_digest(service)
+        for service in project.services
+    }
+
+
+def get_image_digest(service):
+    if 'image' not in service.options:
+        raise UserError(
+            "Service '{s.name}' doesn't define an image tag. An image name is "
+            "required to generate a proper image digest for the bundle. Specify "
+            "an image repo and tag with the 'image' option.".format(s=service))
+
+    repo, tag, separator = parse_repository_tag(service.options['image'])
+    # Compose file already uses a digest, no lookup required
+    if separator == '@':
+        return service.options['image']
+
+    try:
+        image = service.image()
+    except NoSuchImageError:
+        action = 'build' if 'build' in service.options else 'pull'
+        raise UserError(
+            "Image not found for service '{service}'. "
+            "You might need to run `docker-compose {action} {service}`."
+            .format(service=service.name, action=action))
+
+    if image['RepoDigests']:
+        # TODO: pick a digest based on the image tag if there are multiple
+        # digests
+        return image['RepoDigests'][0]
+
+    if 'build' not in service.options:
+        log.warn(
+            "Compose needs to pull the image for '{s.name}' in order to create "
+            "a bundle. This may result in a more recent image being used. "
+            "It is recommended that you use an image tagged with a "
+            "specific version to minimize the potential "
+            "differences.".format(s=service))
+        digest = service.pull()
+    else:
+        try:
+            digest = service.push()
+        except:
+            log.error(
+                "Failed to push image for service '{s.name}'. Please use an "
+                "image tag that can be pushed to a Docker "
+                "registry.".format(s=service))
+            raise
+
+    if not digest:
+        raise ValueError("Failed to get digest for %s" % service.name)
+
+    identifier = '{repo}@{digest}'.format(repo=repo, digest=digest)
+
+    # Pull by digest so that image['RepoDigests'] is populated for next time
+    # and we don't have to pull/push again
+    service.client.pull(identifier)
+
+    return identifier
+
+
+def to_bundle(config, image_digests):
+    config = denormalize_config(config)
+
+    return {
+        'version': VERSION,
+        'services': {
+            name: convert_service_to_bundle(
+                name,
+                service_dict,
+                image_digests[name],
+            )
+            for name, service_dict in config['services'].items()
+        },
+    }
+
+
+def convert_service_to_bundle(name, service_dict, image_id):
+    container_config = {'Image': image_id}
+
+    for key, value in service_dict.items():
+        if key in ('build', 'image', 'ports', 'expose', 'networks'):
+            pass
+        elif key == 'environment':
+            container_config['env'] = {
+                envkey: envvalue for envkey, envvalue in value.items()
+                if envvalue
+            }
+        elif key in SERVICE_KEYS:
+            container_config[SERVICE_KEYS[key]] = value
+        else:
+            log.warn("Unsupported key '{}' in services.{} - ignoring".format(key, name))
+
+    container_config['Networks'] = make_service_networks(name, service_dict)
+
+    ports = make_port_specs(service_dict)
+    if ports:
+        container_config['Ports'] = ports
+
+    return container_config
+
+
+def make_service_networks(name, service_dict):
+    networks = []
+
+    for network_name, network_def in get_network_defs_for_service(service_dict).items():
+        for key in network_def.keys():
+            log.warn(
+                "Unsupported key '{}' in services.{}.networks.{} - ignoring"
+                .format(key, name, network_name))
+
+        networks.append(network_name)
+
+    return networks
+
+
+def make_port_specs(service_dict):
+    ports = []
+
+    internal_ports = [
+        internal_port
+        for port_def in service_dict.get('ports', [])
+        for internal_port in split_port(port_def)[0]
+    ]
+
+    internal_ports += service_dict.get('expose', [])
+
+    for internal_port in internal_ports:
+        spec = make_port_spec(internal_port)
+        if spec not in ports:
+            ports.append(spec)
+
+    return ports
+
+
+def make_port_spec(value):
+    components = six.text_type(value).partition('/')
+    return {
+        'Protocol': components[2] or 'tcp',
+        'Port': int(components[0]),
+    }
diff --git a/compose/cli/command.py b/compose/cli/command.py
index 8ac3aff4..44112fce 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -35,6 +35,16 @@ def project_from_options(project_dir, options):
     )
 
 
+def get_config_from_options(base_dir, options):
+    environment = Environment.from_env_file(base_dir)
+    config_path = get_config_path_from_options(
+        base_dir, options, environment
+    )
+    return config.load(
+        config.find(base_dir, config_path, environment)
+    )
+
+
 def get_config_path_from_options(base_dir, options, environment):
     file_option = options.get('--file')
     if file_option:
diff --git a/compose/cli/main.py b/compose/cli/main.py
index afde7150..3e440463 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -14,10 +14,10 @@ from operator import attrgetter
 from . import errors
 from . import signals
 from .. import __version__
-from ..config import config
+from ..bundle import get_image_digests
+from ..bundle import serialize_bundle
 from ..config import ConfigurationError
 from ..config import parse_environment
-from ..config.environment import Environment
 from ..config.serialize import serialize_config
 from ..const import DEFAULT_TIMEOUT
 from ..const import IS_WINDOWS_PLATFORM
@@ -30,7 +30,7 @@ from ..service import BuildError
 from ..service import ConvergenceStrategy
 from ..service import ImageType
 from ..service import NeedsBuildError
-from .command import get_config_path_from_options
+from .command import get_config_from_options
 from .command import project_from_options
 from .docopt_command import DocoptDispatcher
 from .docopt_command import get_handler
@@ -98,7 +98,7 @@ def perform_command(options, handler, command_options):
         handler(command_options)
         return
 
-    if options['COMMAND'] == 'config':
+    if options['COMMAND'] in ('config', 'bundle'):
         command = TopLevelCommand(None)
         handler(command, options, command_options)
         return
@@ -164,6 +164,7 @@ class TopLevelCommand(object):
 
     Commands:
       build              Build or rebuild services
+      bundle             Generate a Docker bundle from the Compose file
       config             Validate and view the compose file
       create             Create services
       down               Stop and remove containers, networks, images, and volumes
@@ -176,6 +177,7 @@ class TopLevelCommand(object):
       port               Print the public port for a port binding
       ps                 List containers
       pull               Pulls service images
+      push               Push service images
       restart            Restart services
       rm                 Remove stopped containers
       run                Run a one-off command
@@ -212,6 +214,34 @@ class TopLevelCommand(object):
             pull=bool(options.get('--pull', False)),
             force_rm=bool(options.get('--force-rm', False)))
 
+    def bundle(self, config_options, options):
+        """
+        Generate a Docker bundle from the Compose file.
+
+        Local images will be pushed to a Docker registry, and remote images
+        will be pulled to fetch an image digest.
+
+        Usage: bundle [options]
+
+        Options:
+            -o, --output PATH          Path to write the bundle file to.
+                                       Defaults to "<project name>.dsb".
+        """
+        self.project = project_from_options('.', config_options)
+        compose_config = get_config_from_options(self.project_dir, config_options)
+
+        output = options["--output"]
+        if not output:
+            output = "{}.dsb".format(self.project.name)
+
+        with errors.handle_connection_errors(self.project.client):
+            image_digests = get_image_digests(self.project)
+
+        with open(output, 'w') as f:
+            f.write(serialize_bundle(compose_config, image_digests))
+
+        log.info("Wrote bundle to {}".format(output))
+
     def config(self, config_options, options):
         """
         Validate and view the compose file.
@@ -224,13 +254,7 @@ class TopLevelCommand(object):
             --services      Print the service names, one per line.
 
         """
-        environment = Environment.from_env_file(self.project_dir)
-        config_path = get_config_path_from_options(
-            self.project_dir, config_options, environment
-        )
-        compose_config = config.load(
-            config.find(self.project_dir, config_path, environment)
-        )
+        compose_config = get_config_from_options(self.project_dir, config_options)
 
         if options['--quiet']:
             return
@@ -518,6 +542,20 @@ class TopLevelCommand(object):
             ignore_pull_failures=options.get('--ignore-pull-failures')
         )
 
+    def push(self, options):
+        """
+        Pushes images for services.
+
+        Usage: push [options] [SERVICE...]
+
+        Options:
+            --ignore-push-failures  Push what it can and ignores images with push failures.
+        """
+        self.project.push(
+            service_names=options['SERVICE'],
+            ignore_push_failures=options.get('--ignore-push-failures')
+        )
+
     def rm(self, options):
         """
         Removes stopped service containers.
diff --git a/compose/config/serialize.py b/compose/config/serialize.py
index 52de77b8..b788a55d 100644
--- a/compose/config/serialize.py
+++ b/compose/config/serialize.py
@@ -18,7 +18,7 @@ yaml.SafeDumper.add_representer(types.VolumeFromSpec, serialize_config_type)
 yaml.SafeDumper.add_representer(types.VolumeSpec, serialize_config_type)
 
 
-def serialize_config(config):
+def denormalize_config(config):
     denormalized_services = [
         denormalize_service_dict(service_dict, config.version)
         for service_dict in config.services
@@ -32,15 +32,17 @@ def serialize_config(config):
         if 'external_name' in net_conf:
             del net_conf['external_name']
 
-    output = {
+    return {
         'version': V2_0,
         'services': services,
         'networks': networks,
         'volumes': config.volumes,
     }
 
+
+def serialize_config(config):
     return yaml.safe_dump(
-        output,
+        denormalize_config(config),
         default_flow_style=False,
         indent=2,
         width=80)
diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index 1f873d1d..a0f5601f 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -91,3 +91,22 @@ def print_output_event(event, stream, is_terminal):
         stream.write("%s%s" % (event['stream'], terminator))
     else:
         stream.write("%s%s\n" % (status, terminator))
+
+
+def get_digest_from_pull(events):
+    for event in events:
+        status = event.get('status')
+        if not status or 'Digest' not in status:
+            continue
+
+        _, digest = status.split(':', 1)
+        return digest.strip()
+    return None
+
+
+def get_digest_from_push(events):
+    for event in events:
+        digest = event.get('aux', {}).get('Digest')
+        if digest:
+            return digest
+    return None
diff --git a/compose/project.py b/compose/project.py
index 1b7fde23..676b6ae8 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -440,6 +440,10 @@ class Project(object):
         for service in self.get_services(service_names, include_deps=False):
             service.pull(ignore_pull_failures)
 
+    def push(self, service_names=None, ignore_push_failures=False):
+        for service in self.get_services(service_names, include_deps=False):
+            service.push(ignore_push_failures)
+
     def _labeled_containers(self, stopped=False, one_off=OneOffFilter.exclude):
         return list(filter(None, [
             Container.from_ps(self.client, container)
diff --git a/compose/service.py b/compose/service.py
index 8b9f64f0..af572e5b 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -15,6 +15,7 @@ from docker.utils.ports import build_port_bindings
 from docker.utils.ports import split_port
 
 from . import __version__
+from . import progress_stream
 from .config import DOCKER_CONFIG_KEYS
 from .config import merge_environment
 from .config.types import VolumeSpec
@@ -806,20 +807,35 @@ class Service(object):
         repo, tag, separator = parse_repository_tag(self.options['image'])
         tag = tag or 'latest'
         log.info('Pulling %s (%s%s%s)...' % (self.name, repo, separator, tag))
-        output = self.client.pull(
-            repo,
-            tag=tag,
-            stream=True,
-        )
+        output = self.client.pull(repo, tag=tag, stream=True)
 
         try:
-            stream_output(output, sys.stdout)
+            return progress_stream.get_digest_from_pull(
+                stream_output(output, sys.stdout))
         except StreamOutputError as e:
             if not ignore_pull_failures:
                 raise
             else:
                 log.error(six.text_type(e))
 
+    def push(self, ignore_push_failures=False):
+        if 'image' not in self.options or 'build' not in self.options:
+            return
+
+        repo, tag, separator = parse_repository_tag(self.options['image'])
+        tag = tag or 'latest'
+        log.info('Pushing %s (%s%s%s)...' % (self.name, repo, separator, tag))
+        output = self.client.push(repo, tag=tag, stream=True)
+
+        try:
+            return progress_stream.get_digest_from_push(
+                stream_output(output, sys.stdout))
+        except StreamOutputError as e:
+            if not ignore_push_failures:
+                raise
+            else:
+                log.error(six.text_type(e))
+
 
 def short_id_alias_exists(container, network):
     aliases = container.get(

From 9b7bd69cfca3f957f11a8f309ca816f13b52c436 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 14 Jun 2016 12:55:29 -0400
Subject: [PATCH 1053/1265] Support entrypoint, labels, and user in the bundle.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 .dockerignore     |  1 -
 compose/bundle.py | 64 +++++++++++++++++++++++++++++++++++++----------
 2 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index e79da862..055ae7ed 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,4 +7,3 @@ coverage-html
 docs/_site
 venv
 .tox
-dist
diff --git a/compose/bundle.py b/compose/bundle.py
index a6d0d2d1..e93c5bd9 100644
--- a/compose/bundle.py
+++ b/compose/bundle.py
@@ -5,11 +5,13 @@ import json
 import logging
 
 import six
+from docker.utils import split_command
 from docker.utils.ports import split_port
 
 from .cli.errors import UserError
 from .config.serialize import denormalize_config
 from .network import get_network_defs_for_service
+from .service import format_environment
 from .service import NoSuchImageError
 from .service import parse_repository_tag
 
@@ -18,11 +20,22 @@ log = logging.getLogger(__name__)
 
 
 SERVICE_KEYS = {
-    'command': 'Command',
-    'environment': 'Env',
     'working_dir': 'WorkingDir',
+    'user': 'User',
+    'labels': 'Labels',
 }
 
+IGNORED_KEYS = {'build'}
+
+SUPPORTED_KEYS = {
+    'image',
+    'ports',
+    'expose',
+    'networks',
+    'command',
+    'environment',
+    'entrypoint',
+} | set(SERVICE_KEYS)
 
 VERSION = '0.1'
 
@@ -120,22 +133,32 @@ def to_bundle(config, image_digests):
     }
 
 
-def convert_service_to_bundle(name, service_dict, image_id):
-    container_config = {'Image': image_id}
+def convert_service_to_bundle(name, service_dict, image_digest):
+    container_config = {'Image': image_digest}
 
     for key, value in service_dict.items():
-        if key in ('build', 'image', 'ports', 'expose', 'networks'):
-            pass
-        elif key == 'environment':
-            container_config['env'] = {
+        if key in IGNORED_KEYS:
+            continue
+
+        if key not in SUPPORTED_KEYS:
+            log.warn("Unsupported key '{}' in services.{} - ignoring".format(key, name))
+            continue
+
+        if key == 'environment':
+            container_config['Env'] = format_environment({
                 envkey: envvalue for envkey, envvalue in value.items()
                 if envvalue
-            }
-        elif key in SERVICE_KEYS:
-            container_config[SERVICE_KEYS[key]] = value
-        else:
-            log.warn("Unsupported key '{}' in services.{} - ignoring".format(key, name))
+            })
+            continue
 
+        if key in SERVICE_KEYS:
+            container_config[SERVICE_KEYS[key]] = value
+            continue
+
+    set_command_and_args(
+        container_config,
+        service_dict.get('entrypoint', []),
+        service_dict.get('command', []))
     container_config['Networks'] = make_service_networks(name, service_dict)
 
     ports = make_port_specs(service_dict)
@@ -145,6 +168,21 @@ def convert_service_to_bundle(name, service_dict, image_id):
     return container_config
 
 
+# See https://github.com/docker/swarmkit/blob//agent/exec/container/container.go#L95
+def set_command_and_args(config, entrypoint, command):
+    if isinstance(entrypoint, six.string_types):
+        entrypoint = split_command(entrypoint)
+    if isinstance(command, six.string_types):
+        command = split_command(command)
+
+    if entrypoint:
+        config['Command'] = entrypoint + command
+        return
+
+    if command:
+        config['Args'] = command
+
+
 def make_service_networks(name, service_dict):
     networks = []
 

From ee68a51e281e8a997d97ed1efde0e2d2821f85c9 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 14 Jun 2016 12:23:04 -0700
Subject: [PATCH 1054/1265] Skip TLS version test if TLSv1_2 is not available
 on platform

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/unit/cli/command_test.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/cli/command_test.py b/tests/unit/cli/command_test.py
index 28adff3f..50fc84e1 100644
--- a/tests/unit/cli/command_test.py
+++ b/tests/unit/cli/command_test.py
@@ -55,6 +55,7 @@ class TestGetTlsVersion(object):
         environment = {}
         assert get_tls_version(environment) is None
 
+    @pytest.mark.skipif(not hasattr(ssl, 'PROTOCOL_TLSv1_2'), reason='TLS v1.2 unsupported')
     def test_get_tls_version_upgrade(self):
         environment = {'COMPOSE_TLS_VERSION': 'TLSv1_2'}
         assert get_tls_version(environment) == ssl.PROTOCOL_TLSv1_2

From a56e44f96ea86e02d5f3e634f1e23ed9f731a608 Mon Sep 17 00:00:00 2001
From: Victoria Bialas <victoria.bialas@docker.com>
Date: Tue, 14 Jun 2016 12:24:30 -0700
Subject: [PATCH 1055/1265] fixes broken links in 3 Compose docs files due to
 topic re-org in PR#23492

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
---
 docs/django.md         | 2 +-
 docs/gettingstarted.md | 2 +-
 docs/rails.md          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/django.md b/docs/django.md
index b4bcee97..1cf2a567 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -29,7 +29,7 @@ and a `docker-compose.yml` file.
     The Dockerfile defines an application's image content via one or more build
     commands that configure that image. Once built, you can run the image in a
     container.  For more information on `Dockerfiles`, see the [Docker user
-    guide](/engine/userguide/containers/dockerimages.md#building-an-image-from-a-dockerfile)
+    guide](/engine/tutorials/dockerimages.md#building-an-image-from-a-dockerfile)
     and the [Dockerfile reference](/engine/reference/builder.md).
 
 3. Add the following content to the `Dockerfile`.
diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md
index 8c706e4f..249bff72 100644
--- a/docs/gettingstarted.md
+++ b/docs/gettingstarted.md
@@ -77,7 +77,7 @@ dependencies the Python application requires, including Python itself.
   * Install the Python dependencies.
   * Set the default command for the container to `python app.py`
 
-  For more information on how to write Dockerfiles, see the [Docker user guide](/engine/userguide/containers/dockerimages.md#building-an-image-from-a-dockerfile) and the [Dockerfile reference](/engine/reference/builder.md).
+  For more information on how to write Dockerfiles, see the [Docker user guide](/engine/tutorials/dockerimages.md#building-an-image-from-a-dockerfile) and the [Dockerfile reference](/engine/reference/builder.md).
 
 2. Build the image.
 
diff --git a/docs/rails.md b/docs/rails.md
index f54d8286..26777687 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -32,7 +32,7 @@ Dockerfile consists of:
 
 That'll put your application code inside an image that will build a container
 with Ruby, Bundler and all your dependencies inside it. For more information on
-how to write Dockerfiles, see the [Docker user guide](/engine/userguide/containers/dockerimages.md#building-an-image-from-a-dockerfile) and the [Dockerfile reference](/engine/reference/builder.md).
+how to write Dockerfiles, see the [Docker user guide](/engine/tutorials/dockerimages.md#building-an-image-from-a-dockerfile) and the [Dockerfile reference](/engine/reference/builder.md).
 
 Next, create a bootstrap `Gemfile` which just loads Rails. It'll be overwritten in a moment by `rails new`.
 

From 020d46ff21764a57fa21e4f3ccc1ba09a1345049 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 14 Jun 2016 16:03:56 -0700
Subject: [PATCH 1056/1265] Warn on missing digests, don't push/pull by default

Add a --fetch-digests flag to automatically push/pull

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/bundle.py   | 64 ++++++++++++++++++++++++++++++++++++---------
 compose/cli/main.py | 31 +++++++++++++++++++---
 2 files changed, 79 insertions(+), 16 deletions(-)

diff --git a/compose/bundle.py b/compose/bundle.py
index e93c5bd9..965d65c8 100644
--- a/compose/bundle.py
+++ b/compose/bundle.py
@@ -40,6 +40,22 @@ SUPPORTED_KEYS = {
 VERSION = '0.1'
 
 
+class NeedsPush(Exception):
+    def __init__(self, image_name):
+        self.image_name = image_name
+
+
+class NeedsPull(Exception):
+    def __init__(self, image_name):
+        self.image_name = image_name
+
+
+class MissingDigests(Exception):
+    def __init__(self, needs_push, needs_pull):
+        self.needs_push = needs_push
+        self.needs_pull = needs_pull
+
+
 def serialize_bundle(config, image_digests):
     if config.networks:
         log.warn("Unsupported top level key 'networks' - ignoring")
@@ -54,21 +70,36 @@ def serialize_bundle(config, image_digests):
     )
 
 
-def get_image_digests(project):
-    return {
-        service.name: get_image_digest(service)
-        for service in project.services
-    }
+def get_image_digests(project, allow_fetch=False):
+    digests = {}
+    needs_push = set()
+    needs_pull = set()
+
+    for service in project.services:
+        try:
+            digests[service.name] = get_image_digest(
+                service,
+                allow_fetch=allow_fetch,
+            )
+        except NeedsPush as e:
+            needs_push.add(e.image_name)
+        except NeedsPull as e:
+            needs_pull.add(e.image_name)
+
+    if needs_push or needs_pull:
+        raise MissingDigests(needs_push, needs_pull)
+
+    return digests
 
 
-def get_image_digest(service):
+def get_image_digest(service, allow_fetch=False):
     if 'image' not in service.options:
         raise UserError(
             "Service '{s.name}' doesn't define an image tag. An image name is "
             "required to generate a proper image digest for the bundle. Specify "
             "an image repo and tag with the 'image' option.".format(s=service))
 
-    repo, tag, separator = parse_repository_tag(service.options['image'])
+    separator = parse_repository_tag(service.options['image'])[2]
     # Compose file already uses a digest, no lookup required
     if separator == '@':
         return service.options['image']
@@ -87,13 +118,17 @@ def get_image_digest(service):
         # digests
         return image['RepoDigests'][0]
 
+    if not allow_fetch:
+        if 'build' in service.options:
+            raise NeedsPush(service.image_name)
+        else:
+            raise NeedsPull(service.image_name)
+
+    return fetch_image_digest(service)
+
+
+def fetch_image_digest(service):
     if 'build' not in service.options:
-        log.warn(
-            "Compose needs to pull the image for '{s.name}' in order to create "
-            "a bundle. This may result in a more recent image being used. "
-            "It is recommended that you use an image tagged with a "
-            "specific version to minimize the potential "
-            "differences.".format(s=service))
         digest = service.pull()
     else:
         try:
@@ -108,12 +143,15 @@ def get_image_digest(service):
     if not digest:
         raise ValueError("Failed to get digest for %s" % service.name)
 
+    repo = parse_repository_tag(service.options['image'])[0]
     identifier = '{repo}@{digest}'.format(repo=repo, digest=digest)
 
     # Pull by digest so that image['RepoDigests'] is populated for next time
     # and we don't have to pull/push again
     service.client.pull(identifier)
 
+    log.info("Stored digest for {}".format(service.image_name))
+
     return identifier
 
 
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 3e440463..25ee9050 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -15,6 +15,7 @@ from . import errors
 from . import signals
 from .. import __version__
 from ..bundle import get_image_digests
+from ..bundle import MissingDigests
 from ..bundle import serialize_bundle
 from ..config import ConfigurationError
 from ..config import parse_environment
@@ -218,12 +219,17 @@ class TopLevelCommand(object):
         """
         Generate a Docker bundle from the Compose file.
 
-        Local images will be pushed to a Docker registry, and remote images
-        will be pulled to fetch an image digest.
+        Images must have digests stored, which requires interaction with a
+        Docker registry. If digests aren't stored for all images, you can pass
+        `--fetch-digests` to automatically fetch them. Images for services
+        with a `build` key will be pushed. Images for services without a
+        `build` key will be pulled.
 
         Usage: bundle [options]
 
         Options:
+            --fetch-digests            Automatically fetch image digests if missing
+
             -o, --output PATH          Path to write the bundle file to.
                                        Defaults to "<project name>.dsb".
         """
@@ -235,7 +241,26 @@ class TopLevelCommand(object):
             output = "{}.dsb".format(self.project.name)
 
         with errors.handle_connection_errors(self.project.client):
-            image_digests = get_image_digests(self.project)
+            try:
+                image_digests = get_image_digests(
+                    self.project,
+                    allow_fetch=options['--fetch-digests'],
+                )
+            except MissingDigests as e:
+                def list_images(images):
+                    return "\n".join("    {}".format(name) for name in sorted(images))
+
+                paras = ["Some images are missing digests."]
+
+                if e.needs_push:
+                    paras += ["The following images need to be pushed:", list_images(e.needs_push)]
+
+                if e.needs_pull:
+                    paras += ["The following images need to be pulled:", list_images(e.needs_pull)]
+
+                paras.append("If this is OK, run `docker-compose bundle --fetch-digests`.")
+
+                raise UserError("\n\n".join(paras))
 
         with open(output, 'w') as f:
             f.write(serialize_bundle(compose_config, image_digests))

From 80af26d2bb29443663b87eb7a111f0bba4e352bc Mon Sep 17 00:00:00 2001
From: Anton Backer <anton.backer@newsela.com>
Date: Mon, 13 Jun 2016 22:45:15 -0400
Subject: [PATCH 1057/1265] togather -> together

Signed-off-by: Anton Backer <anton.backer@newsela.com>
---
 compose/cli/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 25ee9050..96ad847f 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -664,7 +664,7 @@ class TopLevelCommand(object):
         if options['--publish'] and options['--service-ports']:
             raise UserError(
                 'Service port mapping and manual port mapping '
-                'can not be used togather'
+                'can not be used together'
             )
 
         if options['COMMAND']:

From 3c77db709fe6c86b3da30f84907994af7ab6bc2d Mon Sep 17 00:00:00 2001
From: Jonathan Giannuzzi <jonathan@giannuzzi.be>
Date: Mon, 20 Jun 2016 14:48:45 +0200
Subject: [PATCH 1058/1265] Fix assertion that was always true

Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
---
 tests/integration/service_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index df50d513..1801f5bf 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -397,7 +397,7 @@ class ServiceTest(DockerClientTestCase):
 
         assert not mock_log.warn.called
         assert (
-            [mount['Destination'] for mount in new_container.get('Mounts')],
+            [mount['Destination'] for mount in new_container.get('Mounts')] ==
             ['/data']
         )
         assert new_container.get_mount('/data')['Source'] != host_path

From e5c5dc09f83fea5fc708a9a4d72cf0bb83da6154 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Wed, 22 Jun 2016 17:04:22 +0200
Subject: [PATCH 1059/1265] bash completion for `docker-compose bundle`

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 763cafc4..de25cd57 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -109,6 +109,18 @@ _docker_compose_build() {
 }
 
 
+_docker_compose_bundle() {
+	case "$prev" in
+		--output|-o)
+			_filedir
+			return
+			;;
+	esac
+
+	COMPREPLY=( $( compgen -W "--help --output -o" -- "$cur" ) )
+}
+
+
 _docker_compose_config() {
 	COMPREPLY=( $( compgen -W "--help --quiet -q --services" -- "$cur" ) )
 }
@@ -455,6 +467,7 @@ _docker_compose() {
 
 	local commands=(
 		build
+		bundle
 		config
 		create
 		down

From f49b624d95c30ce457edff4e32c220cc657dbad1 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Wed, 22 Jun 2016 17:19:20 +0200
Subject: [PATCH 1060/1265] bash completion for `docker-compose push`

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 763cafc4..058ede10 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -304,6 +304,18 @@ _docker_compose_pull() {
 }
 
 
+_docker_compose_push() {
+	case "$cur" in
+		-*)
+			COMPREPLY=( $( compgen -W "--help --ignore-push-failures" -- "$cur" ) )
+			;;
+		*)
+			__docker_compose_services_all
+			;;
+	esac
+}
+
+
 _docker_compose_restart() {
 	case "$prev" in
 		--timeout|-t)
@@ -467,6 +479,7 @@ _docker_compose() {
 		port
 		ps
 		pull
+		push
 		restart
 		rm
 		run

From f77dbc06cc6f5794e828b949b5df16d79ee7c143 Mon Sep 17 00:00:00 2001
From: James Ottaway <jamesottaway@users.noreply.github.com>
Date: Fri, 24 Jun 2016 10:51:20 +1000
Subject: [PATCH 1061/1265] Document `tmpfs` being v2 only

Signed-off-by: James Ottaway <git@james.ottaway.io>
---
 docs/compose-file.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index b55f250a..682dacd3 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -228,6 +228,8 @@ Custom DNS search domains. Can be a single value or a list.
 
 ### tmpfs
 
+> [Version 2 file format](#version-2) only.
+
 Mount a temporary file system inside the container. Can be a single value or a list.
 
     tmpfs: /run

From aa7f522ab0b1e85b236b782f9e82d7f70a29b3af Mon Sep 17 00:00:00 2001
From: Ke Xu <leonhartx.k@gmail.com>
Date: Mon, 27 Jun 2016 17:48:14 +0900
Subject: [PATCH 1062/1265] add zsh completion support for bundle

Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 0da217dc..539482e5 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -197,6 +197,11 @@ __docker-compose_subcommand() {
                 '--pull[Always attempt to pull a newer version of the image.]' \
                 '*:services:__docker-compose_services_from_build' && ret=0
             ;;
+        (bundle)
+            _arguments \
+                $opts_help \
+                '(--output -o)'{--output,-o}'[Path to write the bundle file to. Defaults to "<project name>.dsb".]:file:_files' && ret=0
+            ;;
         (config)
             _arguments \
                 $opts_help \

From a0a90b2352d8592796097c549635a56b1bba4aa5 Mon Sep 17 00:00:00 2001
From: Ke Xu <leonhartx.k@gmail.com>
Date: Mon, 27 Jun 2016 18:00:52 +0900
Subject: [PATCH 1063/1265] add zsh completion for push

Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 0da217dc..42876ec9 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -278,6 +278,12 @@ __docker-compose_subcommand() {
                 '--ignore-pull-failures[Pull what it can and ignores images with pull failures.]' \
                 '*:services:__docker-compose_services_from_image' && ret=0
             ;;
+        (push)
+            _arguments \
+                $opts_help \
+                '--ignore-push-failures[Push what it can and ignores images with push failures.]' \
+                '*:services:__docker-compose_services' && ret=0
+            ;;
         (rm)
             _arguments \
                 $opts_help \

From cbb44b1a1462cefe3a1e02c75e36d527af3ff245 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <andree88@gmail.com>
Date: Sat, 26 Mar 2016 21:41:32 -0700
Subject: [PATCH 1064/1265] fix broken zsh autocomplete for version 2
 docker-compose files

This has the added benefit of making autocompletion work when the
docker-compose config file is in a parent directory.

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 0da217dc..f75d412d 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -19,26 +19,13 @@
 #  * @felixr docker zsh completion script : https://github.com/felixr/docker-zsh-completion
 # -------------------------------------------------------------------------
 
-# For compatibility reasons, Compose and therefore its completion supports several
-# stack compositon files as listed here, in descending priority.
-# Support for these filenames might be dropped in some future version.
-__docker-compose_compose_file() {
-    local file
-    for file in docker-compose.y{,a}ml ; do
-        [ -e $file ] && {
-            echo $file
-            return
-        }
-    done
-    echo docker-compose.yml
-}
-
 # Extracts all service names from docker-compose.yml.
 ___docker-compose_all_services_in_compose_file() {
     local already_selected
     local -a services
     already_selected=$(echo $words | tr " " "|")
-    awk -F: '/^[a-zA-Z0-9]/{print $1}' "${compose_file:-$(__docker-compose_compose_file)}" 2>/dev/null | grep -Ev "$already_selected"
+    docker-compose config --services 2>/dev/null \
+        | grep -Ev "$already_selected"
 }
 
 # All services, even those without an existing container
@@ -57,7 +44,12 @@ ___docker-compose_services_with_key() {
     local -a buildable
     already_selected=$(echo $words | tr " " "|")
     # flatten sections to one line, then filter lines containing the key and return section name.
-    awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' "${compose_file:-$(__docker-compose_compose_file)}" 2>/dev/null | awk -F: -v key=": +$1:" '$0 ~ key {print $1}' 2>/dev/null | grep -Ev "$already_selected"
+    docker-compose config 2>/dev/null \
+        | sed -n -e '/^services:/,/^[^ ]/p' \
+        | sed -n 's/^  //p' \
+        | awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' \
+        | awk -F: -v key=": +$1:" '$0 ~ key {print $1}' \
+        | grep -Ev "$already_selected"
 }
 
 # All services that are defined by a Dockerfile reference

From b3d9652cc303e20a991267cc7cea4b553739df17 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Tue, 26 Apr 2016 07:45:55 -0700
Subject: [PATCH 1065/1265] zsh autocomplete: add missing docker-compose base
 flags

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index f75d412d..1286b21c 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -358,10 +358,17 @@ _docker-compose() {
 
     _arguments -C \
         '(- :)'{-h,--help}'[Get help]' \
-        '--verbose[Show more output]' \
-        '(- :)'{-v,--version}'[Print version and exit]' \
         '(-f --file)'{-f,--file}'[Specify an alternate docker-compose file (default: docker-compose.yml)]:file:_files -g "*.yml"' \
         '(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \
+        '--verbose[Show more output]' \
+        '(- :)'{-v,--version}'[Print version and exit]' \
+        '(-H --host)'{-H,--host}'[Daemon socket to connect to]:host:' \
+        '--tls[Use TLS; implied by --tlsverify]' \
+        '--tlscacert=[Trust certs signed only by this CA]:ca path:' \
+        '--tlscert=[Path to TLS certificate file]:client cert path:' \
+        '--tlskey=[Path to TLS key file]:tls key path:' \
+        '--tlsverify[Use TLS and verify the remote]' \
+        "--skip-hostname-check[Don't check the daemon's hostname against the name specified in the client certificate (for example if your docker host is an IP address)]" \
         '(-): :->command' \
         '(-)*:: :->option-or-argument' && ret=0
 

From 73a1b60ced0ae7974aa86484032c7122e0aa708f Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Tue, 26 Apr 2016 07:47:40 -0700
Subject: [PATCH 1066/1265] zsh autocomplete: add missing 'remove-orphans' flag
 for 'up' and 'down'

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 1286b21c..b5e44762 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -207,7 +207,8 @@ __docker-compose_subcommand() {
             _arguments \
                 $opts_help \
                 "--rmi[Remove images, type may be one of: 'all' to remove all images, or 'local' to remove only images that don't have an custom name set by the 'image' field]:type:(all local)" \
-                '(-v --volumes)'{-v,--volumes}"[Remove data volumes]" && ret=0
+                '(-v --volumes)'{-v,--volumes}"[Remove data volumes]" \
+                '--remove-orphans[Remove containers for services not defined in the Compose file]' && ret=0
             ;;
         (events)
             _arguments \
@@ -329,6 +330,7 @@ __docker-compose_subcommand() {
                 "--no-build[Don't build an image, even if it's missing]" \
                 "(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
                 '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
+                "--remove-orphans[Remove containers for services not defined in the Compose file]" \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
         (version)

From eb10f41d13affd1f901fb37230a6868ef58f3610 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Tue, 26 Apr 2016 07:49:48 -0700
Subject: [PATCH 1067/1265] zsh autocomplete: fix incorrect flag exclusions for
 'create' and 'up'

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index b5e44762..2b82d4eb 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -198,9 +198,9 @@ __docker-compose_subcommand() {
         (create)
             _arguments \
                 $opts_help \
-                "(--no-recreate --no-build)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
-                "(--force-recreate)--no-build[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
-                "(--force-recreate)--no-recreate[Don't build an image, even if it's missing]" \
+                "(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
+                "(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
+                "--no-build[Don't build an image, even if it's missing.]" \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
         (down)
@@ -325,9 +325,9 @@ __docker-compose_subcommand() {
                 '--build[Build images before starting containers.]' \
                 '--no-color[Produce monochrome output.]' \
                 "--no-deps[Don't start linked services.]" \
-                "--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
-                "--no-recreate[If containers already exist, don't recreate them.]" \
-                "--no-build[Don't build an image, even if it's missing]" \
+                "(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
+                "(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
+                "--no-build[Don't build an image, even if it's missing.]" \
                 "(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
                 '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
                 "--remove-orphans[Remove containers for services not defined in the Compose file]" \

From 8d2fbe3a555c21c427ffd31b5a85fa77b926853f Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Tue, 26 Apr 2016 07:53:50 -0700
Subject: [PATCH 1068/1265] zsh autocomplete: add 'build' flag for 'create' and
 'up'

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 2b82d4eb..b6cdb0a6 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -200,7 +200,8 @@ __docker-compose_subcommand() {
                 $opts_help \
                 "(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
                 "(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
-                "--no-build[Don't build an image, even if it's missing.]" \
+                "(--build)--no-build[Don't build an image, even if it's missing.]" \
+                "(--no-build)--build[Build images before creating containers.]" \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
         (down)
@@ -322,12 +323,12 @@ __docker-compose_subcommand() {
             _arguments \
                 $opts_help \
                 '(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names.]' \
-                '--build[Build images before starting containers.]' \
                 '--no-color[Produce monochrome output.]' \
                 "--no-deps[Don't start linked services.]" \
                 "(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
                 "(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
-                "--no-build[Don't build an image, even if it's missing.]" \
+                "(--build)--no-build[Don't build an image, even if it's missing.]" \
+                "(--no-build)--build[Build images before starting containers.]" \
                 "(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
                 '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
                 "--remove-orphans[Remove containers for services not defined in the Compose file]" \

From 1b5a94f4e413bd59312795302602ca98da69ce31 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Tue, 26 Apr 2016 07:56:51 -0700
Subject: [PATCH 1069/1265] zsh autocomplete: bring flag help texts up to date

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index b6cdb0a6..54bea10e 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -185,7 +185,7 @@ __docker-compose_subcommand() {
             _arguments \
                 $opts_help \
                 '--force-rm[Always remove intermediate containers.]' \
-                '--no-cache[Do not use cache when building the image]' \
+                '--no-cache[Do not use cache when building the image.]' \
                 '--pull[Always attempt to pull a newer version of the image.]' \
                 '*:services:__docker-compose_services_from_build' && ret=0
             ;;
@@ -207,14 +207,14 @@ __docker-compose_subcommand() {
         (down)
             _arguments \
                 $opts_help \
-                "--rmi[Remove images, type may be one of: 'all' to remove all images, or 'local' to remove only images that don't have an custom name set by the 'image' field]:type:(all local)" \
-                '(-v --volumes)'{-v,--volumes}"[Remove data volumes]" \
+                "--rmi[Remove images. Type must be one of: 'all': Remove all images used by any service. 'local': Remove only images that don't have a custom tag set by the \`image\` field.]:type:(all local)" \
+                '(-v --volumes)'{-v,--volumes}"[Remove named volumes declared in the \`volumes\` section of the Compose file and anonymous volumes attached to containers.]" \
                 '--remove-orphans[Remove containers for services not defined in the Compose file]' && ret=0
             ;;
         (events)
             _arguments \
                 $opts_help \
-                '--json[Output events as a stream of json objects.]' \
+                '--json[Output events as a stream of json objects]' \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
         (exec)
@@ -224,7 +224,7 @@ __docker-compose_subcommand() {
                 '--privileged[Give extended privileges to the process.]' \
                 '--user=[Run the command as this user.]:username:_users' \
                 '-T[Disable pseudo-tty allocation. By default `docker-compose exec` allocates a TTY.]' \
-                '--index=[Index of the container if there are multiple instances of a service (default: 1)]:index: ' \
+                '--index=[Index of the container if there are multiple instances of a service \[default: 1\]]:index: ' \
                 '(-):running services:__docker-compose_runningservices' \
                 '(-):command: _command_names -e' \
                 '*::arguments: _normal' && ret=0
@@ -255,8 +255,8 @@ __docker-compose_subcommand() {
         (port)
             _arguments \
                 $opts_help \
-                '--protocol=-[tcp or udap (defaults to tcp)]:protocol:(tcp udp)' \
-                '--index=-[index of the container if there are mutiple instances of a service (defaults to 1)]:index: ' \
+                '--protocol=[tcp or udp \[default: tcp\]]:protocol:(tcp udp)' \
+                '--index=[index of the container if there are multiple instances of a service \[default: 1\]]:index: ' \
                 '1:running services:__docker-compose_runningservices' \
                 '2:port:_ports' && ret=0
             ;;
@@ -276,7 +276,7 @@ __docker-compose_subcommand() {
             _arguments \
                 $opts_help \
                 '(-f --force)'{-f,--force}"[Don't ask to confirm removal]" \
-                '-v[Remove volumes associated with containers]' \
+                '-v[Remove any anonymous volumes attached to containers]' \
                 '*:stopped services:__docker-compose_stoppedservices' && ret=0
             ;;
         (run)
@@ -285,14 +285,14 @@ __docker-compose_subcommand() {
                 '-d[Detached mode: Run container in the background, print new container name.]' \
                 '*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
                 '--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
-                '--name[Assign a name to the container]:name: ' \
+                '--name=[Assign a name to the container]:name: ' \
                 "--no-deps[Don't start linked services.]" \
-                '(-p --publish)'{-p,--publish=-}"[Run command with manually mapped container's port(s) to the host.]" \
+                '(-p --publish)'{-p,--publish=}"[Publish a container's port(s) to the host]" \
                 '--rm[Remove container after run. Ignored in detached mode.]' \
                 "--service-ports[Run command with the service's ports enabled and mapped to the host.]" \
                 '-T[Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.]' \
-                '(-u --user)'{-u,--user=-}'[Run as specified username or uid]:username or uid:_users' \
-                '(-w --workdir)'{-w=,--workdir=}'[Working directory inside the container]:workdir: ' \
+                '(-u --user)'{-u,--user=}'[Run as specified username or uid]:username or uid:_users' \
+                '(-w --workdir)'{-w,--workdir=}'[Working directory inside the container]:workdir: ' \
                 '(-):services:__docker-compose_services' \
                 '(-):command: _command_names -e' \
                 '*::arguments: _normal' && ret=0
@@ -322,7 +322,7 @@ __docker-compose_subcommand() {
         (up)
             _arguments \
                 $opts_help \
-                '(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names.]' \
+                '(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names. Incompatible with --abort-on-container-exit.]' \
                 '--no-color[Produce monochrome output.]' \
                 "--no-deps[Don't start linked services.]" \
                 "(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
@@ -330,7 +330,7 @@ __docker-compose_subcommand() {
                 "(--build)--no-build[Don't build an image, even if it's missing.]" \
                 "(--no-build)--build[Build images before starting containers.]" \
                 "(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
-                '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
+                '(-t --timeout)'{-t,--timeout}"[Use this timeout in seconds for container shutdown when attached or when containers are already running. (default: 10)]:seconds: " \
                 "--remove-orphans[Remove containers for services not defined in the Compose file]" \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;

From 97ba14c82adecef3a9538e434d85c1e213ab2e38 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <andree88@gmail.com>
Date: Sat, 26 Mar 2016 23:17:00 -0700
Subject: [PATCH 1070/1265] zsh autocomplete: use two underscores for all
 function names

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 54bea10e..e6990b77 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -20,7 +20,7 @@
 # -------------------------------------------------------------------------
 
 # Extracts all service names from docker-compose.yml.
-___docker-compose_all_services_in_compose_file() {
+__docker-compose_all_services_in_compose_file() {
     local already_selected
     local -a services
     already_selected=$(echo $words | tr " " "|")
@@ -32,14 +32,14 @@ ___docker-compose_all_services_in_compose_file() {
 __docker-compose_services_all() {
     [[ $PREFIX = -* ]] && return 1
     integer ret=1
-    services=$(___docker-compose_all_services_in_compose_file)
+    services=$(__docker-compose_all_services_in_compose_file)
     _alternative "args:services:($services)" && ret=0
 
     return ret
 }
 
 # All services that have an entry with the given key in their docker-compose.yml section
-___docker-compose_services_with_key() {
+__docker-compose_services_with_key() {
     local already_selected
     local -a buildable
     already_selected=$(echo $words | tr " " "|")
@@ -56,7 +56,7 @@ ___docker-compose_services_with_key() {
 __docker-compose_services_from_build() {
     [[ $PREFIX = -* ]] && return 1
     integer ret=1
-    buildable=$(___docker-compose_services_with_key build)
+    buildable=$(__docker-compose_services_with_key build)
     _alternative "args:buildable services:($buildable)" && ret=0
 
    return ret
@@ -66,7 +66,7 @@ __docker-compose_services_from_build() {
 __docker-compose_services_from_image() {
     [[ $PREFIX = -* ]] && return 1
     integer ret=1
-    pullable=$(___docker-compose_services_with_key image)
+    pullable=$(__docker-compose_services_with_key image)
     _alternative "args:pullable services:($pullable)" && ret=0
 
     return ret

From d990f7899c921260876d93ec42444bc8fcb08e37 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <andree88@gmail.com>
Date: Sun, 27 Mar 2016 02:33:16 -0700
Subject: [PATCH 1071/1265] zsh autocomplete: pass all relevant flags to
 docker-compose/docker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For autocomplete to work properly, we need to pass along some flags when
calling docker (--host, --tls, …) and docker-compose (--file, --tls, …).

Previously flags would only be passed to docker-compose, and the only
flags passed were --file and --project-name.

This commit makes sure that all relevant flags are passed to both
docker-compose and docker.

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 50 ++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index e6990b77..eeed07a6 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -19,12 +19,16 @@
 #  * @felixr docker zsh completion script : https://github.com/felixr/docker-zsh-completion
 # -------------------------------------------------------------------------
 
+__docker-compose_q() {
+    docker-compose 2>/dev/null $compose_options "$@"
+}
+
 # Extracts all service names from docker-compose.yml.
 __docker-compose_all_services_in_compose_file() {
     local already_selected
     local -a services
     already_selected=$(echo $words | tr " " "|")
-    docker-compose config --services 2>/dev/null \
+    __docker-compose_q config --services \
         | grep -Ev "$already_selected"
 }
 
@@ -44,7 +48,7 @@ __docker-compose_services_with_key() {
     local -a buildable
     already_selected=$(echo $words | tr " " "|")
     # flatten sections to one line, then filter lines containing the key and return section name.
-    docker-compose config 2>/dev/null \
+    __docker-compose_q config \
         | sed -n -e '/^services:/,/^[^ ]/p' \
         | sed -n 's/^  //p' \
         | awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' \
@@ -88,7 +92,7 @@ __docker-compose_get_services() {
     shift
     [[ $kind =~ (stopped|all) ]] && args=($args -a)
 
-    lines=(${(f)"$(_call_program commands docker ps $args)"})
+    lines=(${(f)"$(_call_program commands docker $docker_options ps $args)"})
     services=(${(f)"$(_call_program commands docker-compose 2>/dev/null $compose_options ps -q)"})
 
     # Parse header line to find columns
@@ -375,9 +379,43 @@ _docker-compose() {
         '(-): :->command' \
         '(-)*:: :->option-or-argument' && ret=0
 
-    local compose_file=${opt_args[-f]}${opt_args[--file]}
-    local compose_project=${opt_args[-p]}${opt_args[--project-name]}
-    local compose_options="${compose_file:+--file $compose_file} ${compose_project:+--project-name $compose_project}"
+    local -a relevant_compose_flags relevant_docker_flags compose_options docker_options
+
+    relevant_compose_flags=(
+        "--file" "-f"
+        "--host" "-H"
+        "--project-name" "-p"
+        "--tls"
+        "--tlscacert"
+        "--tlscert"
+        "--tlskey"
+        "--tlsverify"
+        "--skip-hostname-check"
+    )
+
+    relevant_docker_flags=(
+        "--host" "-H"
+        "--tls"
+        "--tlscacert"
+        "--tlscert"
+        "--tlskey"
+        "--tlsverify"
+    )
+
+    for k in "${(@k)opt_args}"; do
+        if [[ -n "${relevant_docker_flags[(r)$k]}" ]]; then
+            docker_options+=$k
+            if [[ -n "$opt_args[$k]" ]]; then
+                docker_options+=$opt_args[$k]
+            fi
+        fi
+        if [[ -n "${relevant_compose_flags[(r)$k]}" ]]; then
+            compose_options+=$k
+            if [[ -n "$opt_args[$k]" ]]; then
+                compose_options+=$opt_args[$k]
+            fi
+        fi
+    done
 
     case $state in
         (command)

From 048408af4835134734bcb565a8c07991a8818530 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Sun, 27 Mar 2016 23:21:58 -0700
Subject: [PATCH 1072/1265] zsh autocomplete: fix missing services issue for
 build/pull commands

Previously, the autocomplete for the build/pull commands would only add
services for which build/image were the _first_ keys, respectively, in
the docker-compose file.

This commit fixes this, so the appropriate services are listed
regardless of the order in which they appear

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index eeed07a6..7fc692cf 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -52,7 +52,8 @@ __docker-compose_services_with_key() {
         | sed -n -e '/^services:/,/^[^ ]/p' \
         | sed -n 's/^  //p' \
         | awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' \
-        | awk -F: -v key=": +$1:" '$0 ~ key {print $1}' \
+        | grep " \+$1:" \
+        | sed "s/:.*//g" \
         | grep -Ev "$already_selected"
 }
 

From 612d263d7481edfdcfe7c82835177e17284adb55 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Tue, 29 Mar 2016 21:31:06 -0700
Subject: [PATCH 1073/1265] zsh autocomplete: fix issue when filtering on
 already selected services

Previously, the filtering on already selected services would break when
one service was a substring of another.

This commit fixes that.

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 7fc692cf..27b17b07 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -29,7 +29,7 @@ __docker-compose_all_services_in_compose_file() {
     local -a services
     already_selected=$(echo $words | tr " " "|")
     __docker-compose_q config --services \
-        | grep -Ev "$already_selected"
+        | grep -Ev "^(${already_selected})$"
 }
 
 # All services, even those without an existing container
@@ -54,7 +54,7 @@ __docker-compose_services_with_key() {
         | awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' \
         | grep " \+$1:" \
         | sed "s/:.*//g" \
-        | grep -Ev "$already_selected"
+        | grep -Ev "^(${already_selected})$"
 }
 
 # All services that are defined by a Dockerfile reference

From 0058b4ba0ce8f76341bedc0988be09cde6ee8441 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Thu, 28 Apr 2016 19:24:44 -0700
Subject: [PATCH 1074/1265] zsh autocomplete: replace use of sed with cut

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 27b17b07..c7df4b44 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -53,7 +53,7 @@ __docker-compose_services_with_key() {
         | sed -n 's/^  //p' \
         | awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' \
         | grep " \+$1:" \
-        | sed "s/:.*//g" \
+        | cut -d: -f1 \
         | grep -Ev "^(${already_selected})$"
 }
 

From b3d4e9c9d7c0a9a85aa2e1958a78ee6910d98e08 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Thu, 28 Apr 2016 19:47:41 -0700
Subject: [PATCH 1075/1265] zsh autocomplete: break out duplicated flag
 messages into variables

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 40 ++++++++++++++++----------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index c7df4b44..77348d5c 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -182,7 +182,17 @@ __docker-compose_commands() {
 }
 
 __docker-compose_subcommand() {
-    local opts_help='(: -)--help[Print usage]'
+    local opts_help opts_force_recreate opts_no_recreate opts_no_build opts_remove_orphans opts_timeout opts_no_color opts_no_deps
+
+    opts_help='(: -)--help[Print usage]'
+    opts_force_recreate="(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]"
+    opts_no_recreate="(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]"
+    opts_no_build="(--build)--no-build[Don't build an image, even if it's missing.]"
+    opts_remove_orphans="--remove-orphans[Remove containers for services not defined in the Compose file]"
+    opts_timeout=('(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: ")
+    opts_no_color='--no-color[Produce monochrome output.]'
+    opts_no_deps="--no-deps[Don't start linked services.]"
+
     integer ret=1
 
     case "$words[1]" in
@@ -203,9 +213,9 @@ __docker-compose_subcommand() {
         (create)
             _arguments \
                 $opts_help \
-                "(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
-                "(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
-                "(--build)--no-build[Don't build an image, even if it's missing.]" \
+                $opts_force_recreate \
+                $opts_no_recreate \
+                $opts_no_build \
                 "(--no-build)--build[Build images before creating containers.]" \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
@@ -214,7 +224,7 @@ __docker-compose_subcommand() {
                 $opts_help \
                 "--rmi[Remove images. Type must be one of: 'all': Remove all images used by any service. 'local': Remove only images that don't have a custom tag set by the \`image\` field.]:type:(all local)" \
                 '(-v --volumes)'{-v,--volumes}"[Remove named volumes declared in the \`volumes\` section of the Compose file and anonymous volumes attached to containers.]" \
-                '--remove-orphans[Remove containers for services not defined in the Compose file]' && ret=0
+                $opts_remove_orphans && ret=0
             ;;
         (events)
             _arguments \
@@ -247,7 +257,7 @@ __docker-compose_subcommand() {
             _arguments \
                 $opts_help \
                 '(-f --follow)'{-f,--follow}'[Follow log output]' \
-                '--no-color[Produce monochrome output.]' \
+                $opts_no_color \
                 '--tail=[Number of lines to show from the end of the logs for each container.]:number of lines: ' \
                 '(-t --timestamps)'{-t,--timestamps}'[Show timestamps]' \
                 '*:services:__docker-compose_services_all' && ret=0
@@ -291,7 +301,7 @@ __docker-compose_subcommand() {
                 '*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
                 '--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
                 '--name=[Assign a name to the container]:name: ' \
-                "--no-deps[Don't start linked services.]" \
+                $opts_no_deps \
                 '(-p --publish)'{-p,--publish=}"[Publish a container's port(s) to the host]" \
                 '--rm[Remove container after run. Ignored in detached mode.]' \
                 "--service-ports[Run command with the service's ports enabled and mapped to the host.]" \
@@ -305,7 +315,7 @@ __docker-compose_subcommand() {
         (scale)
             _arguments \
                 $opts_help \
-                '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
+                $opts_timeout \
                 '*:running services:__docker-compose_runningservices' && ret=0
             ;;
         (start)
@@ -316,7 +326,7 @@ __docker-compose_subcommand() {
         (stop|restart)
             _arguments \
                 $opts_help \
-                '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
+                $opts_timeout \
                 '*:running services:__docker-compose_runningservices' && ret=0
             ;;
         (unpause)
@@ -328,15 +338,15 @@ __docker-compose_subcommand() {
             _arguments \
                 $opts_help \
                 '(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names. Incompatible with --abort-on-container-exit.]' \
-                '--no-color[Produce monochrome output.]' \
-                "--no-deps[Don't start linked services.]" \
-                "(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
-                "(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
-                "(--build)--no-build[Don't build an image, even if it's missing.]" \
+                $opts_no_color \
+                $opts_no_deps \
+                $opts_force_recreate \
+                $opts_no_recreate \
+                $opts_no_build \
                 "(--no-build)--build[Build images before starting containers.]" \
                 "(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
                 '(-t --timeout)'{-t,--timeout}"[Use this timeout in seconds for container shutdown when attached or when containers are already running. (default: 10)]:seconds: " \
-                "--remove-orphans[Remove containers for services not defined in the Compose file]" \
+                $opts_remove_orphans \
                 '*:services:__docker-compose_services_all' && ret=0
             ;;
         (version)

From c3247e7af8edcca113018b9e39af0282a649d6f7 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <andre@tcell.io>
Date: Mon, 27 Jun 2016 10:57:35 -0700
Subject: [PATCH 1076/1265] zsh autocomplete: update misleading comment

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 77348d5c..a59abe29 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -23,7 +23,7 @@ __docker-compose_q() {
     docker-compose 2>/dev/null $compose_options "$@"
 }
 
-# Extracts all service names from docker-compose.yml.
+# All services defined in docker-compose.yml
 __docker-compose_all_services_in_compose_file() {
     local already_selected
     local -a services

From 058a7659ba2590dbc067fe76bb6044e0d4f9b192 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 22 Jun 2016 14:53:45 -0700
Subject: [PATCH 1077/1265] Update bundle extension

It's now .dab, for Distributed Application Bundle

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 25ee9050..ae0175d5 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -217,7 +217,7 @@ class TopLevelCommand(object):
 
     def bundle(self, config_options, options):
         """
-        Generate a Docker bundle from the Compose file.
+        Generate a Distributed Application Bundle (DAB) from the Compose file.
 
         Images must have digests stored, which requires interaction with a
         Docker registry. If digests aren't stored for all images, you can pass
@@ -231,14 +231,14 @@ class TopLevelCommand(object):
             --fetch-digests            Automatically fetch image digests if missing
 
             -o, --output PATH          Path to write the bundle file to.
-                                       Defaults to "<project name>.dsb".
+                                       Defaults to "<project name>.dab".
         """
         self.project = project_from_options('.', config_options)
         compose_config = get_config_from_options(self.project_dir, config_options)
 
         output = options["--output"]
         if not output:
-            output = "{}.dsb".format(self.project.name)
+            output = "{}.dab".format(self.project.name)
 
         with errors.handle_connection_errors(self.project.client):
             try:

From 8e0458205241f654bb1d75de9babd9880afa7206 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 27 Jun 2016 16:21:19 -0700
Subject: [PATCH 1078/1265] Fix tests to accommodate short-id container alias

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 068d0efc..85d5776b 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1135,7 +1135,10 @@ class CLITestCase(DockerClientTestCase):
             ]
 
             for _, config in networks.items():
-                assert not config['Aliases']
+                # TODO: once we drop support for API <1.24, this can be changed to:
+                # assert config['Aliases'] == [container.short_id]
+                aliases = set(config['Aliases']) - set([container.short_id])
+                assert not aliases
 
     @v2_only()
     def test_run_detached_connects_to_network(self):
@@ -1152,7 +1155,10 @@ class CLITestCase(DockerClientTestCase):
         ]
 
         for _, config in networks.items():
-            assert not config['Aliases']
+            # TODO: once we drop support for API <1.24, this can be changed to:
+            # assert config['Aliases'] == [container.short_id]
+            aliases = set(config['Aliases']) - set([container.short_id])
+            assert not aliases
 
         assert self.lookup(container, 'app')
         assert self.lookup(container, 'db')

From 95207561bb510a7165fbcb1e9250e6d1baea4c09 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 14 Jun 2016 16:55:48 -0400
Subject: [PATCH 1079/1265] Add some unit tests for new bundle and push
 commands.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/bundle.py                  |  38 +++--
 tests/unit/bundle_test.py          | 232 +++++++++++++++++++++++++++++
 tests/unit/progress_stream_test.py |  20 +++
 3 files changed, 270 insertions(+), 20 deletions(-)
 create mode 100644 tests/unit/bundle_test.py

diff --git a/compose/bundle.py b/compose/bundle.py
index 965d65c8..8a1e859e 100644
--- a/compose/bundle.py
+++ b/compose/bundle.py
@@ -57,17 +57,7 @@ class MissingDigests(Exception):
 
 
 def serialize_bundle(config, image_digests):
-    if config.networks:
-        log.warn("Unsupported top level key 'networks' - ignoring")
-
-    if config.volumes:
-        log.warn("Unsupported top level key 'volumes' - ignoring")
-
-    return json.dumps(
-        to_bundle(config, image_digests),
-        indent=2,
-        sort_keys=True,
-    )
+    return json.dumps(to_bundle(config, image_digests), indent=2, sort_keys=True)
 
 
 def get_image_digests(project, allow_fetch=False):
@@ -99,7 +89,7 @@ def get_image_digest(service, allow_fetch=False):
             "required to generate a proper image digest for the bundle. Specify "
             "an image repo and tag with the 'image' option.".format(s=service))
 
-    separator = parse_repository_tag(service.options['image'])[2]
+    _, _, separator = parse_repository_tag(service.options['image'])
     # Compose file already uses a digest, no lookup required
     if separator == '@':
         return service.options['image']
@@ -143,24 +133,32 @@ def fetch_image_digest(service):
     if not digest:
         raise ValueError("Failed to get digest for %s" % service.name)
 
-    repo = parse_repository_tag(service.options['image'])[0]
+    repo, _, _ = parse_repository_tag(service.options['image'])
     identifier = '{repo}@{digest}'.format(repo=repo, digest=digest)
 
-    # Pull by digest so that image['RepoDigests'] is populated for next time
-    # and we don't have to pull/push again
-    service.client.pull(identifier)
-
-    log.info("Stored digest for {}".format(service.image_name))
+    # only do this is RepoTags isn't already populated
+    image = service.image()
+    if not image['RepoDigests']:
+        # Pull by digest so that image['RepoDigests'] is populated for next time
+        # and we don't have to pull/push again
+        service.client.pull(identifier)
+        log.info("Stored digest for {}".format(service.image_name))
 
     return identifier
 
 
 def to_bundle(config, image_digests):
+    if config.networks:
+        log.warn("Unsupported top level key 'networks' - ignoring")
+
+    if config.volumes:
+        log.warn("Unsupported top level key 'volumes' - ignoring")
+
     config = denormalize_config(config)
 
     return {
-        'version': VERSION,
-        'services': {
+        'Version': VERSION,
+        'Services': {
             name: convert_service_to_bundle(
                 name,
                 service_dict,
diff --git a/tests/unit/bundle_test.py b/tests/unit/bundle_test.py
new file mode 100644
index 00000000..ff4c0dce
--- /dev/null
+++ b/tests/unit/bundle_test.py
@@ -0,0 +1,232 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import docker
+import mock
+import pytest
+
+from compose import bundle
+from compose import service
+from compose.cli.errors import UserError
+from compose.config.config import Config
+
+
+@pytest.fixture
+def mock_service():
+    return mock.create_autospec(
+        service.Service,
+        client=mock.create_autospec(docker.Client),
+        options={})
+
+
+def test_get_image_digest_exists(mock_service):
+    mock_service.options['image'] = 'abcd'
+    mock_service.image.return_value = {'RepoDigests': ['digest1']}
+    digest = bundle.get_image_digest(mock_service)
+    assert digest == 'digest1'
+
+
+def test_get_image_digest_image_uses_digest(mock_service):
+    mock_service.options['image'] = image_id = 'redis@sha256:digest'
+
+    digest = bundle.get_image_digest(mock_service)
+    assert digest == image_id
+    assert not mock_service.image.called
+
+
+def test_get_image_digest_no_image(mock_service):
+    with pytest.raises(UserError) as exc:
+        bundle.get_image_digest(service.Service(name='theservice'))
+
+    assert "doesn't define an image tag" in exc.exconly()
+
+
+def test_fetch_image_digest_for_image_with_saved_digest(mock_service):
+    mock_service.options['image'] = image_id = 'abcd'
+    mock_service.pull.return_value = expected = 'sha256:thedigest'
+    mock_service.image.return_value = {'RepoDigests': ['digest1']}
+
+    digest = bundle.fetch_image_digest(mock_service)
+    assert digest == image_id + '@' + expected
+
+    mock_service.pull.assert_called_once_with()
+    assert not mock_service.push.called
+    assert not mock_service.client.pull.called
+
+
+def test_fetch_image_digest_for_image(mock_service):
+    mock_service.options['image'] = image_id = 'abcd'
+    mock_service.pull.return_value = expected = 'sha256:thedigest'
+    mock_service.image.return_value = {'RepoDigests': []}
+
+    digest = bundle.fetch_image_digest(mock_service)
+    assert digest == image_id + '@' + expected
+
+    mock_service.pull.assert_called_once_with()
+    assert not mock_service.push.called
+    mock_service.client.pull.assert_called_once_with(digest)
+
+
+def test_fetch_image_digest_for_build(mock_service):
+    mock_service.options['build'] = '.'
+    mock_service.options['image'] = image_id = 'abcd'
+    mock_service.push.return_value = expected = 'sha256:thedigest'
+    mock_service.image.return_value = {'RepoDigests': ['digest1']}
+
+    digest = bundle.fetch_image_digest(mock_service)
+    assert digest == image_id + '@' + expected
+
+    mock_service.push.assert_called_once_with()
+    assert not mock_service.pull.called
+    assert not mock_service.client.pull.called
+
+
+def test_to_bundle():
+    image_digests = {'a': 'aaaa', 'b': 'bbbb'}
+    services = [
+        {'name': 'a', 'build': '.', },
+        {'name': 'b', 'build': './b'},
+    ]
+    config = Config(
+        version=2,
+        services=services,
+        volumes={'special': {}},
+        networks={'extra': {}})
+
+    with mock.patch('compose.bundle.log.warn', autospec=True) as mock_log:
+        output = bundle.to_bundle(config, image_digests)
+
+    assert mock_log.mock_calls == [
+        mock.call("Unsupported top level key 'networks' - ignoring"),
+        mock.call("Unsupported top level key 'volumes' - ignoring"),
+    ]
+
+    assert output == {
+        'Version': '0.1',
+        'Services': {
+            'a': {'Image': 'aaaa', 'Networks': ['default']},
+            'b': {'Image': 'bbbb', 'Networks': ['default']},
+        }
+    }
+
+
+def test_convert_service_to_bundle():
+    name = 'theservice'
+    image_digest = 'thedigest'
+    service_dict = {
+        'ports': ['80'],
+        'expose': ['1234'],
+        'networks': {'extra': {}},
+        'command': 'foo',
+        'entrypoint': 'entry',
+        'environment': {'BAZ': 'ENV'},
+        'build': '.',
+        'working_dir': '/tmp',
+        'user': 'root',
+        'labels': {'FOO': 'LABEL'},
+        'privileged': True,
+    }
+
+    with mock.patch('compose.bundle.log.warn', autospec=True) as mock_log:
+        config = bundle.convert_service_to_bundle(name, service_dict, image_digest)
+
+    mock_log.assert_called_once_with(
+        "Unsupported key 'privileged' in services.theservice - ignoring")
+
+    assert config == {
+        'Image': image_digest,
+        'Ports': [
+            {'Protocol': 'tcp', 'Port': 80},
+            {'Protocol': 'tcp', 'Port': 1234},
+        ],
+        'Networks': ['extra'],
+        'Command': ['entry', 'foo'],
+        'Env': ['BAZ=ENV'],
+        'WorkingDir': '/tmp',
+        'User': 'root',
+        'Labels': {'FOO': 'LABEL'},
+    }
+
+
+def test_set_command_and_args_none():
+    config = {}
+    bundle.set_command_and_args(config, [], [])
+    assert config == {}
+
+
+def test_set_command_and_args_from_command():
+    config = {}
+    bundle.set_command_and_args(config, [], "echo ok")
+    assert config == {'Args': ['echo', 'ok']}
+
+
+def test_set_command_and_args_from_entrypoint():
+    config = {}
+    bundle.set_command_and_args(config, "echo entry", [])
+    assert config == {'Command': ['echo', 'entry']}
+
+
+def test_set_command_and_args_from_both():
+    config = {}
+    bundle.set_command_and_args(config, "echo entry", ["extra", "arg"])
+    assert config == {'Command': ['echo', 'entry', "extra", "arg"]}
+
+
+def test_make_service_networks_default():
+    name = 'theservice'
+    service_dict = {}
+
+    with mock.patch('compose.bundle.log.warn', autospec=True) as mock_log:
+        networks = bundle.make_service_networks(name, service_dict)
+
+    assert not mock_log.called
+    assert networks == ['default']
+
+
+def test_make_service_networks():
+    name = 'theservice'
+    service_dict = {
+        'networks': {
+            'foo': {
+                'aliases': ['one', 'two'],
+            },
+            'bar': {}
+        },
+    }
+
+    with mock.patch('compose.bundle.log.warn', autospec=True) as mock_log:
+        networks = bundle.make_service_networks(name, service_dict)
+
+    mock_log.assert_called_once_with(
+        "Unsupported key 'aliases' in services.theservice.networks.foo - ignoring")
+    assert sorted(networks) == sorted(service_dict['networks'])
+
+
+def test_make_port_specs():
+    service_dict = {
+        'expose': ['80', '500/udp'],
+        'ports': [
+            '400:80',
+            '222',
+            '127.0.0.1:8001:8001',
+            '127.0.0.1:5000-5001:3000-3001'],
+    }
+    port_specs = bundle.make_port_specs(service_dict)
+    assert port_specs == [
+        {'Protocol': 'tcp', 'Port': 80},
+        {'Protocol': 'tcp', 'Port': 222},
+        {'Protocol': 'tcp', 'Port': 8001},
+        {'Protocol': 'tcp', 'Port': 3000},
+        {'Protocol': 'tcp', 'Port': 3001},
+        {'Protocol': 'udp', 'Port': 500},
+    ]
+
+
+def test_make_port_spec_with_protocol():
+    port_spec = bundle.make_port_spec("5000/udp")
+    assert port_spec == {'Protocol': 'udp', 'Port': 5000}
+
+
+def test_make_port_spec_default_protocol():
+    port_spec = bundle.make_port_spec("50000")
+    assert port_spec == {'Protocol': 'tcp', 'Port': 50000}
diff --git a/tests/unit/progress_stream_test.py b/tests/unit/progress_stream_test.py
index b01be11a..c0cb906d 100644
--- a/tests/unit/progress_stream_test.py
+++ b/tests/unit/progress_stream_test.py
@@ -65,3 +65,23 @@ class ProgressStreamTestCase(unittest.TestCase):
 
         events = progress_stream.stream_output(events, output)
         self.assertTrue(len(output.getvalue()) > 0)
+
+
+def test_get_digest_from_push():
+    digest = "sha256:abcd"
+    events = [
+        {"status": "..."},
+        {"status": "..."},
+        {"progressDetail": {}, "aux": {"Digest": digest}},
+    ]
+    assert progress_stream.get_digest_from_push(events) == digest
+
+
+def test_get_digest_from_pull():
+    digest = "sha256:abcd"
+    events = [
+        {"status": "..."},
+        {"status": "..."},
+        {"status": "Digest: %s" % digest},
+    ]
+    assert progress_stream.get_digest_from_pull(events) == digest

From 5640bd42a83e7d30a2f52e919d6e4e691095b9ed Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 16 Jun 2016 15:15:17 -0400
Subject: [PATCH 1080/1265] Add an acceptance test for bundle.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/bundle.py                             |  2 +-
 tests/acceptance/cli_test.py                  | 27 +++++++++++++++++++
 .../bundle-with-digests/docker-compose.yml    |  9 +++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 tests/fixtures/bundle-with-digests/docker-compose.yml

diff --git a/compose/bundle.py b/compose/bundle.py
index 8a1e859e..44f6954b 100644
--- a/compose/bundle.py
+++ b/compose/bundle.py
@@ -136,7 +136,7 @@ def fetch_image_digest(service):
     repo, _, _ = parse_repository_tag(service.options['image'])
     identifier = '{repo}@{digest}'.format(repo=repo, digest=digest)
 
-    # only do this is RepoTags isn't already populated
+    # only do this if RepoDigests isn't already populated
     image = service.image()
     if not image['RepoDigests']:
         # Pull by digest so that image['RepoDigests'] is populated for next time
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 068d0efc..7aef7b52 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -12,6 +12,7 @@ from collections import Counter
 from collections import namedtuple
 from operator import attrgetter
 
+import py
 import yaml
 from docker import errors
 
@@ -378,6 +379,32 @@ class CLITestCase(DockerClientTestCase):
         ]
         assert not containers
 
+    def test_bundle_with_digests(self):
+        self.base_dir = 'tests/fixtures/bundle-with-digests/'
+        tmpdir = py.test.ensuretemp('cli_test_bundle')
+        self.addCleanup(tmpdir.remove)
+        filename = str(tmpdir.join('example.dab'))
+
+        self.dispatch(['bundle', '--output', filename])
+        with open(filename, 'r') as fh:
+            bundle = json.load(fh)
+
+        assert bundle == {
+            'Version': '0.1',
+            'Services': {
+                'web': {
+                    'Image': ('dockercloud/hello-world@sha256:fe79a2cfbd17eefc3'
+                              '44fb8419420808df95a1e22d93b7f621a7399fd1e9dca1d'),
+                    'Networks': ['default'],
+                },
+                'redis': {
+                    'Image': ('redis@sha256:a84cb8f53a70e19f61ff2e1d5e73fb7ae62d'
+                              '374b2b7392de1e7d77be26ef8f7b'),
+                    'Networks': ['default'],
+                }
+            },
+        }
+
     def test_create(self):
         self.dispatch(['create'])
         service = self.project.get_service('simple')
diff --git a/tests/fixtures/bundle-with-digests/docker-compose.yml b/tests/fixtures/bundle-with-digests/docker-compose.yml
new file mode 100644
index 00000000..b7013512
--- /dev/null
+++ b/tests/fixtures/bundle-with-digests/docker-compose.yml
@@ -0,0 +1,9 @@
+
+version: '2.0'
+
+services:
+  web:
+    image: dockercloud/hello-world@sha256:fe79a2cfbd17eefc344fb8419420808df95a1e22d93b7f621a7399fd1e9dca1d
+
+  redis:
+    image: redis@sha256:a84cb8f53a70e19f61ff2e1d5e73fb7ae62d374b2b7392de1e7d77be26ef8f7b

From a822406eb0179ec1f6fe09637dfc3b20662a7085 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 16 Jun 2016 15:10:56 -0700
Subject: [PATCH 1081/1265] Update docker-py version in requirements

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index eb5275f4..160bd0ef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 PyYAML==3.11
 cached-property==1.2.0
-docker-py==1.8.1
+docker-py==1.9.0rc2
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
diff --git a/setup.py b/setup.py
index 0b37c1dd..3696adc6 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.8',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.8.1, < 2',
+    'docker-py == 1.9.0rc2',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

From edd28f09d1bfe16b969ae6719b4a7e66e12c82f7 Mon Sep 17 00:00:00 2001
From: Ke Xu <leonhartx.k@gmail.com>
Date: Wed, 29 Jun 2016 11:01:50 +0900
Subject: [PATCH 1082/1265] change dsb to dab

Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 539482e5..2995932d 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -200,7 +200,7 @@ __docker-compose_subcommand() {
         (bundle)
             _arguments \
                 $opts_help \
-                '(--output -o)'{--output,-o}'[Path to write the bundle file to. Defaults to "<project name>.dsb".]:file:_files' && ret=0
+                '(--output -o)'{--output,-o}'[Path to write the bundle file to. Defaults to "<project name>.dab".]:file:_files' && ret=0
             ;;
         (config)
             _arguments \

From 2b6ea847b91da78023b94b832eaffc65170ae74d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 29 Jun 2016 10:25:47 -0400
Subject: [PATCH 1083/1265] Update requirements.txt

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 requirements.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index eb5275f4..d4748aa1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,12 @@
 PyYAML==3.11
+backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.2.0
 docker-py==1.8.1
 dockerpty==0.4.1
 docopt==0.6.1
-enum34==1.0.4
+enum34==1.0.4; python_version < '3.4'
+functools32==3.2.3.post2; python_version < '3.2'
+ipaddress==1.0.16
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3

From 622de27c1e1cbb5f25140cf6d4bc8bb0625d9a3b Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Wed, 29 Jun 2016 08:45:36 -0700
Subject: [PATCH 1084/1265] bash completion for `docker-compose bundle
 --fetch-digests`

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker-compose | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 0adfdca8..0201bcb2 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -117,7 +117,7 @@ _docker_compose_bundle() {
 			;;
 	esac
 
-	COMPREPLY=( $( compgen -W "--help --output -o" -- "$cur" ) )
+	COMPREPLY=( $( compgen -W "--fetch-digests --help --output -o" -- "$cur" ) )
 }
 
 

From a62739b9068ac4f83580021794c736c98b3415f8 Mon Sep 17 00:00:00 2001
From: Chris Clark <chris@untrod.com>
Date: Thu, 30 Jun 2016 15:30:22 -0700
Subject: [PATCH 1085/1265] Signed-off-by: Chris Clark <chris@untrod.com>

The postgres image expects a specific volume path. The docs had a typo in that path. This can cause a lot of agony. This is not hypothetical agony, but very real agony that was very recently experienced :)
---
 docs/compose-file.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 8c10b5f3..464cf271 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -789,7 +789,7 @@ called `data` and mount it into the `db` service's containers.
       db:
         image: postgres
         volumes:
-          - data:/var/lib/postgres/data
+          - data:/var/lib/postgresql/data
 
     volumes:
       data:

From 5d244ef6d89f79bb9323b2ecf74a7895d7a46b8d Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 22 Apr 2016 14:45:51 -0700
Subject: [PATCH 1086/1265] Unset env vars behavior in 'run' mirroring engine

Unset env vars passed to `run` via command line options take the
value of the system's var with the same name.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py           |  4 +++-
 compose/config/environment.py | 12 ++++++++++++
 tests/acceptance/cli_test.py  |  8 ++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index ae0175d5..5d2b4fa2 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -891,7 +891,9 @@ def build_container_options(options, detach, command):
     }
 
     if options['-e']:
-        container_options['environment'] = parse_environment(options['-e'])
+        container_options['environment'] = Environment.from_command_line(
+            parse_environment(options['-e'])
+        )
 
     if options['--entrypoint']:
         container_options['entrypoint'] = options.get('--entrypoint')
diff --git a/compose/config/environment.py b/compose/config/environment.py
index ff08b771..5d6b5af6 100644
--- a/compose/config/environment.py
+++ b/compose/config/environment.py
@@ -60,6 +60,18 @@ class Environment(dict):
         instance.update(os.environ)
         return instance
 
+    @classmethod
+    def from_command_line(cls, parsed_env_opts):
+        result = cls()
+        for k, v in parsed_env_opts.items():
+            # Values from the command line take priority, unless they're unset
+            # in which case they take the value from the system's environment
+            if v is None and k in os.environ:
+                result[k] = os.environ[k]
+            else:
+                result[k] = v
+        return result
+
     def __getitem__(self, key):
         try:
             return super(Environment, self).__getitem__(key)
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 7b1785ee..43fe5650 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1216,6 +1216,14 @@ class CLITestCase(DockerClientTestCase):
             'simplecomposefile_simple_run_1',
             'exited'))
 
+    @mock.patch.dict(os.environ)
+    def test_run_env_values_from_system(self):
+        os.environ['FOO'] = 'bar'
+        os.environ['BAR'] = 'baz'
+        result = self.dispatch(['run', '-e', 'FOO', 'simple', 'env'], None)
+        assert 'FOO=bar' in result.stdout
+        assert 'BAR=baz' not in result.stdout
+
     def test_rm(self):
         service = self.project.get_service('simple')
         service.create_container()

From 10ae81f8cf94b71bdea03bcb622d972baf39f011 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 30 Jun 2016 15:18:05 -0700
Subject: [PATCH 1087/1265] Post-merge fix - restore Environment import in
 main.py

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 5d2b4fa2..f4c17167 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -19,6 +19,7 @@ from ..bundle import MissingDigests
 from ..bundle import serialize_bundle
 from ..config import ConfigurationError
 from ..config import parse_environment
+from ..config.environment import Environment
 from ..config.serialize import serialize_config
 from ..const import DEFAULT_TIMEOUT
 from ..const import IS_WINDOWS_PLATFORM

From 50d5aab8adbb4463aec49e31d0b90080de3733e3 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 30 Jun 2016 16:26:12 -0700
Subject: [PATCH 1088/1265] Fix test: check container's Env array instead of
 the output of 'env'

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 43fe5650..64662654 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1220,9 +1220,13 @@ class CLITestCase(DockerClientTestCase):
     def test_run_env_values_from_system(self):
         os.environ['FOO'] = 'bar'
         os.environ['BAR'] = 'baz'
-        result = self.dispatch(['run', '-e', 'FOO', 'simple', 'env'], None)
-        assert 'FOO=bar' in result.stdout
-        assert 'BAR=baz' not in result.stdout
+
+        self.dispatch(['run', '-e', 'FOO', 'simple', 'true'], None)
+
+        container = self.project.containers(one_off=OneOffFilter.only, stopped=True)[0]
+        environment = container.get('Config.Env')
+        assert 'FOO=bar' in environment
+        assert 'BAR=baz' not in environment
 
     def test_rm(self):
         service = self.project.get_service('simple')

From 3d0a1de0237024ae8ac49c052edf70d811b069da Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 30 Jun 2016 18:40:39 -0400
Subject: [PATCH 1089/1265] Upgrade pip on osx

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 script/travis/ci      | 2 +-
 script/travis/install | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/script/travis/ci b/script/travis/ci
index 4cce1bc8..cd4fcc6d 100755
--- a/script/travis/ci
+++ b/script/travis/ci
@@ -6,5 +6,5 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     tox -e py27,py34 -- tests/unit
 else
     # TODO: we could also install py34 and test against it
-    python -m tox -e py27 -- tests/unit
+    tox -e py27 -- tests/unit
 fi
diff --git a/script/travis/install b/script/travis/install
index a23667bf..d4b34786 100755
--- a/script/travis/install
+++ b/script/travis/install
@@ -5,5 +5,6 @@ set -ex
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     pip install tox==2.1.1
 else
-    pip install --user tox==2.1.1
+    sudo pip install --upgrade pip tox==2.1.1 virtualenv
+    pip --version
 fi

From 931b01acf93f44b89999f4239e91c3bc8d15dba0 Mon Sep 17 00:00:00 2001
From: allencloud <allen.sun@daocloud.io>
Date: Sat, 2 Jul 2016 23:27:10 +0800
Subject: [PATCH 1090/1265] make-output-consistent-typo

Signed-off-by: allencloud <allen.sun@daocloud.io>
---
 compose/cli/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index f4c17167..ff6dba11 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -178,7 +178,7 @@ class TopLevelCommand(object):
       pause              Pause services
       port               Print the public port for a port binding
       ps                 List containers
-      pull               Pulls service images
+      pull               Pull service images
       push               Push service images
       restart            Restart services
       rm                 Remove stopped containers

From 6fe5d2b54351143ee4eab090ccd58c5067985078 Mon Sep 17 00:00:00 2001
From: George Lester <glester491@gmail.com>
Date: Tue, 5 Jul 2016 23:43:25 -0700
Subject: [PATCH 1091/1265] Implemented oom_score_adj

Signed-off-by: George Lester <glester491@gmail.com>
---
 compose/config/config.py               |  1 +
 compose/config/config_schema_v2.0.json |  1 +
 compose/service.py                     |  2 ++
 docs/compose-file.md                   |  2 +-
 tests/integration/service_test.py      |  5 +++++
 tests/unit/config/config_test.py       | 20 ++++++++++++++++++++
 6 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 7a2b3d36..d3ab1d4b 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -70,6 +70,7 @@ DOCKER_CONFIG_KEYS = [
     'mem_limit',
     'memswap_limit',
     'net',
+    'oom_score_adj'
     'pid',
     'ports',
     'privileged',
diff --git a/compose/config/config_schema_v2.0.json b/compose/config/config_schema_v2.0.json
index e84d1317..c08fa4d7 100644
--- a/compose/config/config_schema_v2.0.json
+++ b/compose/config/config_schema_v2.0.json
@@ -166,6 +166,7 @@
             }
           ]
         },
+        "oom_score_adj": {"type": "integer", "minimum": -1000, "maximum": 1000},
         "pid": {"type": ["string", "null"]},
 
         "ports": {
diff --git a/compose/service.py b/compose/service.py
index af572e5b..73381466 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -53,6 +53,7 @@ DOCKER_START_KEYS = [
     'log_opt',
     'mem_limit',
     'memswap_limit',
+    'oom_score_adj',
     'pid',
     'privileged',
     'restart',
@@ -695,6 +696,7 @@ class Service(object):
             cpu_quota=options.get('cpu_quota'),
             shm_size=options.get('shm_size'),
             tmpfs=options.get('tmpfs'),
+            oom_score_adj=options.get('oom_score_adj')
         )
 
     def build(self, no_cache=False, pull=False, force_rm=False):
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 464cf271..f7b5a931 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -715,7 +715,7 @@ then read-write will be used.
 >     - container_name
 >     - container_name:rw
 
-### cpu\_shares, cpu\_quota, cpuset, domainname, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, shm\_size, stdin\_open, tty, user, working\_dir
+### cpu\_shares, cpu\_quota, cpuset, domainname, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, oom_score_adj, privileged, read\_only, restart, shm\_size, stdin\_open, tty, user, working\_dir
 
 Each of these is a single value, analogous to its
 [docker run](https://docs.docker.com/engine/reference/run/) counterpart.
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 1801f5bf..02f9cc0b 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -854,6 +854,11 @@ class ServiceTest(DockerClientTestCase):
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.RestartPolicy.Name'), 'always')
 
+    def test_oom_score_adj_value(self):
+        service = self.create_service('web', oom_score_adj=500)
+        container = create_and_start_container(service)
+        self.assertEqual(container.get('HostConfig.OomScoreAdj'), 500)
+
     def test_restart_on_failure_value(self):
         service = self.create_service('web', restart={
             'Name': 'on-failure',
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 2dad224b..1be8aefa 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1243,6 +1243,26 @@ class ConfigTest(unittest.TestCase):
             }
         ]
 
+    def test_oom_score_adj_option(self):
+
+        actual = config.load(build_config_details({
+            'version': '2',
+            'services': {
+                'web': {
+                    'image': 'alpine',
+                    'oom_score_adj': 500
+                }
+            }
+        }))
+
+        assert actual.services == [
+            {
+                'name': 'web',
+                'image': 'alpine',
+                'oom_score_adj': 500
+            }
+        ]
+
     def test_merge_service_dicts_from_files_with_extends_in_base(self):
         base = {
             'volumes': ['.:/app'],

From 5dabc81c16d69aad6ecb114a119add5bc77bd9bf Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Tue, 5 Jul 2016 17:29:28 +0100
Subject: [PATCH 1092/1265] Suggest to run Docker for Mac if it isn't running

Instead of suggesting docker-machine.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 compose/cli/errors.py | 30 ++++++++++++++++++++----------
 compose/cli/utils.py  |  4 ++++
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index 2c68d36d..89a7a949 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -15,6 +15,7 @@ from requests.packages.urllib3.exceptions import ReadTimeoutError
 from ..const import API_VERSION_TO_ENGINE_VERSION
 from ..const import HTTP_TIMEOUT
 from .utils import call_silently
+from .utils import is_docker_for_mac_installed
 from .utils import is_mac
 from .utils import is_ubuntu
 
@@ -48,16 +49,7 @@ def handle_connection_errors(client):
         if e.args and isinstance(e.args[0], ReadTimeoutError):
             log_timeout_error()
             raise ConnectionError()
-
-        if call_silently(['which', 'docker']) != 0:
-            if is_mac():
-                exit_with_error(docker_not_found_mac)
-            if is_ubuntu():
-                exit_with_error(docker_not_found_ubuntu)
-            exit_with_error(docker_not_found_generic)
-        if call_silently(['which', 'docker-machine']) == 0:
-            exit_with_error(conn_error_docker_machine)
-        exit_with_error(conn_error_generic.format(url=client.base_url))
+        exit_with_error(get_conn_error_message(client.base_url))
     except APIError as e:
         log_api_error(e, client.api_version)
         raise ConnectionError()
@@ -97,6 +89,20 @@ def exit_with_error(msg):
     raise ConnectionError()
 
 
+def get_conn_error_message(url):
+    if call_silently(['which', 'docker']) != 0:
+        if is_mac():
+            return docker_not_found_mac
+        if is_ubuntu():
+            return docker_not_found_ubuntu
+        return docker_not_found_generic
+    if is_docker_for_mac_installed():
+        return conn_error_docker_for_mac
+    if call_silently(['which', 'docker-machine']) == 0:
+        return conn_error_docker_machine
+    return conn_error_generic.format(url=url)
+
+
 docker_not_found_mac = """
     Couldn't connect to Docker daemon. You might need to install Docker:
 
@@ -122,6 +128,10 @@ conn_error_docker_machine = """
     Couldn't connect to Docker daemon - you might need to run `docker-machine start default`.
 """
 
+conn_error_docker_for_mac = """
+    Couldn't connect to Docker daemon. You might need to start Docker for Mac.
+"""
+
 
 conn_error_generic = """
     Couldn't connect to Docker daemon at {url} - is it running?
diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index cc2b680d..bf5df80c 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -103,3 +103,7 @@ def get_build_version():
 
     with open(filename) as fh:
         return fh.read().strip()
+
+
+def is_docker_for_mac_installed():
+    return is_mac() and os.path.isdir('/Applications/Docker.app')

From 949b88fff935dce586f9226976db105a50c17253 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 6 Jul 2016 09:56:25 -0700
Subject: [PATCH 1093/1265] Fix alias tests on 1.11

The fix in 8e0458205241f654bb1d75de9babd9880afa7206 caused a regression
when testing against 1.11.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/acceptance/cli_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 64662654..a8fd3249 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1164,7 +1164,7 @@ class CLITestCase(DockerClientTestCase):
             for _, config in networks.items():
                 # TODO: once we drop support for API <1.24, this can be changed to:
                 # assert config['Aliases'] == [container.short_id]
-                aliases = set(config['Aliases']) - set([container.short_id])
+                aliases = set(config['Aliases'] or []) - set([container.short_id])
                 assert not aliases
 
     @v2_only()
@@ -1184,7 +1184,7 @@ class CLITestCase(DockerClientTestCase):
         for _, config in networks.items():
             # TODO: once we drop support for API <1.24, this can be changed to:
             # assert config['Aliases'] == [container.short_id]
-            aliases = set(config['Aliases']) - set([container.short_id])
+            aliases = set(config['Aliases'] or []) - set([container.short_id])
             assert not aliases
 
         assert self.lookup(container, 'app')

From 08127625a0de1a50bf4e1a1f9861c669fe778be4 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 6 Jul 2016 18:01:27 -0700
Subject: [PATCH 1094/1265] Pin base image to alpine:3.4 in Dockerfile.run

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 Dockerfile.run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.run b/Dockerfile.run
index 792077ad..4e76d64f 100644
--- a/Dockerfile.run
+++ b/Dockerfile.run
@@ -1,5 +1,5 @@
 
-FROM    alpine:edge
+FROM    alpine:3.4
 RUN     apk -U add \
             python \
             py-pip

From 49d4fd27952433feb20bc22117aba4766c15c1c1 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 7 Jul 2016 11:41:11 -0700
Subject: [PATCH 1095/1265] Update install.md and CHANGELOG.md for 1.7.1

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 CHANGELOG.md    | 41 +++++++++++++++++++++++++++++++++++++++++
 docs/install.md |  6 +++---
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ee45386..0064a5cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,47 @@
 Change log
 ==========
 
+1.7.1 (2016-05-04)
+-----------------
+
+Bug Fixes
+
+- Fixed a bug where the output of `docker-compose config` for v1 files
+  would be an invalid configuration file.
+
+- Fixed a bug where `docker-compose config` would not check the validity
+  of links.
+
+- Fixed an issue where `docker-compose help` would not output a list of
+  available commands and generic options as expected.
+
+- Fixed an issue where filtering by service when using `docker-compose logs`
+  would not apply for newly created services.
+
+- Fixed a bug where unchanged services would sometimes be recreated in
+  in the up phase when using Compose with Python 3.
+
+- Fixed an issue where API errors encountered during the up phase would
+  not be recognized as a failure state by Compose.
+
+- Fixed a bug where Compose would raise a NameError because of an undefined
+  exception name on non-Windows platforms.
+
+- Fixed a bug where the wrong version of `docker-py` would sometimes be
+  installed alongside Compose.
+
+- Fixed a bug where the host value output by `docker-machine config default`
+  would not be recognized as valid options by the `docker-compose`
+  command line.
+
+- Fixed an issue where Compose would sometimes exit unexpectedly  while
+  reading events broadcasted by a Swarm cluster.
+
+- Corrected a statement in the docs about the location of the `.env` file,
+  which is indeed read from the current directory, instead of in the same
+  location as the Compose file.
+
+
 1.7.0 (2016-04-13)
 ------------------
 
diff --git a/docs/install.md b/docs/install.md
index 95416e7a..76e4a868 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -39,7 +39,7 @@ which the release page specifies, in your terminal.
 
      The following is an example command illustrating the format:
 
-        curl -L https://github.com/docker/compose/releases/download/1.6.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+        curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 
      If you have problems installing with `curl`, see
      [Alternative Install Options](#alternative-install-options).
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
 7. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.6.2
+        docker-compose version: 1.7.1
 
 
 ## Alternative install options
@@ -77,7 +77,7 @@ to get started.
 Compose can also be run inside a container, from a small bash script wrapper.
 To install compose as a container run:
 
-    $ curl -L https://github.com/docker/compose/releases/download/1.6.2/run.sh > /usr/local/bin/docker-compose
+    $ curl -L https://github.com/docker/compose/releases/download/1.7.1/run.sh > /usr/local/bin/docker-compose
     $ chmod +x /usr/local/bin/docker-compose
 
 ## Master builds

From 576a2ee7aef42203fd66064a8e40d991e611f90b Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 7 Jul 2016 11:58:10 -0700
Subject: [PATCH 1096/1265] Stop checking the deprecated DOCKER_CLIENT_TIMEOUT
 variable

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/docker_client.py | 4 ----
 compose/const.py             | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 3e0873c4..bed6be79 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -45,10 +45,6 @@ def docker_client(environment, version=None, tls_config=None, host=None,
     Returns a docker-py client configured using environment variables
     according to the same logic as the official Docker client.
     """
-    if 'DOCKER_CLIENT_TIMEOUT' in environment:
-        log.warn("The DOCKER_CLIENT_TIMEOUT environment variable is deprecated.  "
-                 "Please use COMPOSE_HTTP_TIMEOUT instead.")
-
     try:
         kwargs = kwargs_from_env(environment=environment, ssl_version=tls_version)
     except TLSParameterError:
diff --git a/compose/const.py b/compose/const.py
index 9e00d96e..b930e0bf 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -1,11 +1,10 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import os
 import sys
 
 DEFAULT_TIMEOUT = 10
-HTTP_TIMEOUT = int(os.environ.get('DOCKER_CLIENT_TIMEOUT', 60))
+HTTP_TIMEOUT = 60
 IMAGE_EVENTS = ['delete', 'import', 'pull', 'push', 'tag', 'untag']
 IS_WINDOWS_PLATFORM = (sys.platform == "win32")
 LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'

From 4207d43b85c1c6b77bad82349b17fd060fa2abf4 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 7 Jul 2016 12:08:47 -0700
Subject: [PATCH 1097/1265] Fix timeout value in error message

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/errors.py                |  7 +++----
 tests/unit/cli/docker_client_test.py | 23 +++++++++++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index 89a7a949..5af3ede9 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -13,7 +13,6 @@ from requests.exceptions import SSLError
 from requests.packages.urllib3.exceptions import ReadTimeoutError
 
 from ..const import API_VERSION_TO_ENGINE_VERSION
-from ..const import HTTP_TIMEOUT
 from .utils import call_silently
 from .utils import is_docker_for_mac_installed
 from .utils import is_mac
@@ -47,7 +46,7 @@ def handle_connection_errors(client):
         raise ConnectionError()
     except RequestsConnectionError as e:
         if e.args and isinstance(e.args[0], ReadTimeoutError):
-            log_timeout_error()
+            log_timeout_error(client.timeout)
             raise ConnectionError()
         exit_with_error(get_conn_error_message(client.base_url))
     except APIError as e:
@@ -58,13 +57,13 @@ def handle_connection_errors(client):
         raise ConnectionError()
 
 
-def log_timeout_error():
+def log_timeout_error(timeout):
     log.error(
         "An HTTP request took too long to complete. Retry with --verbose to "
         "obtain debug information.\n"
         "If you encounter this issue regularly because of slow network "
         "conditions, consider setting COMPOSE_HTTP_TIMEOUT to a higher "
-        "value (current value: %s)." % HTTP_TIMEOUT)
+        "value (current value: %s)." % timeout)
 
 
 def log_api_error(e, client_version):
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index 5334a944..74669d4a 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -6,6 +6,7 @@ import os
 import docker
 import pytest
 
+from compose.cli import errors
 from compose.cli.docker_client import docker_client
 from compose.cli.docker_client import tls_config_from_options
 from tests import mock
@@ -19,11 +20,25 @@ class DockerClientTestCase(unittest.TestCase):
             del os.environ['HOME']
             docker_client(os.environ)
 
+    @mock.patch.dict(os.environ)
     def test_docker_client_with_custom_timeout(self):
-        timeout = 300
-        with mock.patch('compose.cli.docker_client.HTTP_TIMEOUT', 300):
-            client = docker_client(os.environ)
-            self.assertEqual(client.timeout, int(timeout))
+        os.environ['COMPOSE_HTTP_TIMEOUT'] = '123'
+        client = docker_client(os.environ)
+        assert client.timeout == 123
+
+    @mock.patch.dict(os.environ)
+    def test_custom_timeout_error(self):
+        os.environ['COMPOSE_HTTP_TIMEOUT'] = '123'
+        client = docker_client(os.environ)
+
+        with mock.patch('compose.cli.errors.log') as fake_log:
+            with pytest.raises(errors.ConnectionError):
+                with errors.handle_connection_errors(client):
+                    raise errors.RequestsConnectionError(
+                        errors.ReadTimeoutError(None, None, None))
+
+        assert fake_log.error.call_count == 1
+        assert '123' in fake_log.error.call_args[0][0]
 
 
 class TLSConfigTestCase(unittest.TestCase):

From fea970dff3df60c7579eb06959444160a570927e Mon Sep 17 00:00:00 2001
From: Tomas Tomecek <ttomecek@redhat.com>
Date: Thu, 21 Apr 2016 14:03:02 +0200
Subject: [PATCH 1098/1265] service: detailed error messages for create and
 start

Fixes: #3355

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
---
 compose/cli/main.py               |  4 +++-
 compose/errors.py                 |  7 +++++++
 compose/parallel.py               |  4 ++++
 compose/service.py                | 12 ++++++++++--
 tests/integration/service_test.py |  5 ++++-
 5 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 compose/errors.py

diff --git a/compose/cli/main.py b/compose/cli/main.py
index c924d89d..ed15d6a5 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -32,6 +32,7 @@ from ..service import BuildError
 from ..service import ConvergenceStrategy
 from ..service import ImageType
 from ..service import NeedsBuildError
+from ..service import OperationFailedError
 from .command import get_config_from_options
 from .command import project_from_options
 from .docopt_command import DocoptDispatcher
@@ -61,7 +62,8 @@ def main():
     except (KeyboardInterrupt, signals.ShutdownException):
         log.error("Aborting.")
         sys.exit(1)
-    except (UserError, NoSuchService, ConfigurationError, ProjectError) as e:
+    except (UserError, NoSuchService, ConfigurationError,
+            ProjectError, OperationFailedError) as e:
         log.error(e.msg)
         sys.exit(1)
     except BuildError as e:
diff --git a/compose/errors.py b/compose/errors.py
new file mode 100644
index 00000000..9f68760d
--- /dev/null
+++ b/compose/errors.py
@@ -0,0 +1,7 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+
+class OperationFailedError(Exception):
+    def __init__(self, reason):
+        self.msg = reason
diff --git a/compose/parallel.py b/compose/parallel.py
index 50b2dbea..7ac66b37 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -12,6 +12,7 @@ from six.moves.queue import Empty
 from six.moves.queue import Queue
 
 from compose.cli.signals import ShutdownException
+from compose.errors import OperationFailedError
 from compose.utils import get_output_stream
 
 
@@ -47,6 +48,9 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None):
         elif isinstance(exception, APIError):
             errors[get_name(obj)] = exception.explanation
             writer.write(get_name(obj), 'error')
+        elif isinstance(exception, OperationFailedError):
+            errors[get_name(obj)] = exception.msg
+            writer.write(get_name(obj), 'error')
         elif isinstance(exception, UpstreamError):
             writer.write(get_name(obj), 'error')
         else:
diff --git a/compose/service.py b/compose/service.py
index 73381466..60343542 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -27,6 +27,7 @@ from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
 from .const import LABEL_VERSION
 from .container import Container
+from .errors import OperationFailedError
 from .parallel import parallel_execute
 from .parallel import parallel_start
 from .progress_stream import stream_output
@@ -278,7 +279,11 @@ class Service(object):
         if 'name' in container_options and not quiet:
             log.info("Creating %s" % container_options['name'])
 
-        return Container.create(self.client, **container_options)
+        try:
+            return Container.create(self.client, **container_options)
+        except APIError as ex:
+            raise OperationFailedError("Cannot create container for service %s: %s" %
+                                       (self.name, ex.explanation))
 
     def ensure_image_exists(self, do_build=BuildAction.none):
         if self.can_be_built() and do_build == BuildAction.force:
@@ -448,7 +453,10 @@ class Service(object):
 
     def start_container(self, container):
         self.connect_container_to_networks(container)
-        container.start()
+        try:
+            container.start()
+        except APIError as ex:
+            raise OperationFailedError("Cannot start service %s: %s" % (self.name, ex.explanation))
         return container
 
     def connect_container_to_networks(self, container):
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 7d2f03d3..97ad7476 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -738,7 +738,10 @@ class ServiceTest(DockerClientTestCase):
 
         self.assertEqual(len(service.containers()), 1)
         self.assertTrue(service.containers()[0].is_running)
-        self.assertIn("ERROR: for composetest_web_2  Boom", mock_stderr.getvalue())
+        self.assertIn(
+            "ERROR: for composetest_web_2  Cannot create container for service web: Boom",
+            mock_stderr.getvalue()
+        )
 
     def test_scale_with_unexpected_exception(self):
         """Test that when scaling if the API returns an error, that is not of type

From 83f35e132b37bf20baec264e49905c3ecc944ace Mon Sep 17 00:00:00 2001
From: Jonathan Giannuzzi <jonathan@giannuzzi.be>
Date: Mon, 11 Jul 2016 11:34:01 +0200
Subject: [PATCH 1099/1265] Add support for creating internal networks

Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
---
 compose/config/config_schema_v2.0.json       |  3 ++-
 compose/network.py                           |  5 +++-
 docs/compose-file.md                         |  6 ++++-
 tests/acceptance/cli_test.py                 | 18 +++++++++++++
 tests/fixtures/networks/network-internal.yml | 13 ++++++++++
 tests/integration/project_test.py            | 27 ++++++++++++++++++++
 tests/unit/config/config_test.py             |  8 ++++++
 7 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100755 tests/fixtures/networks/network-internal.yml

diff --git a/compose/config/config_schema_v2.0.json b/compose/config/config_schema_v2.0.json
index c08fa4d7..ac46944c 100644
--- a/compose/config/config_schema_v2.0.json
+++ b/compose/config/config_schema_v2.0.json
@@ -246,7 +246,8 @@
             "name": {"type": "string"}
           },
           "additionalProperties": false
-        }
+        },
+        "internal": {"type": "boolean"}
       },
       "additionalProperties": false
     },
diff --git a/compose/network.py b/compose/network.py
index affba7c2..8962a892 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -15,7 +15,7 @@ log = logging.getLogger(__name__)
 
 class Network(object):
     def __init__(self, client, project, name, driver=None, driver_opts=None,
-                 ipam=None, external_name=None):
+                 ipam=None, external_name=None, internal=False):
         self.client = client
         self.project = project
         self.name = name
@@ -23,6 +23,7 @@ class Network(object):
         self.driver_opts = driver_opts
         self.ipam = create_ipam_config_from_dict(ipam)
         self.external_name = external_name
+        self.internal = internal
 
     def ensure(self):
         if self.external_name:
@@ -68,6 +69,7 @@ class Network(object):
                 driver=self.driver,
                 options=self.driver_opts,
                 ipam=self.ipam,
+                internal=self.internal,
             )
 
     def remove(self):
@@ -115,6 +117,7 @@ def build_networks(name, config_data, client):
             driver_opts=data.get('driver_opts'),
             ipam=data.get('ipam'),
             external_name=data.get('external_name'),
+            internal=data.get('internal'),
         )
         for network_name, data in network_config.items()
     }
diff --git a/docs/compose-file.md b/docs/compose-file.md
index f7b5a931..59fcf331 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -859,6 +859,10 @@ A full example:
             host2: 172.28.1.6
             host3: 172.28.1.7
 
+### internal
+
+By default, Docker also connects a bridge network to it to provide external connectivity. If you want to create an externally isolated overlay network, you can set this option to `true`.
+
 ### external
 
 If set to `true`, specifies that this network has been created outside of
@@ -866,7 +870,7 @@ Compose. `docker-compose up` will not attempt to create it, and will raise
 an error if it doesn't exist.
 
 `external` cannot be used in conjunction with other network configuration keys
-(`driver`, `driver_opts`, `ipam`).
+(`driver`, `driver_opts`, `ipam`, `internal`).
 
 In the example below, `proxy` is the gateway to the outside world. Instead of
 attemping to create a network called `[projectname]_outside`, Compose will
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index a8fd3249..dad23bec 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -576,6 +576,24 @@ class CLITestCase(DockerClientTestCase):
         assert 'forward_facing' in front_aliases
         assert 'ahead' in front_aliases
 
+    @v2_only()
+    def test_up_with_network_internal(self):
+        self.require_api_version('1.23')
+        filename = 'network-internal.yml'
+        self.base_dir = 'tests/fixtures/networks'
+        self.dispatch(['-f', filename, 'up', '-d'], None)
+        internal_net = '{}_internal'.format(self.project.name)
+
+        networks = [
+            n for n in self.client.networks()
+            if n['Name'].startswith('{}_'.format(self.project.name))
+        ]
+
+        # One network was created: internal
+        assert sorted(n['Name'] for n in networks) == [internal_net]
+
+        assert networks[0]['Internal'] is True
+
     @v2_only()
     def test_up_with_network_static_addresses(self):
         filename = 'network-static-addresses.yml'
diff --git a/tests/fixtures/networks/network-internal.yml b/tests/fixtures/networks/network-internal.yml
new file mode 100755
index 00000000..1fa339b1
--- /dev/null
+++ b/tests/fixtures/networks/network-internal.yml
@@ -0,0 +1,13 @@
+version: "2"
+
+services:
+  web:
+    image: busybox
+    command: top
+    networks:
+      - internal
+
+networks:
+  internal:
+    driver: bridge
+    internal: True
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 6e82e931..80915c1a 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -756,6 +756,33 @@ class ProjectTest(DockerClientTestCase):
         with self.assertRaises(ProjectError):
             project.up()
 
+    @v2_only()
+    def test_project_up_with_network_internal(self):
+        self.require_api_version('1.23')
+        config_data = config.Config(
+            version=V2_0,
+            services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'networks': {'internal': None},
+            }],
+            volumes={},
+            networks={
+                'internal': {'driver': 'bridge', 'internal': True},
+            },
+        )
+
+        project = Project.from_config(
+            client=self.client,
+            name='composetest',
+            config_data=config_data,
+        )
+        project.up()
+
+        network = self.client.networks(names=['composetest_internal'])[0]
+
+        assert network['Internal'] is True
+
     @v2_only()
     def test_project_up_volumes(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 1be8aefa..d88c1d47 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -101,6 +101,10 @@ class ConfigTest(unittest.TestCase):
                                 {'subnet': '172.28.0.0/16'}
                             ]
                         }
+                    },
+                    'internal': {
+                        'driver': 'bridge',
+                        'internal': True
                     }
                 }
             }, 'working_dir', 'filename.yml')
@@ -140,6 +144,10 @@ class ConfigTest(unittest.TestCase):
                         {'subnet': '172.28.0.0/16'}
                     ]
                 }
+            },
+            'internal': {
+                'driver': 'bridge',
+                'internal': True
             }
         })
 

From 593d1aeb09a10f4c28f848c7d8d7fc62ef09f6ae Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 11 Jul 2016 16:13:16 -0400
Subject: [PATCH 1100/1265] Fix bugs with entrypoint/command in docker-compose
 run

- When no command is passed but `--entrypoint` is, set Cmd to `[]`
- When command is a single empty string, set Cmd to `[""]`

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py                           |  4 +-
 tests/acceptance/cli_test.py                  | 59 +++++++++++++++----
 .../docker-compose.yml                        |  2 -
 .../entrypoint-composefile/docker-compose.yml |  6 ++
 .../Dockerfile                                |  3 +-
 .../entrypoint-dockerfile/docker-compose.yml  |  4 ++
 6 files changed, 63 insertions(+), 15 deletions(-)
 delete mode 100644 tests/fixtures/dockerfile_with_entrypoint/docker-compose.yml
 create mode 100644 tests/fixtures/entrypoint-composefile/docker-compose.yml
 rename tests/fixtures/{dockerfile_with_entrypoint => entrypoint-dockerfile}/Dockerfile (57%)
 create mode 100644 tests/fixtures/entrypoint-dockerfile/docker-compose.yml

diff --git a/compose/cli/main.py b/compose/cli/main.py
index c924d89d..e33bbe6e 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -668,8 +668,10 @@ class TopLevelCommand(object):
                 'can not be used together'
             )
 
-        if options['COMMAND']:
+        if options['COMMAND'] is not None:
             command = [options['COMMAND']] + options['ARGS']
+        elif options['--entrypoint'] is not None:
+            command = []
         else:
             command = service.options.get('command')
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index dad23bec..a0d1702c 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -4,7 +4,6 @@ from __future__ import unicode_literals
 import datetime
 import json
 import os
-import shlex
 import signal
 import subprocess
 import time
@@ -983,16 +982,54 @@ class CLITestCase(DockerClientTestCase):
             [u'/bin/true'],
         )
 
-    def test_run_service_with_entrypoint_overridden(self):
-        self.base_dir = 'tests/fixtures/dockerfile_with_entrypoint'
-        name = 'service'
-        self.dispatch(['run', '--entrypoint', '/bin/echo', name, 'helloworld'])
-        service = self.project.get_service(name)
-        container = service.containers(stopped=True, one_off=OneOffFilter.only)[0]
-        self.assertEqual(
-            shlex.split(container.human_readable_command),
-            [u'/bin/echo', u'helloworld'],
-        )
+    def test_run_service_with_dockerfile_entrypoint(self):
+        self.base_dir = 'tests/fixtures/entrypoint-dockerfile'
+        self.dispatch(['run', 'test'])
+        container = self.project.containers(stopped=True, one_off=OneOffFilter.only)[0]
+        assert container.get('Config.Entrypoint') == ['printf']
+        assert container.get('Config.Cmd') == ['default', 'args']
+
+    def test_run_service_with_dockerfile_entrypoint_overridden(self):
+        self.base_dir = 'tests/fixtures/entrypoint-dockerfile'
+        self.dispatch(['run', '--entrypoint', 'echo', 'test'])
+        container = self.project.containers(stopped=True, one_off=OneOffFilter.only)[0]
+        assert container.get('Config.Entrypoint') == ['echo']
+        assert not container.get('Config.Cmd')
+
+    def test_run_service_with_dockerfile_entrypoint_and_command_overridden(self):
+        self.base_dir = 'tests/fixtures/entrypoint-dockerfile'
+        self.dispatch(['run', '--entrypoint', 'echo', 'test', 'foo'])
+        container = self.project.containers(stopped=True, one_off=OneOffFilter.only)[0]
+        assert container.get('Config.Entrypoint') == ['echo']
+        assert container.get('Config.Cmd') == ['foo']
+
+    def test_run_service_with_compose_file_entrypoint(self):
+        self.base_dir = 'tests/fixtures/entrypoint-composefile'
+        self.dispatch(['run', 'test'])
+        container = self.project.containers(stopped=True, one_off=OneOffFilter.only)[0]
+        assert container.get('Config.Entrypoint') == ['printf']
+        assert container.get('Config.Cmd') == ['default', 'args']
+
+    def test_run_service_with_compose_file_entrypoint_overridden(self):
+        self.base_dir = 'tests/fixtures/entrypoint-composefile'
+        self.dispatch(['run', '--entrypoint', 'echo', 'test'])
+        container = self.project.containers(stopped=True, one_off=OneOffFilter.only)[0]
+        assert container.get('Config.Entrypoint') == ['echo']
+        assert not container.get('Config.Cmd')
+
+    def test_run_service_with_compose_file_entrypoint_and_command_overridden(self):
+        self.base_dir = 'tests/fixtures/entrypoint-composefile'
+        self.dispatch(['run', '--entrypoint', 'echo', 'test', 'foo'])
+        container = self.project.containers(stopped=True, one_off=OneOffFilter.only)[0]
+        assert container.get('Config.Entrypoint') == ['echo']
+        assert container.get('Config.Cmd') == ['foo']
+
+    def test_run_service_with_compose_file_entrypoint_and_empty_string_command(self):
+        self.base_dir = 'tests/fixtures/entrypoint-composefile'
+        self.dispatch(['run', '--entrypoint', 'echo', 'test', ''])
+        container = self.project.containers(stopped=True, one_off=OneOffFilter.only)[0]
+        assert container.get('Config.Entrypoint') == ['echo']
+        assert container.get('Config.Cmd') == ['']
 
     def test_run_service_with_user_overridden(self):
         self.base_dir = 'tests/fixtures/user-composefile'
diff --git a/tests/fixtures/dockerfile_with_entrypoint/docker-compose.yml b/tests/fixtures/dockerfile_with_entrypoint/docker-compose.yml
deleted file mode 100644
index 78631502..00000000
--- a/tests/fixtures/dockerfile_with_entrypoint/docker-compose.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-service:
-  build: .
diff --git a/tests/fixtures/entrypoint-composefile/docker-compose.yml b/tests/fixtures/entrypoint-composefile/docker-compose.yml
new file mode 100644
index 00000000..e9880973
--- /dev/null
+++ b/tests/fixtures/entrypoint-composefile/docker-compose.yml
@@ -0,0 +1,6 @@
+version: "2"
+services:
+  test:
+    image: busybox
+    entrypoint: printf
+    command: default args
diff --git a/tests/fixtures/dockerfile_with_entrypoint/Dockerfile b/tests/fixtures/entrypoint-dockerfile/Dockerfile
similarity index 57%
rename from tests/fixtures/dockerfile_with_entrypoint/Dockerfile
rename to tests/fixtures/entrypoint-dockerfile/Dockerfile
index e7454e59..49f4416c 100644
--- a/tests/fixtures/dockerfile_with_entrypoint/Dockerfile
+++ b/tests/fixtures/entrypoint-dockerfile/Dockerfile
@@ -1,3 +1,4 @@
 FROM busybox:latest
 LABEL com.docker.compose.test_image=true
-ENTRYPOINT echo "From prebuilt entrypoint"
+ENTRYPOINT ["printf"]
+CMD ["default", "args"]
diff --git a/tests/fixtures/entrypoint-dockerfile/docker-compose.yml b/tests/fixtures/entrypoint-dockerfile/docker-compose.yml
new file mode 100644
index 00000000..8318e61f
--- /dev/null
+++ b/tests/fixtures/entrypoint-dockerfile/docker-compose.yml
@@ -0,0 +1,4 @@
+version: "2"
+services:
+  test:
+    build: .

From 907b0690e6f9f1882297d02eb77266910217af11 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 20 Jul 2016 12:23:51 +0100
Subject: [PATCH 1101/1265] Clarify environment and env_file docs

Add note to say that environment variables will not be automatically
made available at build time, and point to the `args` documentation.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/compose-file.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 59fcf331..d286257d 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -276,6 +276,11 @@ beginning with `#` (i.e. comments) are ignored, as are blank lines.
     # Set Rails/Rack environment
     RACK_ENV=development
 
+> **Note:** If your service specifies a [build](#build) option, variables
+> defined in environment files will _not_ be automatically visible during the
+> build. Use the [args](#args) sub-option of `build` to define build-time
+> environment variables.
+
 ### environment
 
 Add environment variables. You can use either an array or a dictionary. Any
@@ -295,6 +300,11 @@ machine Compose is running on, which can be helpful for secret or host-specific
       - SHOW=true
       - SESSION_SECRET
 
+> **Note:** If your service specifies a [build](#build) option, variables
+> defined in `environment` will _not_ be automatically visible during the
+> build. Use the [args](#args) sub-option of `build` to define build-time
+> environment variables.
+
 ### expose
 
 Expose ports without publishing them to the host machine - they'll only be

From 9ab1d55d06b3f8b8480c64a5c958c45a1361f286 Mon Sep 17 00:00:00 2001
From: Jarrod Pooler <jarrod.pooler@homesite.com>
Date: Fri, 8 Jul 2016 15:56:15 -0400
Subject: [PATCH 1102/1265] Updating arg docs in the proper place

Signed-off-by: Jarrod Pooler <jarrod.pooler@homesite.com>
---
 docs/compose-file.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index d286257d..fce3f1bc 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -119,6 +119,29 @@ Add build arguments. You can use either an array or a dictionary. Any
 boolean values; true, false, yes, no, need to be enclosed in quotes to ensure
 they are not converted to True or False by the YML parser.
 
+First, specify the arguments in your Dockerfile:
+
+    ARG buildno
+    ARG password
+
+    RUN echo "Build number: $buildno"
+    RUN script-requiring-password.sh "$password"
+
+Then specify the arguments under the `build` key. You can pass either a mapping
+or a list:
+
+    build:
+      context: .
+      args:
+        buildno: 1
+        password: secret
+
+    build:
+      context: .
+      args:
+        - buildno=1
+        - password=secret
+
 Build arguments with only a key are resolved to their environment value on the
 machine Compose is running on.
 

From 425303992c8a953440a16ebce4997cbf225b4d1a Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 20 Jul 2016 12:47:47 +0100
Subject: [PATCH 1103/1265] Reorder/clarify args docs

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/compose-file.md | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index fce3f1bc..d6d0cadc 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -115,9 +115,8 @@ specified.
 
 > [Version 2 file format](#version-2) only.
 
-Add build arguments. You can use either an array or a dictionary. Any
-boolean values; true, false, yes, no, need to be enclosed in quotes to ensure
-they are not converted to True or False by the YML parser.
+Add build arguments, which are environment variables accessible only during the
+build process.
 
 First, specify the arguments in your Dockerfile:
 
@@ -142,18 +141,15 @@ or a list:
         - buildno=1
         - password=secret
 
-Build arguments with only a key are resolved to their environment value on the
-machine Compose is running on.
+You can omit the value when specifying a build argument, in which case its value
+at build time is the value in the environment where Compose is running.
 
-    build:
-      args:
-        buildno: 1
-        user: someuser
+    args:
+      - buildno
+      - password
 
-    build:
-      args:
-        - buildno=1
-        - user=someuser
+> **Note**: YAML boolean values (`true`, `false`, `yes`, `no`, `on`, `off`) must
+> be enclosed in quotes, so that the parser interprets them as strings.
 
 ### cap_add, cap_drop
 

From 6649e9aba3293272b99ce68232cac4bdff0dc5f3 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@docker.com>
Date: Wed, 20 Jul 2016 12:45:02 +0100
Subject: [PATCH 1104/1265] tearDown the project override at the end of each
 test case

self._project.client is a docker.client.Client, so creating a new self._project
leaks (via the embedded connection pool) a bunch of Unix socket file
descriptors for each test which overrides self.project using this mechanism.

In my tests I observed the test harness using 800-900 file descriptor, which is
OK on Linux with the default limit of 1024 but breaks on OSX (e.g. with
Docker4Mac) where the default limit is only 256. The failure can be provoked on
Linux too with `ulimit -n 256`.

With this fix I have observed the process ending with ~100 file descriptors
open, including 83 Unix sockets, so I think there is likely at least one more
leak lurking.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
---
 tests/acceptance/cli_test.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index dad23bec..84d401e3 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -114,6 +114,8 @@ class CLITestCase(DockerClientTestCase):
             for n in networks:
                 if n['Name'].startswith('{}_'.format(self.project.name)):
                     self.client.remove_network(n['Name'])
+        if hasattr(self, '_project'):
+            del self._project
 
         super(CLITestCase, self).tearDown()
 

From 0483bcb472e2b765fdff4fca1545b32704f93557 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@docker.com>
Date: Wed, 20 Jul 2016 15:51:22 +0100
Subject: [PATCH 1105/1265] delete DockerClientTestCase.client class attribute
 on tearDownClass

This is a docker.client.Client and therefore contains a connection pool, so
each subclass of DockerClientTestCase can end up holding on to up to 10 Unix
socket file descriptors after the tests contained in the sub-class are
complete.

Before this by the end of a test run I was seeing ~100 open file descriptors,
~80 of which were Unix domain sockets. By cleaning these up only 15 Unix
sockets remain at the end (out of ~25 fds, the rest of which are the Python
interpretter, opened libraries etc).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
---
 tests/integration/testcases.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 8d69d531..3e33a6c0 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -63,6 +63,10 @@ class DockerClientTestCase(unittest.TestCase):
 
         cls.client = docker_client(Environment(), version)
 
+    @classmethod
+    def tearDownClass(cls):
+        del cls.client
+
     def tearDown(self):
         for c in self.client.containers(
                 all=True,

From 5cdf30fc12a84bbb88df390a376d3ba75066b01f Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@docker.com>
Date: Thu, 21 Jul 2016 12:18:33 +0100
Subject: [PATCH 1106/1265] Teardown project and db in ResilienceTest

These hold a reference to a docker.client.Client object and therefore a
connection pool which leaves fds open once the test has completed.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
---
 tests/integration/resilience_test.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/integration/resilience_test.py b/tests/integration/resilience_test.py
index b544783a..2a2d1b56 100644
--- a/tests/integration/resilience_test.py
+++ b/tests/integration/resilience_test.py
@@ -20,6 +20,11 @@ class ResilienceTest(DockerClientTestCase):
         self.db.start_container(container)
         self.host_path = container.get_mount('/var/db')['Source']
 
+    def tearDown(self):
+        del self.project
+        del self.db
+        super(ResilienceTest, self).tearDown()
+
     def test_successful_recreate(self):
         self.project.up(strategy=ConvergenceStrategy.always)
         container = self.db.containers()[0]

From 3124fec01a5c89b52dfcbbf837058e9e5635e631 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@docker.com>
Date: Thu, 21 Jul 2016 12:21:43 +0100
Subject: [PATCH 1107/1265] tearDown tmp_volumes array itself in VolumeTest

Each volume in the array holds a reference to a docker.client.Client object and
therefore a connection pool which leaves fds open once the test has completed.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
---
 tests/integration/volume_test.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/integration/volume_test.py b/tests/integration/volume_test.py
index 706179ed..04922ccd 100644
--- a/tests/integration/volume_test.py
+++ b/tests/integration/volume_test.py
@@ -17,6 +17,7 @@ class VolumeTest(DockerClientTestCase):
                 self.client.remove_volume(volume.full_name)
             except DockerException:
                 pass
+        del self.tmp_volumes
 
     def create_volume(self, name, driver=None, opts=None, external=None):
         if external and isinstance(external, bool):

From d6f70dddc7376e2193ee27778f184022dec4014e Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@docker.com>
Date: Thu, 21 Jul 2016 12:24:24 +0100
Subject: [PATCH 1108/1265] Call the superclass tearDown in VolumeTest

Currently it doesn't actually seem to make any practical difference that this
is missing, but it seems like good practice to do so anyway, to be robust
against future test case changes which might require cleanup done in the super
class.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
---
 tests/integration/volume_test.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/integration/volume_test.py b/tests/integration/volume_test.py
index 04922ccd..a75250ac 100644
--- a/tests/integration/volume_test.py
+++ b/tests/integration/volume_test.py
@@ -18,6 +18,7 @@ class VolumeTest(DockerClientTestCase):
             except DockerException:
                 pass
         del self.tmp_volumes
+        super(VolumeTest, self).tearDown()
 
     def create_volume(self, name, driver=None, opts=None, external=None):
         if external and isinstance(external, bool):

From 07e2426d89750d8eddabe9537d527ac46197e753 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 25 Jul 2016 13:38:04 +0100
Subject: [PATCH 1109/1265] Remove doc on experimental networking support

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 experimental/compose_swarm_networking.md | 182 +----------------------
 1 file changed, 2 insertions(+), 180 deletions(-)

diff --git a/experimental/compose_swarm_networking.md b/experimental/compose_swarm_networking.md
index b1fb25dc..905f52f8 100644
--- a/experimental/compose_swarm_networking.md
+++ b/experimental/compose_swarm_networking.md
@@ -1,183 +1,5 @@
 # Experimental: Compose, Swarm and Multi-Host Networking
 
-The [experimental build of Docker](https://github.com/docker/docker/tree/master/experimental) has an entirely new networking system, which enables secure communication between containers on multiple hosts. In combination with Docker Swarm and Docker Compose, you can now run multi-container apps on multi-host clusters with the same tooling and configuration format you use to develop them locally.
+Compose now supports multi-host networking as standard. Read more here:
 
-> Note: This functionality is in the experimental stage, and contains some hacks and workarounds which will be removed as it matures.
-
-## Prerequisites
-
-Before you start, you’ll need to install the experimental build of Docker, and the latest versions of Machine and Compose.
-
--   To install the experimental Docker build on a Linux machine, follow the instructions [here](https://github.com/docker/docker/tree/master/experimental#install-docker-experimental).
-
--   To install the experimental Docker build on a Mac, run these commands:
-
-        $ curl -L https://experimental.docker.com/builds/Darwin/x86_64/docker-latest > /usr/local/bin/docker
-        $ chmod +x /usr/local/bin/docker
-
--   To install Machine, follow the instructions [here](https://docs.docker.com/machine/install-machine/).
-
--   To install Compose, follow the instructions [here](https://docs.docker.com/compose/install/).
-
-You’ll also need a [Docker Hub](https://hub.docker.com/account/signup/) account and a [Digital Ocean](https://www.digitalocean.com/) account.
-
-## Set up a swarm with multi-host networking
-
-Set the `DIGITALOCEAN_ACCESS_TOKEN` environment variable to a valid Digital Ocean API token, which you can generate in the [API panel](https://cloud.digitalocean.com/settings/applications).
-
-    DIGITALOCEAN_ACCESS_TOKEN=abc12345
-
-Start a consul server:
-
-    docker-machine create -d digitalocean --engine-install-url https://experimental.docker.com consul
-    docker $(docker-machine config consul) run -d -p 8500:8500 -h consul progrium/consul -server -bootstrap
-
-(In a real world setting you’d set up a distributed consul, but that’s beyond the scope of this guide!)
-
-Create a Swarm token:
-
-    SWARM_TOKEN=$(docker run swarm create)
-
-Create a Swarm master:
-
-    docker-machine create -d digitalocean --swarm --swarm-master --swarm-discovery=token://$SWARM_TOKEN --engine-install-url="https://experimental.docker.com" --digitalocean-image "ubuntu-14-10-x64" --engine-opt=default-network=overlay:multihost --engine-label=com.docker.network.driver.overlay.bind_interface=eth0 --engine-opt=kv-store=consul:$(docker-machine ip consul):8500 swarm-0
-
-Create a Swarm node:
-
-    docker-machine create -d digitalocean --swarm --swarm-discovery=token://$SWARM_TOKEN --engine-install-url="https://experimental.docker.com" --digitalocean-image "ubuntu-14-10-x64" --engine-opt=default-network=overlay:multihost --engine-label=com.docker.network.driver.overlay.bind_interface=eth0 --engine-opt=kv-store=consul:$(docker-machine ip consul):8500 --engine-label com.docker.network.driver.overlay.neighbor_ip=$(docker-machine ip swarm-0) swarm-1
-
-You can create more Swarm nodes if you want - it’s best to give them sensible names (swarm-2, swarm-3, etc).
-
-Finally, point Docker at your swarm:
-
-    eval "$(docker-machine env --swarm swarm-0)"
-
-## Run containers and get them communicating
-
-Now that you’ve got a swarm up and running, you can create containers on it just like a single Docker instance:
-
-    $ docker run busybox echo hello world
-    hello world
-
-If you run `docker ps -a`, you can see what node that container was started on by looking at its name (here it’s swarm-3):
-
-    $ docker ps -a
-    CONTAINER ID        IMAGE                      COMMAND                CREATED              STATUS                      PORTS                                   NAMES
-    41f59749737b        busybox                    "echo hello world"     15 seconds ago       Exited (0) 13 seconds ago                                           swarm-3/trusting_leakey
-
-As you start more containers, they’ll be placed on different nodes across the cluster, thanks to Swarm’s default “spread” scheduling strategy.
-
-Every container started on this swarm will use the “overlay:multihost” network by default, meaning they can all intercommunicate. Each container gets an IP address on that network, and an `/etc/hosts` file which will be updated on-the-fly with every other container’s IP address and name. That means that if you have a running container named ‘foo’, other containers can access it at the hostname ‘foo’.
-
-Let’s verify that multi-host networking is functioning. Start a long-running container:
-
-    $ docker run -d --name long-running busybox top
-    <container id>
-
-If you start a new container and inspect its /etc/hosts file, you’ll see the long-running container in there:
-
-    $ docker run busybox cat /etc/hosts
-    ...
-    172.21.0.6  long-running
-
-Verify that connectivity works between containers:
-
-    $ docker run busybox ping long-running
-    PING long-running (172.21.0.6): 56 data bytes
-    64 bytes from 172.21.0.6: seq=0 ttl=64 time=7.975 ms
-    64 bytes from 172.21.0.6: seq=1 ttl=64 time=1.378 ms
-    64 bytes from 172.21.0.6: seq=2 ttl=64 time=1.348 ms
-    ^C
-    --- long-running ping statistics ---
-    3 packets transmitted, 3 packets received, 0% packet loss
-    round-trip min/avg/max = 1.140/2.099/7.975 ms
-
-## Run a Compose application
-
-Here’s an example of a simple Python + Redis app using multi-host networking on a swarm.
-
-Create a directory for the app:
-
-    $ mkdir composetest
-    $ cd composetest
-
-Inside this directory, create 2 files.
-
-First, create `app.py` - a simple web app that uses the Flask framework and increments a value in Redis:
-
-    from flask import Flask
-    from redis import Redis
-    import os
-    app = Flask(__name__)
-    redis = Redis(host='composetest_redis_1', port=6379)
-
-    @app.route('/')
-    def hello():
-        redis.incr('hits')
-        return 'Hello World! I have been seen %s times.' % redis.get('hits')
-
-    if __name__ == "__main__":
-        app.run(host="0.0.0.0", debug=True)
-
-Note that we’re connecting to a host called `composetest_redis_1` - this is the name of the Redis container that Compose will start.
-
-Second, create a Dockerfile for the app container:
-
-    FROM python:2.7
-    RUN pip install flask redis
-    ADD . /code
-    WORKDIR /code
-    CMD ["python", "app.py"]
-
-Build the Docker image and push it to the Hub (you’ll need a Hub account). Replace `<username>` with your Docker Hub username:
-
-    $ docker build -t <username>/counter .
-    $ docker push <username>/counter
-
-Next, create a `docker-compose.yml`, which defines the configuration for the web and redis containers. Once again, replace `<username>` with your Hub username:
-
-    web:
-      image: <username>/counter
-      ports:
-       - "80:5000"
-    redis:
-      image: redis
-
-Now start the app:
-
-    $ docker-compose up -d
-    Pulling web (username/counter:latest)...
-    swarm-0: Pulling username/counter:latest... : downloaded
-    swarm-2: Pulling username/counter:latest... : downloaded
-    swarm-1: Pulling username/counter:latest... : downloaded
-    swarm-3: Pulling username/counter:latest... : downloaded
-    swarm-4: Pulling username/counter:latest... : downloaded
-    Creating composetest_web_1...
-    Pulling redis (redis:latest)...
-    swarm-2: Pulling redis:latest... : downloaded
-    swarm-1: Pulling redis:latest... : downloaded
-    swarm-3: Pulling redis:latest... : downloaded
-    swarm-4: Pulling redis:latest... : downloaded
-    swarm-0: Pulling redis:latest... : downloaded
-    Creating composetest_redis_1...
-
-Swarm has created containers for both web and redis, and placed them on different nodes, which you can check with `docker ps`:
-
-    $ docker ps
-    CONTAINER ID        IMAGE                      COMMAND                CREATED             STATUS              PORTS                                  NAMES
-    92faad2135c9        redis                      "/entrypoint.sh redi   43 seconds ago      Up 42 seconds                                              swarm-2/composetest_redis_1
-    adb809e5cdac        username/counter           "/bin/sh -c 'python    55 seconds ago      Up 54 seconds       45.67.8.9:80->5000/tcp                 swarm-1/composetest_web_1
-
-You can also see that the web container has exposed port 80 on its swarm node. If you curl that IP, you’ll get a response from the container:
-
-    $ curl http://45.67.8.9
-    Hello World! I have been seen 1 times.
-
-If you hit it repeatedly, the counter will increment, demonstrating that the web and redis container are communicating:
-
-    $ curl http://45.67.8.9
-    Hello World! I have been seen 2 times.
-    $ curl http://45.67.8.9
-    Hello World! I have been seen 3 times.
-    $ curl http://45.67.8.9
-    Hello World! I have been seen 4 times.
+https://docs.docker.com/compose/networking

From 2c9e46f60fbe8ddcb4562c1e118f190654d01522 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 1 Jul 2016 13:54:27 -0700
Subject: [PATCH 1110/1265] Show a warning when engine is in swarm mode

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py         | 16 ++++++++++++++++
 tests/unit/project_test.py | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/compose/project.py b/compose/project.py
index 676b6ae8..256fb9c0 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -369,6 +369,8 @@ class Project(object):
            detached=False,
            remove_orphans=False):
 
+        warn_for_swarm_mode(self.client)
+
         self.initialize()
         self.find_orphan_containers(remove_orphans)
 
@@ -533,6 +535,20 @@ def get_volumes_from(project, service_dict):
     return [build_volume_from(vf) for vf in volumes_from]
 
 
+def warn_for_swarm_mode(client):
+    info = client.info()
+    if info.get('Swarm', {}).get('LocalNodeState') == 'active':
+        log.warn(
+            "The Docker Engine you're using is running in swarm mode.\n\n"
+            "Compose does not use swarm mode to deploy services to multiple nodes in a swarm. "
+            "All containers will be scheduled on the current node.\n\n"
+            "To deploy your application across the swarm, "
+            "use the bundle feature of the Docker experimental build.\n\n"
+            "More info:\n"
+            "https://github.com/docker/docker/tree/master/experimental\n"
+        )
+
+
 class NoSuchService(Exception):
     def __init__(self, name):
         self.name = name
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index b6a52e08..9569adc9 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -510,3 +510,35 @@ class ProjectTest(unittest.TestCase):
 
         project.down(ImageType.all, True)
         self.mock_client.remove_image.assert_called_once_with("busybox:latest")
+
+    def test_warning_in_swarm_mode(self):
+        self.mock_client.info.return_value = {'Swarm': {'LocalNodeState': 'active'}}
+        project = Project('composetest', [], self.mock_client)
+
+        with mock.patch('compose.project.log') as fake_log:
+            project.up()
+            assert fake_log.warn.call_count == 1
+
+    def test_no_warning_on_stop(self):
+        self.mock_client.info.return_value = {'Swarm': {'LocalNodeState': 'active'}}
+        project = Project('composetest', [], self.mock_client)
+
+        with mock.patch('compose.project.log') as fake_log:
+            project.stop()
+            assert fake_log.warn.call_count == 0
+
+    def test_no_warning_in_normal_mode(self):
+        self.mock_client.info.return_value = {'Swarm': {'LocalNodeState': 'inactive'}}
+        project = Project('composetest', [], self.mock_client)
+
+        with mock.patch('compose.project.log') as fake_log:
+            project.up()
+            assert fake_log.warn.call_count == 0
+
+    def test_no_warning_with_no_swarm_info(self):
+        self.mock_client.info.return_value = {}
+        project = Project('composetest', [], self.mock_client)
+
+        with mock.patch('compose.project.log') as fake_log:
+            project.up()
+            assert fake_log.warn.call_count == 0

From 583bbb463561807c2983669fbae4c89b21081632 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 25 Jul 2016 13:46:50 +0100
Subject: [PATCH 1111/1265] Copy experimental bundle docs into Compose docs so
 URL is stable

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/project.py |   2 +-
 docs/bundles.md    | 199 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 docs/bundles.md

diff --git a/compose/project.py b/compose/project.py
index 256fb9c0..f85e285f 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -545,7 +545,7 @@ def warn_for_swarm_mode(client):
             "To deploy your application across the swarm, "
             "use the bundle feature of the Docker experimental build.\n\n"
             "More info:\n"
-            "https://github.com/docker/docker/tree/master/experimental\n"
+            "https://docs.docker.com/compose/bundles\n"
         )
 
 
diff --git a/docs/bundles.md b/docs/bundles.md
new file mode 100644
index 00000000..0958e1ef
--- /dev/null
+++ b/docs/bundles.md
@@ -0,0 +1,199 @@
+<!--[metadata]>
++++
+title = "Docker Stacks and Distributed Application Bundles"
+description = "Description of Docker and Compose's experimental support for application bundles"
+keywords = ["documentation, docs,  docker, compose, bundles, stacks"]
+advisory = "experimental"
+[menu.main]
+parent="workw_compose"
++++
+<![end-metadata]-->
+
+
+# Docker Stacks and Distributed Application Bundles (experimental)
+
+> **Note**: This is a copy of the [Docker Stacks and Distributed Application
+> Bundles](https://github.com/docker/docker/blob/v1.12.0-rc4/experimental/docker-stacks-and-bundles.md)
+> document in the [docker/docker repo](https://github.com/docker/docker).
+
+## Overview
+
+Docker Stacks and Distributed Application Bundles are experimental features
+introduced in Docker 1.12 and Docker Compose 1.8, alongside the concept of
+swarm mode, and Nodes and Services in the Engine API.
+
+A Dockerfile can be built into an image, and containers can be created from
+that image. Similarly, a docker-compose.yml can be built into a **distributed
+application bundle**, and **stacks** can be created from that bundle. In that
+sense, the bundle is a multi-services distributable image format.
+
+As of Docker 1.12 and Compose 1.8, the features are experimental. Neither
+Docker Engine nor the Docker Registry support distribution of bundles.
+
+## Producing a bundle
+
+The easiest way to produce a bundle is to generate it using `docker-compose`
+from an existing `docker-compose.yml`. Of course, that's just *one* possible way
+to proceed, in the same way that `docker build` isn't the only way to produce a
+Docker image.
+
+From `docker-compose`:
+
+```bash
+$ docker-compose bundle
+WARNING: Unsupported key 'network_mode' in services.nsqd - ignoring
+WARNING: Unsupported key 'links' in services.nsqd - ignoring
+WARNING: Unsupported key 'volumes' in services.nsqd - ignoring
+[...]
+Wrote bundle to vossibility-stack.dab
+```
+
+## Creating a stack from a bundle
+
+A stack is created using the `docker deploy` command:
+
+```bash
+# docker deploy --help
+
+Usage:  docker deploy [OPTIONS] STACK
+
+Create and update a stack
+
+Options:
+      --file   string        Path to a Distributed Application Bundle file (Default: STACK.dab)
+      --help                 Print usage
+      --with-registry-auth   Send registry authentication details to Swarm agents
+```
+
+Let's deploy the stack created before:
+
+```bash
+# docker deploy vossibility-stack
+Loading bundle from vossibility-stack.dab
+Creating service vossibility-stack_elasticsearch
+Creating service vossibility-stack_kibana
+Creating service vossibility-stack_logstash
+Creating service vossibility-stack_lookupd
+Creating service vossibility-stack_nsqd
+Creating service vossibility-stack_vossibility-collector
+```
+
+We can verify that services were correctly created:
+
+```bash
+# docker service ls
+ID            NAME                                     REPLICAS  IMAGE
+COMMAND
+29bv0vnlm903  vossibility-stack_lookupd                1 nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662 /nsqlookupd
+4awt47624qwh  vossibility-stack_nsqd                   1 nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662 /nsqd --data-path=/data --lookupd-tcp-address=lookupd:4160
+4tjx9biia6fs  vossibility-stack_elasticsearch          1 elasticsearch@sha256:12ac7c6af55d001f71800b83ba91a04f716e58d82e748fa6e5a7359eed2301aa
+7563uuzr9eys  vossibility-stack_kibana                 1 kibana@sha256:6995a2d25709a62694a937b8a529ff36da92ebee74bafd7bf00e6caf6db2eb03
+9gc5m4met4he  vossibility-stack_logstash               1 logstash@sha256:2dc8bddd1bb4a5a34e8ebaf73749f6413c101b2edef6617f2f7713926d2141fe logstash -f /etc/logstash/conf.d/logstash.conf
+axqh55ipl40h  vossibility-stack_vossibility-collector  1 icecrime/vossibility-collector@sha256:f03f2977203ba6253988c18d04061c5ec7aab46bca9dfd89a9a1fa4500989fba --config /config/config.toml --debug
+```
+
+## Managing stacks
+
+Stacks are managed using the `docker stack` command:
+
+```bash
+# docker stack --help
+
+Usage:  docker stack COMMAND
+
+Manage Docker stacks
+
+Options:
+      --help   Print usage
+
+Commands:
+  config      Print the stack configuration
+  deploy      Create and update a stack
+  rm          Remove the stack
+  services    List the services in the stack
+  tasks       List the tasks in the stack
+
+Run 'docker stack COMMAND --help' for more information on a command.
+```
+
+## Bundle file format
+
+Distributed application bundles are described in a JSON format. When bundles
+are persisted as files, the file extension is `.dab` (Docker 1.12RC2 tools use
+`.dsb` for the file extension—this will be updated in the next release client).
+
+A bundle has two top-level fields: `version` and `services`. The version used
+by Docker 1.12 tools is `0.1`.
+
+`services` in the bundle are the services that comprise the app. They
+correspond to the new `Service` object introduced in the 1.12 Docker Engine API.
+
+A service has the following fields:
+
+<dl>
+    <dt>
+        Image (required) <code>string</code>
+    </dt>
+    <dd>
+        The image that the service will run. Docker images should be referenced
+        with full content hash to fully specify the deployment artifact for the
+        service. Example:
+        <code>postgres@sha256:f76245b04ddbcebab5bb6c28e76947f49222c99fec4aadb0bb
+        1c24821a 9e83ef</code>
+    </dd>
+    <dt>
+        Command <code>[]string</code>
+    </dt>
+    <dd>
+        Command to run in service containers.
+    </dd>
+    <dt>
+        Args <code>[]string</code>
+    </dt>
+    <dd>
+        Arguments passed to the service containers.
+    </dd>
+    <dt>
+        Env <code>[]string</code>
+    </dt>
+    <dd>
+        Environment variables.
+    </dd>
+    <dt>
+        Labels <code>map[string]string</code>
+    </dt>
+    <dd>
+        Labels used for setting meta data on services.
+    </dd>
+    <dt>
+        Ports <code>[]Port</code>
+    </dt>
+    <dd>
+        Service ports (composed of <code>Port</code> (<code>int</code>) and
+        <code>Protocol</code> (<code>string</code>). A service description can
+        only specify the container port to be exposed. These ports can be
+        mapped on runtime hosts at the operator's discretion.
+    </dd>
+
+    <dt>
+        WorkingDir <code>string</code>
+    </dt>
+    <dd>
+        Working directory inside the service containers.
+    </dd>
+
+    <dt>
+        User <code>string</code>
+    </dt>
+    <dd>
+        Username or UID (format: <code>&lt;name|uid&gt;[:&lt;group|gid&gt;]</code>).
+    </dd>
+
+    <dt>
+        Networks <code>[]string</code>
+    </dt>
+    <dd>
+        Networks that the service containers should be connected to. An entity
+        deploying a bundle should create networks as needed.
+    </dd>
+</dl>

From 887ed8d1b650ac18fac3f58213cd7cf897f5d885 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 25 Jul 2016 16:48:28 +0100
Subject: [PATCH 1112/1265] Rename --fetch-digests to --push-images and remove
 auto-pull

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/bundle.py         | 43 +++++++++++++++++-------------------
 compose/cli/main.py       | 35 +++++++++++++++++++++--------
 tests/unit/bundle_test.py | 46 ++++++++++++++-------------------------
 3 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/compose/bundle.py b/compose/bundle.py
index 44f6954b..afbdabfa 100644
--- a/compose/bundle.py
+++ b/compose/bundle.py
@@ -60,7 +60,7 @@ def serialize_bundle(config, image_digests):
     return json.dumps(to_bundle(config, image_digests), indent=2, sort_keys=True)
 
 
-def get_image_digests(project, allow_fetch=False):
+def get_image_digests(project, allow_push=False):
     digests = {}
     needs_push = set()
     needs_pull = set()
@@ -69,7 +69,7 @@ def get_image_digests(project, allow_fetch=False):
         try:
             digests[service.name] = get_image_digest(
                 service,
-                allow_fetch=allow_fetch,
+                allow_push=allow_push,
             )
         except NeedsPush as e:
             needs_push.add(e.image_name)
@@ -82,7 +82,7 @@ def get_image_digests(project, allow_fetch=False):
     return digests
 
 
-def get_image_digest(service, allow_fetch=False):
+def get_image_digest(service, allow_push=False):
     if 'image' not in service.options:
         raise UserError(
             "Service '{s.name}' doesn't define an image tag. An image name is "
@@ -108,27 +108,24 @@ def get_image_digest(service, allow_fetch=False):
         # digests
         return image['RepoDigests'][0]
 
-    if not allow_fetch:
-        if 'build' in service.options:
-            raise NeedsPush(service.image_name)
-        else:
-            raise NeedsPull(service.image_name)
-
-    return fetch_image_digest(service)
-
-
-def fetch_image_digest(service):
     if 'build' not in service.options:
-        digest = service.pull()
-    else:
-        try:
-            digest = service.push()
-        except:
-            log.error(
-                "Failed to push image for service '{s.name}'. Please use an "
-                "image tag that can be pushed to a Docker "
-                "registry.".format(s=service))
-            raise
+        raise NeedsPull(service.image_name)
+
+    if not allow_push:
+        raise NeedsPush(service.image_name)
+
+    return push_image(service)
+
+
+def push_image(service):
+    try:
+        digest = service.push()
+    except:
+        log.error(
+            "Failed to push image for service '{s.name}'. Please use an "
+            "image tag that can be pushed to a Docker "
+            "registry.".format(s=service))
+        raise
 
     if not digest:
         raise ValueError("Failed to get digest for %s" % service.name)
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 3f153d0d..db06a5e1 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -223,15 +223,16 @@ class TopLevelCommand(object):
         Generate a Distributed Application Bundle (DAB) from the Compose file.
 
         Images must have digests stored, which requires interaction with a
-        Docker registry. If digests aren't stored for all images, you can pass
-        `--fetch-digests` to automatically fetch them. Images for services
-        with a `build` key will be pushed. Images for services without a
-        `build` key will be pulled.
+        Docker registry. If digests aren't stored for all images, you can fetch
+        them with `docker-compose pull` or `docker-compose push`. To push images
+        automatically when bundling, pass `--push-images`. Only services with
+        a `build` option specified will have their images pushed.
 
         Usage: bundle [options]
 
         Options:
-            --fetch-digests            Automatically fetch image digests if missing
+            --push-images              Automatically push images for any services
+                                       which have a `build` option specified.
 
             -o, --output PATH          Path to write the bundle file to.
                                        Defaults to "<project name>.dab".
@@ -247,7 +248,7 @@ class TopLevelCommand(object):
             try:
                 image_digests = get_image_digests(
                     self.project,
-                    allow_fetch=options['--fetch-digests'],
+                    allow_push=options['--push-images'],
                 )
             except MissingDigests as e:
                 def list_images(images):
@@ -256,12 +257,28 @@ class TopLevelCommand(object):
                 paras = ["Some images are missing digests."]
 
                 if e.needs_push:
-                    paras += ["The following images need to be pushed:", list_images(e.needs_push)]
+                    command_hint = (
+                        "Use `docker-compose push {}` to push them. "
+                        "You can do this automatically with `docker-compose bundle --push-images`."
+                        .format(" ".join(sorted(e.needs_push)))
+                    )
+                    paras += [
+                        "The following images can be pushed:",
+                        list_images(e.needs_push),
+                        command_hint,
+                    ]
 
                 if e.needs_pull:
-                    paras += ["The following images need to be pulled:", list_images(e.needs_pull)]
+                    command_hint = (
+                        "Use `docker-compose pull {}` to pull them. "
+                        .format(" ".join(sorted(e.needs_pull)))
+                    )
 
-                paras.append("If this is OK, run `docker-compose bundle --fetch-digests`.")
+                    paras += [
+                        "The following images need to be pulled:",
+                        list_images(e.needs_pull),
+                        command_hint,
+                    ]
 
                 raise UserError("\n\n".join(paras))
 
diff --git a/tests/unit/bundle_test.py b/tests/unit/bundle_test.py
index ff4c0dce..223b3b07 100644
--- a/tests/unit/bundle_test.py
+++ b/tests/unit/bundle_test.py
@@ -41,44 +41,30 @@ def test_get_image_digest_no_image(mock_service):
     assert "doesn't define an image tag" in exc.exconly()
 
 
-def test_fetch_image_digest_for_image_with_saved_digest(mock_service):
-    mock_service.options['image'] = image_id = 'abcd'
-    mock_service.pull.return_value = expected = 'sha256:thedigest'
-    mock_service.image.return_value = {'RepoDigests': ['digest1']}
-
-    digest = bundle.fetch_image_digest(mock_service)
-    assert digest == image_id + '@' + expected
-
-    mock_service.pull.assert_called_once_with()
-    assert not mock_service.push.called
-    assert not mock_service.client.pull.called
-
-
-def test_fetch_image_digest_for_image(mock_service):
-    mock_service.options['image'] = image_id = 'abcd'
-    mock_service.pull.return_value = expected = 'sha256:thedigest'
-    mock_service.image.return_value = {'RepoDigests': []}
-
-    digest = bundle.fetch_image_digest(mock_service)
-    assert digest == image_id + '@' + expected
-
-    mock_service.pull.assert_called_once_with()
-    assert not mock_service.push.called
-    mock_service.client.pull.assert_called_once_with(digest)
-
-
-def test_fetch_image_digest_for_build(mock_service):
+def test_push_image_with_saved_digest(mock_service):
     mock_service.options['build'] = '.'
     mock_service.options['image'] = image_id = 'abcd'
     mock_service.push.return_value = expected = 'sha256:thedigest'
     mock_service.image.return_value = {'RepoDigests': ['digest1']}
 
-    digest = bundle.fetch_image_digest(mock_service)
+    digest = bundle.push_image(mock_service)
     assert digest == image_id + '@' + expected
 
     mock_service.push.assert_called_once_with()
-    assert not mock_service.pull.called
-    assert not mock_service.client.pull.called
+    assert not mock_service.client.push.called
+
+
+def test_push_image(mock_service):
+    mock_service.options['build'] = '.'
+    mock_service.options['image'] = image_id = 'abcd'
+    mock_service.push.return_value = expected = 'sha256:thedigest'
+    mock_service.image.return_value = {'RepoDigests': []}
+
+    digest = bundle.push_image(mock_service)
+    assert digest == image_id + '@' + expected
+
+    mock_service.push.assert_called_once_with()
+    mock_service.client.pull.assert_called_once_with(digest)
 
 
 def test_to_bundle():

From 8924f6c05ccd69468777dfabf23cbe9e21b0ed4a Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Jul 2016 11:51:16 +0100
Subject: [PATCH 1113/1265] Fix example image hash

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/bundles.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/bundles.md b/docs/bundles.md
index 0958e1ef..a56adb02 100644
--- a/docs/bundles.md
+++ b/docs/bundles.md
@@ -138,8 +138,7 @@ A service has the following fields:
         The image that the service will run. Docker images should be referenced
         with full content hash to fully specify the deployment artifact for the
         service. Example:
-        <code>postgres@sha256:f76245b04ddbcebab5bb6c28e76947f49222c99fec4aadb0bb
-        1c24821a 9e83ef</code>
+        <code>postgres@sha256:e0a230a9f5b4e1b8b03bb3e8cf7322b0e42b7838c5c87f4545edb48f5eb8f077</code>
     </dd>
     <dt>
         Command <code>[]string</code>

From 28e6508f4a781bcc1b12841e9ed9e26f7ff1ba55 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Jul 2016 11:51:30 +0100
Subject: [PATCH 1114/1265] Add note about missing volume mount support

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/bundles.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/bundles.md b/docs/bundles.md
index a56adb02..19322824 100644
--- a/docs/bundles.md
+++ b/docs/bundles.md
@@ -196,3 +196,6 @@ A service has the following fields:
         deploying a bundle should create networks as needed.
     </dd>
 </dl>
+
+> **Note:** Some configuration options are not yet supported in the DAB format,
+> including volume mounts.

From 8ffbe8e0834697640239134575b460ea931b417d Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Jul 2016 11:59:04 +0100
Subject: [PATCH 1115/1265] Remove note about .dsb

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/bundles.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/bundles.md b/docs/bundles.md
index 19322824..5ca2c1ec 100644
--- a/docs/bundles.md
+++ b/docs/bundles.md
@@ -119,8 +119,7 @@ Run 'docker stack COMMAND --help' for more information on a command.
 ## Bundle file format
 
 Distributed application bundles are described in a JSON format. When bundles
-are persisted as files, the file extension is `.dab` (Docker 1.12RC2 tools use
-`.dsb` for the file extension—this will be updated in the next release client).
+are persisted as files, the file extension is `.dab`.
 
 A bundle has two top-level fields: `version` and `services`. The version used
 by Docker 1.12 tools is `0.1`.

From 2fec6966d4c7cf72693fff73c06a52fbe743a042 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 24 Jun 2016 11:10:18 -0400
Subject: [PATCH 1116/1265] Add reference docs for push and bundle.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 docs/reference/bundle.md | 31 +++++++++++++++++++++++++++++++
 docs/reference/push.md   | 21 +++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 docs/reference/bundle.md
 create mode 100644 docs/reference/push.md

diff --git a/docs/reference/bundle.md b/docs/reference/bundle.md
new file mode 100644
index 00000000..fca93a8a
--- /dev/null
+++ b/docs/reference/bundle.md
@@ -0,0 +1,31 @@
+<!--[metadata]>
++++
+title = "bundle"
+description = "Create a distributed application bundle from the Compose file."
+keywords = ["fig, composition, compose, docker, orchestration, cli,  bundle"]
+[menu.main]
+identifier="bundle.compose"
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# bundle
+
+```
+Usage: bundle [options]
+
+Options:
+    --push-images              Automatically push images for any services
+                               which have a `build` option specified.
+
+    -o, --output PATH          Path to write the bundle file to.
+                               Defaults to "<project name>.dab".
+```
+
+Generate a Distributed Application Bundle (DAB) from the Compose file.
+
+Images must have digests stored, which requires interaction with a
+Docker registry. If digests aren't stored for all images, you can fetch
+them with `docker-compose pull` or `docker-compose push`. To push images
+automatically when bundling, pass `--push-images`. Only services with
+a `build` option specified will have their images pushed.
diff --git a/docs/reference/push.md b/docs/reference/push.md
new file mode 100644
index 00000000..bdc3112e
--- /dev/null
+++ b/docs/reference/push.md
@@ -0,0 +1,21 @@
+<!--[metadata]>
++++
+title = "push"
+description = "Pushes service images."
+keywords = ["fig, composition, compose, docker, orchestration, cli,  push"]
+[menu.main]
+identifier="push.compose"
+parent = "smn_compose_cli"
++++
+<![end-metadata]-->
+
+# push
+
+```
+Usage: push [options] [SERVICE...]
+
+Options:
+    --ignore-push-failures  Push what it can and ignores images with push failures.
+```
+
+Pushes images for services.

From 7f3375c2ce79a21a3665ccea51564a0c36b01a45 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 26 Jul 2016 13:07:38 -0700
Subject: [PATCH 1117/1265] Update docker-py requirement to the latest release

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 60260e1c..831ed65a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 PyYAML==3.11
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.2.0
-docker-py==1.9.0rc2
+docker-py==1.9.0
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4; python_version < '3.4'
diff --git a/setup.py b/setup.py
index 3696adc6..5cb52dae 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.8',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py == 1.9.0rc2',
+    'docker-py >= 1.9.0, < 2.0',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

From 1877a41b92eb887ace32579815278f607e95759a Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Sun, 24 Jul 2016 18:57:36 +0100
Subject: [PATCH 1118/1265] Add user agent to API calls

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 compose/cli/docker_client.py         |  3 +++
 compose/cli/utils.py                 | 15 +++++++++++++++
 tests/unit/cli/docker_client_test.py | 12 ++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index bed6be79..ce191fbf 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -10,6 +10,7 @@ from docker.utils import kwargs_from_env
 
 from ..const import HTTP_TIMEOUT
 from .errors import UserError
+from .utils import generate_user_agent
 
 log = logging.getLogger(__name__)
 
@@ -67,4 +68,6 @@ def docker_client(environment, version=None, tls_config=None, host=None,
     else:
         kwargs['timeout'] = HTTP_TIMEOUT
 
+    kwargs['user_agent'] = generate_user_agent()
+
     return Client(**kwargs)
diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index bf5df80c..f60f61cd 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -107,3 +107,18 @@ def get_build_version():
 
 def is_docker_for_mac_installed():
     return is_mac() and os.path.isdir('/Applications/Docker.app')
+
+
+def generate_user_agent():
+    parts = [
+        "docker-compose/{}".format(compose.__version__),
+        "docker-py/{}".format(docker.__version__),
+    ]
+    try:
+        p_system = platform.system()
+        p_release = platform.release()
+    except IOError:
+        pass
+    else:
+        parts.append("{}/{}".format(p_system, p_release))
+    return " ".join(parts)
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index 74669d4a..fc914791 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -2,10 +2,12 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import os
+import platform
 
 import docker
 import pytest
 
+import compose
 from compose.cli import errors
 from compose.cli.docker_client import docker_client
 from compose.cli.docker_client import tls_config_from_options
@@ -40,6 +42,16 @@ class DockerClientTestCase(unittest.TestCase):
         assert fake_log.error.call_count == 1
         assert '123' in fake_log.error.call_args[0][0]
 
+    def test_user_agent(self):
+        client = docker_client(os.environ)
+        expected = "docker-compose/{0} docker-py/{1} {2}/{3}".format(
+            compose.__version__,
+            docker.__version__,
+            platform.system(),
+            platform.release()
+        )
+        self.assertEqual(client.headers['User-Agent'], expected)
+
 
 class TLSConfigTestCase(unittest.TestCase):
     ca_cert = 'tests/fixtures/tls/ca.pem'

From 6633f1962cba18e597f218eaa937e8b3d54dbf80 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 27 Jul 2016 16:00:53 +0100
Subject: [PATCH 1119/1265] Shell completion for --push-images

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 contrib/completion/bash/docker-compose | 2 +-
 contrib/completion/zsh/_docker-compose | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 0201bcb2..991f6572 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -117,7 +117,7 @@ _docker_compose_bundle() {
 			;;
 	esac
 
-	COMPREPLY=( $( compgen -W "--fetch-digests --help --output -o" -- "$cur" ) )
+	COMPREPLY=( $( compgen -W "--push-images --help --output -o" -- "$cur" ) )
 }
 
 
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 2947cef3..928e28de 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -207,6 +207,7 @@ __docker-compose_subcommand() {
         (bundle)
             _arguments \
                 $opts_help \
+                '--push-images[Automatically push images for any services which have a `build` option specified.]' \
                 '(--output -o)'{--output,-o}'[Path to write the bundle file to. Defaults to "<project name>.dab".]:file:_files' && ret=0
             ;;
         (config)

From ec825af3d336a55297250b3a2af63b48fabed177 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 27 Jul 2016 18:26:40 +0100
Subject: [PATCH 1120/1265] Fix error message for unrecognised TLS version

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/command.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 09a9ced8..2c70d31a 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -65,8 +65,9 @@ def get_tls_version(environment):
     tls_attr_name = "PROTOCOL_{}".format(compose_tls_version)
     if not hasattr(ssl, tls_attr_name):
         log.warn(
-            'The {} protocol is unavailable. You may need to update your '
+            'The "{}" protocol is unavailable. You may need to update your '
             'version of Python or OpenSSL. Falling back to TLSv1 (default).'
+            .format(compose_tls_version)
         )
         return None
 

From 22c0779a498ee701c22b857669d3f43a0d404f27 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 14 Jun 2016 11:33:45 -0700
Subject: [PATCH 1121/1265] Bump 1.8.0-rc1

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 CHANGELOG.md        | 50 +++++++++++++++++++++++++++++++++++++++++++++
 compose/__init__.py |  2 +-
 docs/install.md     |  6 +++---
 script/run/run.sh   |  2 +-
 4 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0064a5cc..39ac8698 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,56 @@
 Change log
 ==========
 
+1.8.0 (2016-06-14)
+-----------------
+
+New Features
+
+- Added `docker-compose bundle`, a command that builds a bundle file
+  to be consumed by the new *Docker Stack* commands in Docker 1.12.
+  This command automatically pushes and pulls images as needed.
+
+- Added `docker-compose push`, a command that pushes service images
+  to a registry.
+
+- As announced in 1.7.0, `docker-compose rm` now removes containers
+  created by `docker-compose run` by default.
+
+- Compose now supports specifying a custom TLS version for
+  interaction with the Docker Engine using the `COMPOSE_TLS_VERSION`
+  environment variable.
+
+Bug Fixes
+
+- Fixed a bug where Compose would erroneously try to read `.env`
+  at the project's root when it is a directory.
+
+- Improved config merging when multiple compose files are involved
+  for several service sub-keys.
+
+- Fixed a bug where volume mappings containing Windows drives would
+  sometimes be parsed incorrectly.
+
+- Fixed a bug in Windows environment where volume mappings of the
+  host's root directory would be parsed incorrectly.
+
+- Fixed a bug where `docker-compose config` would ouput an invalid
+  Compose file if external networks were specified.
+
+- Fixed an issue where unset buildargs would be assigned a string
+  containing `'None'` instead of the expected empty value.
+
+- Fixed a bug where yes/no prompts on Windows would not show before
+  receiving input.
+
+- Fixed a bug where trying to `docker-compose exec` on Windows
+  without the `-d` option would exit with a stacktrace. This will
+  still fail for the time being, but should do so gracefully.
+
+- Fixed a bug where errors during `docker-compose up` would show
+  an unrelated stacktrace at the end of the process.
+
+
 1.7.1 (2016-05-04)
 -----------------
 
diff --git a/compose/__init__.py b/compose/__init__.py
index 1052c067..1dd11e79 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.8.0dev'
+__version__ = '1.8.0-rc1'
diff --git a/docs/install.md b/docs/install.md
index 76e4a868..5191a4b5 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -39,7 +39,7 @@ which the release page specifies, in your terminal.
 
      The following is an example command illustrating the format:
 
-        curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+        curl -L https://github.com/docker/compose/releases/download/1.8.0-rc1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 
      If you have problems installing with `curl`, see
      [Alternative Install Options](#alternative-install-options).
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
 7. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.7.1
+        docker-compose version: 1.8.0-rc1
 
 
 ## Alternative install options
@@ -77,7 +77,7 @@ to get started.
 Compose can also be run inside a container, from a small bash script wrapper.
 To install compose as a container run:
 
-    $ curl -L https://github.com/docker/compose/releases/download/1.7.1/run.sh > /usr/local/bin/docker-compose
+    $ curl -L https://github.com/docker/compose/releases/download/1.8.0-rc1/run.sh > /usr/local/bin/docker-compose
     $ chmod +x /usr/local/bin/docker-compose
 
 ## Master builds
diff --git a/script/run/run.sh b/script/run/run.sh
index 98d32c5f..f9199ce1 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.7.0"
+VERSION="1.8.0-rc1"
 IMAGE="docker/compose:$VERSION"
 
 

From 60622026fa54453d6c49c7a1bbfd3ed93692e0c5 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 6 Jul 2016 16:08:07 -0700
Subject: [PATCH 1122/1265] Bump 1.8.0-rc2

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 CHANGELOG.md        | 8 +++++---
 compose/__init__.py | 2 +-
 docs/install.md     | 6 +++---
 script/run/run.sh   | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39ac8698..afa35820 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ Change log
 1.8.0 (2016-06-14)
 -----------------
 
+**Breaking Changes**
+
+- As announced in 1.7.0, `docker-compose rm` now removes containers
+  created by `docker-compose run` by default.
+
 New Features
 
 - Added `docker-compose bundle`, a command that builds a bundle file
@@ -13,9 +18,6 @@ New Features
 - Added `docker-compose push`, a command that pushes service images
   to a registry.
 
-- As announced in 1.7.0, `docker-compose rm` now removes containers
-  created by `docker-compose run` by default.
-
 - Compose now supports specifying a custom TLS version for
   interaction with the Docker Engine using the `COMPOSE_TLS_VERSION`
   environment variable.
diff --git a/compose/__init__.py b/compose/__init__.py
index 1dd11e79..bf8a6f30 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.8.0-rc1'
+__version__ = '1.8.0-rc2'
diff --git a/docs/install.md b/docs/install.md
index 5191a4b5..d1a11ab5 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -39,7 +39,7 @@ which the release page specifies, in your terminal.
 
      The following is an example command illustrating the format:
 
-        curl -L https://github.com/docker/compose/releases/download/1.8.0-rc1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+        curl -L https://github.com/docker/compose/releases/download/1.8.0-rc2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 
      If you have problems installing with `curl`, see
      [Alternative Install Options](#alternative-install-options).
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
 7. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.8.0-rc1
+        docker-compose version: 1.8.0-rc2
 
 
 ## Alternative install options
@@ -77,7 +77,7 @@ to get started.
 Compose can also be run inside a container, from a small bash script wrapper.
 To install compose as a container run:
 
-    $ curl -L https://github.com/docker/compose/releases/download/1.8.0-rc1/run.sh > /usr/local/bin/docker-compose
+    $ curl -L https://github.com/docker/compose/releases/download/1.8.0-rc2/run.sh > /usr/local/bin/docker-compose
     $ chmod +x /usr/local/bin/docker-compose
 
 ## Master builds
diff --git a/script/run/run.sh b/script/run/run.sh
index f9199ce1..caf6ed11 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.8.0-rc1"
+VERSION="1.8.0-rc2"
 IMAGE="docker/compose:$VERSION"
 
 

From 7fafd72c1e3497ad3e8265ffbac06dfce449d762 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 27 Jul 2016 15:55:47 +0100
Subject: [PATCH 1123/1265] Bump 1.8.0-rc3

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 CHANGELOG.md        | 12 +++++++++++-
 compose/__init__.py |  2 +-
 docs/install.md     |  6 +++---
 script/run/run.sh   |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afa35820..8ec7d5b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,15 @@ Change log
 - As announced in 1.7.0, `docker-compose rm` now removes containers
   created by `docker-compose run` by default.
 
+- Setting `entrypoint` on a service now empties out any default
+  command that was set on the image (i.e. any `CMD` instruction in the
+  Dockerfile used to build it). This makes it consistent with
+  the `--entrypoint` flag to `docker run`.
+
 New Features
 
 - Added `docker-compose bundle`, a command that builds a bundle file
   to be consumed by the new *Docker Stack* commands in Docker 1.12.
-  This command automatically pushes and pulls images as needed.
 
 - Added `docker-compose push`, a command that pushes service images
   to a registry.
@@ -27,6 +31,9 @@ Bug Fixes
 - Fixed a bug where Compose would erroneously try to read `.env`
   at the project's root when it is a directory.
 
+- `docker-compose run -e VAR` now passes `VAR` through from the shell
+  to the container, as with `docker run -e VAR`.
+
 - Improved config merging when multiple compose files are involved
   for several service sub-keys.
 
@@ -52,6 +59,9 @@ Bug Fixes
 - Fixed a bug where errors during `docker-compose up` would show
   an unrelated stacktrace at the end of the process.
 
+- `docker-compose create` and `docker-compose start` show more
+  descriptive error messages when something goes wrong.
+
 
 1.7.1 (2016-05-04)
 -----------------
diff --git a/compose/__init__.py b/compose/__init__.py
index bf8a6f30..f9f0e6a6 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.8.0-rc2'
+__version__ = '1.8.0-rc3'
diff --git a/docs/install.md b/docs/install.md
index d1a11ab5..2099b71c 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -39,7 +39,7 @@ which the release page specifies, in your terminal.
 
      The following is an example command illustrating the format:
 
-        curl -L https://github.com/docker/compose/releases/download/1.8.0-rc2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+        curl -L https://github.com/docker/compose/releases/download/1.8.0-rc3/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 
      If you have problems installing with `curl`, see
      [Alternative Install Options](#alternative-install-options).
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
 7. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.8.0-rc2
+        docker-compose version: 1.8.0-rc3
 
 
 ## Alternative install options
@@ -77,7 +77,7 @@ to get started.
 Compose can also be run inside a container, from a small bash script wrapper.
 To install compose as a container run:
 
-    $ curl -L https://github.com/docker/compose/releases/download/1.8.0-rc2/run.sh > /usr/local/bin/docker-compose
+    $ curl -L https://github.com/docker/compose/releases/download/1.8.0-rc3/run.sh > /usr/local/bin/docker-compose
     $ chmod +x /usr/local/bin/docker-compose
 
 ## Master builds
diff --git a/script/run/run.sh b/script/run/run.sh
index caf6ed11..c2c01db6 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.8.0-rc2"
+VERSION="1.8.0-rc3"
 IMAGE="docker/compose:$VERSION"
 
 

From 1110af1bae8382ebce0a553da46cf8f95e46ed72 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 27 Jul 2016 11:55:49 -0700
Subject: [PATCH 1124/1265] Bump 1.8.0

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/__init__.py | 2 +-
 docs/install.md     | 6 +++---
 script/run/run.sh   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compose/__init__.py b/compose/__init__.py
index f9f0e6a6..c550f990 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.8.0-rc3'
+__version__ = '1.8.0'
diff --git a/docs/install.md b/docs/install.md
index 2099b71c..bb7f07b3 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -39,7 +39,7 @@ which the release page specifies, in your terminal.
 
      The following is an example command illustrating the format:
 
-        curl -L https://github.com/docker/compose/releases/download/1.8.0-rc3/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+        curl -L https://github.com/docker/compose/releases/download/1.8.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 
      If you have problems installing with `curl`, see
      [Alternative Install Options](#alternative-install-options).
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
 7. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.8.0-rc3
+        docker-compose version: 1.8.0
 
 
 ## Alternative install options
@@ -77,7 +77,7 @@ to get started.
 Compose can also be run inside a container, from a small bash script wrapper.
 To install compose as a container run:
 
-    $ curl -L https://github.com/docker/compose/releases/download/1.8.0-rc3/run.sh > /usr/local/bin/docker-compose
+    $ curl -L https://github.com/docker/compose/releases/download/1.8.0/run.sh > /usr/local/bin/docker-compose
     $ chmod +x /usr/local/bin/docker-compose
 
 ## Master builds
diff --git a/script/run/run.sh b/script/run/run.sh
index c2c01db6..6205747a 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.8.0-rc3"
+VERSION="1.8.0"
 IMAGE="docker/compose:$VERSION"
 
 

From 6ab0607e6182f7c4dec55b6318ab07af746e7c89 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 27 Jul 2016 13:30:52 -0700
Subject: [PATCH 1125/1265] Switch back to dev version

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/__init__.py b/compose/__init__.py
index c550f990..6e610652 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.8.0'
+__version__ = '1.9.0dev'

From 5aeeecb6f2044860f09be0bada7f4d75f489cb47 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 29 Jul 2016 17:12:40 +0100
Subject: [PATCH 1126/1265] Fix stacktrace when handling timeout error

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/errors.py                | 2 +-
 tests/unit/cli/docker_client_test.py | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index 5af3ede9..f9a20b9e 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -53,7 +53,7 @@ def handle_connection_errors(client):
         log_api_error(e, client.api_version)
         raise ConnectionError()
     except (ReadTimeout, socket.timeout) as e:
-        log_timeout_error()
+        log_timeout_error(client.timeout)
         raise ConnectionError()
 
 
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index fc914791..3430c25c 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -42,6 +42,14 @@ class DockerClientTestCase(unittest.TestCase):
         assert fake_log.error.call_count == 1
         assert '123' in fake_log.error.call_args[0][0]
 
+        with mock.patch('compose.cli.errors.log') as fake_log:
+            with pytest.raises(errors.ConnectionError):
+                with errors.handle_connection_errors(client):
+                    raise errors.ReadTimeout()
+
+        assert fake_log.error.call_count == 1
+        assert '123' in fake_log.error.call_args[0][0]
+
     def test_user_agent(self):
         client = docker_client(os.environ)
         expected = "docker-compose/{0} docker-py/{1} {2}/{3}".format(

From 6f4be1cffc43d97d8070506286e0f15aec4c6b51 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 29 Jul 2016 14:05:59 -0700
Subject: [PATCH 1127/1265] json_splitter: Don't break when buffer contains
 leading whitespace.

Add error logging with detailed output for decode errors

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/utils.py         | 12 +++++++++++-
 tests/unit/utils_test.py | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/compose/utils.py b/compose/utils.py
index 925a8e79..eea73be1 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -5,11 +5,13 @@ import codecs
 import hashlib
 import json
 import json.decoder
+import logging
 
 import six
 
 
 json_decoder = json.JSONDecoder()
+log = logging.getLogger(__name__)
 
 
 def get_output_stream(stream):
@@ -60,13 +62,21 @@ def split_buffer(stream, splitter=None, decoder=lambda a: a):
             yield item
 
     if buffered:
-        yield decoder(buffered)
+        try:
+            yield decoder(buffered)
+        except ValueError:
+            log.error(
+                'Compose tried parsing the following chunk as a JSON object, '
+                'but failed:\n%s' % repr(buffered)
+            )
+            raise
 
 
 def json_splitter(buffer):
     """Attempt to parse a json object from a buffer. If there is at least one
     object, return it and the rest of the buffer, otherwise return None.
     """
+    buffer = buffer.strip()
     try:
         obj, index = json_decoder.raw_decode(buffer)
         rest = buffer[json.decoder.WHITESPACE.match(buffer, index).end():]
diff --git a/tests/unit/utils_test.py b/tests/unit/utils_test.py
index 8ee37b07..85231957 100644
--- a/tests/unit/utils_test.py
+++ b/tests/unit/utils_test.py
@@ -15,6 +15,10 @@ class TestJsonSplitter(object):
         data = '{"foo": "bar"}\n  \n{"next": "obj"}'
         assert utils.json_splitter(data) == ({'foo': 'bar'}, '{"next": "obj"}')
 
+    def test_json_splitter_leading_whitespace(self):
+        data = '\n   \r{"foo": "bar"}\n\n   {"next": "obj"}'
+        assert utils.json_splitter(data) == ({'foo': 'bar'}, '{"next": "obj"}')
+
 
 class TestStreamAsText(object):
 
@@ -43,3 +47,16 @@ class TestJsonStream(object):
             [1, 2, 3],
             [],
         ]
+
+    def test_with_leading_whitespace(self):
+        stream = [
+            '\n  \r\n  {"one": "two"}{"x": 1}',
+            '  {"three": "four"}\t\t{"x": 2}'
+        ]
+        output = list(utils.json_stream(stream))
+        assert output == [
+            {'one': 'two'},
+            {'x': 1},
+            {'three': 'four'},
+            {'x': 2}
+        ]

From 48258e2b4668a7a4917a3c3f102ff97ba86e0908 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 1 Aug 2016 12:19:20 +0100
Subject: [PATCH 1128/1265] Add note to bundle docs about requiring an
 experimental Engine build

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/bundles.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/bundles.md b/docs/bundles.md
index 5ca2c1ec..096c9ec3 100644
--- a/docs/bundles.md
+++ b/docs/bundles.md
@@ -50,6 +50,15 @@ Wrote bundle to vossibility-stack.dab
 
 ## Creating a stack from a bundle
 
+> **Note**: Because support for stacks and bundles is in the experimental stage,
+> you need to install an experimental build of Docker Engine to use it.
+>
+> If you're on Mac or Windows, download the “Beta channel” version of
+> [Docker for Mac](https://docs.docker.com/docker-for-mac/) or
+> [Docker for Windows](https://docs.docker.com/docker-for-windows/) to install
+> it. If you're on Linux, follow the instructions in the
+> [experimental build README](https://github.com/docker/docker/blob/master/experimental/README.md).
+
 A stack is created using the `docker deploy` command:
 
 ```bash

From b3a4d76d4faf172efcb1c0fc691cd1b50c786447 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 2 Aug 2016 11:44:25 +0100
Subject: [PATCH 1129/1265] Handle connection errors on project initialization

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/command.py                              |  4 +++-
 tests/acceptance/cli_test.py                        | 13 +++++++++++++
 .../volumes-from-container/docker-compose.yml       |  5 +++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 tests/fixtures/volumes-from-container/docker-compose.yml

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 2c70d31a..02035428 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -8,6 +8,7 @@ import ssl
 
 import six
 
+from . import errors
 from . import verbose_proxy
 from .. import config
 from ..config.environment import Environment
@@ -110,7 +111,8 @@ def get_project(project_dir, config_path=None, project_name=None, verbose=False,
         host=host, environment=environment
     )
 
-    return Project.from_config(project_name, config_data, client)
+    with errors.handle_connection_errors(client):
+        return Project.from_config(project_name, config_data, client)
 
 
 def get_project_name(working_dir, project_name=None, environment=None):
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 7641870b..3939a97b 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -154,6 +154,19 @@ class CLITestCase(DockerClientTestCase):
             returncode=0
         )
 
+    def test_host_not_reachable(self):
+        result = self.dispatch(['-H=tcp://doesnotexist:8000', 'ps'], returncode=1)
+        assert "Couldn't connect to Docker daemon" in result.stderr
+
+    def test_host_not_reachable_volumes_from_container(self):
+        self.base_dir = 'tests/fixtures/volumes-from-container'
+
+        container = self.client.create_container('busybox', 'true', name='composetest_data_container')
+        self.addCleanup(self.client.remove_container, container)
+
+        result = self.dispatch(['-H=tcp://doesnotexist:8000', 'ps'], returncode=1)
+        assert "Couldn't connect to Docker daemon" in result.stderr
+
     def test_config_list_services(self):
         self.base_dir = 'tests/fixtures/v2-full'
         result = self.dispatch(['config', '--services'])
diff --git a/tests/fixtures/volumes-from-container/docker-compose.yml b/tests/fixtures/volumes-from-container/docker-compose.yml
new file mode 100644
index 00000000..495fcaae
--- /dev/null
+++ b/tests/fixtures/volumes-from-container/docker-compose.yml
@@ -0,0 +1,5 @@
+version: "2"
+services:
+  test:
+    image: busybox
+    volumes_from: ["container:composetest_data_container"]

From 9abbe1b7f8cf4e83fea7b115204d50384c9723ed Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 1 Aug 2016 11:50:57 -0700
Subject: [PATCH 1130/1265] Catchable error for parse failures in split_buffer

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py |  3 ++-
 compose/errors.py   |  5 +++++
 compose/utils.py    | 10 ++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index db06a5e1..20200b09 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -23,6 +23,7 @@ from ..config.environment import Environment
 from ..config.serialize import serialize_config
 from ..const import DEFAULT_TIMEOUT
 from ..const import IS_WINDOWS_PLATFORM
+from ..errors import StreamParseError
 from ..progress_stream import StreamOutputError
 from ..project import NoSuchService
 from ..project import OneOffFilter
@@ -75,7 +76,7 @@ def main():
     except NeedsBuildError as e:
         log.error("Service '%s' needs to be built, but --no-build was passed." % e.service.name)
         sys.exit(1)
-    except errors.ConnectionError:
+    except (errors.ConnectionError, StreamParseError):
         sys.exit(1)
 
 
diff --git a/compose/errors.py b/compose/errors.py
index 9f68760d..376cc555 100644
--- a/compose/errors.py
+++ b/compose/errors.py
@@ -5,3 +5,8 @@ from __future__ import unicode_literals
 class OperationFailedError(Exception):
     def __init__(self, reason):
         self.msg = reason
+
+
+class StreamParseError(RuntimeError):
+    def __init__(self, reason):
+        self.msg = reason
diff --git a/compose/utils.py b/compose/utils.py
index eea73be1..6d9a9fdc 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -9,6 +9,8 @@ import logging
 
 import six
 
+from .errors import StreamParseError
+
 
 json_decoder = json.JSONDecoder()
 log = logging.getLogger(__name__)
@@ -64,12 +66,12 @@ def split_buffer(stream, splitter=None, decoder=lambda a: a):
     if buffered:
         try:
             yield decoder(buffered)
-        except ValueError:
+        except Exception as e:
             log.error(
-                'Compose tried parsing the following chunk as a JSON object, '
-                'but failed:\n%s' % repr(buffered)
+                'Compose tried decoding the following data chunk, but failed:'
+                '\n%s' % repr(buffered)
             )
-            raise
+            raise StreamParseError(e)
 
 
 def json_splitter(buffer):

From 4cba653eeb3c054557a02b23b905da8a11bbc8e5 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 4 Aug 2016 15:19:02 +0100
Subject: [PATCH 1131/1265] Disambiguate 'Swarm' in integration doc

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docs/swarm.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/swarm.md b/docs/swarm.md
index bbab6908..f956f8c2 100644
--- a/docs/swarm.md
+++ b/docs/swarm.md
@@ -11,6 +11,10 @@ parent="workw_compose"
 
 # Using Compose with Swarm
 
+> **Note:** “Swarm” here refers to [Docker Swarm](/swarm/overview.md), a product separate from Docker Engine. It does _not_ refer to [swarm mode](/engine/swarm), which is a built-in feature of Docker Engine introduced in version 1.12.
+>
+> Integration between Compose and swarm mode is at the experimental stage. See [Docker Stacks and Bundles](bundles.md) for details.
+
 Docker Compose and [Docker Swarm](/swarm/overview.md) aim to have full integration, meaning
 you can point a Compose app at a Swarm cluster and have it all just work as if
 you were using a single Docker host.

From 17f46f8999e66e3dbb8f8438002caf17fe6065a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JG=C2=B2?= <garciagonzalez.julien@gmail.com>
Date: Wed, 3 Aug 2016 11:17:54 +0200
Subject: [PATCH 1132/1265] Update rm.md

Receiving this message when using the -a flag : `--all flag is obsolete. This is now the default behavior of `docker-compose rm`, I proposed to mark it in the docs but I don't know which way is the best

Signed-off-by: jgsqware <garciagonzalez.julien@gmail.com>
---
 compose/cli/main.py  | 3 +--
 docs/reference/rm.md | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index db06a5e1..7655fe9c 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -615,8 +615,7 @@ class TopLevelCommand(object):
         Options:
             -f, --force   Don't ask to confirm removal
             -v            Remove any anonymous volumes attached to containers
-            -a, --all     Obsolete. Also remove one-off containers created by
-                          docker-compose run
+            -a, --all     Deprecated - no effect.
         """
         if options.get('--all'):
             log.warn(
diff --git a/docs/reference/rm.md b/docs/reference/rm.md
index 8285a4ae..6351e6cf 100644
--- a/docs/reference/rm.md
+++ b/docs/reference/rm.md
@@ -17,8 +17,7 @@ Usage: rm [options] [SERVICE...]
 Options:
     -f, --force   Don't ask to confirm removal
     -v            Remove any anonymous volumes attached to containers
-    -a, --all     Also remove one-off containers created by
-                  docker-compose run
+    -a, --all     Deprecated - no effect.
 ```
 
 Removes stopped service containers.

From c0305024f53c07607c34ff253860af386b004fbe Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 9 Aug 2016 15:13:01 -0700
Subject: [PATCH 1133/1265] Remove surrounding quotes from TLS paths, if
 present

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/docker_client.py         |  7 ++++---
 compose/cli/utils.py                 |  8 ++++++++
 tests/unit/cli/docker_client_test.py | 13 +++++++++++++
 tests/unit/cli/utils_test.py         | 23 +++++++++++++++++++++++
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 tests/unit/cli/utils_test.py

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index ce191fbf..b196d303 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -11,15 +11,16 @@ from docker.utils import kwargs_from_env
 from ..const import HTTP_TIMEOUT
 from .errors import UserError
 from .utils import generate_user_agent
+from .utils import unquote_path
 
 log = logging.getLogger(__name__)
 
 
 def tls_config_from_options(options):
     tls = options.get('--tls', False)
-    ca_cert = options.get('--tlscacert')
-    cert = options.get('--tlscert')
-    key = options.get('--tlskey')
+    ca_cert = unquote_path(options.get('--tlscacert'))
+    cert = unquote_path(options.get('--tlscert'))
+    key = unquote_path(options.get('--tlskey'))
     verify = options.get('--tlsverify')
     skip_hostname_check = options.get('--skip-hostname-check', False)
 
diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index f60f61cd..e10a3674 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -122,3 +122,11 @@ def generate_user_agent():
     else:
         parts.append("{}/{}".format(p_system, p_release))
     return " ".join(parts)
+
+
+def unquote_path(s):
+    if not s:
+        return s
+    if s[0] == '"' and s[-1] == '"':
+        return s[1:-1]
+    return s
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index 3430c25c..aaa935af 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -144,3 +144,16 @@ class TLSConfigTestCase(unittest.TestCase):
         result = tls_config_from_options(options)
         assert isinstance(result, docker.tls.TLSConfig)
         assert result.assert_hostname is False
+
+    def test_tls_client_and_ca_quoted_paths(self):
+        options = {
+            '--tlscacert': '"{0}"'.format(self.ca_cert),
+            '--tlscert': '"{0}"'.format(self.client_cert),
+            '--tlskey': '"{0}"'.format(self.key),
+            '--tlsverify': True
+        }
+        result = tls_config_from_options(options)
+        assert isinstance(result, docker.tls.TLSConfig)
+        assert result.cert == (self.client_cert, self.key)
+        assert result.ca_cert == self.ca_cert
+        assert result.verify is True
diff --git a/tests/unit/cli/utils_test.py b/tests/unit/cli/utils_test.py
new file mode 100644
index 00000000..066fb359
--- /dev/null
+++ b/tests/unit/cli/utils_test.py
@@ -0,0 +1,23 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import unittest
+
+from compose.cli.utils import unquote_path
+
+
+class UnquotePathTest(unittest.TestCase):
+    def test_no_quotes(self):
+        assert unquote_path('hello') == 'hello'
+
+    def test_simple_quotes(self):
+        assert unquote_path('"hello"') == 'hello'
+
+    def test_uneven_quotes(self):
+        assert unquote_path('"hello') == '"hello'
+        assert unquote_path('hello"') == 'hello"'
+
+    def test_nested_quotes(self):
+        assert unquote_path('""hello""') == '"hello"'
+        assert unquote_path('"hel"lo"') == 'hel"lo'
+        assert unquote_path('"hello""') == 'hello"'

From d824cb9b0678ec2ad460b034231c00c05df8c0fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= <jfroche@affinitic.be>
Date: Wed, 1 Jun 2016 21:15:12 +0200
Subject: [PATCH 1134/1265] Add support for swappiness constraint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Run a service using `docker run --memory-swappiness=0` (see
https://docs.docker.com/engine/reference/run/)

refs #2383

Signed-off-by: Jean-François Roche <jfroche@affinitic.be>
---
 compose/config/config.py               |  1 +
 compose/config/config_schema_v1.json   |  1 +
 compose/config/config_schema_v2.0.json |  1 +
 compose/service.py                     |  4 +++-
 docs/compose-file.md                   |  3 ++-
 tests/integration/service_test.py      |  5 +++++
 tests/unit/config/config_test.py       | 18 ++++++++++++++++++
 7 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index d3ab1d4b..91c2f6a6 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -69,6 +69,7 @@ DOCKER_CONFIG_KEYS = [
     'mac_address',
     'mem_limit',
     'memswap_limit',
+    'mem_swappiness',
     'net',
     'oom_score_adj'
     'pid',
diff --git a/compose/config/config_schema_v1.json b/compose/config/config_schema_v1.json
index 36a93793..94354cda 100644
--- a/compose/config/config_schema_v1.json
+++ b/compose/config/config_schema_v1.json
@@ -85,6 +85,7 @@
         "mac_address": {"type": "string"},
         "mem_limit": {"type": ["number", "string"]},
         "memswap_limit": {"type": ["number", "string"]},
+        "mem_swappiness": {"type": "integer"},
         "net": {"type": "string"},
         "pid": {"type": ["string", "null"]},
 
diff --git a/compose/config/config_schema_v2.0.json b/compose/config/config_schema_v2.0.json
index ac46944c..59caac9b 100644
--- a/compose/config/config_schema_v2.0.json
+++ b/compose/config/config_schema_v2.0.json
@@ -139,6 +139,7 @@
         "mac_address": {"type": "string"},
         "mem_limit": {"type": ["number", "string"]},
         "memswap_limit": {"type": ["number", "string"]},
+        "mem_swappiness": {"type": "integer"},
         "network_mode": {"type": "string"},
 
         "networks": {
diff --git a/compose/service.py b/compose/service.py
index 60343542..d0cdeeb3 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -55,6 +55,7 @@ DOCKER_START_KEYS = [
     'mem_limit',
     'memswap_limit',
     'oom_score_adj',
+    'mem_swappiness',
     'pid',
     'privileged',
     'restart',
@@ -704,7 +705,8 @@ class Service(object):
             cpu_quota=options.get('cpu_quota'),
             shm_size=options.get('shm_size'),
             tmpfs=options.get('tmpfs'),
-            oom_score_adj=options.get('oom_score_adj')
+            oom_score_adj=options.get('oom_score_adj'),
+            mem_swappiness=options.get('mem_swappiness')
         )
 
     def build(self, no_cache=False, pull=False, force_rm=False):
diff --git a/docs/compose-file.md b/docs/compose-file.md
index d6d0cadc..9f4bd121 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -744,7 +744,7 @@ then read-write will be used.
 >     - container_name
 >     - container_name:rw
 
-### cpu\_shares, cpu\_quota, cpuset, domainname, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, oom_score_adj, privileged, read\_only, restart, shm\_size, stdin\_open, tty, user, working\_dir
+### cpu\_shares, cpu\_quota, cpuset, domainname, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, mem\_swappiness, oom\_score\_adj, privileged, read\_only, restart, shm\_size, stdin\_open, tty, user, working\_dir
 
 Each of these is a single value, analogous to its
 [docker run](https://docs.docker.com/engine/reference/run/) counterpart.
@@ -763,6 +763,7 @@ Each of these is a single value, analogous to its
 
     mem_limit: 1000000000
     memswap_limit: 2000000000
+    mem_swappiness: 10
     privileged: true
 
     restart: always
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 97ad7476..24dec983 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -852,6 +852,11 @@ class ServiceTest(DockerClientTestCase):
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.Dns'), ['8.8.8.8', '9.9.9.9'])
 
+    def test_mem_swappiness(self):
+        service = self.create_service('web', mem_swappiness=11)
+        container = create_and_start_container(service)
+        self.assertEqual(container.get('HostConfig.MemorySwappiness'), 11)
+
     def test_restart_always_value(self):
         service = self.create_service('web', restart={'Name': 'always'})
         container = create_and_start_container(service)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index d88c1d47..02810d2b 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1271,6 +1271,24 @@ class ConfigTest(unittest.TestCase):
             }
         ]
 
+    def test_swappiness_option(self):
+        actual = config.load(build_config_details({
+            'version': '2',
+            'services': {
+                'web': {
+                    'image': 'alpine',
+                    'mem_swappiness': 10,
+                }
+            }
+        }))
+        assert actual.services == [
+            {
+                'name': 'web',
+                'image': 'alpine',
+                'mem_swappiness': 10,
+            }
+        ]
+
     def test_merge_service_dicts_from_files_with_extends_in_base(self):
         base = {
             'volumes': ['.:/app'],

From bf91c64983a8598f9170d3f298b9abed100aacd0 Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Mon, 22 Aug 2016 12:18:07 +1000
Subject: [PATCH 1135/1265] Add docs checking Jenkinsfile

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 Jenkinsfile | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 00000000..fa29520b
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,8 @@
+// Only run on Linux atm
+wrappedNode(label: 'docker') {
+  deleteDir()
+  stage "checkout"
+  checkout scm
+
+  documentationChecker("docs")
+}

From 817c76c8e9ebbeb864ef69e8e03819fefb1a784d Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 8 Sep 2016 11:17:39 -0700
Subject: [PATCH 1136/1265] Fix command hint in bundle to pull services instead
 of images

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/bundle.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/compose/bundle.py b/compose/bundle.py
index afbdabfa..854cc799 100644
--- a/compose/bundle.py
+++ b/compose/bundle.py
@@ -46,8 +46,9 @@ class NeedsPush(Exception):
 
 
 class NeedsPull(Exception):
-    def __init__(self, image_name):
+    def __init__(self, image_name, service_name):
         self.image_name = image_name
+        self.service_name = service_name
 
 
 class MissingDigests(Exception):
@@ -74,7 +75,7 @@ def get_image_digests(project, allow_push=False):
         except NeedsPush as e:
             needs_push.add(e.image_name)
         except NeedsPull as e:
-            needs_pull.add(e.image_name)
+            needs_pull.add(e.service_name)
 
     if needs_push or needs_pull:
         raise MissingDigests(needs_push, needs_pull)
@@ -109,7 +110,7 @@ def get_image_digest(service, allow_push=False):
         return image['RepoDigests'][0]
 
     if 'build' not in service.options:
-        raise NeedsPull(service.image_name)
+        raise NeedsPull(service.image_name, service.name)
 
     if not allow_push:
         raise NeedsPush(service.image_name)

From dada36f732ed7f7fc05c0f9841a432c490c7ff9c Mon Sep 17 00:00:00 2001
From: George Lester <glester491@gmail.com>
Date: Fri, 8 Jul 2016 00:29:13 -0700
Subject: [PATCH 1137/1265] Supported group_add

Signed-off-by: George Lester <glester491@gmail.com>
---
 compose/config/config.py               |  1 +
 compose/config/config_schema_v2.0.json |  7 +++++++
 compose/service.py                     |  4 +++-
 docs/compose-file.md                   | 14 ++++++++++++++
 tests/integration/service_test.py      |  8 ++++++++
 tests/unit/config/config_test.py       | 20 ++++++++++++++++++++
 6 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 91c2f6a6..d36aefa5 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -61,6 +61,7 @@ DOCKER_CONFIG_KEYS = [
     'env_file',
     'environment',
     'extra_hosts',
+    'group_add',
     'hostname',
     'image',
     'ipc',
diff --git a/compose/config/config_schema_v2.0.json b/compose/config/config_schema_v2.0.json
index 59caac9b..76688916 100644
--- a/compose/config/config_schema_v2.0.json
+++ b/compose/config/config_schema_v2.0.json
@@ -168,6 +168,13 @@
           ]
         },
         "oom_score_adj": {"type": "integer", "minimum": -1000, "maximum": 1000},
+        "group_add": {
+            "type": "array",
+            "items": {
+                "type": ["string", "number"]
+            },
+            "uniqueItems": true
+        },
         "pid": {"type": ["string", "null"]},
 
         "ports": {
diff --git a/compose/service.py b/compose/service.py
index d0cdeeb3..b5a35b7e 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -48,6 +48,7 @@ DOCKER_START_KEYS = [
     'dns_search',
     'env_file',
     'extra_hosts',
+    'group_add',
     'ipc',
     'read_only',
     'log_driver',
@@ -706,7 +707,8 @@ class Service(object):
             shm_size=options.get('shm_size'),
             tmpfs=options.get('tmpfs'),
             oom_score_adj=options.get('oom_score_adj'),
-            mem_swappiness=options.get('mem_swappiness')
+            mem_swappiness=options.get('mem_swappiness'),
+            group_add=options.get('group_add')
         )
 
     def build(self, no_cache=False, pull=False, force_rm=False):
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 9f4bd121..384649b1 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -889,6 +889,20 @@ A full example:
             host2: 172.28.1.6
             host3: 172.28.1.7
 
+### group_add
+
+Specify additional groups (by name or number) which the user inside the container will be a member of. Groups must exist in both the container and the host system to be added. An example of where this is useful is when multiple containers (running as different users) need to all read or write the same file on the host system. That file can be owned by a group shared by all the containers, and specified in `group_add`. See the [Docker documentation](https://docs.docker.com/engine/reference/run/#/additional-groups) for more details.
+
+A full example:
+
+    version: '2'
+    services:
+        image: alpine
+        group_add:
+          - mail
+
+Running `id` inside the created container will show that the user belongs to the `mail` group, which would not have been the case if `group_add` were not used.
+
 ### internal
 
 By default, Docker also connects a bridge network to it to provide external connectivity. If you want to create an externally isolated overlay network, you can set this option to `true`.
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 24dec983..a5ca81ee 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -867,6 +867,14 @@ class ServiceTest(DockerClientTestCase):
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.OomScoreAdj'), 500)
 
+    def test_group_add_value(self):
+        service = self.create_service('web', group_add=["root", "1"])
+        container = create_and_start_container(service)
+
+        host_container_groupadd = container.get('HostConfig.GroupAdd')
+        self.assertTrue("root" in host_container_groupadd)
+        self.assertTrue("1" in host_container_groupadd)
+
     def test_restart_on_failure_value(self):
         service = self.create_service('web', restart={
             'Name': 'on-failure',
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 02810d2b..837630c1 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1289,6 +1289,26 @@ class ConfigTest(unittest.TestCase):
             }
         ]
 
+    def test_group_add_option(self):
+
+        actual = config.load(build_config_details({
+            'version': '2',
+            'services': {
+                'web': {
+                    'image': 'alpine',
+                    'group_add': ["docker", 777]
+                }
+             }
+        }))
+
+        assert actual.services == [
+            {
+                'name': 'web',
+                'image': 'alpine',
+                'group_add': ["docker", 777]
+            }
+        ]
+
     def test_merge_service_dicts_from_files_with_extends_in_base(self):
         base = {
             'volumes': ['.:/app'],

From b64bd07f225dd8af9f2b8fd096dfd957022c3dda Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 9 Sep 2016 17:19:14 -0700
Subject: [PATCH 1138/1265] Update docker-py dependency to latest release

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 5 +++--
 setup.py         | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 831ed65a..7f28514b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,15 @@
 PyYAML==3.11
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.2.0
-docker-py==1.9.0
+docker-py==1.10.2
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4; python_version < '3.4'
 functools32==3.2.3.post2; python_version < '3.2'
 ipaddress==1.0.16
 jsonschema==2.5.1
+pypiwin32==219; sys_platform == 'win32'
 requests==2.7.0
-six==1.7.3
+six==1.10.0
 texttable==0.8.4
 websocket-client==0.32.0
diff --git a/setup.py b/setup.py
index 5cb52dae..34b40273 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.8',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.9.0, < 2.0',
+    'docker-py >= 1.10.2, < 2.0',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

From 9759f27fa6a970ee9e01d1edd2d8b4a96eb510fa Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 13 Sep 2016 14:50:37 +0100
Subject: [PATCH 1139/1265] Fix integration test on Docker for Mac

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/unit/cli/errors_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/cli/errors_test.py b/tests/unit/cli/errors_test.py
index 71fa9dee..1d454a08 100644
--- a/tests/unit/cli/errors_test.py
+++ b/tests/unit/cli/errors_test.py
@@ -32,7 +32,7 @@ class TestHandleConnectionErrors(object):
                     raise ConnectionError()
 
         _, args, _ = mock_logging.error.mock_calls[0]
-        assert "Couldn't connect to Docker daemon at" in args[0]
+        assert "Couldn't connect to Docker daemon" in args[0]
 
     def test_api_error_version_mismatch(self, mock_logging):
         with pytest.raises(errors.ConnectionError):

From 7dd2e33057f8dab7bb63ceedc8ea598f993463c4 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 12 Sep 2016 16:02:58 -0700
Subject: [PATCH 1140/1265] Only allow log streaming if logdriver is json-file
 or journald

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/container.py         |  2 +-
 tests/unit/container_test.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/compose/container.py b/compose/container.py
index 2c16863d..bda4e659 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -163,7 +163,7 @@ class Container(object):
     @property
     def has_api_logs(self):
         log_type = self.log_driver
-        return not log_type or log_type != 'none'
+        return not log_type or log_type in ('json-file', 'journald')
 
     def attach_log_stream(self):
         """A log stream can only be attached if the container uses a json-file
diff --git a/tests/unit/container_test.py b/tests/unit/container_test.py
index 47f60de8..62e3aa2c 100644
--- a/tests/unit/container_test.py
+++ b/tests/unit/container_test.py
@@ -150,6 +150,34 @@ class ContainerTest(unittest.TestCase):
         container = Container(None, self.container_dict, has_been_inspected=True)
         assert container.short_id == self.container_id[:12]
 
+    def test_has_api_logs(self):
+        container_dict = {
+            'HostConfig': {
+                'LogConfig': {
+                    'Type': 'json-file'
+                }
+            }
+        }
+
+        container = Container(None, container_dict, has_been_inspected=True)
+        assert container.has_api_logs is True
+
+        container_dict['HostConfig']['LogConfig']['Type'] = 'none'
+        container = Container(None, container_dict, has_been_inspected=True)
+        assert container.has_api_logs is False
+
+        container_dict['HostConfig']['LogConfig']['Type'] = 'syslog'
+        container = Container(None, container_dict, has_been_inspected=True)
+        assert container.has_api_logs is False
+
+        container_dict['HostConfig']['LogConfig']['Type'] = 'journald'
+        container = Container(None, container_dict, has_been_inspected=True)
+        assert container.has_api_logs is True
+
+        container_dict['HostConfig']['LogConfig']['Type'] = 'foobar'
+        container = Container(None, container_dict, has_been_inspected=True)
+        assert container.has_api_logs is False
+
 
 class GetContainerNameTestCase(unittest.TestCase):
 

From 3fcd648ba2e63191f72c7bdb53cadc387c90769f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 12 Sep 2016 15:49:54 -0700
Subject: [PATCH 1141/1265] Catch APIError while printing container logs

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/log_printer.py         | 11 +++++++++--
 tests/unit/cli/log_printer_test.py | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index b48462ff..299ddea4 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -6,6 +6,7 @@ from collections import namedtuple
 from itertools import cycle
 from threading import Thread
 
+from docker.errors import APIError
 from six.moves import _thread as thread
 from six.moves.queue import Empty
 from six.moves.queue import Queue
@@ -176,8 +177,14 @@ def build_log_generator(container, log_args):
 
 
 def wait_on_exit(container):
-    exit_code = container.wait()
-    return "%s exited with code %s\n" % (container.name, exit_code)
+    try:
+        exit_code = container.wait()
+        return "%s exited with code %s\n" % (container.name, exit_code)
+    except APIError as e:
+        return "Unexpected API error for %s (HTTP code %s)\nResponse body:\n%s\n" % (
+            container.name, e.response.status_code,
+            e.response.text or '[empty]'
+        )
 
 
 def start_producer_thread(thread_args):
diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py
index ab48eefc..b908eb68 100644
--- a/tests/unit/cli/log_printer_test.py
+++ b/tests/unit/cli/log_printer_test.py
@@ -4,7 +4,9 @@ from __future__ import unicode_literals
 import itertools
 
 import pytest
+import requests
 import six
+from docker.errors import APIError
 from six.moves.queue import Queue
 
 from compose.cli.log_printer import build_log_generator
@@ -56,6 +58,26 @@ def test_wait_on_exit():
     assert expected == wait_on_exit(mock_container)
 
 
+def test_wait_on_exit_raises():
+    status_code = 500
+
+    def mock_wait():
+        resp = requests.Response()
+        resp.status_code = status_code
+        raise APIError('Bad server', resp)
+
+    mock_container = mock.Mock(
+        spec=Container,
+        name='cname',
+        wait=mock_wait
+    )
+
+    expected = 'Unexpected API error for {} (HTTP code {})\n'.format(
+        mock_container.name, status_code,
+    )
+    assert expected in wait_on_exit(mock_container)
+
+
 def test_build_no_log_generator(mock_container):
     mock_container.has_api_logs = False
     mock_container.log_driver = 'none'

From fd254caa681ac697b9aad03d4b8c5e2e04d4f437 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 27 Jun 2016 17:27:31 -0700
Subject: [PATCH 1142/1265] Add support for link-local IPs in service.networks
 definition

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py               |   5 +-
 compose/config/config_schema_v2.1.json | 319 +++++++++++++++++++++++++
 compose/config/serialize.py            |   7 +-
 compose/const.py                       |   5 +-
 compose/service.py                     |   4 +-
 docs/compose-file.md                   |  34 +++
 tests/integration/project_test.py      |  27 +++
 tests/integration/testcases.py         |  32 ++-
 tests/unit/config/config_test.py       |  34 ++-
 9 files changed, 452 insertions(+), 15 deletions(-)
 create mode 100644 compose/config/config_schema_v2.1.json

diff --git a/compose/config/config.py b/compose/config/config.py
index 91c2f6a6..32eda81f 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -15,6 +15,7 @@ from cached_property import cached_property
 
 from ..const import COMPOSEFILE_V1 as V1
 from ..const import COMPOSEFILE_V2_0 as V2_0
+from ..const import COMPOSEFILE_V2_1 as V2_1
 from ..utils import build_string_dict
 from .environment import env_vars_from_file
 from .environment import Environment
@@ -173,7 +174,7 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
         if version == '2':
             version = V2_0
 
-        if version != V2_0:
+        if version not in (V2_0, V2_1):
             raise ConfigurationError(
                 'Version in "{}" is unsupported. {}'
                 .format(self.filename, VERSION_EXPLANATION))
@@ -423,7 +424,7 @@ def process_config_file(config_file, environment, service_name=None):
         'service',
         environment,)
 
-    if config_file.version == V2_0:
+    if config_file.version in (V2_0, V2_1):
         processed_config = dict(config_file.config)
         processed_config['services'] = services
         processed_config['volumes'] = interpolate_config_section(
diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
new file mode 100644
index 00000000..de4ddf25
--- /dev/null
+++ b/compose/config/config_schema_v2.1.json
@@ -0,0 +1,319 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "config_schema_v2.1.json",
+  "type": "object",
+
+  "properties": {
+    "version": {
+      "type": "string"
+    },
+
+    "services": {
+      "id": "#/properties/services",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/service"
+        }
+      },
+      "additionalProperties": false
+    },
+
+    "networks": {
+      "id": "#/properties/networks",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/network"
+        }
+      }
+    },
+
+    "volumes": {
+      "id": "#/properties/volumes",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/volume"
+        }
+      },
+      "additionalProperties": false
+    }
+  },
+
+  "additionalProperties": false,
+
+  "definitions": {
+
+    "service": {
+      "id": "#/definitions/service",
+      "type": "object",
+
+      "properties": {
+        "build": {
+          "oneOf": [
+            {"type": "string"},
+            {
+              "type": "object",
+              "properties": {
+                "context": {"type": "string"},
+                "dockerfile": {"type": "string"},
+                "args": {"$ref": "#/definitions/list_or_dict"}
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "cgroup_parent": {"type": "string"},
+        "command": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
+        "container_name": {"type": "string"},
+        "cpu_shares": {"type": ["number", "string"]},
+        "cpu_quota": {"type": ["number", "string"]},
+        "cpuset": {"type": "string"},
+        "depends_on": {"$ref": "#/definitions/list_of_strings"},
+        "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "dns": {"$ref": "#/definitions/string_or_list"},
+        "dns_search": {"$ref": "#/definitions/string_or_list"},
+        "domainname": {"type": "string"},
+        "entrypoint": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
+        "env_file": {"$ref": "#/definitions/string_or_list"},
+        "environment": {"$ref": "#/definitions/list_or_dict"},
+
+        "expose": {
+          "type": "array",
+          "items": {
+            "type": ["string", "number"],
+            "format": "expose"
+          },
+          "uniqueItems": true
+        },
+
+        "extends": {
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "object",
+
+              "properties": {
+                "service": {"type": "string"},
+                "file": {"type": "string"}
+              },
+              "required": ["service"],
+              "additionalProperties": false
+            }
+          ]
+        },
+
+        "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
+        "hostname": {"type": "string"},
+        "image": {"type": "string"},
+        "ipc": {"type": "string"},
+        "labels": {"$ref": "#/definitions/list_or_dict"},
+        "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+
+        "logging": {
+            "type": "object",
+
+            "properties": {
+                "driver": {"type": "string"},
+                "options": {"type": "object"}
+            },
+            "additionalProperties": false
+        },
+
+        "mac_address": {"type": "string"},
+        "mem_limit": {"type": ["number", "string"]},
+        "memswap_limit": {"type": ["number", "string"]},
+        "network_mode": {"type": "string"},
+
+        "networks": {
+          "oneOf": [
+            {"$ref": "#/definitions/list_of_strings"},
+            {
+              "type": "object",
+              "patternProperties": {
+                "^[a-zA-Z0-9._-]+$": {
+                  "oneOf": [
+                    {
+                      "type": "object",
+                      "properties": {
+                        "aliases": {"$ref": "#/definitions/list_of_strings"},
+                        "ipv4_address": {"type": "string"},
+                        "ipv6_address": {"type": "string"},
+                        "link_local_ips": {"$ref": "#/definitions/list_of_strings"}
+                      },
+                      "additionalProperties": false
+                    },
+                    {"type": "null"}
+                  ]
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "pid": {"type": ["string", "null"]},
+
+        "ports": {
+          "type": "array",
+          "items": {
+            "type": ["string", "number"],
+            "format": "ports"
+          },
+          "uniqueItems": true
+        },
+
+        "privileged": {"type": "boolean"},
+        "read_only": {"type": "boolean"},
+        "restart": {"type": "string"},
+        "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "shm_size": {"type": ["number", "string"]},
+        "stdin_open": {"type": "boolean"},
+        "stop_signal": {"type": "string"},
+        "tmpfs": {"$ref": "#/definitions/string_or_list"},
+        "tty": {"type": "boolean"},
+        "ulimits": {
+          "type": "object",
+          "patternProperties": {
+            "^[a-z]+$": {
+              "oneOf": [
+                {"type": "integer"},
+                {
+                  "type":"object",
+                  "properties": {
+                    "hard": {"type": "integer"},
+                    "soft": {"type": "integer"}
+                  },
+                  "required": ["soft", "hard"],
+                  "additionalProperties": false
+                }
+              ]
+            }
+          }
+        },
+        "user": {"type": "string"},
+        "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "volume_driver": {"type": "string"},
+        "volumes_from": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "working_dir": {"type": "string"}
+      },
+
+      "dependencies": {
+        "memswap_limit": ["mem_limit"]
+      },
+      "additionalProperties": false
+    },
+
+    "network": {
+      "id": "#/definitions/network",
+      "type": "object",
+      "properties": {
+        "driver": {"type": "string"},
+        "driver_opts": {
+          "type": "object",
+          "patternProperties": {
+            "^.+$": {"type": ["string", "number"]}
+          }
+        },
+        "ipam": {
+            "type": "object",
+            "properties": {
+                "driver": {"type": "string"},
+                "config": {
+                    "type": "array"
+                }
+            },
+            "additionalProperties": false
+        },
+        "external": {
+          "type": ["boolean", "object"],
+          "properties": {
+            "name": {"type": "string"}
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+
+    "volume": {
+      "id": "#/definitions/volume",
+      "type": ["object", "null"],
+      "properties": {
+        "driver": {"type": "string"},
+        "driver_opts": {
+          "type": "object",
+          "patternProperties": {
+            "^.+$": {"type": ["string", "number"]}
+          }
+        },
+        "external": {
+          "type": ["boolean", "object"],
+          "properties": {
+            "name": {"type": "string"}
+          }
+        },
+        "additionalProperties": false
+      },
+      "additionalProperties": false
+    },
+
+    "string_or_list": {
+      "oneOf": [
+        {"type": "string"},
+        {"$ref": "#/definitions/list_of_strings"}
+      ]
+    },
+
+    "list_of_strings": {
+      "type": "array",
+      "items": {"type": "string"},
+      "uniqueItems": true
+    },
+
+    "list_or_dict": {
+      "oneOf": [
+        {
+          "type": "object",
+          "patternProperties": {
+            ".+": {
+              "type": ["string", "number", "null"]
+            }
+          },
+          "additionalProperties": false
+        },
+        {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
+      ]
+    },
+
+    "constraints": {
+      "service": {
+        "id": "#/definitions/constraints/service",
+        "anyOf": [
+          {"required": ["build"]},
+          {"required": ["image"]}
+        ],
+        "properties": {
+          "build": {
+            "required": ["context"]
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/compose/config/serialize.py b/compose/config/serialize.py
index b788a55d..0e6efbdf 100644
--- a/compose/config/serialize.py
+++ b/compose/config/serialize.py
@@ -7,6 +7,7 @@ import yaml
 from compose.config import types
 from compose.config.config import V1
 from compose.config.config import V2_0
+from compose.config.config import V2_1
 
 
 def serialize_config_type(dumper, data):
@@ -32,8 +33,12 @@ def denormalize_config(config):
         if 'external_name' in net_conf:
             del net_conf['external_name']
 
+    version = config.version
+    if version not in (V2_0, V2_1):
+        version = V2_0
+
     return {
-        'version': V2_0,
+        'version': version,
         'services': services,
         'networks': networks,
         'volumes': config.volumes,
diff --git a/compose/const.py b/compose/const.py
index b930e0bf..e7b1ae97 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -16,13 +16,16 @@ LABEL_CONFIG_HASH = 'com.docker.compose.config-hash'
 
 COMPOSEFILE_V1 = '1'
 COMPOSEFILE_V2_0 = '2.0'
+COMPOSEFILE_V2_1 = '2.1'
 
 API_VERSIONS = {
     COMPOSEFILE_V1: '1.21',
     COMPOSEFILE_V2_0: '1.22',
+    COMPOSEFILE_V2_1: '1.24',
 }
 
 API_VERSION_TO_ENGINE_VERSION = {
     API_VERSIONS[COMPOSEFILE_V1]: '1.9.0',
-    API_VERSIONS[COMPOSEFILE_V2_0]: '1.10.0'
+    API_VERSIONS[COMPOSEFILE_V2_0]: '1.10.0',
+    API_VERSIONS[COMPOSEFILE_V2_1]: '1.12.0',
 }
diff --git a/compose/service.py b/compose/service.py
index d0cdeeb3..31ea9e0f 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -477,7 +477,9 @@ class Service(object):
                 aliases=self._get_aliases(netdefs, container),
                 ipv4_address=netdefs.get('ipv4_address', None),
                 ipv6_address=netdefs.get('ipv6_address', None),
-                links=self._get_links(False))
+                links=self._get_links(False),
+                link_local_ips=netdefs.get('link_local_ips', None),
+            )
 
     def remove_duplicate_containers(self, timeout=DEFAULT_TIMEOUT):
         for c in self.duplicate_containers():
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 9f4bd121..c8fa112d 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -621,6 +621,31 @@ An example:
           - subnet: 2001:3984:3989::/64
             gateway: 2001:3984:3989::1
 
+#### link_local_ips
+
+> [Version 2.1 file format](#version-2.1) only.
+
+Specify a list of link-local IPs. Link-local IPs are special IPs which belong
+to a well known subnet and are purely managed by the operator, usually
+dependent on the architecture where they are deployed. Therefore they are not
+managed by docker (IPAM driver).
+
+Example usage:
+
+    version: '2.1'
+    services:
+      app:
+        image: busybox
+        command: top
+        networks:
+          app_net:
+            link_local_ips:
+              - 57.123.22.11
+              - 57.123.22.13
+    networks:
+      app_net:
+        driver: bridge
+
 ### pid
 
     pid: "host"
@@ -1040,6 +1065,15 @@ A more extended example, defining volumes and networks:
       back-tier:
         driver: bridge
 
+### Version 2.1
+
+An upgrade of [version 2](#version-2) that introduces new parameters only
+available with Docker Engine version **1.12.0+**
+
+Introduces:
+
+- [`link_local_ips`](#link_local_ips)
+- ...
 
 ### Upgrading
 
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 80915c1a..2241f70f 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -13,6 +13,7 @@ from .testcases import DockerClientTestCase
 from compose.config import config
 from compose.config import ConfigurationError
 from compose.config.config import V2_0
+from compose.config.config import V2_1
 from compose.config.types import VolumeFromSpec
 from compose.config.types import VolumeSpec
 from compose.const import LABEL_PROJECT
@@ -21,6 +22,7 @@ from compose.container import Container
 from compose.project import Project
 from compose.project import ProjectError
 from compose.service import ConvergenceStrategy
+from tests.integration.testcases import v2_1_only
 from tests.integration.testcases import v2_only
 
 
@@ -756,6 +758,31 @@ class ProjectTest(DockerClientTestCase):
         with self.assertRaises(ProjectError):
             project.up()
 
+    @v2_1_only()
+    def test_up_with_network_link_local_ips(self):
+        config_data = config.Config(
+            version=V2_1,
+            services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'networks': {
+                    'linklocaltest': {
+                        'link_local_ips': ['169.254.8.8']
+                    }
+                }
+            }],
+            volumes={},
+            networks={
+                'linklocaltest': {'driver': 'bridge'}
+            }
+        )
+        project = Project.from_config(
+            client=self.client,
+            name='composetest',
+            config_data=config_data
+        )
+        project.up()
+
     @v2_only()
     def test_project_up_with_network_internal(self):
         self.require_api_version('1.23')
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 3e33a6c0..c7743fb8 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -12,6 +12,7 @@ from compose.cli.docker_client import docker_client
 from compose.config.config import resolve_environment
 from compose.config.config import V1
 from compose.config.config import V2_0
+from compose.config.config import V2_1
 from compose.config.environment import Environment
 from compose.const import API_VERSIONS
 from compose.const import LABEL_PROJECT
@@ -33,18 +34,22 @@ def get_links(container):
     return [format_link(link) for link in links]
 
 
-def engine_version_too_low_for_v2():
+def engine_max_version():
     if 'DOCKER_VERSION' not in os.environ:
-        return False
+        return V2_1
     version = os.environ['DOCKER_VERSION'].partition('-')[0]
-    return version_lt(version, '1.10')
+    if version_lt(version, '1.10'):
+        return V1
+    elif version_lt(version, '1.12'):
+        return V2_0
+    return V2_1
 
 
 def v2_only():
     def decorator(f):
         @functools.wraps(f)
         def wrapper(self, *args, **kwargs):
-            if engine_version_too_low_for_v2():
+            if engine_max_version() == V1:
                 skip("Engine version is too low")
                 return
             return f(self, *args, **kwargs)
@@ -53,14 +58,23 @@ def v2_only():
     return decorator
 
 
+def v2_1_only():
+    def decorator(f):
+        @functools.wraps(f)
+        def wrapper(self, *args, **kwargs):
+            if engine_max_version() in (V1, V2_0):
+                skip('Engine version is too low')
+                return
+            return f(self, *args, **kwargs)
+        return wrapper
+
+    return decorator
+
+
 class DockerClientTestCase(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        if engine_version_too_low_for_v2():
-            version = API_VERSIONS[V1]
-        else:
-            version = API_VERSIONS[V2_0]
-
+        version = API_VERSIONS[engine_max_version()]
         cls.client = docker_client(Environment(), version)
 
     @classmethod
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 02810d2b..8087c773 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -17,6 +17,7 @@ from compose.config.config import resolve_build_args
 from compose.config.config import resolve_environment
 from compose.config.config import V1
 from compose.config.config import V2_0
+from compose.config.config import V2_1
 from compose.config.environment import Environment
 from compose.config.errors import ConfigurationError
 from compose.config.errors import VERSION_EXPLANATION
@@ -155,6 +156,8 @@ class ConfigTest(unittest.TestCase):
         for version in ['2', '2.0']:
             cfg = config.load(build_config_details({'version': version}))
             assert cfg.version == V2_0
+        cfg = config.load(build_config_details({'version': '2.1'}))
+        assert cfg.version == V2_1
 
     def test_v1_file_version(self):
         cfg = config.load(build_config_details({'web': {'image': 'busybox'}}))
@@ -182,7 +185,7 @@ class ConfigTest(unittest.TestCase):
         with pytest.raises(ConfigurationError) as excinfo:
             config.load(
                 build_config_details(
-                    {'version': '2.1'},
+                    {'version': '2.18'},
                     filename='filename.yml',
                 )
             )
@@ -344,6 +347,35 @@ class ConfigTest(unittest.TestCase):
                 }, 'working_dir', 'filename.yml')
             )
 
+    def test_load_config_link_local_ips_network(self):
+        base_file = config.ConfigFile(
+            'base.yaml',
+            {
+                'version': '2.1',
+                'services': {
+                    'web': {
+                        'image': 'example/web',
+                        'networks': {
+                            'foobar': {
+                                'aliases': ['foo', 'bar'],
+                                'link_local_ips': ['169.254.8.8']
+                            }
+                        }
+                    }
+                },
+                'networks': {'foobar': {}}
+            }
+        )
+
+        details = config.ConfigDetails('.', [base_file])
+        web_service = config.load(details).services[0]
+        assert web_service['networks'] == {
+            'foobar': {
+                'aliases': ['foo', 'bar'],
+                'link_local_ips': ['169.254.8.8']
+            }
+        }
+
     def test_load_config_invalid_service_names(self):
         for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
             with pytest.raises(ConfigurationError) as exc:

From 66b395d950d333e945333717b525485ec9f664fe Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 25 Jul 2016 15:21:27 -0700
Subject: [PATCH 1143/1265] Include docker-py link-local fix and improve
 integration test

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/integration/project_test.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 2241f70f..4427fe6b 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -783,6 +783,17 @@ class ProjectTest(DockerClientTestCase):
         )
         project.up()
 
+        service_container = project.get_service('web').containers()[0]
+        ipam_config = service_container.inspect().get(
+            'NetworkSettings', {}
+        ).get(
+            'Networks', {}
+        ).get(
+            'composetest_linklocaltest', {}
+        ).get('IPAMConfig', {})
+        assert 'LinkLocalIPs' in ipam_config
+        assert ipam_config['LinkLocalIPs'] == ['169.254.8.8']
+
     @v2_only()
     def test_project_up_with_network_internal(self):
         self.require_api_version('1.23')

From 64517e31fce5293f58295c567bd5487e07b069f4 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 15 Sep 2016 17:59:20 -0700
Subject: [PATCH 1144/1265] Force default host on windows to the default TCP
 host (instead of npipe)

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/docker_client.py         | 6 ++++++
 tests/unit/cli/docker_client_test.py | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index b196d303..7950c242 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -9,6 +9,7 @@ from docker.tls import TLSConfig
 from docker.utils import kwargs_from_env
 
 from ..const import HTTP_TIMEOUT
+from ..const import IS_WINDOWS_PLATFORM
 from .errors import UserError
 from .utils import generate_user_agent
 from .utils import unquote_path
@@ -71,4 +72,9 @@ def docker_client(environment, version=None, tls_config=None, host=None,
 
     kwargs['user_agent'] = generate_user_agent()
 
+    if 'base_url' not in kwargs and IS_WINDOWS_PLATFORM:
+        # docker-py 1.10 defaults to using npipes, but we don't want that
+        # change in compose yet - use the default TCP connection instead.
+        kwargs['base_url'] = 'tcp://127.0.0.1:2375'
+
     return Client(**kwargs)
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index aaa935af..6cdb7da5 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -60,6 +60,14 @@ class DockerClientTestCase(unittest.TestCase):
         )
         self.assertEqual(client.headers['User-Agent'], expected)
 
+    @mock.patch.dict(os.environ)
+    def test_docker_client_default_windows_host(self):
+        with mock.patch('compose.cli.docker_client.IS_WINDOWS_PLATFORM', True):
+            if 'DOCKER_HOST' in os.environ:
+                del os.environ['DOCKER_HOST']
+            client = docker_client(os.environ)
+            assert client.base_url == 'http://127.0.0.1:2375'
+
 
 class TLSConfigTestCase(unittest.TestCase):
     ca_cert = 'tests/fixtures/tls/ca.pem'

From fc6791f3f0e3e8ae23d9b380398f39bea2e83101 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 16 Sep 2016 14:12:15 -0700
Subject: [PATCH 1145/1265] Bump docker-py dependency

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7f28514b..7acdd130 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 PyYAML==3.11
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.2.0
-docker-py==1.10.2
+docker-py==1.10.3
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4; python_version < '3.4'
diff --git a/setup.py b/setup.py
index 34b40273..80258fbd 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.8',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.10.2, < 2.0',
+    'docker-py >= 1.10.3, < 2.0',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

From cb3bf869f46e2aa2ead695b942a9d1d7b07b23f3 Mon Sep 17 00:00:00 2001
From: Andreas Kohn <andreas.kohn@gmail.com>
Date: Tue, 20 Sep 2016 13:57:34 +0200
Subject: [PATCH 1146/1265] Fix typo

Signed-off-by: Andreas Kohn <andreas.kohn@gmail.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ec7d5b5..cd4a2370 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,7 +43,7 @@ Bug Fixes
 - Fixed a bug in Windows environment where volume mappings of the
   host's root directory would be parsed incorrectly.
 
-- Fixed a bug where `docker-compose config` would ouput an invalid
+- Fixed a bug where `docker-compose config` would output an invalid
   Compose file if external networks were specified.
 
 - Fixed an issue where unset buildargs would be assigned a string

From 79116592668be2c22d0bc188e1f1d92ff8be104c Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 8 Sep 2016 16:39:30 -0700
Subject: [PATCH 1147/1265] Improve volumespec parsing on windows platforms

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py        | 10 +---
 compose/config/types.py         | 85 +++++++++++++++++++++------------
 compose/utils.py                |  9 ++++
 tests/unit/config/types_test.py | 28 +++++++++--
 4 files changed, 90 insertions(+), 42 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 91c2f6a6..2789e9ed 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 
 import functools
 import logging
-import ntpath
 import os
 import string
 import sys
@@ -16,6 +15,7 @@ from cached_property import cached_property
 from ..const import COMPOSEFILE_V1 as V1
 from ..const import COMPOSEFILE_V2_0 as V2_0
 from ..utils import build_string_dict
+from ..utils import splitdrive
 from .environment import env_vars_from_file
 from .environment import Environment
 from .environment import split_env
@@ -942,13 +942,7 @@ def split_path_mapping(volume_path):
     path. Using splitdrive so windows absolute paths won't cause issues with
     splitting on ':'.
     """
-    # splitdrive is very naive, so handle special cases where we can be sure
-    # the first character is not a drive.
-    if (volume_path.startswith('.') or volume_path.startswith('~') or
-            volume_path.startswith('/')):
-        drive, volume_config = '', volume_path
-    else:
-        drive, volume_config = ntpath.splitdrive(volume_path)
+    drive, volume_config = splitdrive(volume_path)
 
     if ':' in volume_config:
         (host, container) = volume_config.split(':', 1)
diff --git a/compose/config/types.py b/compose/config/types.py
index e6a3dea0..9664b580 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -12,6 +12,7 @@ import six
 from compose.config.config import V1
 from compose.config.errors import ConfigurationError
 from compose.const import IS_WINDOWS_PLATFORM
+from compose.utils import splitdrive
 
 
 class VolumeFromSpec(namedtuple('_VolumeFromSpec', 'source mode type')):
@@ -114,41 +115,23 @@ def parse_extra_hosts(extra_hosts_config):
         return extra_hosts_dict
 
 
-def normalize_paths_for_engine(external_path, internal_path):
+def normalize_path_for_engine(path):
     """Windows paths, c:\my\path\shiny, need to be changed to be compatible with
     the Engine. Volume paths are expected to be linux style /c/my/path/shiny/
     """
-    if not IS_WINDOWS_PLATFORM:
-        return external_path, internal_path
+    drive, tail = splitdrive(path)
 
-    if external_path:
-        drive, tail = os.path.splitdrive(external_path)
+    if drive:
+        path = '/' + drive.lower().rstrip(':') + tail
 
-        if drive:
-            external_path = '/' + drive.lower().rstrip(':') + tail
-
-        external_path = external_path.replace('\\', '/')
-
-    return external_path, internal_path.replace('\\', '/')
+    return path.replace('\\', '/')
 
 
 class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
 
     @classmethod
-    def parse(cls, volume_config):
-        """Parse a volume_config path and split it into external:internal[:mode]
-        parts to be returned as a valid VolumeSpec.
-        """
-        if IS_WINDOWS_PLATFORM:
-            # relative paths in windows expand to include the drive, eg C:\
-            # so we join the first 2 parts back together to count as one
-            drive, tail = os.path.splitdrive(volume_config)
-            parts = tail.split(":")
-
-            if drive:
-                parts[0] = drive + parts[0]
-        else:
-            parts = volume_config.split(':')
+    def _parse_unix(cls, volume_config):
+        parts = volume_config.split(':')
 
         if len(parts) > 3:
             raise ConfigurationError(
@@ -156,13 +139,11 @@ class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
                 "external:internal[:mode]" % volume_config)
 
         if len(parts) == 1:
-            external, internal = normalize_paths_for_engine(
-                None,
-                os.path.normpath(parts[0]))
+            external = None
+            internal = os.path.normpath(parts[0])
         else:
-            external, internal = normalize_paths_for_engine(
-                os.path.normpath(parts[0]),
-                os.path.normpath(parts[1]))
+            external = os.path.normpath(parts[0])
+            internal = os.path.normpath(parts[1])
 
         mode = 'rw'
         if len(parts) == 3:
@@ -170,6 +151,48 @@ class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
 
         return cls(external, internal, mode)
 
+    @classmethod
+    def _parse_win32(cls, volume_config):
+        # relative paths in windows expand to include the drive, eg C:\
+        # so we join the first 2 parts back together to count as one
+        mode = 'rw'
+
+        def separate_next_section(volume_config):
+            drive, tail = splitdrive(volume_config)
+            parts = tail.split(':', 1)
+            if drive:
+                parts[0] = drive + parts[0]
+            return parts
+
+        parts = separate_next_section(volume_config)
+        if len(parts) == 1:
+            internal = normalize_path_for_engine(os.path.normpath(parts[0]))
+            external = None
+        else:
+            external = parts[0]
+            parts = separate_next_section(parts[1])
+            external = normalize_path_for_engine(os.path.normpath(external))
+            internal = normalize_path_for_engine(os.path.normpath(parts[0]))
+            if len(parts) > 1:
+                if ':' in parts[1]:
+                    raise ConfigurationError(
+                        "Volume %s has incorrect format, should be "
+                        "external:internal[:mode]" % volume_config
+                    )
+                mode = parts[1]
+
+        return cls(external, internal, mode)
+
+    @classmethod
+    def parse(cls, volume_config):
+        """Parse a volume_config path and split it into external:internal[:mode]
+        parts to be returned as a valid VolumeSpec.
+        """
+        if IS_WINDOWS_PLATFORM:
+            return cls._parse_win32(volume_config)
+        else:
+            return cls._parse_unix(volume_config)
+
     def repr(self):
         external = self.external + ':' if self.external else ''
         return '{ext}{v.internal}:{v.mode}'.format(ext=external, v=self)
diff --git a/compose/utils.py b/compose/utils.py
index 6d9a9fdc..8f05e308 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -6,6 +6,7 @@ import hashlib
 import json
 import json.decoder
 import logging
+import ntpath
 
 import six
 
@@ -108,3 +109,11 @@ def microseconds_from_time_nano(time_nano):
 
 def build_string_dict(source_dict):
     return dict((k, str(v if v is not None else '')) for k, v in source_dict.items())
+
+
+def splitdrive(path):
+    if len(path) == 0:
+        return ('', '')
+    if path[0] in ['.', '\\', '/', '~']:
+        return ('', path)
+    return ntpath.splitdrive(path)
diff --git a/tests/unit/config/types_test.py b/tests/unit/config/types_test.py
index c741a339..8dfa65d5 100644
--- a/tests/unit/config/types_test.py
+++ b/tests/unit/config/types_test.py
@@ -9,7 +9,6 @@ from compose.config.errors import ConfigurationError
 from compose.config.types import parse_extra_hosts
 from compose.config.types import VolumeFromSpec
 from compose.config.types import VolumeSpec
-from compose.const import IS_WINDOWS_PLATFORM
 
 
 def test_parse_extra_hosts_list():
@@ -64,15 +63,38 @@ class TestVolumeSpec(object):
             VolumeSpec.parse('one:two:three:four')
         assert 'has incorrect format' in exc.exconly()
 
-    @pytest.mark.xfail((not IS_WINDOWS_PLATFORM), reason='does not have a drive')
     def test_parse_volume_windows_absolute_path(self):
         windows_path = "c:\\Users\\me\\Documents\\shiny\\config:\\opt\\shiny\\config:ro"
-        assert VolumeSpec.parse(windows_path) == (
+        assert VolumeSpec._parse_win32(windows_path) == (
             "/c/Users/me/Documents/shiny/config",
             "/opt/shiny/config",
             "ro"
         )
 
+    def test_parse_volume_windows_internal_path(self):
+        windows_path = 'C:\\Users\\reimu\\scarlet:C:\\scarlet\\app:ro'
+        assert VolumeSpec._parse_win32(windows_path) == (
+            '/c/Users/reimu/scarlet',
+            '/c/scarlet/app',
+            'ro'
+        )
+
+    def test_parse_volume_windows_just_drives(self):
+        windows_path = 'E:\\:C:\\:ro'
+        assert VolumeSpec._parse_win32(windows_path) == (
+            '/e/',
+            '/c/',
+            'ro'
+        )
+
+    def test_parse_volume_windows_mixed_notations(self):
+        windows_path = '/c/Foo:C:\\bar'
+        assert VolumeSpec._parse_win32(windows_path) == (
+            '/c/Foo',
+            '/c/bar',
+            'rw'
+        )
+
 
 class TestVolumesFromSpec(object):
 

From 33424189d43ce7ec0a55abdd709d08af8840e7e5 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 19 Sep 2016 17:13:53 -0700
Subject: [PATCH 1148/1265] Denormalize function defaults to latest version
 Minor docs fix

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/serialize.py  | 2 +-
 docs/compose-file.md         | 2 +-
 tests/acceptance/cli_test.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compose/config/serialize.py b/compose/config/serialize.py
index 0e6efbdf..95b1387f 100644
--- a/compose/config/serialize.py
+++ b/compose/config/serialize.py
@@ -35,7 +35,7 @@ def denormalize_config(config):
 
     version = config.version
     if version not in (V2_0, V2_1):
-        version = V2_0
+        version = V2_1
 
     return {
         'version': version,
diff --git a/docs/compose-file.md b/docs/compose-file.md
index c8fa112d..625e5bf6 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -623,7 +623,7 @@ An example:
 
 #### link_local_ips
 
-> [Version 2.1 file format](#version-2.1) only.
+> [Added in version 2.1 file format](#version-21).
 
 Specify a list of link-local IPs. Link-local IPs are special IPs which belong
 to a well known subnet and are purely managed by the operator, usually
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 3939a97b..2247ffff 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -257,7 +257,7 @@ class CLITestCase(DockerClientTestCase):
         self.base_dir = 'tests/fixtures/v1-config'
         result = self.dispatch(['config'])
         assert yaml.load(result.stdout) == {
-            'version': '2.0',
+            'version': '2.1',
             'services': {
                 'net': {
                     'image': 'busybox',

From 53fa44c01e7b50b571c48101d6ca59ac0fd94ace Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 20 Sep 2016 18:05:59 -0700
Subject: [PATCH 1149/1265] Don't break when interpolating environment with
 unicode characters

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/service.py                            |  2 ++
 tests/acceptance/cli_test.py                  | 19 +++++++++++++++++++
 .../unicode-environment/docker-compose.yml    |  7 +++++++
 3 files changed, 28 insertions(+)
 create mode 100644 tests/fixtures/unicode-environment/docker-compose.yml

diff --git a/compose/service.py b/compose/service.py
index b5a35b7e..1759bf7d 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -1109,6 +1109,8 @@ def format_environment(environment):
     def format_env(key, value):
         if value is None:
             return key
+        if isinstance(value, six.binary_type):
+            value = value.decode('utf-8')
         return '{key}={value}'.format(key=key, value=value)
     return [format_env(*item) for item in environment.items()]
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 3939a97b..67cca8c7 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
@@ -12,6 +13,7 @@ from collections import namedtuple
 from operator import attrgetter
 
 import py
+import six
 import yaml
 from docker import errors
 
@@ -1286,6 +1288,23 @@ class CLITestCase(DockerClientTestCase):
             'simplecomposefile_simple_run_1',
             'exited'))
 
+    @mock.patch.dict(os.environ)
+    def test_run_unicode_env_values_from_system(self):
+        value = 'ą, ć, ę, ł, ń, ó, ś, ź, ż'
+        if six.PY2:  # os.environ doesn't support unicode values in Py2
+            os.environ['BAR'] = value.encode('utf-8')
+        else:  # ... and doesn't support byte values in Py3
+            os.environ['BAR'] = value
+        self.base_dir = 'tests/fixtures/unicode-environment'
+        result = self.dispatch(['run', 'simple'])
+
+        if six.PY2:  # Can't retrieve output on Py3. See issue #3670
+            assert value == result.stdout.strip()
+
+        container = self.project.containers(one_off=OneOffFilter.only, stopped=True)[0]
+        environment = container.get('Config.Env')
+        assert 'FOO={}'.format(value) in environment
+
     @mock.patch.dict(os.environ)
     def test_run_env_values_from_system(self):
         os.environ['FOO'] = 'bar'
diff --git a/tests/fixtures/unicode-environment/docker-compose.yml b/tests/fixtures/unicode-environment/docker-compose.yml
new file mode 100644
index 00000000..a41af4f0
--- /dev/null
+++ b/tests/fixtures/unicode-environment/docker-compose.yml
@@ -0,0 +1,7 @@
+version: '2'
+services:
+  simple:
+    image: busybox:latest
+    command: sh -c 'echo $$FOO'
+    environment:
+      FOO: ${BAR}

From 5667de87e88e0abcc876647ff7e73510de8b878a Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 22 Sep 2016 12:34:59 -0700
Subject: [PATCH 1150/1265] Fix the contributors script to show only
 contributors on the current branch

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 script/release/contributors | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/release/contributors b/script/release/contributors
index 1e69b143..4657dd80 100755
--- a/script/release/contributors
+++ b/script/release/contributors
@@ -15,10 +15,10 @@ EOM
 
 [[ -n "$1" ]] || usage
 PREV_RELEASE=$1
-VERSION=HEAD
+BRANCH="$(git rev-parse --abbrev-ref HEAD)"
 URL="https://api.github.com/repos/docker/compose/compare"
 
-contribs=$(curl -sf "$URL/$PREV_RELEASE...$VERSION" | \
+contribs=$(curl -sf "$URL/$PREV_RELEASE...$BRANCH" | \
     jq -r '.commits[].author.login' | \
     sort | \
     uniq -c | \

From 90356b7040be49e402b1e176f4db7461659fbbd5 Mon Sep 17 00:00:00 2001
From: Matthew Bray <mattjbray@gmail.com>
Date: Wed, 28 Sep 2016 12:04:13 +0100
Subject: [PATCH 1151/1265] Zsh completion: permit multiple --file arguments

Before this change:

```
$ docker-compose --file docker-compose.yml -<TAB>
 -- option --
--help                 -h  -- Get help
--host                 -H  -- Daemon socket to connect to
--project-name         -p  -- Specify an alternate project name (default: directory name)
--skip-hostname-check      -- Don't check the daemon's hostname against the name specified in the client certificate (for example if your docker host is an IP address)
--tls                      -- Use TLS; implied by --tlsverify
--tlscacert                -- Trust certs signed only by this CA
--tlscert                  -- Path to TLS certificate file
--tlskey                   -- Path to TLS key file
--tlsverify                -- Use TLS and verify the remote
--verbose                  -- Show more output
--version              -v  -- Print version and exit
```

(Note the `--file` argument is no longer available to complete.)

After this change:

```
docker-compose --file docker-compose.yml -<TAB>
 -- option --
--file                 -f  -- Specify an alternate docker-compose file (default: docker-compose.yml)
--help                 -h  -- Get help
--host                 -H  -- Daemon socket to connect to
--project-name         -p  -- Specify an alternate project name (default: directory name)
--skip-hostname-check      -- Don't check the daemon's hostname against the name specified in the client certificate (for example if your docker host is an IP address)
--tls                      -- Use TLS; implied by --tlsverify
--tlscacert                -- Trust certs signed only by this CA
--tlscert                  -- Path to TLS certificate file
--tlskey                   -- Path to TLS key file
--tlsverify                -- Use TLS and verify the remote
--verbose                  -- Show more output
--version              -v  -- Print version and exit
```

Signed-off-by: Matt Bray <mattjbray@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 928e28de..fae75842 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -388,7 +388,7 @@ _docker-compose() {
 
     _arguments -C \
         '(- :)'{-h,--help}'[Get help]' \
-        '(-f --file)'{-f,--file}'[Specify an alternate docker-compose file (default: docker-compose.yml)]:file:_files -g "*.yml"' \
+        '*'{-f,--file}'[Specify an alternate docker-compose file (default: docker-compose.yml)]:file:_files -g "*.yml"' \
         '(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \
         '--verbose[Show more output]' \
         '(- :)'{-v,--version}'[Print version and exit]' \

From dc8a39f70d66948bcd220d1693ed8ab167fa3513 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 28 Sep 2016 15:31:58 -0700
Subject: [PATCH 1152/1265] Add support for "isolation" in config

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config_schema_v2.1.json |  1 +
 compose/service.py                     |  8 ++++-
 tests/integration/project_test.py      | 43 ++++++++++++++++++++++++++
 tests/unit/config/config_test.py       | 23 ++++++++++++--
 4 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
index de4ddf25..243759fa 100644
--- a/compose/config/config_schema_v2.1.json
+++ b/compose/config/config_schema_v2.1.json
@@ -123,6 +123,7 @@
         "hostname": {"type": "string"},
         "image": {"type": "string"},
         "ipc": {"type": "string"},
+        "isolation": {"type": "string"},
         "labels": {"$ref": "#/definitions/list_or_dict"},
         "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
 
diff --git a/compose/service.py b/compose/service.py
index c461220f..f4f4b90d 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -682,7 +682,7 @@ class Service(object):
         logging_dict = options.get('logging', None)
         log_config = get_log_config(logging_dict)
 
-        return self.client.create_host_config(
+        host_config = self.client.create_host_config(
             links=self._get_links(link_to_self=one_off),
             port_bindings=build_port_bindings(options.get('ports') or []),
             binds=options.get('binds'),
@@ -713,6 +713,12 @@ class Service(object):
             group_add=options.get('group_add')
         )
 
+        # TODO: Add as an argument to create_host_config once it's supported
+        # in docker-py
+        host_config['Isolation'] = options.get('isolation')
+
+        return host_config
+
     def build(self, no_cache=False, pull=False, force_rm=False):
         log.info('Building %s' % self.name)
 
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 4427fe6b..8588c6b1 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -794,6 +794,49 @@ class ProjectTest(DockerClientTestCase):
         assert 'LinkLocalIPs' in ipam_config
         assert ipam_config['LinkLocalIPs'] == ['169.254.8.8']
 
+    @v2_1_only()
+    def test_up_with_isolation(self):
+        self.require_api_version('1.24')
+        config_data = config.Config(
+            version=V2_1,
+            services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'isolation': 'default'
+            }],
+            volumes={},
+            networks={}
+        )
+        project = Project.from_config(
+            client=self.client,
+            name='composetest',
+            config_data=config_data
+        )
+        project.up()
+        service_container = project.get_service('web').containers()[0]
+        assert service_container.inspect()['HostConfig']['Isolation'] == 'default'
+
+    @v2_1_only()
+    def test_up_with_invalid_isolation(self):
+        self.require_api_version('1.24')
+        config_data = config.Config(
+            version=V2_1,
+            services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'isolation': 'foobar'
+            }],
+            volumes={},
+            networks={}
+        )
+        project = Project.from_config(
+            client=self.client,
+            name='composetest',
+            config_data=config_data
+        )
+        with self.assertRaises(ProjectError):
+            project.up()
+
     @v2_only()
     def test_project_up_with_network_internal(self):
         self.require_api_version('1.23')
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 88b990e5..d9bc5764 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -351,7 +351,7 @@ class ConfigTest(unittest.TestCase):
         base_file = config.ConfigFile(
             'base.yaml',
             {
-                'version': '2.1',
+                'version': V2_1,
                 'services': {
                     'web': {
                         'image': 'example/web',
@@ -1330,7 +1330,7 @@ class ConfigTest(unittest.TestCase):
                     'image': 'alpine',
                     'group_add': ["docker", 777]
                 }
-             }
+            }
         }))
 
         assert actual.services == [
@@ -1341,6 +1341,25 @@ class ConfigTest(unittest.TestCase):
             }
         ]
 
+    def test_isolation_option(self):
+        actual = config.load(build_config_details({
+            'version': V2_1,
+            'services': {
+                'web': {
+                    'image': 'win10',
+                    'isolation': 'hyperv'
+                }
+            }
+        }))
+
+        assert actual.services == [
+            {
+                'name': 'web',
+                'image': 'win10',
+                'isolation': 'hyperv',
+            }
+        ]
+
     def test_merge_service_dicts_from_files_with_extends_in_base(self):
         base = {
             'volumes': ['.:/app'],

From 007cf96452a28941fde58f8b775f7cd48d86c1c9 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 28 Sep 2016 15:36:57 -0700
Subject: [PATCH 1153/1265] Use docker-py's default behavior when no explicit
 host on Windows

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/docker_client.py         | 6 ------
 tests/unit/cli/docker_client_test.py | 8 --------
 2 files changed, 14 deletions(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index 7950c242..b196d303 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -9,7 +9,6 @@ from docker.tls import TLSConfig
 from docker.utils import kwargs_from_env
 
 from ..const import HTTP_TIMEOUT
-from ..const import IS_WINDOWS_PLATFORM
 from .errors import UserError
 from .utils import generate_user_agent
 from .utils import unquote_path
@@ -72,9 +71,4 @@ def docker_client(environment, version=None, tls_config=None, host=None,
 
     kwargs['user_agent'] = generate_user_agent()
 
-    if 'base_url' not in kwargs and IS_WINDOWS_PLATFORM:
-        # docker-py 1.10 defaults to using npipes, but we don't want that
-        # change in compose yet - use the default TCP connection instead.
-        kwargs['base_url'] = 'tcp://127.0.0.1:2375'
-
     return Client(**kwargs)
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index 6cdb7da5..aaa935af 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -60,14 +60,6 @@ class DockerClientTestCase(unittest.TestCase):
         )
         self.assertEqual(client.headers['User-Agent'], expected)
 
-    @mock.patch.dict(os.environ)
-    def test_docker_client_default_windows_host(self):
-        with mock.patch('compose.cli.docker_client.IS_WINDOWS_PLATFORM', True):
-            if 'DOCKER_HOST' in os.environ:
-                del os.environ['DOCKER_HOST']
-            client = docker_client(os.environ)
-            assert client.base_url == 'http://127.0.0.1:2375'
-
 
 class TLSConfigTestCase(unittest.TestCase):
     ca_cert = 'tests/fixtures/tls/ca.pem'

From fe08be698d36d42a66839ce284989947220931cd Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 10 Mar 2016 17:33:01 -0500
Subject: [PATCH 1154/1265] Support inline default values.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py                | 22 +++++---
 compose/config/interpolation.py         | 74 +++++++++++++++++++------
 tests/unit/config/interpolation_test.py | 74 ++++++++++++++++++++-----
 tests/unit/interpolation_test.py        | 36 ------------
 4 files changed, 130 insertions(+), 76 deletions(-)
 delete mode 100644 tests/unit/interpolation_test.py

diff --git a/compose/config/config.py b/compose/config/config.py
index aea1e094..4d32b50c 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -413,31 +413,35 @@ def load_services(config_details, config_file):
     return build_services(service_config)
 
 
-def interpolate_config_section(filename, config, section, environment):
-    validate_config_section(filename, config, section)
-    return interpolate_environment_variables(config, section, environment)
+def interpolate_config_section(config_file, config, section, environment):
+    validate_config_section(config_file.filename, config, section)
+    return interpolate_environment_variables(
+            config_file.version,
+            config,
+            section,
+            environment)
 
 
 def process_config_file(config_file, environment, service_name=None):
     services = interpolate_config_section(
-        config_file.filename,
+        config_file,
         config_file.get_service_dicts(),
         'service',
-        environment,)
+        environment)
 
     if config_file.version in (V2_0, V2_1):
         processed_config = dict(config_file.config)
         processed_config['services'] = services
         processed_config['volumes'] = interpolate_config_section(
-            config_file.filename,
+            config_file,
             config_file.get_volumes(),
             'volume',
-            environment,)
+            environment)
         processed_config['networks'] = interpolate_config_section(
-            config_file.filename,
+            config_file,
             config_file.get_networks(),
             'network',
-            environment,)
+            environment)
 
     if config_file.version == V1:
         processed_config = services
diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index 63020d91..cb841437 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -7,14 +7,35 @@ from string import Template
 import six
 
 from .errors import ConfigurationError
+from compose.const import COMPOSEFILE_V1 as V1
+from compose.const import COMPOSEFILE_V2_0 as V2_0
+
+
 log = logging.getLogger(__name__)
 
 
-def interpolate_environment_variables(config, section, environment):
+class Interpolator(object):
+
+    def __init__(self, templater, mapping):
+        self.templater = templater
+        self.mapping = mapping
+
+    def interpolate(self, string):
+        try:
+            return self.templater(string).substitute(self.mapping)
+        except ValueError:
+            raise InvalidInterpolation(string)
+
+
+def interpolate_environment_variables(version, config, section, environment):
+    if version in (V2_0, V1):
+        interpolator = Interpolator(Template, environment)
+    else:
+        interpolator = Interpolator(TemplateWithDefaults, environment)
 
     def process_item(name, config_dict):
         return dict(
-            (key, interpolate_value(name, key, val, section, environment))
+            (key, interpolate_value(name, key, val, section, interpolator))
             for key, val in (config_dict or {}).items()
         )
 
@@ -24,9 +45,9 @@ def interpolate_environment_variables(config, section, environment):
     )
 
 
-def interpolate_value(name, config_key, value, section, mapping):
+def interpolate_value(name, config_key, value, section, interpolator):
     try:
-        return recursive_interpolate(value, mapping)
+        return recursive_interpolate(value, interpolator)
     except InvalidInterpolation as e:
         raise ConfigurationError(
             'Invalid interpolation format for "{config_key}" option '
@@ -37,25 +58,44 @@ def interpolate_value(name, config_key, value, section, mapping):
                 string=e.string))
 
 
-def recursive_interpolate(obj, mapping):
+def recursive_interpolate(obj, interpolator):
     if isinstance(obj, six.string_types):
-        return interpolate(obj, mapping)
-    elif isinstance(obj, dict):
+        return interpolator.interpolate(obj)
+    if isinstance(obj, dict):
         return dict(
-            (key, recursive_interpolate(val, mapping))
+            (key, recursive_interpolate(val, interpolator))
             for (key, val) in obj.items()
         )
-    elif isinstance(obj, list):
-        return [recursive_interpolate(val, mapping) for val in obj]
-    else:
-        return obj
+    if isinstance(obj, list):
+        return [recursive_interpolate(val, interpolator) for val in obj]
+    return obj
 
 
-def interpolate(string, mapping):
-    try:
-        return Template(string).substitute(mapping)
-    except ValueError:
-        raise InvalidInterpolation(string)
+class TemplateWithDefaults(Template):
+    idpattern = r'[_a-z][_a-z0-9]*(?::?-[_a-z0-9]+)?'
+
+    # Modified from python2.7/string.py
+    def substitute(self, mapping):
+        # Helper function for .sub()
+        def convert(mo):
+            # Check the most common path first.
+            named = mo.group('named') or mo.group('braced')
+            if named is not None:
+                if ':-' in named:
+                    var, _, default = named.partition(':-')
+                    return mapping.get(var) or default
+                if '-' in named:
+                    var, _, default = named.partition('-')
+                    return mapping.get(var, default)
+                val = mapping[named]
+                return '%s' % (val,)
+            if mo.group('escaped') is not None:
+                return self.delimiter
+            if mo.group('invalid') is not None:
+                self._invalid(mo)
+            raise ValueError('Unrecognized named group in pattern',
+                             self.pattern)
+        return self.pattern.sub(convert, self.template)
 
 
 class InvalidInterpolation(Exception):
diff --git a/tests/unit/config/interpolation_test.py b/tests/unit/config/interpolation_test.py
index 42b5db6e..22444495 100644
--- a/tests/unit/config/interpolation_test.py
+++ b/tests/unit/config/interpolation_test.py
@@ -1,21 +1,28 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import os
-
-import mock
 import pytest
 
 from compose.config.environment import Environment
 from compose.config.interpolation import interpolate_environment_variables
+from compose.config.interpolation import Interpolator
+from compose.config.interpolation import InvalidInterpolation
+from compose.config.interpolation import TemplateWithDefaults
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def mock_env():
-    with mock.patch.dict(os.environ):
-        os.environ['USER'] = 'jenny'
-        os.environ['FOO'] = 'bar'
-        yield
+    return Environment({'USER': 'jenny', 'FOO': 'bar'})
+
+
+@pytest.fixture
+def variable_mapping():
+    return Environment({'FOO': 'first', 'BAR': ''})
+
+
+@pytest.fixture
+def defaults_interpolator(variable_mapping):
+    return Interpolator(TemplateWithDefaults, variable_mapping).interpolate
 
 
 def test_interpolate_environment_variables_in_services(mock_env):
@@ -43,9 +50,8 @@ def test_interpolate_environment_variables_in_services(mock_env):
             }
         }
     }
-    assert interpolate_environment_variables(
-        services, 'service', Environment.from_env_file(None)
-    ) == expected
+    value = interpolate_environment_variables("2.0", services, 'service', mock_env)
+    assert value == expected
 
 
 def test_interpolate_environment_variables_in_volumes(mock_env):
@@ -69,6 +75,46 @@ def test_interpolate_environment_variables_in_volumes(mock_env):
         },
         'other': {},
     }
-    assert interpolate_environment_variables(
-        volumes, 'volume', Environment.from_env_file(None)
-    ) == expected
+    value = interpolate_environment_variables("2.0",  volumes, 'volume', mock_env)
+    assert value == expected
+
+
+def test_escaped_interpolation(defaults_interpolator):
+    assert defaults_interpolator('$${foo}') == '${foo}'
+
+
+def test_invalid_interpolation(defaults_interpolator):
+    with pytest.raises(InvalidInterpolation):
+        defaults_interpolator('${')
+    with pytest.raises(InvalidInterpolation):
+        defaults_interpolator('$}')
+    with pytest.raises(InvalidInterpolation):
+        defaults_interpolator('${}')
+    with pytest.raises(InvalidInterpolation):
+        defaults_interpolator('${ }')
+    with pytest.raises(InvalidInterpolation):
+        defaults_interpolator('${ foo}')
+    with pytest.raises(InvalidInterpolation):
+        defaults_interpolator('${foo }')
+    with pytest.raises(InvalidInterpolation):
+        defaults_interpolator('${foo!}')
+
+
+def test_interpolate_missing_no_default(defaults_interpolator):
+    assert defaults_interpolator("This ${missing} var") == "This  var"
+    assert defaults_interpolator("This ${BAR} var") == "This  var"
+
+
+def test_interpolate_with_value(defaults_interpolator):
+    assert defaults_interpolator("This $FOO var") == "This first var"
+    assert defaults_interpolator("This ${FOO} var") == "This first var"
+
+
+def test_interpolate_missing_with_default(defaults_interpolator):
+    assert defaults_interpolator("ok ${missing:-def}") == "ok def"
+    assert defaults_interpolator("ok ${missing-def}") == "ok def"
+
+
+def test_interpolate_with_empty_and_default_value(defaults_interpolator):
+    assert defaults_interpolator("ok ${BAR:-def}") == "ok def"
+    assert defaults_interpolator("ok ${BAR-def}") == "ok "
diff --git a/tests/unit/interpolation_test.py b/tests/unit/interpolation_test.py
deleted file mode 100644
index c3050c2c..00000000
--- a/tests/unit/interpolation_test.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-import unittest
-
-from compose.config.environment import Environment as bddict
-from compose.config.interpolation import interpolate
-from compose.config.interpolation import InvalidInterpolation
-
-
-class InterpolationTest(unittest.TestCase):
-    def test_valid_interpolations(self):
-        self.assertEqual(interpolate('$foo', bddict(foo='hi')), 'hi')
-        self.assertEqual(interpolate('${foo}', bddict(foo='hi')), 'hi')
-
-        self.assertEqual(interpolate('${subject} love you', bddict(subject='i')), 'i love you')
-        self.assertEqual(interpolate('i ${verb} you', bddict(verb='love')), 'i love you')
-        self.assertEqual(interpolate('i love ${object}', bddict(object='you')), 'i love you')
-
-    def test_empty_value(self):
-        self.assertEqual(interpolate('${foo}', bddict(foo='')), '')
-
-    def test_unset_value(self):
-        self.assertEqual(interpolate('${foo}', bddict()), '')
-
-    def test_escaped_interpolation(self):
-        self.assertEqual(interpolate('$${foo}', bddict(foo='hi')), '${foo}')
-
-    def test_invalid_strings(self):
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('${', bddict()))
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('$}', bddict()))
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('${}', bddict()))
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('${ }', bddict()))
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('${ foo}', bddict()))
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('${foo }', bddict()))
-        self.assertRaises(InvalidInterpolation, lambda: interpolate('${foo!}', bddict()))

From a37d99f20114efced6381336990252f2e8238850 Mon Sep 17 00:00:00 2001
From: Matt Bray <mattjbray@gmail.com>
Date: Fri, 30 Sep 2016 00:38:48 +0100
Subject: [PATCH 1155/1265] Zsh completion: change --file description text

Signed-off-by: Matt Bray <mattjbray@gmail.com>
---
 contrib/completion/zsh/_docker-compose | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index fae75842..ceb7d0f5 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -386,9 +386,17 @@ _docker-compose() {
     integer ret=1
     typeset -A opt_args
 
+    local file_description
+
+    if [[ -n ${words[(r)-f]} || -n ${words[(r)--file]} ]] ; then
+        file_description="Specify an override docker-compose file (default: docker-compose.override.yml)"
+    else
+        file_description="Specify an alternate docker-compose file (default: docker-compose.yml)"
+    fi
+
     _arguments -C \
         '(- :)'{-h,--help}'[Get help]' \
-        '*'{-f,--file}'[Specify an alternate docker-compose file (default: docker-compose.yml)]:file:_files -g "*.yml"' \
+        '*'{-f,--file}"[${file_description}]:file:_files -g '*.yml'" \
         '(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \
         '--verbose[Show more output]' \
         '(- :)'{-v,--version}'[Print version and exit]' \

From 1a4e81920b31a2241fb37c2737f183939ad32058 Mon Sep 17 00:00:00 2001
From: John Mulhausen <john@docker.com>
Date: Tue, 4 Oct 2016 17:56:18 -0700
Subject: [PATCH 1156/1265] Remove old documentation source, add README on
 migration

Signed-off-by: John Mulhausen <john@docker.com>
---
 docs/Dockerfile                   |    8 -
 docs/Makefile                     |   38 -
 docs/README.md                    |   90 +--
 docs/bundles.md                   |  209 -----
 docs/completion.md                |   68 --
 docs/compose-file.md              | 1223 -----------------------------
 docs/django.md                    |  194 -----
 docs/env-file.md                  |   43 -
 docs/environment-variables.md     |  107 ---
 docs/extends.md                   |  354 ---------
 docs/faq.md                       |  128 ---
 docs/gettingstarted.md            |  191 -----
 docs/images/django-it-worked.png  |  Bin 28446 -> 0 bytes
 docs/images/rails-welcome.png     |  Bin 71034 -> 0 bytes
 docs/images/wordpress-files.png   |  Bin 70823 -> 0 bytes
 docs/images/wordpress-lang.png    |  Bin 30149 -> 0 bytes
 docs/images/wordpress-welcome.png |  Bin 62063 -> 0 bytes
 docs/index.md                     |   30 -
 docs/install.md                   |  136 ----
 docs/link-env-deprecated.md       |   48 --
 docs/networking.md                |  154 ----
 docs/overview.md                  |  188 -----
 docs/production.md                |   88 ---
 docs/rails.md                     |  174 ----
 docs/reference/build.md           |   25 -
 docs/reference/bundle.md          |   31 -
 docs/reference/config.md          |   23 -
 docs/reference/create.md          |   26 -
 docs/reference/down.md            |   38 -
 docs/reference/envvars.md         |   92 ---
 docs/reference/events.md          |   34 -
 docs/reference/exec.md            |   29 -
 docs/reference/help.md            |   18 -
 docs/reference/index.md           |   42 -
 docs/reference/kill.md            |   24 -
 docs/reference/logs.md            |   25 -
 docs/reference/overview.md        |  127 ---
 docs/reference/pause.md           |   18 -
 docs/reference/port.md            |   23 -
 docs/reference/ps.md              |   21 -
 docs/reference/pull.md            |   21 -
 docs/reference/push.md            |   21 -
 docs/reference/restart.md         |   21 -
 docs/reference/rm.md              |   28 -
 docs/reference/run.md             |   56 --
 docs/reference/scale.md           |   21 -
 docs/reference/start.md           |   18 -
 docs/reference/stop.md            |   22 -
 docs/reference/unpause.md         |   18 -
 docs/reference/up.md              |   55 --
 docs/startup-order.md             |   88 ---
 docs/swarm.md                     |  185 -----
 docs/wordpress.md                 |  112 ---
 53 files changed, 7 insertions(+), 4726 deletions(-)
 delete mode 100644 docs/Dockerfile
 delete mode 100644 docs/Makefile
 delete mode 100644 docs/bundles.md
 delete mode 100644 docs/completion.md
 delete mode 100644 docs/compose-file.md
 delete mode 100644 docs/django.md
 delete mode 100644 docs/env-file.md
 delete mode 100644 docs/environment-variables.md
 delete mode 100644 docs/extends.md
 delete mode 100644 docs/faq.md
 delete mode 100644 docs/gettingstarted.md
 delete mode 100644 docs/images/django-it-worked.png
 delete mode 100644 docs/images/rails-welcome.png
 delete mode 100644 docs/images/wordpress-files.png
 delete mode 100644 docs/images/wordpress-lang.png
 delete mode 100644 docs/images/wordpress-welcome.png
 delete mode 100644 docs/index.md
 delete mode 100644 docs/install.md
 delete mode 100644 docs/link-env-deprecated.md
 delete mode 100644 docs/networking.md
 delete mode 100644 docs/overview.md
 delete mode 100644 docs/production.md
 delete mode 100644 docs/rails.md
 delete mode 100644 docs/reference/build.md
 delete mode 100644 docs/reference/bundle.md
 delete mode 100644 docs/reference/config.md
 delete mode 100644 docs/reference/create.md
 delete mode 100644 docs/reference/down.md
 delete mode 100644 docs/reference/envvars.md
 delete mode 100644 docs/reference/events.md
 delete mode 100644 docs/reference/exec.md
 delete mode 100644 docs/reference/help.md
 delete mode 100644 docs/reference/index.md
 delete mode 100644 docs/reference/kill.md
 delete mode 100644 docs/reference/logs.md
 delete mode 100644 docs/reference/overview.md
 delete mode 100644 docs/reference/pause.md
 delete mode 100644 docs/reference/port.md
 delete mode 100644 docs/reference/ps.md
 delete mode 100644 docs/reference/pull.md
 delete mode 100644 docs/reference/push.md
 delete mode 100644 docs/reference/restart.md
 delete mode 100644 docs/reference/rm.md
 delete mode 100644 docs/reference/run.md
 delete mode 100644 docs/reference/scale.md
 delete mode 100644 docs/reference/start.md
 delete mode 100644 docs/reference/stop.md
 delete mode 100644 docs/reference/unpause.md
 delete mode 100644 docs/reference/up.md
 delete mode 100644 docs/startup-order.md
 delete mode 100644 docs/swarm.md
 delete mode 100644 docs/wordpress.md

diff --git a/docs/Dockerfile b/docs/Dockerfile
deleted file mode 100644
index 7b5a3b24..00000000
--- a/docs/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM docs/base:oss
-MAINTAINER Docker Docs <docs@docker.com>
-
-ENV PROJECT=compose
-# To get the git info for this repo
-COPY . /src
-RUN rm -rf /docs/content/$PROJECT/
-COPY . /docs/content/$PROJECT/
diff --git a/docs/Makefile b/docs/Makefile
deleted file mode 100644
index e6629289..00000000
--- a/docs/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-.PHONY: all default docs docs-build docs-shell shell test
-
-# to allow `make DOCSDIR=1 docs-shell` (to create a bind mount in docs)
-DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR):/docs/content/compose)
-
-# to allow `make DOCSPORT=9000 docs`
-DOCSPORT := 8000
-
-# Get the IP ADDRESS
-DOCKER_IP=$(shell python -c "import urlparse ; print urlparse.urlparse('$(DOCKER_HOST)').hostname or ''")
-HUGO_BASE_URL=$(shell test -z "$(DOCKER_IP)" && echo localhost || echo "$(DOCKER_IP)")
-HUGO_BIND_IP=0.0.0.0
-
-GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
-GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
-DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN))
-
-DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e AWS_S3_BUCKET -e NOCACHE
-
-# for some docs workarounds (see below in "docs-build" target)
-GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
-
-default: docs
-
-docs: docs-build
-	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP) --watch
-
-docs-draft: docs-build
-	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --buildDrafts="true" --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)
-
-docs-shell: docs-build
-	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash
-
-test: docs-build
-	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)"
-
-docs-build:
-	docker build -t "$(DOCKER_DOCS_IMAGE)" .
diff --git a/docs/README.md b/docs/README.md
index e60fa48c..03d2e3a7 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,86 +1,10 @@
-<!--[metadata]>
-+++
-draft = true
-title = "Compose README"
-description = "Compose README"
-keywords = ["Docker, documentation, manual, guide, reference, api"]
-+++
-<![end-metadata]-->
+# The docs have been moved!
 
-# Contributing to the Docker Compose documentation
+The documentation for Compose has been merged into
+[the general documentation repo](https://github.com/docker/docker.github.io).
 
-The documentation in this directory is part of the [https://docs.docker.com](https://docs.docker.com) website.  Docker uses [the Hugo static generator](http://gohugo.io/overview/introduction/) to convert project Markdown files to a static HTML site.
+The docs for Compose are now here:
+https://github.com/docker/docker.github.io/tree/master/compose
 
-You don't need to be a Hugo expert to contribute to the compose documentation. If you are familiar with Markdown, you can modify the content in the `docs` files.
-
-If you want to add a new file or change the location of the document in the menu, you do need to know a little more.
-
-## Documentation contributing workflow
-
-1. Edit a Markdown file in the tree.
-
-2. Save your changes.
-
-3. Make sure you are in the `docs` subdirectory.
-
-4. Build the documentation.
-
-        $ make docs
-         ---> ffcf3f6c4e97
-        Removing intermediate container a676414185e8
-        Successfully built ffcf3f6c4e97
-        docker run --rm -it  -e AWS_S3_BUCKET -e NOCACHE -p 8000:8000 -e DOCKERHOST "docs-base:test-tooling" hugo server --port=8000 --baseUrl=192.168.59.103 --bind=0.0.0.0
-        ERROR: 2015/06/13 MenuEntry's .Url is deprecated and will be removed in Hugo 0.15. Use .URL instead.
-        0 of 4 drafts rendered
-        0 future content
-        12 pages created
-        0 paginator pages created
-        0 tags created
-        0 categories created
-        in 55 ms
-        Serving pages from /docs/public
-        Web Server is available at http://0.0.0.0:8000/
-        Press Ctrl+C to stop
-
-5. Open the available server in your browser.
-
-    The documentation server has the complete menu but only the Docker Compose
-    documentation resolves.  You can't access the other project docs from this
-    localized build.
-
-## Tips on Hugo metadata and menu positioning
-
-The top of each Docker Compose documentation file contains TOML metadata. The metadata is commented out to prevent it from appearing in GitHub.
-
-    <!--[metadata]>
-    +++
-    title = "Extending services in Compose"
-    description = "How to use Docker Compose's extends keyword to share configuration between files and projects"
-    keywords = ["fig, composition, compose, docker, orchestration, documentation, docs"]
-    [menu.main]
-    parent="workw_compose"
-    weight=2
-    +++
-    <![end-metadata]-->
-
-The metadata alone has this structure:
-
-    +++
-    title = "Extending services in Compose"
-    description = "How to use Docker Compose's extends keyword to share configuration between files and projects"
-    keywords = ["fig, composition, compose, docker, orchestration, documentation, docs"]
-    [menu.main]
-    parent="workw_compose"
-    weight=2
-    +++
-
-The `[menu.main]` section refers to navigation defined [in the main Docker menu](https://github.com/docker/docs-base/blob/hugo/config.toml). This metadata says *add a menu item called* Extending services in Compose *to the menu with the* `smn_workdw_compose` *identifier*.  If you locate the menu in the configuration, you'll find *Create multi-container applications* is the menu title.
-
-You can move an article in the tree by specifying a new parent. You can shift the location of the item by changing its weight.  Higher numbers are heavier and shift the item to the bottom of menu. Low or no numbers shift it up.
-
-
-## Other key documentation repositories
-
-The `docker/docs-base` repository contains [the Hugo theme and menu configuration](https://github.com/docker/docs-base). If you open the `Dockerfile` you'll see the `make docs` relies on this as a base image for building the Compose documentation.
-
-The `docker/docs.docker.com` repository contains [build system for building the Docker documentation site](https://github.com/docker/docs.docker.com). Fork this repository to build the entire documentation site.
+As always, the docs remain open-source and we appreciate your feedback and
+pull requests!
diff --git a/docs/bundles.md b/docs/bundles.md
deleted file mode 100644
index 096c9ec3..00000000
--- a/docs/bundles.md
+++ /dev/null
@@ -1,209 +0,0 @@
-<!--[metadata]>
-+++
-title = "Docker Stacks and Distributed Application Bundles"
-description = "Description of Docker and Compose's experimental support for application bundles"
-keywords = ["documentation, docs,  docker, compose, bundles, stacks"]
-advisory = "experimental"
-[menu.main]
-parent="workw_compose"
-+++
-<![end-metadata]-->
-
-
-# Docker Stacks and Distributed Application Bundles (experimental)
-
-> **Note**: This is a copy of the [Docker Stacks and Distributed Application
-> Bundles](https://github.com/docker/docker/blob/v1.12.0-rc4/experimental/docker-stacks-and-bundles.md)
-> document in the [docker/docker repo](https://github.com/docker/docker).
-
-## Overview
-
-Docker Stacks and Distributed Application Bundles are experimental features
-introduced in Docker 1.12 and Docker Compose 1.8, alongside the concept of
-swarm mode, and Nodes and Services in the Engine API.
-
-A Dockerfile can be built into an image, and containers can be created from
-that image. Similarly, a docker-compose.yml can be built into a **distributed
-application bundle**, and **stacks** can be created from that bundle. In that
-sense, the bundle is a multi-services distributable image format.
-
-As of Docker 1.12 and Compose 1.8, the features are experimental. Neither
-Docker Engine nor the Docker Registry support distribution of bundles.
-
-## Producing a bundle
-
-The easiest way to produce a bundle is to generate it using `docker-compose`
-from an existing `docker-compose.yml`. Of course, that's just *one* possible way
-to proceed, in the same way that `docker build` isn't the only way to produce a
-Docker image.
-
-From `docker-compose`:
-
-```bash
-$ docker-compose bundle
-WARNING: Unsupported key 'network_mode' in services.nsqd - ignoring
-WARNING: Unsupported key 'links' in services.nsqd - ignoring
-WARNING: Unsupported key 'volumes' in services.nsqd - ignoring
-[...]
-Wrote bundle to vossibility-stack.dab
-```
-
-## Creating a stack from a bundle
-
-> **Note**: Because support for stacks and bundles is in the experimental stage,
-> you need to install an experimental build of Docker Engine to use it.
->
-> If you're on Mac or Windows, download the “Beta channel” version of
-> [Docker for Mac](https://docs.docker.com/docker-for-mac/) or
-> [Docker for Windows](https://docs.docker.com/docker-for-windows/) to install
-> it. If you're on Linux, follow the instructions in the
-> [experimental build README](https://github.com/docker/docker/blob/master/experimental/README.md).
-
-A stack is created using the `docker deploy` command:
-
-```bash
-# docker deploy --help
-
-Usage:  docker deploy [OPTIONS] STACK
-
-Create and update a stack
-
-Options:
-      --file   string        Path to a Distributed Application Bundle file (Default: STACK.dab)
-      --help                 Print usage
-      --with-registry-auth   Send registry authentication details to Swarm agents
-```
-
-Let's deploy the stack created before:
-
-```bash
-# docker deploy vossibility-stack
-Loading bundle from vossibility-stack.dab
-Creating service vossibility-stack_elasticsearch
-Creating service vossibility-stack_kibana
-Creating service vossibility-stack_logstash
-Creating service vossibility-stack_lookupd
-Creating service vossibility-stack_nsqd
-Creating service vossibility-stack_vossibility-collector
-```
-
-We can verify that services were correctly created:
-
-```bash
-# docker service ls
-ID            NAME                                     REPLICAS  IMAGE
-COMMAND
-29bv0vnlm903  vossibility-stack_lookupd                1 nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662 /nsqlookupd
-4awt47624qwh  vossibility-stack_nsqd                   1 nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662 /nsqd --data-path=/data --lookupd-tcp-address=lookupd:4160
-4tjx9biia6fs  vossibility-stack_elasticsearch          1 elasticsearch@sha256:12ac7c6af55d001f71800b83ba91a04f716e58d82e748fa6e5a7359eed2301aa
-7563uuzr9eys  vossibility-stack_kibana                 1 kibana@sha256:6995a2d25709a62694a937b8a529ff36da92ebee74bafd7bf00e6caf6db2eb03
-9gc5m4met4he  vossibility-stack_logstash               1 logstash@sha256:2dc8bddd1bb4a5a34e8ebaf73749f6413c101b2edef6617f2f7713926d2141fe logstash -f /etc/logstash/conf.d/logstash.conf
-axqh55ipl40h  vossibility-stack_vossibility-collector  1 icecrime/vossibility-collector@sha256:f03f2977203ba6253988c18d04061c5ec7aab46bca9dfd89a9a1fa4500989fba --config /config/config.toml --debug
-```
-
-## Managing stacks
-
-Stacks are managed using the `docker stack` command:
-
-```bash
-# docker stack --help
-
-Usage:  docker stack COMMAND
-
-Manage Docker stacks
-
-Options:
-      --help   Print usage
-
-Commands:
-  config      Print the stack configuration
-  deploy      Create and update a stack
-  rm          Remove the stack
-  services    List the services in the stack
-  tasks       List the tasks in the stack
-
-Run 'docker stack COMMAND --help' for more information on a command.
-```
-
-## Bundle file format
-
-Distributed application bundles are described in a JSON format. When bundles
-are persisted as files, the file extension is `.dab`.
-
-A bundle has two top-level fields: `version` and `services`. The version used
-by Docker 1.12 tools is `0.1`.
-
-`services` in the bundle are the services that comprise the app. They
-correspond to the new `Service` object introduced in the 1.12 Docker Engine API.
-
-A service has the following fields:
-
-<dl>
-    <dt>
-        Image (required) <code>string</code>
-    </dt>
-    <dd>
-        The image that the service will run. Docker images should be referenced
-        with full content hash to fully specify the deployment artifact for the
-        service. Example:
-        <code>postgres@sha256:e0a230a9f5b4e1b8b03bb3e8cf7322b0e42b7838c5c87f4545edb48f5eb8f077</code>
-    </dd>
-    <dt>
-        Command <code>[]string</code>
-    </dt>
-    <dd>
-        Command to run in service containers.
-    </dd>
-    <dt>
-        Args <code>[]string</code>
-    </dt>
-    <dd>
-        Arguments passed to the service containers.
-    </dd>
-    <dt>
-        Env <code>[]string</code>
-    </dt>
-    <dd>
-        Environment variables.
-    </dd>
-    <dt>
-        Labels <code>map[string]string</code>
-    </dt>
-    <dd>
-        Labels used for setting meta data on services.
-    </dd>
-    <dt>
-        Ports <code>[]Port</code>
-    </dt>
-    <dd>
-        Service ports (composed of <code>Port</code> (<code>int</code>) and
-        <code>Protocol</code> (<code>string</code>). A service description can
-        only specify the container port to be exposed. These ports can be
-        mapped on runtime hosts at the operator's discretion.
-    </dd>
-
-    <dt>
-        WorkingDir <code>string</code>
-    </dt>
-    <dd>
-        Working directory inside the service containers.
-    </dd>
-
-    <dt>
-        User <code>string</code>
-    </dt>
-    <dd>
-        Username or UID (format: <code>&lt;name|uid&gt;[:&lt;group|gid&gt;]</code>).
-    </dd>
-
-    <dt>
-        Networks <code>[]string</code>
-    </dt>
-    <dd>
-        Networks that the service containers should be connected to. An entity
-        deploying a bundle should create networks as needed.
-    </dd>
-</dl>
-
-> **Note:** Some configuration options are not yet supported in the DAB format,
-> including volume mounts.
diff --git a/docs/completion.md b/docs/completion.md
deleted file mode 100644
index 2076d512..00000000
--- a/docs/completion.md
+++ /dev/null
@@ -1,68 +0,0 @@
-<!--[metadata]>
-+++
-title = "Command-line Completion"
-description = "Compose CLI reference"
-keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
-[menu.main]
-parent="workw_compose"
-weight=88
-+++
-<![end-metadata]-->
-
-# Command-line Completion
-
-Compose comes with [command completion](http://en.wikipedia.org/wiki/Command-line_completion)
-for the bash and zsh shell.
-
-## Installing Command Completion
-
-### Bash
-
-Make sure bash completion is installed. If you use a current Linux in a non-minimal installation, bash completion should be available.
-On a Mac, install with `brew install bash-completion`
-
-Place the completion script in `/etc/bash_completion.d/` (`/usr/local/etc/bash_completion.d/` on a Mac), using e.g.
-
-     curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose version --short)/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose
-
-Completion will be available upon next login.
-
-### Zsh
-
-Place the completion script in your `/path/to/zsh/completion`, using e.g. `~/.zsh/completion/`
-
-    mkdir -p ~/.zsh/completion
-    curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose version --short)/contrib/completion/zsh/_docker-compose > ~/.zsh/completion/_docker-compose
-
-Include the directory in your `$fpath`, e.g. by adding in `~/.zshrc`
-
-    fpath=(~/.zsh/completion $fpath)
-
-Make sure `compinit` is loaded or do it by adding in `~/.zshrc`
-
-    autoload -Uz compinit && compinit -i
-
-Then reload your shell
-
-    exec $SHELL -l
-
-## Available completions
-
-Depending on what you typed on the command line so far, it will complete
-
- - available docker-compose commands
- - options that are available for a particular command
- - service names that make sense in a given context (e.g. services with running or stopped instances or services based on images vs. services based on Dockerfiles). For `docker-compose scale`, completed service names will automatically have "=" appended.
- - arguments for selected options, e.g. `docker-compose kill -s` will complete some signals like SIGHUP and SIGUSR1.
-
-Enjoy working with Compose faster and with less typos!
-
-## Compose documentation
-
-- [User guide](index.md)
-- [Installing Compose](install.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
diff --git a/docs/compose-file.md b/docs/compose-file.md
deleted file mode 100644
index cfc242ce..00000000
--- a/docs/compose-file.md
+++ /dev/null
@@ -1,1223 +0,0 @@
-<!--[metadata]>
-+++
-title = "Compose File Reference"
-description = "Compose file reference"
-keywords = ["fig, composition, compose, docker"]
-aliases = ["/compose/yml"]
-[menu.main]
-parent="workw_compose"
-weight=70
-+++
-<![end-metadata]-->
-
-
-# Compose file reference
-
-The Compose file is a [YAML](http://yaml.org/) file defining
-[services](#service-configuration-reference),
-[networks](#network-configuration-reference) and
-[volumes](#volume-configuration-reference).
-The default path for a Compose file is `./docker-compose.yml`.
-
-A service definition contains configuration which will be applied to each
-container started for that service, much like passing command-line parameters to
-`docker run`. Likewise, network and volume definitions are analogous to
-`docker network create` and `docker volume create`.
-
-As with `docker run`, options specified in the Dockerfile (e.g., `CMD`,
-`EXPOSE`, `VOLUME`, `ENV`) are respected by default - you don't need to
-specify them again in `docker-compose.yml`.
-
-You can use environment variables in configuration values with a Bash-like
-`${VARIABLE}` syntax - see [variable substitution](#variable-substitution) for
-full details.
-
-
-## Service configuration reference
-
-> **Note:** There are two versions of the Compose file format – version 1 (the
-> legacy format, which does not support volumes or networks) and version 2 (the
-> most up-to-date). For more information, see the [Versioning](#versioning)
-> section.
-
-This section contains a list of all configuration options supported by a service
-definition.
-
-### build
-
-Configuration options that are applied at build time.
-
-`build` can be specified either as a string containing a path to the build
-context, or an object with the path specified under [context](#context) and
-optionally [dockerfile](#dockerfile) and [args](#args).
-
-    build: ./dir
-
-    build:
-      context: ./dir
-      dockerfile: Dockerfile-alternate
-      args:
-        buildno: 1
-
-If you specify `image` as well as `build`, then Compose names the built image
-with the `webapp` and optional `tag` specified in `image`:
-
-    build: ./dir
-    image: webapp:tag
-
-This will result in an image named `webapp` and tagged `tag`, built from `./dir`.
-
-> **Note**: In the [version 1 file format](#version-1), `build` is different in
-> two ways:
->
-> -   Only the string form (`build: .`) is allowed - not the object form.
-> -   Using `build` together with `image` is not allowed. Attempting to do so
->     results in an error.
-
-#### context
-
-> [Version 2 file format](#version-2) only. In version 1, just use
-> [build](#build).
-
-Either a path to a directory containing a Dockerfile, or a url to a git repository.
-
-When the value supplied is a relative path, it is interpreted as relative to the
-location of the Compose file. This directory is also the build context that is
-sent to the Docker daemon.
-
-Compose will build and tag it with a generated name, and use that image thereafter.
-
-    build:
-      context: ./dir
-
-#### dockerfile
-
-Alternate Dockerfile.
-
-Compose will use an alternate file to build with. A build path must also be
-specified.
-
-    build:
-      context: .
-      dockerfile: Dockerfile-alternate
-
-> **Note**: In the [version 1 file format](#version-1), `dockerfile` is
-> different in two ways:
-
-  * It appears alongside `build`, not as a sub-option:
-
-        build: .
-        dockerfile: Dockerfile-alternate
-
-  * Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
-
-#### args
-
-> [Version 2 file format](#version-2) only.
-
-Add build arguments, which are environment variables accessible only during the
-build process.
-
-First, specify the arguments in your Dockerfile:
-
-    ARG buildno
-    ARG password
-
-    RUN echo "Build number: $buildno"
-    RUN script-requiring-password.sh "$password"
-
-Then specify the arguments under the `build` key. You can pass either a mapping
-or a list:
-
-    build:
-      context: .
-      args:
-        buildno: 1
-        password: secret
-
-    build:
-      context: .
-      args:
-        - buildno=1
-        - password=secret
-
-You can omit the value when specifying a build argument, in which case its value
-at build time is the value in the environment where Compose is running.
-
-    args:
-      - buildno
-      - password
-
-> **Note**: YAML boolean values (`true`, `false`, `yes`, `no`, `on`, `off`) must
-> be enclosed in quotes, so that the parser interprets them as strings.
-
-### cap_add, cap_drop
-
-Add or drop container capabilities.
-See `man 7 capabilities` for a full list.
-
-    cap_add:
-      - ALL
-
-    cap_drop:
-      - NET_ADMIN
-      - SYS_ADMIN
-
-### command
-
-Override the default command.
-
-    command: bundle exec thin -p 3000
-
-The command can also be a list, in a manner similar to [dockerfile](https://docs.docker.com/engine/reference/builder/#cmd):
-
-    command: [bundle, exec, thin, -p, 3000]
-
-### cgroup_parent
-
-Specify an optional parent cgroup for the container.
-
-    cgroup_parent: m-executor-abcd
-
-### container_name
-
-Specify a custom container name, rather than a generated default name.
-
-    container_name: my-web-container
-
-Because Docker container names must be unique, you cannot scale a service
-beyond 1 container if you have specified a custom name. Attempting to do so
-results in an error.
-
-### devices
-
-List of device mappings.  Uses the same format as the `--device` docker
-client create option.
-
-    devices:
-      - "/dev/ttyUSB0:/dev/ttyUSB0"
-
-### depends_on
-
-Express dependency between services, which has two effects:
-
-- `docker-compose up` will start services in dependency order. In the following
-  example, `db` and `redis` will be started before `web`.
-
-- `docker-compose up SERVICE` will automatically include `SERVICE`'s
-  dependencies. In the following example, `docker-compose up web` will also
-  create and start `db` and `redis`.
-
-Simple example:
-
-    version: '2'
-    services:
-      web:
-        build: .
-        depends_on:
-          - db
-          - redis
-      redis:
-        image: redis
-      db:
-        image: postgres
-
-> **Note:** `depends_on` will not wait for `db` and `redis` to be "ready" before
-> starting `web` - only until they have been started. If you need to wait
-> for a service to be ready, see [Controlling startup order](startup-order.md)
-> for more on this problem and strategies for solving it.
-
-### dns
-
-Custom DNS servers. Can be a single value or a list.
-
-    dns: 8.8.8.8
-    dns:
-      - 8.8.8.8
-      - 9.9.9.9
-
-### dns_search
-
-Custom DNS search domains. Can be a single value or a list.
-
-    dns_search: example.com
-    dns_search:
-      - dc1.example.com
-      - dc2.example.com
-
-### tmpfs
-
-> [Version 2 file format](#version-2) only.
-
-Mount a temporary file system inside the container. Can be a single value or a list.
-
-    tmpfs: /run
-    tmpfs:
-      - /run
-      - /tmp
-
-### entrypoint
-
-Override the default entrypoint.
-
-    entrypoint: /code/entrypoint.sh
-
-The entrypoint can also be a list, in a manner similar to [dockerfile](https://docs.docker.com/engine/reference/builder/#entrypoint):
-
-    entrypoint:
-        - php
-        - -d
-        - zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20100525/xdebug.so
-        - -d
-        - memory_limit=-1
-        - vendor/bin/phpunit
-
-
-### env_file
-
-Add environment variables from a file. Can be a single value or a list.
-
-If you have specified a Compose file with `docker-compose -f FILE`, paths in
-`env_file` are relative to the directory that file is in.
-
-Environment variables specified in `environment` override these values.
-
-    env_file: .env
-
-    env_file:
-      - ./common.env
-      - ./apps/web.env
-      - /opt/secrets.env
-
-Compose expects each line in an env file to be in `VAR=VAL` format. Lines
-beginning with `#` (i.e. comments) are ignored, as are blank lines.
-
-    # Set Rails/Rack environment
-    RACK_ENV=development
-
-> **Note:** If your service specifies a [build](#build) option, variables
-> defined in environment files will _not_ be automatically visible during the
-> build. Use the [args](#args) sub-option of `build` to define build-time
-> environment variables.
-
-### environment
-
-Add environment variables. You can use either an array or a dictionary. Any
-boolean values; true, false, yes no, need to be enclosed in quotes to ensure
-they are not converted to True or False by the YML parser.
-
-Environment variables with only a key are resolved to their values on the
-machine Compose is running on, which can be helpful for secret or host-specific values.
-
-    environment:
-      RACK_ENV: development
-      SHOW: 'true'
-      SESSION_SECRET:
-
-    environment:
-      - RACK_ENV=development
-      - SHOW=true
-      - SESSION_SECRET
-
-> **Note:** If your service specifies a [build](#build) option, variables
-> defined in `environment` will _not_ be automatically visible during the
-> build. Use the [args](#args) sub-option of `build` to define build-time
-> environment variables.
-
-### expose
-
-Expose ports without publishing them to the host machine - they'll only be
-accessible to linked services. Only the internal port can be specified.
-
-    expose:
-     - "3000"
-     - "8000"
-
-### extends
-
-Extend another service, in the current file or another, optionally overriding
-configuration.
-
-You can use `extends` on any service together with other configuration keys.
-The `extends` value must be a dictionary defined with a required `service`
-and an optional `file` key.
-
-    extends:
-      file: common.yml
-      service: webapp
-
-The `service` the name of the service being extended, for example
-`web` or `database`. The `file` is the location of a Compose configuration
-file defining that service.
-
-If you omit the `file` Compose looks for the service configuration in the
-current file. The `file` value can be an absolute or relative path. If you
-specify a relative path, Compose treats it as relative to the location of the
-current file.
-
-You can extend a service that itself extends another. You can extend
-indefinitely. Compose does not support circular references and `docker-compose`
-returns an error if it encounters one.
-
-For more on `extends`, see the
-[the extends documentation](extends.md#extending-services).
-
-### external_links
-
-Link to containers started outside this `docker-compose.yml` or even outside
-of Compose, especially for containers that provide shared or common services.
-`external_links` follow semantics similar to `links` when specifying both the
-container name and the link alias (`CONTAINER:ALIAS`).
-
-    external_links:
-     - redis_1
-     - project_db_1:mysql
-     - project_db_1:postgresql
-
-> **Note:** If you're using the [version 2 file format](#version-2), the
-> externally-created containers must be connected to at least one of the same
-> networks as the service which is linking to them.
-
-### extra_hosts
-
-Add hostname mappings. Use the same values as the docker client `--add-host` parameter.
-
-    extra_hosts:
-     - "somehost:162.242.195.82"
-     - "otherhost:50.31.209.229"
-
-An entry with the ip address and hostname will be created in `/etc/hosts` inside containers for this service, e.g:
-
-    162.242.195.82  somehost
-    50.31.209.229   otherhost
-
-### image
-
-Specify the image to start the container from. Can either be a repository/tag or
-a partial image ID.
-
-    image: redis
-    image: ubuntu:14.04
-    image: tutum/influxdb
-    image: example-registry.com:4000/postgresql
-    image: a4bc65fd
-
-If the image does not exist, Compose attempts to pull it, unless you have also
-specified [build](#build), in which case it builds it using the specified
-options and tags it with the specified tag.
-
-> **Note**: In the [version 1 file format](#version-1), using `build` together
-> with `image` is not allowed. Attempting to do so results in an error.
-
-### labels
-
-Add metadata to containers using [Docker labels](https://docs.docker.com/engine/userguide/labels-custom-metadata/). You can use either an array or a dictionary.
-
-It's recommended that you use reverse-DNS notation to prevent your labels from conflicting with those used by other software.
-
-    labels:
-      com.example.description: "Accounting webapp"
-      com.example.department: "Finance"
-      com.example.label-with-empty-value: ""
-
-    labels:
-      - "com.example.description=Accounting webapp"
-      - "com.example.department=Finance"
-      - "com.example.label-with-empty-value"
-
-### links
-
-Link to containers in another service. Either specify both the service name and
-a link alias (`SERVICE:ALIAS`), or just the service name.
-
-    web:
-      links:
-       - db
-       - db:database
-       - redis
-
-Containers for the linked service will be reachable at a hostname identical to
-the alias, or the service name if no alias was specified.
-
-Links also express dependency between services in the same way as
-[depends_on](#depends-on), so they determine the order of service startup.
-
-> **Note:** If you define both links and [networks](#networks), services with
-> links between them must share at least one network in common in order to
-> communicate.
-
-### logging
-
-> [Version 2 file format](#version-2) only. In version 1, use
-> [log_driver](#log_driver) and [log_opt](#log_opt).
-
-Logging configuration for the service.
-
-    logging:
-      driver: syslog
-      options:
-        syslog-address: "tcp://192.168.0.42:123"
-
-The `driver`  name specifies a logging driver for the service's
-containers, as with the ``--log-driver`` option for docker run
-([documented here](https://docs.docker.com/engine/reference/logging/overview/)).
-
-The default value is json-file.
-
-    driver: "json-file"
-    driver: "syslog"
-    driver: "none"
-
-> **Note:** Only the `json-file` driver makes the logs available directly from
-> `docker-compose up` and `docker-compose logs`. Using any other driver will not
-> print any logs.
-
-Specify logging options for the logging driver with the ``options`` key, as with the ``--log-opt`` option for `docker run`.
-
-Logging options are key-value pairs. An example of `syslog` options:
-
-    driver: "syslog"
-    options:
-      syslog-address: "tcp://192.168.0.42:123"
-
-### log_driver
-
-> [Version 1 file format](#version-1) only. In version 2, use
-> [logging](#logging).
-
-Specify a log driver. The default is `json-file`.
-
-    log_driver: syslog
-
-### log_opt
-
-> [Version 1 file format](#version-1) only. In version 2, use
-> [logging](#logging).
-
-Specify logging options as key-value pairs. An example of `syslog` options:
-
-    log_opt:
-      syslog-address: "tcp://192.168.0.42:123"
-
-### net
-
-> [Version 1 file format](#version-1) only. In version 2, use
-> [network_mode](#network_mode).
-
-Network mode. Use the same values as the docker client `--net` parameter.
-The `container:...` form can take a service name instead of a container name or
-id.
-
-    net: "bridge"
-    net: "host"
-    net: "none"
-    net: "container:[service name or container name/id]"
-
-### network_mode
-
-> [Version 2 file format](#version-2) only. In version 1, use [net](#net).
-
-Network mode. Use the same values as the docker client `--net` parameter, plus
-the special form `service:[service name]`.
-
-    network_mode: "bridge"
-    network_mode: "host"
-    network_mode: "none"
-    network_mode: "service:[service name]"
-    network_mode: "container:[container name/id]"
-
-### networks
-
-> [Version 2 file format](#version-2) only. In version 1, use [net](#net).
-
-Networks to join, referencing entries under the
-[top-level `networks` key](#network-configuration-reference).
-
-    services:
-      some-service:
-        networks:
-         - some-network
-         - other-network
-
-#### aliases
-
-Aliases (alternative hostnames) for this service on the network. Other containers on the same network can use either the service name or this alias to connect to one of the service's containers.
-
-Since `aliases` is network-scoped, the same service can have different aliases on different networks.
-
-> **Note**: A network-wide alias can be shared by multiple containers, and even by multiple services. If it is, then exactly which container the name will resolve to is not guaranteed.
-
-The general format is shown here.
-
-    services:
-      some-service:
-        networks:
-          some-network:
-            aliases:
-             - alias1
-             - alias3
-          other-network:
-            aliases:
-             - alias2
-
-In the example below, three services are provided (`web`, `worker`, and `db`), along with two networks (`new` and `legacy`). The `db` service is reachable at the hostname `db` or `database` on the `new` network, and at `db` or `mysql` on the `legacy` network.
-
-    version: '2'
-
-    services:
-      web:
-        build: ./web
-        networks:
-          - new
-
-      worker:
-        build: ./worker
-        networks:
-        - legacy
-
-      db:
-        image: mysql
-        networks:
-          new:
-            aliases:
-              - database
-          legacy:
-            aliases:
-              - mysql
-
-    networks:
-      new:
-      legacy:
-
-#### ipv4_address, ipv6_address
-
-Specify a static IP address for containers for this service when joining the network.
-
-The corresponding network configuration in the [top-level networks section](#network-configuration-reference) must have an `ipam` block with subnet and gateway configurations covering each static address. If IPv6 addressing is desired, the `com.docker.network.enable_ipv6` driver option must be set to `true`.
-
-An example:
-
-    version: '2'
-
-    services:
-      app:
-        image: busybox
-        command: ifconfig
-        networks:
-          app_net:
-            ipv4_address: 172.16.238.10
-            ipv6_address: 2001:3984:3989::10
-
-    networks:
-      app_net:
-        driver: bridge
-        driver_opts:
-          com.docker.network.enable_ipv6: "true"
-        ipam:
-          driver: default
-          config:
-          - subnet: 172.16.238.0/24
-            gateway: 172.16.238.1
-          - subnet: 2001:3984:3989::/64
-            gateway: 2001:3984:3989::1
-
-#### link_local_ips
-
-> [Added in version 2.1 file format](#version-21).
-
-Specify a list of link-local IPs. Link-local IPs are special IPs which belong
-to a well known subnet and are purely managed by the operator, usually
-dependent on the architecture where they are deployed. Therefore they are not
-managed by docker (IPAM driver).
-
-Example usage:
-
-    version: '2.1'
-    services:
-      app:
-        image: busybox
-        command: top
-        networks:
-          app_net:
-            link_local_ips:
-              - 57.123.22.11
-              - 57.123.22.13
-    networks:
-      app_net:
-        driver: bridge
-
-### pid
-
-    pid: "host"
-
-Sets the PID mode to the host PID mode.  This turns on sharing between
-container and the host operating system the PID address space.  Containers
-launched with this flag will be able to access and manipulate other
-containers in the bare-metal machine's namespace and vise-versa.
-
-### ports
-
-Expose ports. Either specify both ports (`HOST:CONTAINER`), or just the container
-port (a random host port will be chosen).
-
-> **Note:** When mapping ports in the `HOST:CONTAINER` format, you may experience
-> erroneous results when using a container port lower than 60, because YAML will
-> parse numbers in the format `xx:yy` as sexagesimal (base 60). For this reason,
-> we recommend always explicitly specifying your port mappings as strings.
-
-    ports:
-     - "3000"
-     - "3000-3005"
-     - "8000:8000"
-     - "9090-9091:8080-8081"
-     - "49100:22"
-     - "127.0.0.1:8001:8001"
-     - "127.0.0.1:5000-5010:5000-5010"
-
-### security_opt
-
-Override the default labeling scheme for each container.
-
-    security_opt:
-      - label:user:USER
-      - label:role:ROLE
-
-### stop_signal
-
-Sets an alternative signal to stop the container. By default `stop` uses
-SIGTERM. Setting an alternative signal using `stop_signal` will cause
-`stop` to send that signal instead.
-
-    stop_signal: SIGUSR1
-
-### ulimits
-
-Override the default ulimits for a container. You can either specify a single
-limit as an integer or soft/hard limits as a mapping.
-
-
-    ulimits:
-      nproc: 65535
-      nofile:
-        soft: 20000
-        hard: 40000
-
-### volumes, volume\_driver
-
-Mount paths or named volumes, optionally specifying a path on the host machine
-(`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`).
-For [version 2 files](#version-2), named volumes need to be specified with the
-[top-level `volumes` key](#volume-configuration-reference).
-When using [version 1](#version-1), the Docker Engine will create the named
-volume automatically if it doesn't exist.
-
-You can mount a relative path on the host, which will expand relative to
-the directory of the Compose configuration file being used. Relative paths
-should always begin with `.` or `..`.
-
-    volumes:
-      # Just specify a path and let the Engine create a volume
-      - /var/lib/mysql
-
-      # Specify an absolute path mapping
-      - /opt/data:/var/lib/mysql
-
-      # Path on the host, relative to the Compose file
-      - ./cache:/tmp/cache
-
-      # User-relative path
-      - ~/configs:/etc/configs/:ro
-
-      # Named volume
-      - datavolume:/var/lib/mysql
-
-If you do not use a host path, you may specify a `volume_driver`.
-
-    volume_driver: mydriver
-
-Note that for [version 2 files](#version-2), this driver
-will not apply to named volumes (you should use the `driver` option when
-[declaring the volume](#volume-configuration-reference) instead).
-For [version 1](#version-1), both named volumes and container volumes will
-use the specified driver.
-
-> Note: No path expansion will be done if you have also specified a
-> `volume_driver`.
-
-See [Docker Volumes](https://docs.docker.com/engine/userguide/dockervolumes/) and
-[Volume Plugins](https://docs.docker.com/engine/extend/plugins_volume/) for more
-information.
-
-### volumes_from
-
-Mount all of the volumes from another service or container, optionally
-specifying read-only access (``ro``) or read-write (``rw``). If no access level is specified,
-then read-write will be used.
-
-    volumes_from:
-     - service_name
-     - service_name:ro
-     - container:container_name
-     - container:container_name:rw
-
-> **Note:** The `container:...` formats are only supported in the
-> [version 2 file format](#version-2). In [version 1](#version-1), you can use
-> container names without marking them as such:
->
->     - service_name
->     - service_name:ro
->     - container_name
->     - container_name:rw
-
-### cpu\_shares, cpu\_quota, cpuset, domainname, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, mem\_swappiness, oom\_score\_adj, privileged, read\_only, restart, shm\_size, stdin\_open, tty, user, working\_dir
-
-Each of these is a single value, analogous to its
-[docker run](https://docs.docker.com/engine/reference/run/) counterpart.
-
-    cpu_shares: 73
-    cpu_quota: 50000
-    cpuset: 0,1
-
-    user: postgresql
-    working_dir: /code
-
-    domainname: foo.com
-    hostname: foo
-    ipc: host
-    mac_address: 02:42:ac:11:65:43
-
-    mem_limit: 1000000000
-    memswap_limit: 2000000000
-    mem_swappiness: 10
-    privileged: true
-
-    restart: always
-
-    read_only: true
-    shm_size: 64M
-    stdin_open: true
-    tty: true
-
-
-## Volume configuration reference
-
-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](https://docs.docker.com/engine/reference/commandline/volume_create/)
-subcommand documentation for more information.
-
-### driver
-
-Specify which volume driver should be used for this volume. Defaults to
-`local`. The Docker Engine will return an error if the driver is not available.
-
-     driver: foobar
-
-### driver_opts
-
-Specify a list of options as key-value pairs to pass to the driver for this
-volume. Those options are driver-dependent - consult the driver's
-documentation for more information. Optional.
-
-     driver_opts:
-       foo: "bar"
-       baz: 1
-
-### external
-
-If set to `true`, specifies that this volume has been created outside of
-Compose. `docker-compose up` will not attempt to create it, and will raise
-an error if it doesn't exist.
-
-`external` cannot be used in conjunction with other volume configuration keys
-(`driver`, `driver_opts`).
-
-In the example below, instead of attemping to create a volume called
-`[projectname]_data`, Compose will look for an existing volume simply
-called `data` and mount it into the `db` service's containers.
-
-    version: '2'
-
-    services:
-      db:
-        image: postgres
-        volumes:
-          - data:/var/lib/postgresql/data
-
-    volumes:
-      data:
-        external: true
-
-You can also specify the name of the volume separately from the name used to
-refer to it within the Compose file:
-
-    volumes:
-      data:
-        external:
-          name: actual-name-of-volume
-
-
-## Network configuration reference
-
-The top-level `networks` key lets you specify networks to be created. For a full
-explanation of Compose's use of Docker networking features, see the
-[Networking guide](networking.md).
-
-### driver
-
-Specify which driver should be used for this network.
-
-The default driver depends on how the Docker Engine you're using is configured,
-but in most instances it will be `bridge` on a single host and `overlay` on a
-Swarm.
-
-The Docker Engine will return an error if the driver is not available.
-
-    driver: overlay
-
-### driver_opts
-
-Specify a list of options as key-value pairs to pass to the driver for this
-network. Those options are driver-dependent - consult the driver's
-documentation for more information. Optional.
-
-      driver_opts:
-        foo: "bar"
-        baz: 1
-
-### ipam
-
-Specify custom IPAM config. This is an object with several properties, each of
-which is optional:
-
--   `driver`: Custom IPAM driver, instead of the default.
--   `config`: A list with zero or more config blocks, each containing any of
-    the following keys:
-    - `subnet`: Subnet in CIDR format that represents a network segment
-    - `ip_range`: Range of IPs from which to allocate container IPs
-    - `gateway`: IPv4 or IPv6 gateway for the master subnet
-    - `aux_addresses`: Auxiliary IPv4 or IPv6 addresses used by Network driver,
-      as a mapping from hostname to IP
-
-A full example:
-
-    ipam:
-      driver: default
-      config:
-        - subnet: 172.28.0.0/16
-          ip_range: 172.28.5.0/24
-          gateway: 172.28.5.254
-          aux_addresses:
-            host1: 172.28.1.5
-            host2: 172.28.1.6
-            host3: 172.28.1.7
-
-### group_add
-
-Specify additional groups (by name or number) which the user inside the container will be a member of. Groups must exist in both the container and the host system to be added. An example of where this is useful is when multiple containers (running as different users) need to all read or write the same file on the host system. That file can be owned by a group shared by all the containers, and specified in `group_add`. See the [Docker documentation](https://docs.docker.com/engine/reference/run/#/additional-groups) for more details.
-
-A full example:
-
-    version: '2'
-    services:
-        image: alpine
-        group_add:
-          - mail
-
-Running `id` inside the created container will show that the user belongs to the `mail` group, which would not have been the case if `group_add` were not used.
-
-### internal
-
-By default, Docker also connects a bridge network to it to provide external connectivity. If you want to create an externally isolated overlay network, you can set this option to `true`.
-
-### external
-
-If set to `true`, specifies that this network has been created outside of
-Compose. `docker-compose up` will not attempt to create it, and will raise
-an error if it doesn't exist.
-
-`external` cannot be used in conjunction with other network configuration keys
-(`driver`, `driver_opts`, `ipam`, `internal`).
-
-In the example below, `proxy` is the gateway to the outside world. Instead of
-attemping to create a network called `[projectname]_outside`, Compose will
-look for an existing network simply called `outside` and connect the `proxy`
-service's containers to it.
-
-    version: '2'
-
-    services:
-      proxy:
-        build: ./proxy
-        networks:
-          - outside
-          - default
-      app:
-        build: ./app
-        networks:
-          - default
-
-    networks:
-      outside:
-        external: true
-
-You can also specify the name of the network separately from the name used to
-refer to it within the Compose file:
-
-    networks:
-      outside:
-        external:
-          name: actual-name-of-network
-
-
-## Versioning
-
-There are two versions of the Compose file format:
-
-- Version 1, the legacy format. This is specified by omitting a `version` key at
-  the root of the YAML.
-- Version 2, the recommended format. This is specified with a `version: '2'` entry
-  at the root of the YAML.
-
-To move your project from version 1 to 2, see the [Upgrading](#upgrading)
-section.
-
-> **Note:** If you're using
-> [multiple Compose files](extends.md#different-environments) or
-> [extending services](extends.md#extending-services), each file must be of the
-> same version - you cannot mix version 1 and 2 in a single project.
-
-Several things differ depending on which version you use:
-
-- The structure and permitted configuration keys
-- The minimum Docker Engine version you must be running
-- Compose's behaviour with regards to networking
-
-These differences are explained below.
-
-
-### Version 1
-
-Compose files that do not declare a version are considered "version 1". In
-those files, all the [services](#service-configuration-reference) are declared
-at the root of the document.
-
-Version 1 is supported by **Compose up to 1.6.x**. It will be deprecated in a
-future Compose release.
-
-Version 1 files cannot declare named
-[volumes](#volume-configuration-reference), [networks](networking.md) or
-[build arguments](#args).
-
-Example:
-
-    web:
-      build: .
-      ports:
-       - "5000:5000"
-      volumes:
-       - .:/code
-      links:
-       - redis
-    redis:
-      image: redis
-
-
-### Version 2
-
-Compose files using the version 2 syntax must indicate the version number at
-the root of the document. All [services](#service-configuration-reference)
-must be declared under the `services` key.
-
-Version 2 files are supported by **Compose 1.6.0+** and require a Docker Engine
-of version **1.10.0+**.
-
-Named [volumes](#volume-configuration-reference) can be declared under the
-`volumes` key, and [networks](#network-configuration-reference) can be declared
-under the `networks` key.
-
-Simple example:
-
-    version: '2'
-    services:
-      web:
-        build: .
-        ports:
-         - "5000:5000"
-        volumes:
-         - .:/code
-      redis:
-        image: redis
-
-A more extended example, defining volumes and networks:
-
-    version: '2'
-    services:
-      web:
-        build: .
-        ports:
-         - "5000:5000"
-        volumes:
-         - .:/code
-        networks:
-          - front-tier
-          - back-tier
-      redis:
-        image: redis
-        volumes:
-          - redis-data:/var/lib/redis
-        networks:
-          - back-tier
-    volumes:
-      redis-data:
-        driver: local
-    networks:
-      front-tier:
-        driver: bridge
-      back-tier:
-        driver: bridge
-
-### Version 2.1
-
-An upgrade of [version 2](#version-2) that introduces new parameters only
-available with Docker Engine version **1.12.0+**
-
-Introduces:
-
-- [`link_local_ips`](#link_local_ips)
-- ...
-
-### Upgrading
-
-In the majority of cases, moving from version 1 to 2 is a very simple process:
-
-1. Indent the whole file by one level and put a `services:` key at the top.
-2. Add a `version: '2'` line at the top of the file.
-
-It's more complicated if you're using particular configuration features:
-
--   `dockerfile`: This now lives under the `build` key:
-
-        build:
-          context: .
-          dockerfile: Dockerfile-alternate
-
--   `log_driver`, `log_opt`: These now live under the `logging` key:
-
-        logging:
-          driver: syslog
-          options:
-            syslog-address: "tcp://192.168.0.42:123"
-
--   `links` with environment variables: As documented in the
-    [environment variables reference](link-env-deprecated.md), environment variables
-    created by
-    links have been deprecated for some time. In the new Docker network system,
-    they have been removed. You should either connect directly to the
-    appropriate hostname or set the relevant environment variable yourself,
-    using the link hostname:
-
-        web:
-          links:
-            - db
-          environment:
-            - DB_PORT=tcp://db:5432
-
--   `external_links`: Compose uses Docker networks when running version 2
-    projects, so links behave slightly differently. In particular, two
-    containers must be connected to at least one network in common in order to
-    communicate, even if explicitly linked together.
-
-    Either connect the external container to your app's
-    [default network](networking.md), or connect both the external container and
-    your service's containers to an
-    [external network](networking.md#using-a-pre-existing-network).
-
--   `net`: This is now replaced by [network_mode](#network_mode):
-
-        net: host    ->  network_mode: host
-        net: bridge  ->  network_mode: bridge
-        net: none    ->  network_mode: none
-
-    If you're using `net: "container:[service name]"`, you must now use
-    `network_mode: "service:[service name]"` instead.
-
-        net: "container:web"  ->  network_mode: "service:web"
-
-    If you're using `net: "container:[container name/id]"`, the value does not
-    need to change.
-
-        net: "container:cont-name"  ->  network_mode: "container:cont-name"
-        net: "container:abc12345"   ->  network_mode: "container:abc12345"
-
--   `volumes` with named volumes: these must now be explicitly declared in a
-    top-level `volumes` section of your Compose file. If a service mounts a
-    named volume called `data`, you must declare a `data` volume in your
-    top-level `volumes` section. The whole file might look like this:
-
-        version: '2'
-        services:
-          db:
-            image: postgres
-            volumes:
-              - data:/var/lib/postgresql/data
-        volumes:
-          data: {}
-
-    By default, Compose creates a volume whose name is prefixed with your
-    project name. If you want it to just be called `data`, declare it as
-    external:
-
-        volumes:
-          data:
-            external: true
-
-## Variable substitution
-
-Your configuration options can contain environment variables. Compose uses the
-variable values from the shell environment in which `docker-compose` is run.
-For example, suppose the shell contains `EXTERNAL_PORT=8000` and you supply
-this configuration:
-
-    web:
-      build: .
-      ports:
-        - "${EXTERNAL_PORT}:5000"
-
-When you run `docker-compose up` with this configuration, Compose looks for
-the `EXTERNAL_PORT` environment variable in the shell and substitutes its
-value in. In this example, Compose resolves the port mapping to `"8000:5000"`
-before creating the `web` container.
-
-If an environment variable is not set, Compose substitutes with an empty
-string. In the example above, if `EXTERNAL_PORT` is not set, the value for the
-port mapping is `:5000` (which is of course an invalid port mapping, and will
-result in an error when attempting to create the container).
-
-Both `$VARIABLE` and `${VARIABLE}` syntax are supported. Extended shell-style
-features, such as `${VARIABLE-default}` and `${VARIABLE/foo/bar}`, are not
-supported.
-
-You can use a `$$` (double-dollar sign) when your configuration needs a literal
-dollar sign. This also prevents Compose from interpolating a value, so a `$$`
-allows you to refer to environment variables that you don't want processed by
-Compose.
-
-    web:
-      build: .
-      command: "$$VAR_NOT_INTERPOLATED_BY_COMPOSE"
-
-If you forget and use a single dollar sign (`$`), Compose interprets the value as an environment variable and will warn you:
-
-  The VAR_NOT_INTERPOLATED_BY_COMPOSE is not set. Substituting an empty string.
-
-## Compose documentation
-
-- [User guide](index.md)
-- [Installing Compose](install.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
-- [Command line reference](./reference/index.md)
diff --git a/docs/django.md b/docs/django.md
deleted file mode 100644
index 1cf2a567..00000000
--- a/docs/django.md
+++ /dev/null
@@ -1,194 +0,0 @@
-<!--[metadata]>
-+++
-title = "Quickstart: Compose and Django"
-description = "Getting started with Docker Compose and Django"
-keywords = ["documentation, docs,  docker, compose, orchestration, containers"]
-[menu.main]
-parent="workw_compose"
-weight=4
-+++
-<![end-metadata]-->
-
-
-# Quickstart: Docker Compose and Django
-
-This quick-start guide demonstrates how to use Docker Compose to set up and run a simple Django/PostgreSQL app. Before starting, you'll need to have
-[Compose installed](install.md).
-
-### Define the project components
-
-For this project, you need to create a Dockerfile, a Python dependencies file,
-and a `docker-compose.yml` file.
-
-1. Create an empty project directory.
-
-    You can name the directory something easy for you to remember. This directory is the context for your application image. The directory should only contain resources to build that image.
-
-2. Create a new file called `Dockerfile` in your project directory.
-
-    The Dockerfile defines an application's image content via one or more build
-    commands that configure that image. Once built, you can run the image in a
-    container.  For more information on `Dockerfiles`, see the [Docker user
-    guide](/engine/tutorials/dockerimages.md#building-an-image-from-a-dockerfile)
-    and the [Dockerfile reference](/engine/reference/builder.md).
-
-3. Add the following content to the `Dockerfile`.
-
-        FROM python:2.7
-        ENV PYTHONUNBUFFERED 1
-        RUN mkdir /code
-        WORKDIR /code
-        ADD requirements.txt /code/
-        RUN pip install -r requirements.txt
-        ADD . /code/
-
-    This `Dockerfile` starts with a Python 2.7 base image. The base image is
-    modified by adding a new `code` directory. The base image is further modified
-    by installing the Python requirements defined in the `requirements.txt` file.
-
-4. Save and close the `Dockerfile`.
-
-5. Create a `requirements.txt` in your project directory.
-
-    This file is used by the `RUN pip install -r requirements.txt` command in your `Dockerfile`.
-
-6. Add the required software in the file.
-
-        Django
-        psycopg2
-
-7. Save and close the `requirements.txt` file.
-
-8. Create a file called `docker-compose.yml` in your project directory.
-
-    The `docker-compose.yml` file describes the services that make your app. In
-    this example those services are a web server and database.  The compose file
-    also describes which Docker images these services use, how they link
-    together, any volumes they might need mounted inside the containers.
-    Finally, the `docker-compose.yml` file describes which ports these services
-    expose. See the [`docker-compose.yml` reference](compose-file.md) for more
-    information on how this file works.
-
-9. Add the following configuration to the file.
-
-        version: '2'
-        services:
-          db:
-            image: postgres
-          web:
-            build: .
-            command: python manage.py runserver 0.0.0.0:8000
-            volumes:
-              - .:/code
-            ports:
-              - "8000:8000"
-            depends_on:
-              - db
-
-    This file defines two services: The `db` service and the `web` service.
-
-10. Save and close the `docker-compose.yml` file.
-
-### Create a Django project
-
-In this step, you create a Django started project by building the image from the build context defined in the previous procedure.
-
-1. Change to the root of your project directory.
-
-2. Create the Django project using the `docker-compose` command.
-
-        $ docker-compose run web django-admin.py startproject composeexample .
-
-    This instructs Compose to run `django-admin.py startproject composeeexample`
-    in a container, using the `web` service's image and configuration. Because
-    the `web` image doesn't exist yet, Compose builds it from the current
-    directory, as specified by the `build: .` line in `docker-compose.yml`.
-
-    Once the `web` service image is built, Compose runs it and executes the
-    `django-admin.py startproject` command in the container. This command
-    instructs Django to create a set of files and directories representing a
-    Django project.
-
-3. After the `docker-compose` command completes, list the contents of your project.
-
-        $ ls -l
-        drwxr-xr-x 2 root   root   composeexample
-        -rw-rw-r-- 1 user   user   docker-compose.yml
-        -rw-rw-r-- 1 user   user   Dockerfile
-        -rwxr-xr-x 1 root   root   manage.py
-        -rw-rw-r-- 1 user   user   requirements.txt
-
-  If you are running Docker on Linux, the files `django-admin` created are owned
-  by root. This happens because the container runs as the root user. Change the
-  ownership of the the new files.
-
-          sudo chown -R $USER:$USER .
-
-  If you are running Docker on Mac or Windows, you should already have ownership
-  of all files, including those generated by `django-admin`. List the files just
-  verify this.
-
-        $ ls -l
-        total 32
-        -rw-r--r--  1 user  staff  145 Feb 13 23:00 Dockerfile
-        drwxr-xr-x  6 user  staff  204 Feb 13 23:07 composeexample
-        -rw-r--r--  1 user  staff  159 Feb 13 23:02 docker-compose.yml
-        -rwxr-xr-x  1 user  staff  257 Feb 13 23:07 manage.py
-        -rw-r--r--  1 user  staff   16 Feb 13 23:01 requirements.txt
-
-
-### Connect the database
-
-In this section, you set up the database connection for Django.
-
-1. In your project directory, edit the `composeexample/settings.py` file.
-
-2. Replace the `DATABASES = ...` with the following:
-
-        DATABASES = {
-            'default': {
-                'ENGINE': 'django.db.backends.postgresql_psycopg2',
-                'NAME': 'postgres',
-                'USER': 'postgres',
-                'HOST': 'db',
-                'PORT': 5432,
-            }
-        }
-
-    These settings are determined by the
-    [postgres](https://hub.docker.com/_/postgres/) Docker image
-    specified in `docker-compose.yml`.
-
-3. Save and close the file.
-
-4. Run the `docker-compose up` command.
-
-        $ docker-compose up
-        Starting composepractice_db_1...
-        Starting composepractice_web_1...
-        Attaching to composepractice_db_1, composepractice_web_1
-        ...
-        db_1  | PostgreSQL init process complete; ready for start up.
-        ...
-        db_1  | LOG:  database system is ready to accept connections
-        db_1  | LOG:  autovacuum launcher started
-        ..
-        web_1 | Django version 1.8.4, using settings 'composeexample.settings'
-        web_1 | Starting development server at http://0.0.0.0:8000/
-        web_1 | Quit the server with CONTROL-C.
-
-    At this point, your Django app should be running at port `8000` on your
-    Docker host. If you are using a Docker Machine VM, you can use the
-    `docker-machine ip MACHINE_NAME` to get the IP address.
-
-    ![Django example](images/django-it-worked.png)
-
-## More Compose documentation
-
-- [User guide](index.md)
-- [Installing Compose](install.md)
-- [Getting Started](gettingstarted.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
diff --git a/docs/env-file.md b/docs/env-file.md
deleted file mode 100644
index be2625f8..00000000
--- a/docs/env-file.md
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--[metadata]>
-+++
-title = "Environment file"
-description = "Declaring default environment variables in file"
-keywords = ["fig, composition, compose, docker, orchestration, environment, env file"]
-[menu.main]
-parent = "workw_compose"
-weight=10
-+++
-<![end-metadata]-->
-
-
-# Environment file
-
-Compose supports declaring default environment variables in an environment
-file named `.env` placed in the folder `docker-compose` command is executed from
-*(current working directory)*.
-
-Compose expects each line in an env file to be in `VAR=VAL` format. Lines
-beginning with `#` (i.e. comments) are ignored, as are blank lines.
-
-> Note: Values present in the environment at runtime will always override
-> those defined inside the `.env` file. Similarly, values passed via
-> command-line arguments take precedence as well.
-
-Those environment variables will be used for
-[variable substitution](compose-file.md#variable-substitution) in your Compose
-file, but can also be used to define the following
-[CLI variables](reference/envvars.md):
-
-- `COMPOSE_API_VERSION`
-- `COMPOSE_FILE`
-- `COMPOSE_HTTP_TIMEOUT`
-- `COMPOSE_PROJECT_NAME`
-- `DOCKER_CERT_PATH`
-- `DOCKER_HOST`
-- `DOCKER_TLS_VERIFY`
-
-## More Compose documentation
-
-- [User guide](index.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
diff --git a/docs/environment-variables.md b/docs/environment-variables.md
deleted file mode 100644
index a2e74f0a..00000000
--- a/docs/environment-variables.md
+++ /dev/null
@@ -1,107 +0,0 @@
-<!--[metadata]>
-+++
-title = "Environment variables in Compose"
-description = "How to set, use and manage environment variables in Compose"
-keywords = ["fig, composition, compose, docker, orchestration, environment, variables, env file"]
-[menu.main]
-parent = "workw_compose"
-weight=10
-+++
-<![end-metadata]-->
-
-# Environment variables in Compose
-
-There are multiple parts of Compose that deal with environment variables in one sense or another. This page should help you find the information you need.
-
-
-## Substituting environment variables in Compose files
-
-It's possible to use environment variables in your shell to populate values inside a Compose file:
-
-    web:
-      image: "webapp:${TAG}"
-
-For more information, see the [Variable substitution](compose-file.md#variable-substitution) section in the Compose file reference.
-
-
-## Setting environment variables in containers
-
-You can set environment variables in a service's containers with the ['environment' key](compose-file.md#environment), just like with `docker run -e VARIABLE=VALUE ...`:
-
-    web:
-      environment:
-        - DEBUG=1
-
-
-## Passing environment variables through to containers
-
-You can pass environment variables from your shell straight through to a service's containers with the ['environment' key](compose-file.md#environment) by not giving them a value, just like with `docker run -e VARIABLE ...`:
-
-    web:
-      environment:
-        - DEBUG
-
-The value of the `DEBUG` variable in the container will be taken from the value for the same variable in the shell in which Compose is run.
-
-
-## The “env_file” configuration option
-
-You can pass multiple environment variables from an external file through to a service's containers with the ['env_file' option](compose-file.md#env-file), just like with `docker run --env-file=FILE ...`:
-
-    web:
-      env_file:
-        - web-variables.env
-
-
-## Setting environment variables with 'docker-compose run'
-
-Just like with `docker run -e`, you can set environment variables on a one-off container with `docker-compose run -e`:
-
-    $ docker-compose run -e DEBUG=1 web python console.py
-
-You can also pass a variable through from the shell by not giving it a value:
-
-    $ docker-compose run -e DEBUG web python console.py
-
-The value of the `DEBUG` variable in the container will be taken from the value for the same variable in the shell in which Compose is run.
-
-
-## The “.env” file
-
-You can set default values for any environment variables referenced in the Compose file, or used to configure Compose, in an [environment file](env-file.md) named `.env`:
-
-    $ cat .env
-    TAG=v1.5
-
-    $ cat docker-compose.yml
-    version: '2.0'
-    services:
-      web:
-        image: "webapp:${TAG}"
-
-When you run `docker-compose up`, the `web` service defined above uses the image `webapp:v1.5`. You can verify this with the [config command](reference/config.md), which prints your resolved application config to the terminal:
-
-    $ docker-compose config
-    version: '2.0'
-    services:
-      web:
-        image: 'webapp:v1.5'
-
-Values in the shell take precedence over those specified in the `.env` file. If you set `TAG` to a different value in your shell, the substitution in `image` uses that instead:
-
-    $ export TAG=v2.0
-
-    $ docker-compose config
-    version: '2.0'
-    services:
-      web:
-        image: 'webapp:v2.0'
-
-## Configuring Compose using environment variables
-
-Several environment variables are available for you to configure the Docker Compose command-line behaviour. They begin with `COMPOSE_` or `DOCKER_`, and are documented in [CLI Environment Variables](reference/envvars.md).
-
-
-## Environment variables created by links
-
-When using the ['links' option](compose-file.md#links) in a [v1 Compose file](compose-file.md#version-1), environment variables will be created for each link. They are documented in the [Link environment variables reference](link-env-deprecated.md). Please note, however, that these variables are deprecated - you should just use the link alias as a hostname instead.
diff --git a/docs/extends.md b/docs/extends.md
deleted file mode 100644
index 6f457391..00000000
--- a/docs/extends.md
+++ /dev/null
@@ -1,354 +0,0 @@
-<!--[metadata]>
-+++
-title = "Extending Services in Compose"
-description = "How to use Docker Compose's extends keyword to share configuration between files and projects"
-keywords = ["fig, composition, compose, docker, orchestration, documentation, docs"]
-[menu.main]
-parent="workw_compose"
-weight=20
-+++
-<![end-metadata]-->
-
-
-# Extending services and Compose files
-
-Compose supports two methods of sharing common configuration:
-
-1. Extending an entire Compose file by
-   [using multiple Compose files](#multiple-compose-files)
-2. Extending individual services with [the `extends` field](#extending-services)
-
-
-## Multiple Compose files
-
-Using multiple Compose files enables you to customize a Compose application
-for different environments or different workflows.
-
-### Understanding multiple Compose files
-
-By default, Compose reads two files, a `docker-compose.yml` and an optional
-`docker-compose.override.yml` file. By convention, the `docker-compose.yml`
-contains your base configuration. The override file, as its name implies, can
-contain configuration overrides for existing services or entirely new
-services.
-
-If a service is defined in both files Compose merges the configurations using
-the rules described in [Adding and overriding
-configuration](#adding-and-overriding-configuration).
-
-To use multiple override files, or an override file with a different name, you
-can use the `-f` option to specify the list of files. Compose merges files in
-the order they're specified on the command line. See the [`docker-compose`
-command reference](./reference/overview.md) for more information about
-using `-f`.
-
-When you use multiple configuration files, you must make sure all paths in the
-files are relative to the base Compose file (the first Compose file specified
-with `-f`). This is required because override files need not be valid
-Compose files. Override files can contain small fragments of configuration.
-Tracking which fragment of a service is relative to which path is difficult and
-confusing, so to keep paths easier to understand, all paths must be defined
-relative to the base file.
-
-### Example use case
-
-In this section are two common use cases for multiple compose files: changing a
-Compose app for different environments, and running administrative tasks
-against a Compose app.
-
-#### Different environments
-
-A common use case for multiple files is changing a development Compose app
-for a production-like environment (which may be production, staging or CI).
-To support these differences, you can split your Compose configuration into
-a few different files:
-
-Start with a base file that defines the canonical configuration for the
-services.
-
-**docker-compose.yml**
-
-    web:
-      image: example/my_web_app:latest
-      links:
-        - db
-        - cache
-
-    db:
-      image: postgres:latest
-
-    cache:
-      image: redis:latest
-
-In this example the development configuration exposes some ports to the
-host, mounts our code as a volume, and builds the web image.
-
-**docker-compose.override.yml**
-
-
-    web:
-      build: .
-      volumes:
-        - '.:/code'
-      ports:
-        - 8883:80
-      environment:
-        DEBUG: 'true'
-
-    db:
-      command: '-d'
-      ports:
-        - 5432:5432
-
-    cache:
-      ports:
-        - 6379:6379
-
-When you run `docker-compose up` it reads the overrides automatically.
-
-Now, it would be nice to use this Compose app in a production environment. So,
-create another override file (which might be stored in a different git
-repo or managed by a different team).
-
-**docker-compose.prod.yml**
-
-    web:
-      ports:
-        - 80:80
-      environment:
-        PRODUCTION: 'true'
-
-    cache:
-      environment:
-        TTL: '500'
-
-To deploy with this production Compose file you can run
-
-    docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
-
-This deploys all three services using the configuration in
-`docker-compose.yml` and `docker-compose.prod.yml` (but not the
-dev configuration in `docker-compose.override.yml`).
-
-
-See [production](production.md) for more information about Compose in
-production.
-
-#### Administrative tasks
-
-Another common use case is running adhoc or administrative tasks against one
-or more services in a Compose app. This example demonstrates running a
-database backup.
-
-Start with a **docker-compose.yml**.
-
-    web:
-      image: example/my_web_app:latest
-      links:
-        - db
-
-    db:
-      image: postgres:latest
-
-In a **docker-compose.admin.yml** add a new service to run the database
-export or backup.
-
-    dbadmin:
-      build: database_admin/
-      links:
-        - db
-
-To start a normal environment run `docker-compose up -d`. To run a database
-backup, include the `docker-compose.admin.yml` as well.
-
-    docker-compose -f docker-compose.yml -f docker-compose.admin.yml \
-        run dbadmin db-backup
-
-
-## Extending services
-
-Docker Compose's `extends` keyword enables sharing of common configurations
-among different files, or even different projects entirely. Extending services
-is useful if you have several services that reuse a common set of configuration
-options. Using `extends` you can define a common set of service options in one
-place and refer to it from anywhere.
-
-> **Note:** `links`, `volumes_from`, and `depends_on` are never shared between
-> services using >`extends`. These exceptions exist to avoid
-> implicit dependencies&mdash;you always define `links` and `volumes_from`
-> locally. This ensures dependencies between services are clearly visible when
-> reading the current file. Defining these locally also ensures changes to the
-> referenced file don't result in breakage.
-
-### Understand the extends configuration
-
-When defining any service in `docker-compose.yml`, you can declare that you are
-extending another service like this:
-
-    web:
-      extends:
-        file: common-services.yml
-        service: webapp
-
-This instructs Compose to re-use the configuration for the `webapp` service
-defined in the `common-services.yml` file. Suppose that `common-services.yml`
-looks like this:
-
-    webapp:
-      build: .
-      ports:
-        - "8000:8000"
-      volumes:
-        - "/data"
-
-In this case, you'll get exactly the same result as if you wrote
-`docker-compose.yml` with the same `build`, `ports` and `volumes` configuration
-values defined directly under `web`.
-
-You can go further and define (or re-define) configuration locally in
-`docker-compose.yml`:
-
-    web:
-      extends:
-        file: common-services.yml
-        service: webapp
-      environment:
-        - DEBUG=1
-      cpu_shares: 5
-
-    important_web:
-      extends: web
-      cpu_shares: 10
-
-You can also write other services and link your `web` service to them:
-
-    web:
-      extends:
-        file: common-services.yml
-        service: webapp
-      environment:
-        - DEBUG=1
-      cpu_shares: 5
-      links:
-        - db
-    db:
-      image: postgres
-
-### Example use case
-
-Extending an individual service is useful when you have multiple services that
-have a common configuration.  The example below is a Compose app with
-two services: a web application and a queue worker. Both services use the same
-codebase and share many configuration options.
-
-In a **common.yml** we define the common configuration:
-
-    app:
-      build: .
-      environment:
-        CONFIG_FILE_PATH: /code/config
-        API_KEY: xxxyyy
-      cpu_shares: 5
-
-In a **docker-compose.yml** we define the concrete services which use the
-common configuration:
-
-    webapp:
-      extends:
-        file: common.yml
-        service: app
-      command: /code/run_web_app
-      ports:
-        - 8080:8080
-      links:
-        - queue
-        - db
-
-    queue_worker:
-      extends:
-        file: common.yml
-        service: app
-      command: /code/run_worker
-      links:
-        - queue
-
-## Adding and overriding configuration
-
-Compose copies configurations from the original service over to the local one.
-If a configuration option is defined in both the original service the local
-service, the local value *replaces* or *extends* the original value.
-
-For single-value options like `image`, `command` or `mem_limit`, the new value
-replaces the old value.
-
-    # original service
-    command: python app.py
-
-    # local service
-    command: python otherapp.py
-
-    # result
-    command: python otherapp.py
-
-> **Note:** In the case of `build` and `image`, when using
-> [version 1 of the Compose file format](compose-file.md#version-1), using one
-> option in the local service causes Compose to discard the other option if it
-> was defined in the original service.
->
-> For example, if the original service defines `image: webapp` and the
-> local service defines `build: .` then the resulting service will have
-> `build: .` and no `image` option.
->
-> This is because `build` and `image` cannot be used together in a version 1
-> file.
-
-For the **multi-value options** `ports`, `expose`, `external_links`, `dns`,
-`dns_search`, and `tmpfs`, Compose concatenates both sets of values:
-
-    # original service
-    expose:
-      - "3000"
-
-    # local service
-    expose:
-      - "4000"
-      - "5000"
-
-    # result
-    expose:
-      - "3000"
-      - "4000"
-      - "5000"
-
-In the case of `environment`, `labels`, `volumes` and `devices`, Compose
-"merges" entries together with locally-defined values taking precedence:
-
-    # original service
-    environment:
-      - FOO=original
-      - BAR=original
-
-    # local service
-    environment:
-      - BAR=local
-      - BAZ=local
-
-    # result
-    environment:
-      - FOO=original
-      - BAR=local
-      - BAZ=local
-
-
-
-
-## Compose documentation
-
-- [User guide](index.md)
-- [Installing Compose](install.md)
-- [Getting Started](gettingstarted.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
diff --git a/docs/faq.md b/docs/faq.md
deleted file mode 100644
index 45885255..00000000
--- a/docs/faq.md
+++ /dev/null
@@ -1,128 +0,0 @@
-<!--[metadata]>
-+++
-title = "Frequently Asked Questions"
-description = "Docker Compose FAQ"
-keywords = "documentation, docs,  docker, compose, faq"
-[menu.main]
-identifier="faq.compose"
-parent="workw_compose"
-weight=90
-+++
-<![end-metadata]-->
-
-# Frequently asked questions
-
-If you don’t see your question here, feel free to drop by `#docker-compose` on
-freenode IRC and ask the community.
-
-
-## Can I control service startup order?
-
-Yes - see [Controlling startup order](startup-order.md).
-
-
-## Why do my services take 10 seconds to recreate or stop?
-
-Compose stop attempts to stop a container by sending a `SIGTERM`. It then waits
-for a [default timeout of 10 seconds](./reference/stop.md).  After the timeout,
-a `SIGKILL` is sent to the container to forcefully kill it.  If you
-are waiting for this timeout, it means that your containers aren't shutting down
-when they receive the `SIGTERM` signal.
-
-There has already been a lot written about this problem of
-[processes handling signals](https://medium.com/@gchudnov/trapping-signals-in-docker-containers-7a57fdda7d86)
-in containers.
-
-To fix this problem, try the following:
-
-* Make sure you're using the JSON form of `CMD` and `ENTRYPOINT`
-in your Dockerfile.
-
-  For example use `["program", "arg1", "arg2"]` not `"program arg1 arg2"`.
-  Using the string form causes Docker to run your process using `bash` which
-  doesn't handle signals properly. Compose always uses the JSON form, so don't
-  worry if you override the command or entrypoint in your Compose file.
-
-* If you are able, modify the application that you're running to
-add an explicit signal handler for `SIGTERM`.
-
-* Set the `stop_signal` to a signal which the application knows how to handle:
-
-      web:
-        build: .
-        stop_signal: SIGINT
-
-* If you can't modify the application, wrap the application in a lightweight init
-system (like [s6](http://skarnet.org/software/s6/)) or a signal proxy (like
-[dumb-init](https://github.com/Yelp/dumb-init) or
-[tini](https://github.com/krallin/tini)).  Either of these wrappers take care of
-handling `SIGTERM` properly.
-
-## How do I run multiple copies of a Compose file on the same host?
-
-Compose uses the project name to create unique identifiers for all of a
-project's  containers and other resources. To run multiple copies of a project,
-set a custom project name using the [`-p` command line
-option](./reference/overview.md) or the [`COMPOSE_PROJECT_NAME`
-environment variable](./reference/envvars.md#compose-project-name).
-
-## What's the difference between `up`, `run`, and `start`?
-
-Typically, you want `docker-compose up`. Use `up` to start or restart all the
-services defined in a `docker-compose.yml`. In the default "attached"
-mode, you'll see all the logs from all the containers. In "detached" mode (`-d`),
-Compose exits after starting the containers, but the containers continue to run
-in the background.
-
-The `docker-compose run` command is for running "one-off" or "adhoc" tasks. It
-requires the service name you want to run and only starts containers for services
-that the running service depends on. Use `run` to run tests or perform
-an administrative task such as removing or adding data to a data volume
-container. The `run` command acts like `docker run -ti` in that it opens an
-interactive terminal to the container and returns an exit status matching the
-exit status of the process in the container.
-
-The `docker-compose start` command is useful only to restart containers
-that were previously created, but were stopped. It never creates new
-containers.
-
-## Can I use json instead of yaml for my Compose file?
-
-Yes. [Yaml is a superset of json](http://stackoverflow.com/a/1729545/444646) so
-any JSON file should be valid Yaml.  To use a JSON file with Compose,
-specify the filename to use, for example:
-
-```bash
-docker-compose -f docker-compose.json up
-```
-
-## Should I include my code with `COPY`/`ADD` or a volume?
-
-You can add your code to the image using `COPY` or `ADD` directive in a
-`Dockerfile`.  This is useful if you need to relocate your code along with the
-Docker image, for example when you're sending code to another environment
-(production, CI, etc).
-
-You should use a `volume` if you want to make changes to your code and see them
-reflected immediately, for example when you're developing code and your server
-supports hot code reloading or live-reload.
-
-There may be cases where you'll want to use both. You can have the image
-include the code using a `COPY`, and use a `volume` in your Compose file to
-include the code from the host during development. The volume overrides
-the directory contents of the image.
-
-## Where can I find example compose files?
-
-There are [many examples of Compose files on
-github](https://github.com/search?q=in%3Apath+docker-compose.yml+extension%3Ayml&type=Code).
-
-
-## Compose documentation
-
-- [Installing Compose](install.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md
deleted file mode 100644
index 249bff72..00000000
--- a/docs/gettingstarted.md
+++ /dev/null
@@ -1,191 +0,0 @@
-<!--[metadata]>
-+++
-title = "Getting Started"
-description = "Getting started with Docker Compose"
-keywords = ["documentation, docs,  docker, compose, orchestration, containers"]
-[menu.main]
-parent="workw_compose"
-weight=-85
-+++
-<![end-metadata]-->
-
-
-# Getting Started
-
-On this page you build a simple Python web application running on Docker Compose. The
-application uses the Flask framework and increments a value in Redis. While the
-sample uses Python, the concepts demonstrated here should be understandable even
-if you're not familiar with it.
-
-## Prerequisites
-
-Make sure you have already
-[installed both Docker Engine and Docker Compose](install.md). You
-don't need to install Python, it is provided by a Docker image.
-
-## Step 1: Setup
-
-1. Create a directory for the project:
-
-        $ mkdir composetest
-        $ cd composetest
-
-2. With your favorite text editor create a file called `app.py` in your project
-   directory.
-
-        from flask import Flask
-        from redis import Redis
-
-        app = Flask(__name__)
-        redis = Redis(host='redis', port=6379)
-
-        @app.route('/')
-        def hello():
-            redis.incr('hits')
-            return 'Hello World! I have been seen %s times.' % redis.get('hits')
-
-        if __name__ == "__main__":
-            app.run(host="0.0.0.0", debug=True)
-
-3. Create another file called `requirements.txt` in your project directory and
-   add the following:
-
-        flask
-        redis
-
-   These define the applications dependencies.
-
-## Step 2: Create a Docker image
-
-In this step, you build a new Docker image. The image contains all the
-dependencies the Python application requires, including Python itself.
-
-1. In your project directory create a file named `Dockerfile` and add the
-   following:
-
-        FROM python:2.7
-        ADD . /code
-        WORKDIR /code
-        RUN pip install -r requirements.txt
-        CMD python app.py
-
-  This tells Docker to:
-
-  * Build an image starting with the Python 2.7 image.
-  * Add the current directory `.` into the path `/code` in the image.
-  * Set the working directory to `/code`.
-  * Install the Python dependencies.
-  * Set the default command for the container to `python app.py`
-
-  For more information on how to write Dockerfiles, see the [Docker user guide](/engine/tutorials/dockerimages.md#building-an-image-from-a-dockerfile) and the [Dockerfile reference](/engine/reference/builder.md).
-
-2. Build the image.
-
-        $ docker build -t web .
-
-  This command builds an image named `web` from the contents of the current
-  directory. The command automatically locates the `Dockerfile`, `app.py`, and
-  `requirements.txt` files.
-
-
-## Step 3: Define services
-
-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:
-
-
-        version: '2'
-        services:
-          web:
-            build: .
-            ports:
-             - "5000:5000"
-            volumes:
-             - .:/code
-            depends_on:
-             - redis
-          redis:
-            image: redis
-
-This Compose file defines two services, `web` and `redis`. The web service:
-
-* Builds from the `Dockerfile` in the current directory.
-* Forwards the exposed port 5000 on the container to port 5000 on the host machine.
-* Mounts the project directory on the host to `/code` inside the container allowing you to modify the code without having to rebuild the image.
-* Links the web service to the Redis service.
-
-The `redis` service uses the latest public [Redis](https://registry.hub.docker.com/_/redis/) image pulled from the Docker Hub registry.
-
-## Step 4: Build and run your app with Compose
-
-1. From your project directory, start up your application.
-
-        $ docker-compose up
-        Pulling image redis...
-        Building web...
-        Starting composetest_redis_1...
-        Starting composetest_web_1...
-        redis_1 | [8] 02 Jan 18:43:35.576 # Server started, Redis version 2.8.3
-        web_1   |  * Running on http://0.0.0.0:5000/
-        web_1   |  * Restarting with stat
-
-   Compose pulls a Redis image, builds an image for your code, and start the
-   services you defined.
-
-2. Enter `http://0.0.0.0:5000/` in a browser to see the application running.
-
-   If you're using Docker on Linux natively, then the web app should now be
-   listening on port 5000 on your Docker daemon host. If `http://0.0.0.0:5000`
-   doesn't resolve, you can also try `http://localhost:5000`.
-
-   If you're using Docker Machine on a Mac, use `docker-machine ip MACHINE_VM` to get
-   the IP address of your Docker host. Then, `open http://MACHINE_VM_IP:5000` in a
-   browser.
-
-   You should see a message in your browser saying:
-
-   `Hello World! I have been seen 1 times.`
-
-3. Refresh the page.
-
-   The number should increment.
-
-## Step 5: Experiment with some other commands
-
-If you want to run your services in the background, you can pass the `-d` flag
-(for "detached" mode) to `docker-compose up` and use `docker-compose ps` to
-see what is currently running:
-
-        $ docker-compose up -d
-        Starting composetest_redis_1...
-        Starting composetest_web_1...
-        $ docker-compose ps
-        Name                 Command            State       Ports
-        -------------------------------------------------------------------
-        composetest_redis_1   /usr/local/bin/run         Up
-        composetest_web_1     /bin/sh -c python app.py   Up      5000->5000/tcp
-
-The `docker-compose run` command allows you to run one-off commands for your
-services. For example, to see what environment variables are available to the
-`web` service:
-
-        $ docker-compose run web env
-
-See `docker-compose --help` to see other available commands. You can also install [command completion](completion.md) for the bash and zsh shell, which will also show you available commands.
-
-If you started Compose with `docker-compose up -d`, you'll probably want to stop
-your services once you've finished with them:
-
-        $ docker-compose stop
-
-At this point, you have seen the basics of how Compose works.
-
-
-## Where to go next
-
-- Next, try the quick start guide for [Django](django.md),
-  [Rails](rails.md), or [WordPress](wordpress.md).
-- [Explore the full list of Compose commands](./reference/index.md)
-- [Compose configuration file reference](compose-file.md)
diff --git a/docs/images/django-it-worked.png b/docs/images/django-it-worked.png
deleted file mode 100644
index 75769754b975748dea24a9896083e6e9447d121f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28446
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
Q9vqyCf`)vREb#OH1EUHMCIA2c

diff --git a/docs/images/rails-welcome.png b/docs/images/rails-welcome.png
deleted file mode 100644
index 51512dbda6986b41a5f9a8a0ca5ba6f5de450d1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 71034
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
a6Y}y^58ih#ifY@Kcf`{7Q?LtYPUU~rH#6%1

diff --git a/docs/images/wordpress-files.png b/docs/images/wordpress-files.png
deleted file mode 100644
index 4762935baeb03568530e962231687bbcd38d075b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 70823
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

diff --git a/docs/images/wordpress-lang.png b/docs/images/wordpress-lang.png
deleted file mode 100644
index f0bd864ef0a72930a28dd8e58685437ecbd947b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 30149
zcmagEbyQSu)CNkYl%!HhDjm|Lq|yjT4GkjF-Q6uBAT1!>NaxTXB_IsV0Maq^(A)#c
z@B8jr-(7e9893*Sz4!a<dfo|BR+PcPdW?mDfPnMnwd7j_1jIcA1SC5QG~h{dJ{0(J
zihLvaO3f8<dwL~$UKT%ak%ODNBRDB3?#2*wesazJbndMzQ`EF`%#N*=JMwbUpTMCX
zR<JBT$Wl71$|kk!^PF?{Q;Sm0SntEt!BI;*YEjTh(Ocm0$H>RT@cpuD1Bic9d3kx0
z(#dk^I`I6<=9WC`De^07_wnqxASaxbGQDQ)v&OqAq8RJq&5WzY%V{z~zJi@@?(XjD
zNjo}o@mF;gA60?LT-}nqsJ$WO5ChT2OKx?CA7nIZ4KG*v6RTBfZ006`)!!=YR%KFW
zruPWroxN;2wB??D;Edvga=5*{?Y=vfr$qj9d%HXHc3>=Lj)bM!1CIxS!o~hgVoRK}
z&(K{Wd5s5^WjJQ06xNq}Vp957S66EuC;-F5BMk$fZ&5tM+ymW64n}7lgU3`|NUYN<
zY0DpNK3px+Z?%@Hu_5Q<=Kj$<;2li~2&<+M`!t8!QW;aEgUS!Lx0&Tn{Fti<G}489
z_GQW<Tb@OCaxB}c^o)#!jj1Hv)SbDKFK=aWN{&!>!I=-w9v<7vn)Nob^)7CH^$m%0
zdEsORMVm%w?0ozh*-WUh=SQ<g?9Nok_Utv6kjqOz!jDXq0ak_%Q2bBmyY!m~lwZxB
z*d%vP%`$Wf?MoBP`wD@D0vjdC4Y(&FUj$g1;knnq@he3_V$(#jfPKfi6UsSlL)y${
z{R9K_jHq5wJ>BJbn(j`m7vZ8`Cs&2YTaNbo!H*K^>SN>dIiXzzhB(619igOK+b~i3
zvF~;7_(>p8<s%<q9EyH2BTzyfa`kxBbf)5l!k10yH~1R){S2QeT*>XkIPGM6{*j5<
z&_ph<Zw37x>U^DuZ@OK~OS1vm-m?*RwEcrLS3K~ctMTTl%Phg{*QzVhp)np~oP56@
zC22pZ57T$*4Yo){8eK4_()*`?MV|Abl-6+qA|M|4rm3twpHt{Cp?Wn0>*b6BBtfE5
zT8ONL1oP!u`%wGJtoY7|y<L1m{sGz2U{HCPZ+fD1a#~%dadm2bD}AnUaq24NZp~9f
zC1`}s@+z1bJd}^@XfPC4uY=yZ|6xv{^Tm9y>zQJcF;-7}M$61zH)FoxW_Px|{H*WH
zL@t@t&0rhdPOIC?$NV$XtU8TW7B0d%trlBw;frf86A!8v0Qh7p9@%y(__13@r7WKy
zxPqhm<_3)h=3cxUBCID5HK)i}p9pqcAxh6^*<TlKPoYkdQFTG#%eDN5Q|`y}32oqH
zC#2@2x5eAiLP=Q1XLD-$hb4eGqDx;!>wY|ADkOI(?r%gvjvhzgAQhIaO~{uPri3DN
z2cuXcWnEI;pzY;Jz~>R}3+`oAIN|Iz{f^S~^Z1w>$KY!k*7%r<Kv2NSv`NsYnOIOv
zYRk;8daQ|r&n_ZPai@#}PwWVTp*X?#s5U&p_-UnXnxCsB2LqxP1W4d9J;RJfBA9kJ
zYO`WE`-hK=BRSu{`-2CfDf@05y-YDnTOqf}FPnGd2zdueP}E_JT^63zP+FFI0}8UT
zdZvpMGKJbAxeh8Z`bb!G@UAzN5AXAZppz<!a@QdFgGEd#|L=n-F@daFa-()$Bui_D
z_;9vP7$|Z}4j+>Ew6u&2*iV8;zn7ZSF8q>a;q~t4hQR0|x<kiF+|+kc(T9$YdxH2?
zo*pyVRVNj6S@M4oW!m%JZ6p;;Y<lyvmJ!Be^Z61h(X7tUg1A<3`m?j`+xFF0vZKP=
zbv`^37W;?Cnl>*%3y~MKPrO@1f;qd%Xl<bQXLNJ+thx?b_KCmk2%|p_IB}KH^w`xY
z8ah#E($A-N+U3*DW9P8PVkg#yC@mOgIuI8h|4BRZt^R}IxcSaHrIs`-r8b3W$CJ6C
zUE+`5Dsl_uR+=WP+nxP-+Z#08b?jM;jSq=1zE$o(TF?YH51QaOkmfj~K=FmG!9S&N
zz%EfTdh81`#GC@Y_!2Z3SBEttExtjUw`YHDjjHF-;*sf~o)Y(+acCjVh2bK8Z9Z`^
zg!Z8eC<B}Az2>sEE$u?&?jPi|xNpW@WLw#%TXrDPu;b^Q$3N<BJRbnNqM7wlZ+z~l
zqo<^88(w?@3XHQ=72LEJ+)4%ZwIz>M^`?Ly(?v7e<ra>4WFAeE&tp-bp$@T&r(C=n
zcOw^M%vH*v>~jwqENa4JHW~HtS;dPs)myY&r7T_lPC47hmw9HOQi+>>@XOeX;3hS(
z%_7vpW@&z=&YN`Wf-{n{`>SKO4h2mHl!PL#)QzbiFJg5}!NrlQN0<LW;^K?h;N?-L
zMmzoZy7rB_hh|GdykANSk9bMh*kiDpFf(fFZPe3hGaZ<AzZ_D1u2q~1eCoI~gnu??
zpqOVlAL?)RxtfmBGj!pMOw1>IYq-KY?AT)Vf&{YA!_iG<Y>T%0It2PzsSdRVfRlT}
z`Wu0?;YF6&96|xbF>}w?OFzSwf8K4V#|APyQt^YguN4a0C@t_frVnoQ7c}*U@uXlr
zeLXMceR<jnK!%%`&JGkxXlE>FFECV`d2~V)?GO?^C5@`ru_l++VzDkP(_hm6hG%B8
zZzjbY@E_UVar}y%QTz`zCX~<L=I!xDiZa;-4bLp`6#n_R+nC<6;nH8$XgLt;AoON+
z?FMXTlM7hvx!;BD6SmH<Is%y`*;Fm1MIO><iy0%{pb>P`A?hk5n~pWB-9`~FW=E=R
zOkA`c|FL;_;HXuR;5o>4i&R0QGpepB*ft&OCE!JNq@HzkX!BnEd5gN+ypUHBMChU^
z1})G3P<8snEk1xbF-wxip>V~;!q+_&5{5@iwyASiO({1M(1aS-5|?vaXA}>I=(8}E
zvep+l3f#AbrN-?H;^&;J%XY!CiI{pZnUjH@p#pU}(AH^6pytvqt*MBF!G=ccWw<?U
z{kSfkTO|Y53;17JRmU$XgQiJ-jQ3gk=s<aHO8P9C_XI?&3Wf1%AY**0AMIcF5B{%d
z#d)@%f^bKQY3ytZE}ax~80MwE6Ozu(&AVd(&a=m&d6>G34(>DltZj-bEe?{KT@<)J
zF0v`_0RTc<9HCNa?RIpf@@AzPWR!Um9D+mYJnlQ_iFxW_qR;lAiRoZ<FDjO@E{myh
zZw|S&;Z?`vl!_q*^D$sL*=!<iQ>vnHG_9Q}>-&zJLTMN#1?e!|o*rsLZdvsi%s^_$
zWv+P7?Zhi%K&1d;Z@s<rg?A9}_%<(oe9~M(rKQ(FBV%b6cIGMQ5VaaT`tt##va1D&
zGnn3~aBH?Zt=Pqx?f;01lRAl=jknTfA$F>S2_jy9oKd)8ac&!Su%M+<8-XPhG<?X+
zT6>^Vq?B7_4xGh<-44Hvc4n;XJZ6_g#g#U@!UO0-{$2IEZD`fD5E5%{gfuBFdmoi~
z<d+vM9zw0X>sO}kMce>4@<ame&#>E>Sy#1#UWTl@`Fgw*yrt2r<~NV!neVI6p~F?<
z!_>O(B~q7|f#xM}j{&4R47kd=+0F{6^-f?>FlzWMZzrKBa;5obmie+ye#cAf^jRZV
zX;t?cLLV{q61ks=tH#rC0IhpV&EJ;UEY6!6;o+kVP4+7#D12DAnqlGjG0m&=gwyD{
zg01uX#cpfTXzpz`s>4Ii#kMI(D;|=DXsQoNC4%irQKBPc?tG$*`&S6lFLiLYhQ<po
zg&pIz!#cS2KdXvT<U4aIn0CZ7nUEJsmT`~h_(^C$A7?Z9S)jQSyT0o$QA2g7guca|
ztPH%CVxhh_tQ@*%age3cw+N;YJ0|NAq@Lyy@YqNPQr>h4u`90TO&N;fRHLXt7MA1t
z<_V-4D8ZXcO)<s)P~)kFJ!PB2G;(Z6n9AgrXW?Uk8lBRETKe2F3Oqw)Tm4BzA&-P>
zP%O_)#Fe56OZ0#6<{3%IL#kV1Qm0yCV#V&tY?~_l1I!at!njw1-c<8x#b-9kfX($`
z6RxPzzuiKR$ATO-x+ALNi+50O0ebTV%p+aRXnPL%x+W{ogi=aUX`n~EUg3RjOr`jB
zew7jv04nk!))Wu<aj#{NATHp58yrlK2=q&zh9A05rOO0(h)#oSPWbXh_-Hkj4{tzm
zu!4`**eJMHKK8Z>NlFsHTX8A$)Ggd<7;T*1n24Om9KxeDZ!r7J4Y&B(qetn%MCzc5
zPe1^8gRMT4pKHQj1F5HaUvCc;HQm{e8HLIMJSDx`I<}tC-4z-dI!kmHTq;PK@Li{)
zto*@KuYyaUMudq)t<(d8wRT9PvDDYsHjQ{UP<SJw545qdap5{@PM7`c2-jNdP@++Y
z3SR2PPm*z{>)l}^(DUe=Eej0ze&is?_8FUQ1bAaM`*t;$@O5}zhBu)k(MeIu>5sV%
zJ$U@5BN|(_p}zW?J-841tj(>+9J~%~QCOfq?XU7fkG;#zE^or%6Y;LFt0g5^`q4FP
zTW>!oV@LETU_rvIl>K^X*mKC`45xL4;;gAkD&<mIvf-I6L6KGAl2H12%S~9k&jNfr
zV?hK)D5lMIF1?)^=dgCN-r+R!kN}k}tB&A<uVz8AS?5gEE1jx0Gk!Fr&y}Gx(koAQ
z^S!Ch8`v|{ldBY{Pb7y>_<Q=Ki0VSYhhk^6fs{+{Js-c(6S{uibUw-A2z5;l@}3L9
zKCfDk>FJfSt^!L%_QO0Ed*Ipj(UeyTJOw+Fp9Jv;Am%BeyEj80L6Uw8ERyq=QTi%<
z-IfPmMfCitBu*qUqiFm4)|tJcKMJ3-(O_Lx5<G36FKfWovQNzyqS-Ha@_t(McWv{>
zRG2+TlIT>5<{{xYKAl|cPuSDW{9nUZG-WFTJln%+YhOd3?L~;Eno<$)zco3~dZg3?
zpFnwzP~pQ98*LG;U_e1issgpQduG!e{iA7Fh@hnGOI2iX0zag%6VS1D71M2D3zZtX
zV*JMlA9&~dX`n@<Y^pI$7T9!#e^p^6ZG|${O|4YNUv%xY2;GobbXdeQ+t|T_4>bGk
z11YR>e2lxUWQ)_2vn!gZLoWObSzzM2-ggsj`sq#N;;YHae5Hh>sHI?2=DH4TwQr&4
zMt>+FZ{M<TF6;3ZC=k^lkxmVK=g~uX`)+l{-z8-1hPPr0d#1FTlK_|`^-e}DjnllO
zaG<ukfRi8Y>oHOW1%yT-O_CS@vjvgHpOIwV<h3_*$lmTD^$t7MZQDj~=(QNGMM3Ob
z@baOc?3!rj-?b(<?Mh0y3dEV0F2-}8z2Yp@OKlyYx{(<Tneb#6s9@LAVY-#Q7_A6K
z4-r`_^!oFe<y?eGeAuc}A~Y0916pZR+;U+XUF*3F5s;3Vnyo1H<SeW?F*v!TftV7r
zB?cmqR-CU=Fv8@92H<U0U3K2rR4+a`ThB0oZbjA_A8@#CHUZ6lI{i|Utj=vGhR0*7
zP0%BGrw^`0O1Ai*5e$R9hDwCkTdaX~>7o>T*nw(W1|ns{0{KOx#(h$uqLo&hqgSn1
ze3KaZJ+CV0ixARqRw=dn-!(cj`M-X2dRs;5^>u^<@|&1n?)T#k+&Fv{C>AJk*x{Jm
z2%V1ixiljx@OpWg)h{GJYDCJ9*)~>vP;~gA(Yw<>AILu~Mb;SAgCw9UBFSRpx{|<a
zf~7ygLgb;5W->E~MwDakTCvuIx;jwdEK&!A1h;Eb+_c1_pp1J|F?O!2)o@QQwS8}#
zZ+eX|``eW2)}$Ewwxuk~r&C#0&?qyBnUBI>e<ivX=+F^&)PxY<F7Q1%<V=WC%&cmz
z<U_%v42$lvJN9BC+*X+8R`EcSu>qU!&O;v>uYM|;h#8>s@Ag-CKRt5vq`Q0nd!M~$
zn99n9F?a=%!22NwV>ShOt8?w??bgrs9GfcUHYUj^1%^ULikw|T0guN5nOHr^uK~v%
z6qBVr^AV4X4%}*?Rzd^G^8OVk{1f@e$s}2tsUD$`Bg(wH?#AN9vpaC$p;E=oGjy(B
z<ydsCV`HX<paX#g%#N)BRm&qZI?}A<5te3up8*&R)mtSLDaNZ)re}Sm`xjYS%lLjh
z65xq6TeO|iaR#k|4ARsT8F1sHthCT!p?3D@VX0eV+dX>JL%w9uy?%9?%DHLCDcCMX
zk<l0_FX`9cZAY7kQn}r8`zi@m#X}=Kyfy8{0W67iX^&s~wxkFmt#hSG-sTK{oTq<f
z`mt+%%{m7FwJGx{7vcBcle>;*A5u<!oXS*n1^nFKIx%GcOfeBtMz|BLbvXCFYA$A2
zraImf)U(#2s3z$bQ5>4D7HeY6;2ixWWyD!bbeQ;1+-m>Zukhi_$!Om0^|dFrHt8)9
zf2o!rXX7GEes${kT1Rbt=QP#h^NcNK(lc9BHhYr%j}oanVFp(v>I7zDqSU|MrTe--
z<V5G9W+l#J9}K*@RXdh0QxR2&W_oDf?JNy-dg*e<LP4lwB$4h!AoO+>|E5A$L6q@N
zI@!$)?NKHMnmUs6)$12RH3HWn)VC0#lcd~t^byeNt);et7~u*`?7Os<*e}hcv0t7R
z?7M|}iQZx53)ja1X|o4sM<0ZyTjrf}G2m2HU1vJ`0&wu@UoWM9y2(;FnQzipqJE|)
zCaV9Pwe$yNh67$Sp3s2Iov5GQClHGdtDpMc*@V;eM@cG|@?dR|&9w7L{jIQ-4Skkc
znxSqRCF%lZlo@yy5wfk-%b=^5%YS%oWt|9DcfGMPdR_6z3ch@ZFy%5M4)%z5wD>^^
zo!9h=xD7SV#qC1zb~=_AT;G$6W(cfa&7)Nxa<pGnoRi!Ix;G*%<Qc3r)l4J2`))2%
z+9IM}b*y!Yo_e|XaF4+?FQ;|Ey8xPnRXSfTMcimo6;*XX-g5-W7@P2xiV74O5rAjy
z|Kgy&8}-SkxOS*g+}~+nZeiC^Ocd7FxG+(1DvUD7lPh{~bzF8qa%bat>63DZR}TIq
zl1>rtP<?0eo}g&i3eIf65pU%&?JXF{a%dsxwiodqfkn#1#DvG1TNJY$fb3gIZ#2ut
zG#1?HF_U((e0ZI_=k777Jr8n7$NP&S1_NH_*QxmpPwiU7_-`i<_b=A5MUNj0agW}G
z{HY-{_Lc87pNvXB3N1zK$X^`QzKgPW(<d%qK8T|OL_kYweF1H`)Q>{!oD%+5iBU(G
zk7}13&b9keERNJOf#d)4@TKL`4=5q7G4JZSChc4@j&o|>tsDmQA&AHPOtEkpO%6p$
zjCd6$L$B94><c7m3@>HRd40m64)O6dvcu@ZXEuN)_7%oU7%;Fsr|2^MGuq|Dfj3KD
z*Ni@2;2Na2Z>N5Y8UIKWPo)T{*mv`}ayw!@;d7~}4@DxaSJ~>Mb!Na~?`|~fT)R46
zJL2hXtPfsq1P~re&doMNlI_H!*8wA;xXH~DYdA?Ah8J0%LtSfc=T_kB%J2*=C|!eH
z%2=ff^}UC+tpnX(Ztn}&xrjV3asBm8>4-IIAp#g%@i+$JNJ5i=OAMd0xseVfUpL;3
z1NI<zmFy<MUvaF{vcF~S<vLF4L!#pLGUIKh9t~g|$yk_r>t%|aJxc$YTuqmNfQvOO
zJ@nSDp~inIFy-g1<7Jcb)3B~O#7?g=T~mfnaVuB(E_vU_!6bB|?bw5Woe5APH4DOR
zf?P>`9qbf`=BO4(2vFx`I=`lAtq(9QWCW$JP<@UbK4WWLtnFUDF)S0sA`8qy@I8Z{
zCj`WxOF#c4@d5>f%@zTl9{~ddMR;QChwKYRgj%8CA|R38KSRK;10%kKBB3MrwNfKs
zP$1mRxO?_*1}ZSz$1h0$0l^RZa?MU-{O15NLVh7chHX#mrw})!+nbUM5v5a^XuDMr
zL0Meh9ZcyQamtPeeOO-rmjQuMh0D6!(w842{K;Ld!K(9Jxc0*9z()Yl@Es?y1FxH4
z7YMgwhf!|-*=j(5KCUl7VuK>#+KM2O+9IOA1fyOqx>ENLY&A&F)F6U+>{T6f9E`VO
z>U^>J5$;Alf&R}I0><rgUtjG1zL4);-;HF0{+)358u<&&?Y#f535<<SeuS^^1698E
z+as~Pv@G-0M{uc)k6vtvZWMC-K~&H-XSj0J*Ab@V<zOi_fhYA2ca)okrdg$j1dKR~
z4c3*Vt6}A;V;N1s-w1t}V<YKabo9PnEgBgYicpFtepMAZ%>H)LBWZ$w;Or8se!i3f
zjRK5#Ik`Er%`=aRgZ_wsAa<UmS+|E*1`*vBL0_!NJ8ryI+v^z<+VMqeRA~N3TP5w>
zw5lLgn|GFqO*%PzMSPijEPn?JxIU=!rkwwsaic3Kx!k9aG$WW8L<ukMn!|=2{wa)`
zj?D&$`mFO-1aDGb<htu^_8u~03kwT-XJ>|qX)}SfqaQT5(8s=c#t1`X$a{x}4wxYw
zMv?pBk~HVs2(8%QF%AT?NW?n-9ry(d3kB(6L>Iy(8-h{?LMkU3wEL@>@76E^V1zNQ
zyJ1;Z4{Wa<KoJ1d({+p=fDr*rh1tavC66``fIlg~H#y8FLjko>f5MmHQllORk4oXe
zdT#?Iuw~uL@(Fg1YQUT#v5j6)A*&$OHsW(%R2mxmmr0!BPm2gc7-Of2H&#CPAH<+f
z^LZY;2E}EyJ#oczWz%`TKu&PE!_4h&nHk)ZcB6kIy7_E?)zWzPOMBjRqSfFt&lNS(
z(F-Y5D3UE=9l~X-Cwg{HOvIGM*aebpDJ>Fy0mAu>&vCbF@R<DWT*~^CKFiU!oV{})
zlb%@PD=D1rqvr5&vX>N#Z<1%aNU$ufC2OXaoj=S<9H%F0=XaJ%x<U4zwDQh?3rR;S
zbSCsmo%TkTgj6pmX0Og$D#(L&`nvIneX+s7{(Gf}PDC?Ujup1#2)NaWz7MrWUzslm
zr4R8zkzbN6sd^SaM{2@gr4){jjOnwi?ukM)Kmn6J)UWCkAySXD{}mFeeP~NAQ*``j
z%C<-q#jpJ>27<^X1NT0E)}3x3gqHLSSw|j%K(X|sXYSN;J{vgSOjmMlpwR`$sg4d`
zYtn5#m-L{`eZ&HbEj#;lRALTSJuHV;KtapKQN(_&u;bGjPwDyANk5X-CZT<@`(<~n
zb7bV(5LECDr?%Q&&vwbNS9qi$6tSF-LG)Ebo<#4bMB)tTC!D)KxSXFtU#Xqty(E*)
z;^^+0op`k#Oj$gEww;XYy&Q?Kb4le{esofYpaf6T9cy1!L?+%vK7>hT24G0+tA~~)
ztxX@UK^j6iXo3_SFkY7IXs+ogzi7QU*&prwxg^9OqUfNwHWByxW-bDKCkjcnl{q!9
z{+oxaNAYe;*x}0jEByeBg+Yo0-Ss8LIH|>Z`CC*b+bEN;c3rGTACz_3m!C`~ih3c!
zzLDXn)(c0;aa5_UBgcu~faNGpOsOS;9DQOsGIYl%uf;4E+rAK$!&JWWv4O|D);2Z-
z%<xvoCa}@`5-j<QJ1KGY2@cJWXG<9g4TO5@Jx+fXlt}1<UuV_jAx7Jj>?a1{rZ{}F
zUA~-)u;N|wI_1IH!%Aph<W!e?IarCnD2wcz?rBONDVcGCc8O{)PkfIP0&(cK515+l
z+hor`m^i7=<K;MV80yu0$Ld4kE{H8G1v4b4AM>v29qqpz;vR7dnlUf(lYH9B!wDYq
zWbBQje20}*iLg$;VHy4jok#@Fhve1kmS3sS2khoR_(>4uZQ64EDcd8{H=GylL#NSl
zH1I2zok3aOr3jdq*FqpYkgH2%{J6j4tg|dpaimV@nS@*-q^WN$Y;67Bq*U;4{wXh-
zGQ;2IqU3*l+wzX|%&lv4faJv}qBp5WQm8+fO&QN#nkug&!HXR>tHQ(F_Q}$`yoI>U
zMw~qsc$`e1?&X{njRr=nLyG1*uP61<l>}QyS+7*wu)uG`l1pecJ{~?xmN{*DI`r~t
zISGqOsJbK(viN5U=g$NUQ3oP2Kl=~0Gi(BU$vSB8G%3h7<ykNX#9aTi8f(Mij~Icq
za<nEAo0F89aI9O`vo$yRfnXY7eQJaJHr#g%QL*~H?vHA^$QQn+qwM``kBvdTw7DO?
ze4+6XeIE`x;Yr9SNQ$1uhq9+PBnZMl)E>FfarG`G!3{R8RBa)Cg(4H7D`wdULyMM}
zPDR7$XzL))nDIVybEq8x8xsO4;O{wMC4$evs<eB|izP@PnZT6O{OmnuzRto;zfSg@
z1CJOy+wf1U9B)ND1QGHQahUL)Jm5^6>rTv=;&iv?{FQ_z;-luFh+apW3ExY}7VPcA
zwJ6qA(+toWvV!&uTdGW7zxItwyB>cjvpbL|=w1Cf_JrYR_@Kp-k`#*|{LR(exu-DU
z{`47(ni>KdAdwu3B6$wjk!g!<^@J4yzA-}Jz4Z67X_0w8v5YwT@k?QLWPp>^D0{u`
z{5R)Ij8r|c5AwX-VQ<9{H4VUF(1vQF?GL^-$-$NR(kV5c-YG0kcPkK_2Jkg^?&Y5b
zC8vq69l|+k<7Nn+oUx1#%5_l}pK&c$R>ZW<D*hFqUz#lesql~L)eBT3C!(of8uIER
zHb-x<TGQs)_JeU=Pv6aU8KkDKNPCS3X%a41OO%tLjn4|nm;wpZY0C4?t#z{(dlQv5
zNd5W|A8usYR#&$+Mf1fDqUV=eAFSAukMy!R$_CW7txe$>5h<AQ+fZbGpbTwi)AP(U
zOwVf~VXI?JKdJeFzAjO~Ky`V^_VYDeWCiGB1x8~8Oyx`ZK+%cQ)YieU-#CYctJfvZ
z>OIoaX<|tyb=;?qt>Q+TA3iW(Ki-5|Jl82WsO|!(xxso%)cV*qcNMkJt;ZX0v}rC3
zO3Zm7ITzNt9a;JbBxOsLn>xcxbu-Y$LiMG9HNU=^w>k8dt!7})WOma-=lv<qnUkvp
zPMQ{LQ6UtOUmY-R$Pp*52l7_L@UKl@!FK_EJSQ_}g*;{4^HB=_EXmG&X29l;b)3kL
zZcZ6*R|^|Z+p9PGc>1%Q7ZE<`u19|iF}rqJcPm`+UQt8MNIqaEtzVcDcAZrz7<S+O
zQX1D9fzIffo-X7CTOJxYyr}EQX!cP`hQUpVcZV&hgcE)ru2sg<Zoe7IczbdN@>r$(
z&+ipSgjwT%qVv~Jc7FU|1?9v}yRxSr`J#C9X!6Nl;G;snV<nCwBy^@dvWf3god?Sf
zrBtwHQOjr9EF79yMdTxZ?f@A#U#r}sKgYmUhjW=+qLkjuWHQI#?e%d2f%Ixm+!x!;
zCs^x|3Xrnzh7;chM<9vk=ijffz(4?el0@!Y9MRPSx%G5W;PS^r+xDMe95HQw&iXm<
zhr=1ymDcU%3k@QTY4{a<*5V=Zo4|b7#SmRIrU`@07y0xHOQUbE=(q(6tR#C?f_O)$
zGb9O!mC1LXJ>w1kBx#3cuEd{wqC)Pr-OcE@s;hR<u{#UXUZ}k&OfG8tpp7A+HUR%I
zq4!q3(RpW6!1E(D`$EY2<HyZ1PPBo_P!};3C{bOwhe8{Tu=c6X8}}hGe-CL-eEL4Y
z0p=}#MEt#$Fv54Zb{-kyf@|><f%SY&jWYP+eyUI+epD**&Y$g4u9b@v-B~J{Xg_``
z&yY}HL@R21ew%nHlVT|UI<TIZNQT#VPlJ>Ow((xlNJa8}?I?E{`O`q8R_rjOJn)ZD
z)JD7c_H9FPS6ce!Gn?hdxiaOuoR?-$5`=)7EYwq@bzXbJRJ>26*e<WW3v4>a08{h8
z&uy`0zvUPpisB5GevxMh9LuEU&}}b~+uQ0cs-ct106Pq7<PF>?MJ3vj_Nvr+pgje|
zRRp9)3)tB*5w34CrrVm1?UpzdU8^8B?lLf?A~$A~k2&p<rZmIl5sA`Yc=dV2fIMNn
zt}4aWg&EDLK4y+AvWw+ex4)?t$NS9&0(+Zpw^F1c@e%w^WP9m7qLaVR0+t|Gq>bzR
z@UrvTe9va8C+^o)TAAsC>V&+5kJBkU?}elFGSJUrAWO-9pUA8e?A~L)%&$hlD-#eX
zu)Xl=-}}&pt$EW%{pn_sch+%Br@P2!+*Y(_AH{n;?)+GiFce(}<irLq`tI;M>XQe;
zokB#X%42T{)V<rp`a6q%cXC+xn+O$R@1=Ch2}I95;AM@k93tO%@7!lw?_<&~e{j~z
zUX#(-bXFLh(#iry9w~z`1Z{-GkIUL9#xo-6t28KIQ<g(%JoB;K<c{<pb|johhHSb^
znG;;kg)D+Sh8hUOpWSNRijIWm#AjGtixxjlUf#UI9s5p$KYjO{_vN-ca{7Ynywj!l
zm8ra<WJ1nP{V8%Oo>vr47xoTb;8_s|zTBj#CIN~kmB7u?^wo!J=+t+R4uPDm94my$
zm5PzYe4hc;9p!x%SOT#)QSb&c#d-Jh#IcYcL8RI5sm_ZE*FMEgu4tc&qx97FC~w_}
zro>ipeounIM{>WN(Ph%O9LA#ngf8Sr0_R=-rZ$<n7B#ovmzQS`CP+q~{kP}t7v0ia
z)KcT5#k9K7P&f4+PU7j0-r}%~BYq8RP~E=RkFD=3e@gE_8gUC!2ji?)mZkekb1tH7
z?-$nks>o+rFEO?>d{}yBTy|xzF9=RnKr@umQj0WAC%Yt;HUg1;dw8Qe-jzSbpF@~e
zws%Fb`^hAOTcm#shtw|U1}Lq#^{K(@<@qB*1Z@ojElLznC|l52J4)AZJ@;BjGX$OH
z(=T1(Zdl|?wW;;|F1v_Ns|=|d{P_$F@ONSI3F>@Oa~MyFPUjQ=Sc~r9$n)}1bo2Bh
zaMX#ucn|=JY=b?of_Rb7N^~!lDTMP{Vmq@q67b>JKXhOyy)x^;0OsDh!?2Z~%tbj}
z_RQpr4|bSg>t))eAaA$0WTM_9N%4(+Ya1BrEICa+yJo&q!qnbLsd+<EBz@!H6fYlx
z|9k?R-sU621rM?~#vKqHK+uX;Q&NL7d^Drniv2aMCBQXvAjl<fM^^u29^6dpPnj+*
ztmc7~K-~7#4}aIDXBUj|_CZZ?f8inRipMjXzreaN4I<=uhXRp!m5Qq;+1XCf_T(XD
z_XhM42t(!-MkaVoJ`3<Wap12z?_&(a2heyM5dMil#QzisYj^4`h~fWTGY_mlmIB%B
zKGQ@J;|m)RwR{k{UQxk9CL9XjBtzKEJ`21;fhxLu3m7JAOwlZl)C-wC?kv0Nv5`KS
z{O421*myL+s+r2q<e(a*piHn?GT;TEFdW$zWsKxQhVstOJBAfK^A%98m7+9EUHF79
zpHaO8WF!njX}Q=HGIwH(!w_+bM#^vlq~BvPYO_wQwIwA>WL3hGAuJ`E!J`0{*V<^k
zxoBNk&?5X7t5{L7_srLMy%mqNq_Fp-)@A03JRwR^+fw)1^O0HB!ZFx~!+T9_zwhI>
z3<F6(lT)+Q7<+;)?su@~F#kwv_ezJMhU_X}C(q<N!&n0+s_T21Rja(L^@N~lmb)97
z=0qvLr(ZBVQV-_IYMfs^OZ>vbMw(e@R@;B!g&vZ@uXj}lFcfP)z+6g%clHiRP6!9Z
z5%zs&76Jl$oy{W|87IG9-V6Sew%nYd?=J#sMj6%S1-E9Oa?VCJ(R-80oNH47p*!R8
z-E@gL1<jq3SEk2kmNsYdk~7579c0UNPn>fRhi!ymg5H_eTnvmf{i7$KOGHS>C};cO
zT3P!`mc=hm<@)H*;BZBY%lg%#CxFqo{ejc3C)8;ezdQ~6Iu*3LEQAGL-wH||POAc0
z9pjNb`CUb1x-HIVlKT%9$PAA=S0A&_d#w>#o_M9pH&$Hr$CP^?_t-ait(E?1r8d;J
zC5j{bKfPJK^m{OsxnGE&j+xV=NB>gMZV(l<eE11RsTP`V+i|8L*&m|^-bzmo)>@-1
z&|E0*f$3U>C&$&$*nCy{wlTMF;jj?U89VkXDtW-`XCm`EJI$!#z0JOVlbbMaC?6JS
z+YBEP^Wz}9_ut^PJeka?pSGgQbvOFw$?Jyyfqcj|t2-R({w#E?Eh1F&$?YL05CZN<
zc)#iYcmv_RFZ^Gw@_)Q^-Bt@|p3$B{oK=8_;HmeK6er?%bJ7J1rSflxA#ps+b<)!!
zeen4!{yP%3&-lfvm!kK67t;Y7d2Lj=JUvG<tH<zE#^;s)Xo<N?(9&Z}He%X2dzAE9
zOr`9Wpc%PT{;jVF_o;bAl;G#*rL~m>z@z4z{Pa86Ll*;>Z26{;82_bwVMZVi<*kUY
zu<nPkE_HsOW)fjm(Yj((C~D@>)NOu9jKgSP#=}217swY*I>mbCPr8>*$g9R-_}k+;
z(926kMYTcs!1BSYELM~3f%jBBA3dAE&1hi>St!G&Zi8|M>~~*886k|Tm@XH42bHz9
z{D)K`H=JlJYjv%Z@y?G92Al?w%X1GOl-$T#ZeNp7wqUVlXJumZ;q1PCF&V|9SRdmm
z+MS;JQ3JaP0%y>(SocekgpQPXxfXabXE!O_+eb!OwH)It#>YPeAxoy2Cea0{b{0wh
zU3`Me9JRXr&?GBbO2SXO!bTU>e!Y0ddF~lo)h;^!2{jV3H<+LpQpTYADYy*(O1>+)
zm()ppR_$j~n0VA0{A7Q*delBf-#q>Mn!$tPE^O}kqIWrs=4))lcAM~`V80DviJsi!
z<xY64ckyi?t`F5WAA@@=)aqoUj0fr2bI6doKWhAic^A%!TzU5+YAzFm+Ft_I;PZXa
zxk!){T{|L+-5&<l<4#loXN8*238n?XkDO4Rm0b9dAsDxDDf_Y8sGZ3csRmiL(^Osd
z)R<e$lk9Rm?<dhgIYzB1E;IeDvd|xxX4V>o$jo}$orOx%)4$xIDlE~(1oNC9)k8fy
z?bF#D-q(5L=!zwEy5WYp4AhQ=;51<x+c-JsF4e#CBM*#&G=EkjA1rOig551CX~`ug
znA%Is4*LE(TXzD@c*GDC)4gbP6e|0hAg(CB*nf1Qrt!Gg=mlCryeuaOPrq%WC3{qS
z2tUOeWBYLfj>!?mk>nUP{V<>2&+vSPiorb3;Ba;A?Qppkt#z4*F}X~-(ig*;(EB4S
znxq<xt+H_S|D^VXiLR9!Q?b-EhmjmjO}_t1Bhw@l9vGBr6p1EOeW5$nN#avXE%(-G
z-uCfJ6bmepzN-Xp#}DihysBay>Nn=tAlRcmZE0Rrz-fW}17xn!<+(B*$3>F`KK{}I
zT{@b%Ic-Hr?XH5$EhO40YNY7xld7Gr^aQnY_U*lEMI9(%*B2h_Ir@CN4b)F0uAa(&
zn2op67M8?a$r3m*3MN5Z@zzIUZO%Il!$i41A#IWp{8K(?u^((V%|2ZDG=Qn~W{@TP
z;<WyS9uR%O9E6a}zTsQH<iv92)a%W<Ss%=)z#S6Us7U!IhLdU~#?BS|x*9Ow$%1`U
zzmN#R^juSuTjzM!{PsYCn2o8GH0^T{QCv#oTE^ec1wHZk=LEaB-#@dB%&tEQD_(Fd
zFYuK9&!<6*Zi7XFy9qHKm)hT5PJS^FFM9~V4I5z&me(F1`B~mRsGe~<NU-XNy%wV_
zKfF3(u?{FeVKY}<<D`Ji`qK~XFXlT(MRcAV-w>1f&*j?<{~6j{8s5EzaPG_eR6V{x
z^VXMgC%M8?6{AfAUkRX=QWH-Tx3*r8JD$$}wucKM!If11=Un;4aISHB$K4&B&1PCu
z=~LoI?K#OTi~5@wDur$8|0Ii`dH1q;NF5iIay6<ARHh3R&C-U{Oo|{;()xO=*2zMm
zUIB?zLx8<>F2>@0@-WBZn@t=1d^Y8?RT{_Nx+meILAxbtB0-fwR?#JDKq&ru<ldwl
zBrMGF0}rg@Jsct#$s0k&pOCEve@?>+Hq8bi(>Wd9EA!q5N<7}>%I$ubhbm*yf9?Qt
zk=IP@$l*0!tjWFy=`ca@I!6mOPDgtH`u*HMAcfz7Oi|vEi~#$-dfH3XeEM4h0`1?m
zv1_^*t~1{?O}xTS-qNc`T*8?{`<v+YE?z^I%Lkg9#QbTkWC-lA{2p~2E8`E&i!sn&
zYmm(%%cCG>^k9l;2MyxrFIJ-d%R%rUu#?dE%{E!R27HUR5a@O`KA*1^BL8?|bEpa_
z+)AjRv0kvAie=-uxWcXhW8PJEm!br9KV@rin^WM-Xp7f2AlBK=a{Ut$F`H{nH<#R#
zXFk92kW)VRFyf-f<muVWmuwBDy*t(6Cs2UyO8hNIiRu))xpwVaOQq&N2XK7l{o&SX
z1axo=fr&RNevE9B2ji48beH*^{27|1VL^7fsH_CDbPI`TK5fU7BE)?67DKaAG^y<G
z9-kh6w|SJ5a}jU%o0LU<N2U~seWZEFOf=f762`(3_k0uIouLN2+)Q(>Z^7QqKP{W_
z2~20{1UU7=+-+eg5Q^gjy$U8|(pj!j(-7XlCBQOXbl23`5}-}nA-^<Sx{|GHBu1{7
z^@xwDw+{W*;^-GzCG%Y%I>8_Hjo(eE4^c^;L{-_Gdf90b&%rF|<Ds_h4;Z6r(`00A
zBLAJ^wsMwIiGU$?ok=UL6V6Tn(%}o-^=eFl1{1lliq22-8QsyF$3?-10u6JJpUr%k
z`TREp`-LYYuOs&#Etjsr1vX8KLp}4qe!!n0KM{x>@5bLNfh-u#=_c~u8-yV;z>oav
z>-=iThOjan30DEy%EU07#n)?3Uzo`+xqr881r5`Q&KfGca9Dt0Jx#9d#KWHI9C{&J
zuf@9UD#pZ{`Z9d}`+(1wE9T8JZ6$|1cPV964z0+2yQ6bqXI%m8G<>W}HaehAbW!L%
zIGJyke3*?WW2q7g@l&SgCVPWhp7pBOt}_8XzzZT98sH8-Kf6Ij-n~de`T9N5XKPbi
zL+#fv?1~%LIW=fy*3A3$0--f)eaH3*XDaTMZ{H{TZdMHuz9AoC#va1@&78Q^6Y6t>
zvl!l|xiCY?B|khWNT00>;(fJ*bGhR4`;CQl_sGG3>;tlm_atwW(ypl?6`lwt^EZJ)
ztyPW=-kNHQeF|yQ3L^XIKsWxy)Fsmb*5)G!smf_Oyo$8<j?;yw9*@3p(1LxsDy_r5
z_rcQT8G-lSq&X<Kk8b8vevsIx6?f#d3|9yw@$SrqhzPmlTu&UG2$AodyuX0$^jV}h
zQ*|gT&+2Q0)IwbM3mmLG3Lo5PeHDsSV2A5>8|bL6av!BDn{7!NZVELQ8&98eKKXoQ
zWlsDK;uZL~#Ej`|&v}Z;^4D_T7V)EVZHCd6oA>mh&Ik2xJ4Ayy=mU{%rfzG;M(qUM
zMac=4z3W{2N65qUIhy6jx-OGPCgrBsC#W{^OzRcDqzF9N&~!AyY+JDy-&Z;4xX;zs
z^s26GG{7vrViNo&W&dsMaqs@hP_8ZQ&XWe0qAEIw2eZ1f5^rkbp>x&-&$6tKZpA!1
zcb|jji{2i@2Q(vJe@=u4{o3|=x9e3{gT6{V>F%UEqmN$^Y29frcxr|z{8`K=enNl`
z&G^yrV{CYiH)Fw%c{!jRg1x$J3+bt_pixUwTFdn*g2PMEwK{K}<3_&^vnekCb$Shk
zKmBZ+SZV7c<lH}6gppk2lgN{PslALzHh@n!8s-$2vqnB_C~J~5nUb^&qw%($1vKz3
zyETa!P-P_01vExi;9~-%1JI1dbem;1ai;Ey1`f8wl(&?k6*W^Es`eW`2=w{-YMce2
zipYTGbI&97mM!_O4aK}CuYgDY!tlRV97sX;k3_ludlt4BEwqc>!goZwEA-z(@A%{J
zO)<kDvz*+-h(gDd@eBO>YX8*!2I%eYs^z_UhCLy)4UYBW=I5+O<MSrWUgHx&((|%`
z$oWT;Zp=kHYKtYY4x?F#2lGntc@Pa(-fxT_^~twq{fTpi&4<BqeQP+9gbh9(&1UrT
z0HZ<aMBH#};fzvYcT{WD)<48saVDicIp;x}9jQ^l$&uAF=;YJ6Rdn*?vztQLw<(?H
z5Sz!deE%ucMYV|L_nk%mp!l~}+i*%j{{Z{7*-kXOok<fjQR2a6y135Jqq*adY|IDe
z;S`H4K?<ym%FAcXgi^&Mknc=SalkZ7)>9EYIoLd>;S&%cG2Nk|;iEHhrE7(suGzM+
z(j;3~P`mn**Jr$v-MWxKWsjt-W*F&xr=0PkS?!urF>tw;4(Lf}8hN9*;K781!v$cW
z&q%|}b|F`Rm=VH<jGc#6N35!Df(P--eq<ChlPV1eF(ggCgcV1fO)@`EI{YO(mHp#h
z=d0vBc*Og9axKHA1;x;RmS79=jRCIpg6lqP<nS;rO2)lG^5xeZX6kz2*I%!Y)?@qq
zBLDlCL^jhBi<Z*Uy<(=v$o;Z8WTkmXsYjIY@9KgPt5H+Njq%0C3=+j0$@dMiFR!Ey
zVDiNuh>R0Pxb!}(zXEG8!9)$7%0b@_Zz8#!yoXU&;lerpX8fTymS~8KHE<!n*av<Z
z3e(!d9`DIZlQP(Bk@-dp@-Tkuw$yl6V_#+BtTD2Mj2&dlSfsW3Nb+h2CtSVmv*XVP
z-~2E}*^h{_pPTW(Ud&bpxD=oq73D(#Rt{qxv{z`1<8JtcZiERYBV!J}o=`t0;869m
z;H&MXy&)lO?<kLq<@^wz*BGH=XTrP^g6GDl+d+kiYR7fjYCzAW1Eun?Y`RI1gO;5+
z8!POK{}GvcAh(e6uN2%9m_Zt*LRR8G@NC(C7?^|!5+h6CGn+7dFxc0`g=THOrKNqj
zp>I8#PNcDi6m1&m*ZPa&Q-MwK^YR`DEhZ&0<Z!y(rFO`P^787L?fp4Oc^7Sow!6RK
zdDh2iC)WekX=!h(xoLM^a8LVlEM-g7%$i|Xy#}8SN|S?Lv-oWVauTexT(>TXmy`3H
zJaA}+5EKtR78`}*IJ^2V_TY`DD`)bNuzqqV<M9lNyOL3Xxrs;j3rSaM?^mee2u94+
zuX-Y+IyCc{WiAZ=Wv1%m3$dEBocV@&9`?R$%;Q#_udMyt-n{sEVW|-LRP;iil;pIj
z5}Cu6aQDQ#o@qluN3A6qoRcz_^nr2Xc$&>Cy>#cKWr=BPZWU2;s5*WWsWo}rUyPuc
z24XUmyw#B-EBgM3;$L7v<4&?<XrNzSu%3+@_{@LyiO^W<bI)xkx+QJ%z%T+P+cZa+
z|Ga__DRKYomg2b&OrE%glk|%J3aC5sz=0mPA^6`k!vDPd%T@fJ;q74TA3YB78cZY-
zgUPZp#x+x)AD%*SFtM`CjbW?^XaEV6f7BEXY1ZMyS9lWj3Sf}7nb}O^ukl#nwFRx*
zKivx(yxY?^9~(yAhmq?z4iYrH5{dbTV#Sdh8D}w@71AU#q?gP{I^lGZYw+Iga49=o
zBlj7j7`mHi$$-kZX;O(=^;6bc{_Ghp5GSuy@9N80N&LO$f)c|hB8K)FRBNsvQ6FNo
zVw5Zy3&yZfp3;iWxHmK*>hJ1w4m{K+xgP@h|08Cous%Re8m)X@t$$I{hSsCtN-FC&
zDVu_JTQ}L*C!ehWcR7gtSjHiF%F%pirAF)PBsk215<qYF?*xp^ET>k*4#T2N8-vok
zETuvSDp)oiwo(m}*wi)4H;l)?Dcf@sYzV?|7Y)|*4W=~clPBd-74J`sS|qDvy@L}&
z6?^tuN$)PMK13J+dkW~wHC)a}GpT=Mg$=3!spRgkpWBihoy)3MZ3zyy%V(on7h|~V
zh<@^TYrLqtXnBTPT{gCbO!8jmez*XdwUOZqj|}2PQP504ukB1)5BRtRe^ZWhvSb_j
ztdc_-mZbYXip1}YOdln0e-2Q^5ccRk>%P|M?b^ovFR_&d;<~9rCs6!!TsFfO4#*Cu
z%etz~u`U5Z9pbcjFX7%J1E4tq$Kf!7wp#Q-W60cHUI{_w_^-T1WRD~X9}O3E8j3L7
zH#E1b)-?h>pxpnaeg9*E|M7cwqh8+DkN<z8ZZCxX7qo{T+~-l((|i>6K3R6R`S#s;
z@~;s9>-C57B-lIkT<~9Z6?ndP!W66JtwIcNP!%*udTd^LQrC(GCb(F$F)}<R8^0l#
ze+%YeEk76z<EJ;C{J!)B<ymr9<*O~=fA7S;A}z#^rwK;`Oo$c|9=tZY@<^aDNN*2m
z-s+NMfp$>yneTYI#_{=<1sv+hg4iYbYf&dAF@n@QJv_L~b`0Ddr~=api<(<tI8-<J
zvmv{pA`URCi@#}GPc!!QB=A~>pYL&=Ze52G_ZODiJc|Z6vv(xw0F{VvuLtWMyMMMX
zCr5#a7MZXb<61_cNNmFU3nt>t+_XkzfG~?bOt-FC5pb6*YlY234bIEzl;2WU(XY26
zc05Qld?H0yGZt}V{s4TY#HFRUrq<Vl3y+qV7sC>Yx>@>=kF`F9R7K1rz55*&iomT4
zHU0936QZB{*f_`>cyDiO{X6=84`dDocQ^O~tS7xGDB@7N^i``((x1bVdGV!i)@~(q
zn+`+?g_U0RQ!@Y;OhW)i_;j%DwMf~YCoD2htzk~X-$X2<^S(gZ{~}<J(|?<|-TG@5
z-v@ug3$%U$O=I_Aw-N4PbN=gxK6@zF0P#23a>#wh0aIso61dKDzj^+cZe^CGXN8j1
zc3&bRGF}YgsowQfmbhhZ9qXDsQVT7K%-A63Elc=T=96fb+T1`^B)&&TH|iY-qhtVM
z#iIoHaC+?L)7-QWJHZ!N{RUazcm|n;u6<)-|FJua70;K~_e4`j(#AwuEQ~}66`kB7
zz=#2DH4Vk@E+eXS%MsSjN#IWL+lYza#EY_3B7S_o*4_AGt_df-WHsp7p@tzi>%L2V
zMd*r~)TP9;{+25bHQLEf$2PX^Ny+gFjV-z{K9G68ul)GUvttyKW?mk2F3*a4lGb%>
zON5s2Qwul=6akddm`5EhZDk|d9;&8ugbLW_bKie;<awU^8L0f@M6RK=U|Oy-ImUpl
z^E6Xa573XHj*#t(#0!}!iwj#Kb4#u8Pq&4H*;55i<-n33b9qE{uXHvDxum^u!bOGX
zO$n-6;%-Cx;ZysF`&5rE2X)I)&o91?OA}@un;VYl>*UC6E!7+ndE0^`bAA(vo41l8
zc4GzNWs=^goL{)YQ9N-n0!oH>bAXke_px8cQgo@!qRURXXzF7HnvmJ_&fMem3+`wa
z-po$64s|?YM^EL_{?1x5Aanu+ycig1?OmZ<_;&R;Uz7)^skUG`-p1~27V=17xO2V(
zcETjY@%dyoICP$RFTP>drzBGj;^9NAxc>FLlXLH-lOGlZnFM&vF2;ehIjGcD81k-Q
z`rOCW3XjD)NA_<*Z0$8*0B(or<2dWNzL&~z^>&l3B`4*$Yogr;ySrN}SnDkr@L#d7
z_+MH7{~C37x78~4-&GcQM~>FN0c+vl<we!}vg?k(L6yStvKusSE`~_jIWt2JR>z{>
zZl=1W9^xgYil-xp^1k<Zld2lo`-A4lRa!{72<^+)^*$(L-BU%vHeu8xxe?a!f{W>P
zb1}_~SoZ<2&PexV*pHPBKTMARMrmZt1Gq>htGvQ)uOWA9Pv9clE1GZw<v-C&McR2N
zK9B(Z`H=2A^ESrs`!Kbkw?>SkFW`|&4z%{}*DIzrnLPwHFDAo)pjNGZGxMj~t8E0h
zLLYg;>%m;nIhA;|GRkCmkbx?*`j-X*H~{}Z`PLwjV0Xrb$)(Mhio6x>ro~WCy>UA-
zvZIT6HNUd_`6oyKz<)WwV6!2EPVr0!9V3ze6BF<lKc^ioP;((FPigU5`9IZMT7nl-
zk#IWBOgaR<KO!yII<5YBiV^8Bt92gO>jCzENLnEDRAdebGC7}tJ0HCCTDK$eTKv8M
z05QfCfb;w~(cUq2Wz|t(ExEcBb;3x_R#QK{H(-%_OD7yT)@Jhyq!B9z_5Z_1(w)_D
z%I1nDqb*wAcn<J=|H=TrYgVag!E_>K|1k+ZgGV}@0aiK;QPiSk+Xw@c-9NTOT8A4L
z0nb~vMS&?2)xG>zbh*|w|0K!wvF8j1ejC3<E0~aW^S`~?#ojL_vjt4W=Tnv`CyGXs
z@aj@lN6`=OJbc^kL|w;D*p&d1ZAZpT$La-irT>ZqGfRQz(&j-fL5wW4*zior#Mm6O
zVi=CuLPqUxJPR&>D*Hg{!4ROZQUeaLR;ud}ci12tE%CuIH!^!ne{&d>cze-#2iTBs
zt<i}268=dq453XXu7(mT^KM0+-hJAY8QXs@+c`wrF2deTrDXMoW=&5ifd@b0BetjN
zn*N^d`h!cSvbx4jhbpkX#d>?tFDc3!MFum=w0jVjZdEbMkt$ZiZ}KCxj1CCXOyOp*
zUX-O)FD;gN6&UND5L4swXDRi2`@ntP^n2>5lMZy2s40*g=U~5RWxX-BXY;w98448o
z4+%yr7C!-}opg(AqvYTyeIVU`Rp7+=<bRhNqB8$~*J=N|r~h}jm`{Ho{=G!0vjcu$
z@y~H##(q5=dCK}%A+tgi3Z#VHz;9<BQv~53aKHM?1yG5ssG7G{ePljyp#nOT6!+3u
zF@JO8?R>*w&W~hI#c1ztwN;@Ls2&*y{-m}~UOas~^#MWd#p5ZZhjoF}^nsTw|7su$
zy2@0$nvmq5^rx>i_z}qiGP8A*KaUKyG{U75z!}<&=z}d-LQ4B$#=wsZBE89u7NfF&
z`>tePBbv#@Gh|-0(WSpmxk5{$ArRls3w?RRmk+-bWmYO(^n=7XHCo<Y1_R~ODTui4
z)wc#HV^ukh`&KxmU2BknkXQ%#|5Ms~hr<<q?ZQG3(SqnL4bh`TCq;=wNF)fOC4%Uq
zmr)}kB#7RL2ohz~XrqkiAw(Tz%#4=NjXG-P>_L9#{l4q{zUw{L@yFgXWAFX+^{jQT
zd#}~@UV8THRWLhQ;E>bsgUke-Okm3%o95o>UWYzX@<KrT9<`ZHO+>CV(q~wPgA<LS
z0`3*zhhOnHm&9Qs{=~T6MCkuSZ}du>+Adi+r1;(>mYvEw?om7pd&=LdC>NG30aZeQ
z_lyu&P)fA(+~RxI`<YB-3sg#giSMJrT~FH<Qx~V%ZDis>!s5U<MZz<zH1o>yMcmpi
zZ-dGS0W42}@|n}g;HHNO(4DFz=TVvUFdk5@x#3QcA7T?rFnfbOC=#8`o)DVGa*AJ$
z8~sM{ONutwUhc7_$OrYXb<+(aU}<+QuOeJ;?x26Bl8et>6MNap)%Q|c<@!eA{&QkC
z^<@xc{(VB?m4(ILu}~*<u<tyD2-%y7Lbc@D0an}K2VS*T%2yuQ>gr+`+=ukFH_{!5
zN+Z9prd6hLcJHT_C-3S34EuCus$kDT^?GZa6o-tbO?Yp2E{yE#MBZB(9k_V+8b_#=
zYu}w{N>2Upv1yO$^d|tCvb?(fzt{eQp9aCY>z6+T+IS^AK-8T>5>3A>MIz0`bmpg4
zmzHq7u+npOqZ)cX_U=wb!&LQTaqU;8_=CjU(B*ql&I>$9ZEC4ueQ_V(&kNyJOQhA3
zXVIUF?KMjWz8}kk*{io;*!&AMo(a0irFji!Hh<Px5G4fm4w3qR1pN06^OF%FlVPQI
zVI>}KYtNOHy$a57Ug6<d1GciP4Dq!T$K8M*B3qh2tEcWs_C+nCYXu_P_6IA56r&eL
zJvDTLs!jz&TaVJXYo;;g)|P!rDL*gS0j#Mx<}S!RuTIB-NN#hx3Yf0mH~TFFgaEnG
zkWfICGj?#_T4mu+qeE@ok2#dALyY2;)!<O+DJO=)JTDMk4uHBxu=0y^u=}X(d~@5|
zM7LYbRDMx!RYkc7Bfw~#gsQ7<0LAS!aa7BQqgtyK?U<&BmC{kM{KzS#&Xd!ZTA)Hf
zxK1+w%q$iB|DE(mk?Jn~&n~-;6C5%mT*hmNooWxeM|`+>!L0iSx%!~8rp*gg2dE*p
zxxWnm;6QvFyqNmB%MPFFh13f@FQtR{7Ayc^1UMv)nJ%lh_&LZ$(z5e5hEP+C-$XEw
zC&u##8p#{3f7`xOTBO`q1T33xD{O~dZXBgwW*9$E**}UKqHJ!5->ajWRG~6<{c=QB
zn_2CUrqrSqGP+zm<lnRTp1_`VX!HEjz04jc0fAWUkf9d)-0V~&=-<oE;!RC?5OrU<
zNy&%kc=CfDWBlFKbr$2I%a80+?%@WTC!pXj57O^ha)kH9Y%SJtB$T+(EiKulTSihs
zCAwtLGv8}?=ocFRg?x1N;88T13hBCi;a$yA)eAS%Tnb@%=i7i&d&Cv3n^>ViRyD6l
z{m;(14qo$PKv{)+3*UZ!18{lf6k~9YOWtm|-|@L$SsL6#z4anTbl66vKM}I59fFDz
z#LY!wznFAOcDdE6vZTMW((_V`^0^`m-Hl_c@Z)mK)qRz@rKtMg)N8woWT`<vk@F93
z`E)hG98@#I$g4ysbF88I3Rll$9}sovk`#`r?o{9#V>0l(CV476a39*wCY7g`W?#W#
z)YIuQwesHA{6>q#_JJ0|5<c$VTf4;{4h|w}%~^586`BBO4Og1eP3H~H=7%}KB`>_l
zUmmHz&pKLc-7|h81deQ5QNSZFlJ@<5_wG{;^v*_Ytcv*S{TC~AefNDH9F|_tco?h#
za+xi`{xeP`g6;9&@5@4vu+~}?(q?vSfVU&-{)A!I_smyLMtx5)A&pnMD!hjcxaiGV
zw_kC!$Cj&MbZQ6oo2<M3NTmY2Pqh~;A8T$HQ6smfj`>-7#AV(i<`k2ztizS{dl(tU
zXsVGYh_D(T$T0LIAp#CFuf+WC^qSsH9Zk`wUE6DapwO66FcHo+pmtEIwm3{qMy+_C
zwG+0jHfV`yXw)OBDt=K!v%jw)Ui&{9M&*G5U)_TXPvP9YzW}`Q=W;dN%4h6YZAe^Q
zj}0j$Y3-AqU)~XiHMOm;8u%n?2T=e0m7<0y>K;R(Yw2Y&$<spt>p;cu7~*H5_557!
zJ|$hP#~s&YFPZX7n+?<}K>;<zvBz~j#e@|+#iUpbClxsGIW8*kV`D3jGR~Dv<a|3G
z%-iijpq}+95(5@-SL+tUqL`aG4T|VA&ANL+9~7}Ku;5pqgIad0@*4BHVNFW;f7#rq
z*(3vKB!!@PsFee8J**PfLl!&#>zPT-$L2?n$#-*q+doxoQGHvg>#ca#3aFdQ@hq^Y
z_orY|U@1UiM8xV9JBP^MlKu*7vGS}~qx(y8x~0+A!4vLzv!O$Cl0j?`spQ|xCiI#o
z`%%~b#0J3z91Coz?#YGfT>a4@R~mrma<gu50`)t(llDLQ@SBDo6$3iCecw7a0f@&c
z1ojS6IE?%c;#eVTCBd*;NIf?mM@vQoTS%Mm#7@Z<e8AM6`dWR}|0j|Bxb0o*9pe<C
z*N<a%O5IZ4&P*5`J#v&ZSJ%iCGxYNN3ey7Z@3j#=;5mG8{=Ev3&E|N`qGtx7{&&6N
zPca#QkasuCj@q9{eVOxi+3pw}++at6)l^Cr<+OdX+?nx2SR%T@OMwVWl*T_)^m^{m
zMk*iR{i}=0W51tHbWt#VhLwZD0`P_XgC)R_1hb_2f!qK(+jjLu&v&|!D*TpMY_WS`
zeVzpau)*``er<5L12`|kCo-xXIGwDA7H-W`0OS<U`M!3yOK*BePSkAN#dfx5-{Q~H
zFrK%gS&fH3d<zep<B*k|$6d6`1Vd8V*HM+5H*~@@o~IzCX0Qp|9lHOq-c*L3X7*<|
z-WaV?Z(B?x0t0;f-gLoa47*EaT|$<o*xatOVwN~EmUEW}PjE_|7jf&$hX9>A^~?($
zu9ZU@JD1Y6qO%kdrB8cPNCTnr`EX{-cAP2BUK+5WjPPoM9=@`ITR6e2fJ@Jk8Bb@B
ziN?s3|A@>VZe`=8S@qQ2Pv=1G)%kp2BDwG7heM8wD+Y)%&*EeAo~wzehUoEEIRms8
zt09&!92i^qW7Do(Lo5pjS93wpsv6EKh<+P)*AQF>W9DO@L}DL01s~{RB*Pze%Majf
zxYitEUDN06#u`Z1Z`X=3p<mQUosL6o!eTX>RHp^k8S`(#XnR`II@CcS_zrARAS#%$
zfchy0&PJ*d4M~U1i@Jx-)K=*Yj}ThyAvN(I{*7ab#Ru~4atoTj5?|7vN+xrhw(!58
zfB%&-cY^i)x4^cf+o_TtUS`2A)n#ici6?22J+Xieo5wrn*qk^HMF9V~Y4hVA(z?mT
z`f@S0o}k@JiPzA3s)`zw_07Ga&m^a0eQbvfXw;aJc~)s{S6Nmg-ShbU=4okHPT>SM
zci~~?%mhy%e=$qpVPlh<$)?)(sx*!~HuZZ*p~c3<>_|>rZ<45`^AG+ZW9z2CW@_(}
z=e#@B%Rf>FLglaI{8Ac7bJY!;c-Lx&rSm%R2~u894sWXaO=T?^G{(35hKsv-`6Ks=
zL)|qEvW+Md3RGw602p^y7B^W;Xud;#<c#ZO?KwlTvL}XkqWDj3Q2Kjv{W9e5r90n6
zHvjGyUAV-5>;`P{&~3o#J1ld$P*tH%$Zs)AP1S3ne{G7MeIKSvd|?WwbI$byHO-C%
zL9=<0<7>{ERts+93T6O=E&K%2=g<P^ZUa{Fy2EphzYm&c7{z3c0xSU_?-pp52{vxX
zq8c3;%y8X+EdcH7|7Ut5x}PZu7BJ!A*io9Z@3r4c)H_Jjns%n<tT@3}a-y<(MUAj;
z>4y2xR`gD(3x|Ih4)93|8nJ!F+T>sRE5|``+JW~8tLzN3JmX-F6QfV1njA{ApICbb
zvNOVLkBd1qWoEs7Hu)}j$vvjJEM$u0pN=(Z8$Wu-w$Ps7R)TPB1H4HqKxBtugU=C=
z!Cv>Ioe~a;r<h)4?@1W5Ot0qax1zr^mKIl463e%^@wwBPnlrutO1sqHoiGGi^1hPS
zRP5Q{T%}%;{dk5oEu%?uYbLwVBHOGwyi<N}C183@9G~}AjmyW-+kR_L=YyAFDf`i*
ztEXOGaU2+;zrR1vuy-Jsglqr3EI1VY=t&1z-{Ktv<d1&Fkm7W+hR;Yl3Zx(*%$IRS
z_y`Gr%^S#We$h$s*MT7zz=@zYpk+O$qkK{LP3j8<TcL09!ghGeOI&@)BnESxn<jNA
zn`^TL^-Y@-_lvgHrY@|sFxFxV8WHscGarT8_n#o77gKNes`04~qRk~1=%dK8<uFkl
ze?NKVoN$E&ak$GRQv9e8>bo{z1#kYnHTB(wzHy(oPJq1wRq`#8YM}SbQooj$fbhlu
z3_RC^&WL*|qJ#zOc~hZhRBj4wFv7boHfl-$&XjuU>#mozboF_u?YDQE^|vV~V!#&@
zwUP)67{}{Ejwuo)rn?A|)<&quL!SDSbvot8J-c{BqTl+RqwA?bI~4PQ^e1c8&xzXa
z>o*fVY^RdV{tIhT*3Zp1<F&7gJC6y-IoE=U2eVrL{M}9d3*-Ett`2wVVWXHpjBOiF
zhmk*cOTLQyfwvLADwQ1%_h|R)u`T00M+o{$&yzH=ANoW^9>E;>dE&_@UVbUUQHNDZ
zhUa(PBhab2jAX8<V)3Y#o^`MAJ<wRD)sb$yz_9QwJs0A4KDhAX<Oa=@x0kTciiA_j
zvpIJUn_|bC{TFn0vTnDgDhCTdrC}YPCOh4hwVZ3)BWa<Ogb#z+{arr|gZqRPN#gop
zxK!sXZMH*?8GX|vv#A5*w&Ftq-ix{(ozn3U@-3Op=n>{r6aY3}*r3b-0D>hU&A?HU
zuRltfFtx<*eoF5iCe<}5TYB^-_K(+&GT^XSrl(4=3Sf#TLhDR=i6kbM!6$hs6#j_B
zX3B*qON<MYCn#9CJ3B8o&DEK!D&?`%INh1CQ@7NH!E*U{bPk8m=7AF*pLDe8Q(9aW
zP@oXAI_-<}@lN$5j$&MWsszgc6_g#(DnWcDL|G0+pgnAi7%J=BhGfV%cISW279LI=
zS$9k@m?pjNo)a&o#(4Qx1z?-#?C`eHtqBVm+SD6G5x1AC3s?nM3HvU<Yy2KIwb!nF
znPbaYZ~!0J4`ZGH?YyX{){7dn>>T$U@#S4}0;1BiPr3n~W@{1Cu$AGIMXV@(nQ+*#
zm1E`G1cX@|ce~v5M3Ru1k@dV{&Fx_?WrT{Z^)lzbp+w)`27O3zSddY4^@tV8u5-8@
zPEYytrKEkGr>a6#y!E+}PY7(+Goi#=4qrh@YVukmk)V_pjz;+ihwzmSnH<xt{oqfe
ztP&C0`J<r^+Y$g*vAwn#!UT^7^nRRRkydr0m0sFxil4B)DX2uMZ?K{-_irNX0Z3IW
z@91F3pg;)6rL~lcSE~PW?Q{n^LvQ`!gVbL;8rRDRQMdd%H`YDv3ow^!vlN-!ceeAJ
zo94XJW#%9?i;=L9ls5Eb&w}6?^r<Mh2L24nU#!^?Uq1pxu)IoA`N#Njd#g4&M&CeS
z39xO|ap848<*ulNu~VDJh&~Clebzs9u-$M<9RC0H6$7@+F+|lHX%aP+*WC9yoT8tZ
zt8MwxM2rHg{OHG}<GO&Ia_dgC%Gw{sX2)Bfr~CnN>!Yhn5JE_v`cgtt0L3!Hf}bqe
z^an?o!%eWJBGK#zU^0LgU+!G3_%e^UMP2Vg^48<uE@k@m6^@Q#=>*0B?&Qu*S=S@{
zP6MD*G8a~jAAAI{mbQSx`E+W<eQtiTpQo(eIhc4X*g)oaDV|9C9w1E$;?bmY)Jl5X
zs88m3_~Nvt=S^~6*iuh^s)mj-;6bC6n^Ls5%Io(SKXMB_B}W<TznN@v1ZX5jip<``
zJtO&?-T7r#vyzF3mBwxMV4X{9(IW*lvMb0?8J&8ZxeU!$cm@Pl=Ot{H9(|VT>1%Vw
zlLi5_th=suMN9c3JMdRg64H?KeCH8C2_VdPTgGH46yH;*KvnbEMQdIsGLcWBPSo(#
zL!VWvIF?;jj(9bdo0WJBEA_wOoVsgfqg_wQ`nDJ2j?>;izsEtczHib@W@f@CeYT#}
zH5fX!HLn5&N96{G*8yOjb+$fZ=*pi{our|*{Sj6mojxyq{vVJHV2l|{ss%l6x#HIR
z;L98i-4RV0)yquj)g(k~u5O`3M>$;7aIIPV?7v$~O%Vv13wGjh^{7S$MV+cVwk!SD
zMRHsLtL@v_OwpGiWv|Y4z(9`|KDek>PDwMiaPP>$&>83x;xYpeQs-o{r+0TMq(j$<
zxS~&qboV;-PT4?K=6s$jV8iNKv)24akg?Q+N~5)S!Ur7#?{$i7rrl!#G^c~8HpV8C
zf23<!*KdF~>I-wGq0~*+y|ai9_S4Dffi9=0l)3uiv)O%RJ;2v*QJpEwQKwgI%Z<)7
z^n|lG01_#keQu3!^ZzB2payu0K|T3^FMga+U$T~#8?7<<a4MH$S_BvJSaK{oZCit&
zsVpVq5#22DyWm@)A{8U{_#Ddzwr?$Hef={(<i4P4eOu?Dl^XYQvL>N6vEC|UY5%=F
zekQeF%=hTlqhQ``Yn>PWCOv><%gvzMFR{8#N_q*MZGSm=RnVr)sE_a89Qto`+<y!5
zzj<dwMdsLEJAT_TJ-I6>FJ-H|YV6j}y3_J>f&*pwv1`e1#kt#a-X~e*=KuXp!MT$T
zPf7lhF)Z!paZXgADJyq_#<S^&k>}guU2lGTv>AMQR*|r2$RH{X#yk+o#HA_W4X#F+
zJbZcR*)a=*PQ=ehXKgpF^XiJW5gKMnTn{ht^XE|`I&N@1c=tshk8niz8@RF7_W0PW
zN+2+KQTt(y<TE9?R|(WSkX(u;vs$ul1Lx|&pTAsn^cDh^YrgE+2$=GyyOb}hD-!xd
z685gDJgeZ@V-As%3xO=D8b@~|a^EU+bFvvs>ODZrsH&)j)@7hAe1_41(S)oF$nO=h
zh#5IwUI*P9O|2Jf=&T{l%W@TtQmO2{2C#huYTUC=U~i;d`N$CRVsj?X8Rml^c<t}4
zsJhndyBH{6|5cqv3*+|Q71mJ}j+7GrIWai`BHs=&4@m1PWjHSfKV$ZYaUJL1x?vxq
zD)_dwr{^ZJKpuAfzQ%P738nYyHvU~spX9VmQY+<VPmd%j2|bc-TFXF9ywTWfGaQHW
z|N8}3T;HrH)onA>f|s!|u$70OQE@%vyuPy47kDHYnL>;5|2r`~@rQ&`4$f!Wc@`W*
zW)gdHB%wS0LOeZ)Jw7tR&k(;HpR`Vnq(EVGU@hWF?DR;+bo|r*=l_XCoe^8GdG4Z(
zgvbu0UyaG*U7iwY5)EXDC*i`7Bn?$Z8hZ&16otgFWW2B3dZBCmzE?BVO}gEoj)Yhx
zJ#-@f+Pg}egY#wUO<m2@I%=RhYKE|9>Z=(lx)hJAdQz{T2mj6_vO#2AnB!*rm$P0s
zN#pFDFKyVXq6(b0Qz-=*#e0yAHr9Q*4nE*FCBsd>L=%$ZCQ@Nc|K{^;3XLgJ|B)-d
z8r7#s)sl2hiurAJXT4;Ek-T*yQ$<@(rA1=O%J-gY3Ky<@XUJX5T3zs1iDGJAcU&YC
z+O_ngjV!Yq<{dQ1E{4VR(+Siv^rC#jDdYr;!LGh4DXcA{WUt>SU#!{aT?maEClzS;
zwPWJ^X!_K<1FTi@D+5Jha<HZKkj3|}c+*<P4tO!h6{^Z;v*r@BqL8>r%O6K_8@;?i
zas7hjiJfZ|ly7I_&gqC^kSTGlepj78=KOm(lC=819E>xngw-+b!LGT8$~jP|$qkE`
z3HulXtG&Pde3Smb-jQo#pQ1+LQl-J+!mf0$Y3(^1bEfnjI=Md64$?Px=dLmqnDuuq
z-xA##)t2!?gJO_=R*56wHaAn@*5*r-sJY(<Rg@=oHWM!(<Kw1K8rPyl;d~onnW7@W
z6%BV@oYjp+wL+&g<k(Faxh1RUdV4wKv=|lfEm}?tS{i(5C^{S625#Mggs*Qa9{km@
zEjOqyVGMrvbHA=J^J#Ba&7_CkHg9vZzvRtYb{)G3A^BMoooWNz$h2;p%N}&JSn(tB
zA}k4cM!95fMMWlBhw`Oo_$cMEPg3_4uvvW9lbKTXr>%Hojgw_wYSeK2272jv|DD{R
zTCZZ%mHBT2tPJOA?3X4pI{vO+?kZOb!4wDjw$scfbDuf;2g4^B%Ii!$<#0B+-e2pB
zsj$4YLHBc2Y(`o#33#;z&BIn%hjMHEC2@c$IE3{BL@<6Q@eauz9aM94T*1oiRw0*T
zSw(f3N(d*Qq5V75D_c85(Qequtf^WwQ#5uf6f8oTq*%TBX?m7STaBEZgX80p9j+p0
z^M(O<b%S;&E3N%?3P+#Q3cOoDVEOj*J+jIyNYKt8E5?BqBlM<=6I^8o&9H>jo<pw6
z_$>zM?-)&jW9eF5m%qjw&{^IT`rGd&+aE|Uf5ftNn5l5!cRbaY?l2l-*d2E_Fp$TB
z5k>f$3y0-i+QwlYQeI2SdzxG`vU1$|W%w|Dtx(Q#gPYrdVal+!Bf$4(l+4A%uHDP&
zE^%+B911J#d_d`b)%rzocU2~qyguVOURRWioo#GMo9TDIg;iAF@xM3p@J@1vQ<p9E
zhQ={?BJk!~0X%GSWY>$nH~C^T?V?|e*lq-;)R!i6q;UUBW}76%CKG()cT`|Sv62v)
zS-RfH$!+9-W75*ow6=O&XPjQ3VMb!l02-GgqJyDyM@@_$H12ZEU0DjWlu?KfR>vr?
zo^rdcWrOBToj|^4;LAtUb+3A6O>VG(lrxdj#b2JJInMd&6?YC?1#><z$u1nxhnodE
zQ>pOddiBpX8b`?m^A0-Q4iPPy;Q5iFDPQ&UlQub2bk`o=uX;21lN!Nl@8IXdL($rP
z6((UYFv38qR<GP_avUC)uw!hy!clO)vb<{1)4W1|0>ZgITxEOROP73V*A6*6)0;S$
z9CX90&-D9hf-~%=SHgKE2ghCiNFnnzu3cYwRBZ_PQH-SxpXT>s>A-D%mTBX8@k#UY
z^%B+zJ1_Hu$jJtD6?DwZ?ccnrk1VpdF4V=YbVbRNX>GUVtDFbDO@7|G-SdodxO2T?
zEmm8z>R+ltT|DW;u$3G;`W;=>l0xXj(X!9y8ERBhufFyr_$UqfJUh$zp#+ZT%GN)8
z%o%-7;ZWeCq&Jyi4*vU%Zxe%RLnXDb)%qI(CDRLVtD#8$Al$ZnRm1XH$jN+){rw0t
za=&-Q3vWh15`G&bLY}EvJ&ybp*~HL3d`{_&cvkc(rSp%zsG}A~Q$v;!V|%l+hZT<%
zM;;lk7_2nLNxhQ@F<-;M?wI-AuofOebeC1r1uEb&&nswLdu?QhK{(Lwt!nr=V;Xrj
zZ$K1_CMHj2)3yF=xae}RmA}*X!j*Mi7IIvntR}8ImcjmUzSn5LQl+Qi2-<Hj+MFfS
z-TZsFG7JP-7XsP8w{dSr<^ACqtX=fv%rD-vIocft1^6Ab8AJAdqI?yhn`5@c_SnwF
z?<<y#Jhfq;W*5p>eDop}+gEdC_otJM4<EH3mfv{8t8D1_gw%I6oZ)0Rw7jo_sV6oa
zuk<dKC5+dp3zs0GRI{<B{S$jdVsY8$cfvc&a`#&Uo6Lq?X(rC&)6J+F8vCG#O>)o4
zcGpg{yuW9lJV!%fw^>pFVxCPgaUp;uoTvNwM&7Yh|JWKvijP3P<azJW8#ok3{$6)p
zMRv<*w_6+NjY9$(Ab}~4$p=|V|4?jTb^`MGgk|s#w<pfmQ?kJE>u)rtbLn&!`Y)Ov
za3QHU+ZT7$lv3F?N5PZ5<-*3ov;%YS8dPfCPsvB(JjDtOX?9w|?BJY$Gfhfsb-a;G
z@2+>*cbX<)Dk6y(;9~8$r$mZO89LLqjOjnz3m{!j`Wdq7wa>e=81gpzI>qZtfl&+L
zEAHn@EOyl$H5ATQAIH@@iIzu<t5*|5b{t;sB#PeuY1lon|3~z_|MBxmnAXv2h%2AZ
zlt#TvM%Ve*lbgV$Du8c2NC9F1KmB2nXPWv{H9^iz1Oghh<^@sWS#hnc99$TR>d5if
zS)Mq5hmGX31tGG4?wR(xhqL_2Ze^$dIuu!_r}f>6+_52tCAMZ3+zufW3!f_}i;u<1
z=KE3BG}k7K{dQQmM`$FkKYE9?lL%W?B`MFn+YW+H(C?{|d|-AuLrDU}C?vT6gefFB
zLm71D91vF#=p&%RfDhg+B)8xQH0#b{ux9zCsL$S|RgM!?j`r5$f424q*J`yIzKo0v
zWz5c+n;ylx;}0`S#U6!dj6u={!v3VY^>(SSvx$gwwg*yx$A6)2|DocU<ytE2fl(mk
zvB(Z~oW++SB>}~dY#8AjM(MYmQ+;q%03A5WN885?@vRTV8JOHFkJY=s({-z$Tg~@S
z9&RP%__3_%BF;}mRW+$w^o1CK3*(-MhyKoB16xP$jq~QY_14D6`b*xRP-62@w+5bO
z#MzTUcoL-Qv+;5VOOkJDa!3N{kb;lF9!6i+lvx}Q4onuDOLx=RAt$qsr@o2mC877^
z`IwtUW<o)@fYHrT$ygVJ8<p5J@KL1q;`Uv=Yr;${-xLgGC;h$g<fl9~eK|*`6s&gh
z=e;@+DNDFjfy2>7O!+R1gqMRObzcykQuqRHtJ=Xk*n+#1^b9?4ci@J;chfJwDf&Tq
ztjYbZMhgqR<lRRaKkugqDq6jwkt^Q6h>_e&BeBu>djafJ^)b;Zr~+kj{i5gMAElnh
zVt%RH>O0PoyuU9bj5$kW9<;dk$|vcSi?e-gy6k)5L;ZCrt9+V-TuB)+laYZR^k<TO
znV&WBKPM-f%1YMz5V2rg8N#_Xb0(@(rOk!)8QQ`>I`eT%>T=}%>4S7B^dyqKbx-T_
zRV4RUxeSHLPQW?2hr8D>TuOiM!qH`31`Vm4w=dF20e=GBJv}`ip8wqhUdp_e(Y0G4
zTcRR7Y{q|(jg(ve#S;hD%~aZZaTsK{cX_=LzY!MDC7x|1wqC~V!D5mz-<SeqRrvEp
z;r9}aT+|RFD>D49i=a+hu^bEHK1QyFSq{p>?5)JEBoZtY%^%z`;k?oEIyyvrdNXmz
z2pk#P@1eP#DW-((k$--YT|?LYO;K;qj1E`CgTZgkz$1Y8_iY3aX8l*@Y+Bod_*PX}
z*?DMG?65{v&k;I#@HE2)X%Vf1#~T{2ovP9)V<1C<0F@HT$A(#M(n&dZkh_E4)~0zl
zTnFOk__CXP)e!4`lB*(&ERCW{bn%w64ctXIYK7_~Cj%5dL%kXYXTO9^`%T+nSM5n`
zr`^jOn3&t)ft$+#``b}}DeN0!vWqY>k9Sl~tub~MPbhsA$ugn-9QbJqDlS=F7H`vh
zp<sHC&y){_I`b6dKsIb<0-=~Rd4ba;8_$QEhT(6e!W4e<;jAMUi>cFBs}K1v4rVRM
zl=rK5s2C16+jE%CylhNy`vIiKXz#GwH`!iu|C7`}ant0zn~OMIrU<xGx2_5LgfBk7
z*#B#c=x&~vd%s*tUH@tIJb>g7MPlIQl)JPJH7wW>nF2X>*_rvr!G%l>0yy8V;ft6C
z>AIcIPvH1p=}g2-C0RRJ_yKG|AmXmJFVOGr&ju(uzltw{KG7Gb>m}zc2$AZ}Bi@lz
z?4ao<6)Dl)Lxs#=u^$hFZprs@6$CDE;XL2a$lAXVArF8UVjKnPJU>@^fOGq8LlI`~
z3d<KmDPdiN18WY;4=GGQh6<tm_Q>(TD5(S$=Oy%bFv{~2x*R?nZszqF;RD?D-9Tm+
zsxc+6SA~!rWV7r^hx^NwYM|xxmY%rSC=yJ)J{6Mrm&3CW;m}aA25ALu_wOmis~YrG
z6tI7_3nN=v-5jrfs|Z<e69q4Le43djoKvdFIbUBKV$V~b*FPMI(wIs?oAVS=-K3cK
zcUuyjNu17M6|4WuK&lGj&<jL>l6H&{809pa$)O6~kjk%B<=daZ8wU!QYuF#Md;e+C
zB8Cw;`o8hIf3fnNr`u}=m>S<ln1T@c-2MscDvr>?tEO&KUubv9{uLBPCWDXUoS26>
znsMIGD*UUg1ze3En0J&)`wXsIc=of`Ax&=~w&pn1jr?UFVUH-z!I(9neWx^p?}FQK
zlO{PGqjzx#z4}x^=u!}q^|&;kc9}I5#(0;?gBHEYGWZR9xVr|8b+BEchcGS^TBq5R
z0@e2Jtk>q#ZUK?if$tH4(Mf@=-KsPGfo)5H(ZE7%$Iu{y?+)-aO|fu=*bm5~^FyF{
zabjO`bY_a&5w}g=4g$H53S(q}yfz%1Eino;XT8KC8YlLvS!zC<uYZ_hFAU-Yn%a;z
zutz?&rf|(AV&8{<F-nQoBM^K&3>95*n89S?8ojJer$!HLT|!LHd1!G@`>WntUEjbG
z(;%^FafD$QyEr<&*h4WqK=vnvI46au!U3ZL7dEjL+ZxAvC^-h%k)c|JzKMCz1Y&$^
zuLe#zFmGr5<f574fW1&gu={XJVXM~Vm()i;kx7ka{c<3?*UAx{n-?o`e6n@^4E7qS
zV`CL`)l6P?x*3*49=H0#baZ#DM|gSPG!NIC_h3dRz1EE0@o!%_^QUfdg)M>25~>$b
za^-ow_E>o*$5dbdHXGsD%r(S<3)9A=Sy6cd5Jmw)3A@Yqf}4(?W9jWHefi0z%_zTe
z`A?lnDg-uGi9r?tAI6{WA#bTgn~yuYlXKzYpd5MiapExb@rBPv3wfqB_ov&R*U$h3
z|MH!w&#a#qs{PZr^hd@71nYxsuL*&_k~-($%tY%S=HjnGQ{~zq3b<D}0>yCN6p*dK
zgV{<XC8(fh^HzL=(mI%-!aCrcz-0{S=F77txZ@7?Aq(piSV#<6NcCUHRMsDtJ8!6k
zTqtE;s9XbcL0fzZeDJfAdA$?kUgG<!(xqCMmdD;8>b2Yfd*%8BxlJc`RKH3eP5S3`
zp$$J@qq|49B>VEyiW%#^&<$~4^P=MMzRy7vTY`<F!df#Ikynf!jLMy3)gqQNRV3u3
zKDkh%3+7q1pEF%TH4OPYIpBHU7)EYp^P@v=L4P`;wQKW9QT|L+mCwLArI@EN*ujX!
zneJ<D>VFs&ew_iv?bfB*yY&r|KoLOT)Q?~0n7cTz_eLWs`5aAh6=dlOr`ug>=&(~j
zHY59p`oj7SJ?tePbSxb5*jqfI@!s^sg^Iyd4{OxL$Op6XOn9R_&c<mferm#lr^0>j
zzw7B?yEI==a!>|QI|8#&Tm3Jbk5MKnrpSe!PS253cIvuGXa$&+uEmP6`m<Ad(kg_R
zRV>y^zylT87<N{LF%<t~;Vz@0C5SG+>1ob-W~bl=mVDPl68lZ#PM^UcU&O#|*CfpC
z&%DGgiV?r|O3OF^czE=i$hd2c#77(IB4rlagKHkq+P7@*=w!59@zIU?k#OG}SV|kQ
z-r^i3R|J0DifQ_pF0B^X8+<XeRjl>_F18+6Ia18X%eNm4Fv|4C1YWe7$rEx!hPD*c
zKpx{&S0*OxW^Y}*`&fuT=x_14@GfNhaRD~dada)k#M;QJ8pp%Qi>u1n^z~Q79Gwrm
z<Hz&!Af|4l<`Q0Ag&xnnS^J)0ev>gMXSGz<jrGe`B>$BwcCL44BR+W+bzBKn){q~!
zOcr-)E*@Ud1TtGPp;q>xXPg=EtP_7C70hR-T)B(;GJYPm_^0%R5NvbAMney-%{FlW
zF{VLR%x5DlMU(t&qfIT7qkb|W8|ykWAkT~256<J<<58EOGSKK0$4-yR)nxk==imOh
z&d7vM0zmO@cW(|fLYYP_6LXaF_-eK#B#Kul)&wz=q^PR_WVL4Q50Vw<qv|ZO&K_Qy
zKPhXvy_5U-iiJRBM<uAH1eZDDVL<1t=6C;{bLY`3f6K<(UPIiTQz}$Gx)=x#1H<F;
z7DpGi*^i|t3+Kv?8bffC@g$YA{*)+uf=`97m9ta!58b|oX{q9BloA6&Kde^tj`1Vs
zBJSl#PcnQv2#oJOV8p%IwfU$^S9=3*CH7l(F>YqH6GEo~T>Yf$<H`rl*=N)a=HquD
zya|C6`1S)j-1K!*`DxKv+XR8%`1@W+<=eVyYFkcSY_gpQ4^qYA6$+<0FhmAP=Uveb
z>NI~2<=Uo&kfO4I4)K+(wjx`3Bv7P(2lg6fK1q7Wv(B>d!H43A%2W3@69dE1a=9Y=
z;#to-u(z-dm}Y%geFqX~aRY6AQvcdjphrKr#BnXrdPaNFR(pA5aBPrn()zwuzDlgY
zfm@v95a%+7qemu$prFo6JI}dIvCB_rXJla5-u0~2r&=O)@CcwpD$nxG(?L?;K!x^2
vWo|M*DjdWgK;6bDfhGqI)h_SvpJ^Q)e!S-uU<;&YCDBsXQG?#Gc>TWshhb~F

diff --git a/docs/images/wordpress-welcome.png b/docs/images/wordpress-welcome.png
deleted file mode 100644
index c9ba20368c55c34b18cc6a37ed1e5d3d37aa1a60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 62063
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

diff --git a/docs/index.md b/docs/index.md
deleted file mode 100644
index f1b71079..00000000
--- a/docs/index.md
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--[metadata]>
-+++
-title = "Docker Compose"
-description = "Introduction and Overview of Compose"
-keywords = ["documentation, docs,  docker, compose, orchestration,  containers"]
-[menu.main]
-identifier="workw_compose"
-weight=-70
-+++
-<![end-metadata]-->
-
-
-# Docker Compose
-
-Compose is a tool for defining and running multi-container Docker applications. To learn more about Compose refer to the following documentation:
-
-- [Compose Overview](overview.md)
-- [Install Compose](install.md)
-- [Getting Started](gettingstarted.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
-- [Frequently asked questions](faq.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
-- [Environment file](env-file.md)
-
-To see a detailed list of changes for past and current releases of Docker
-Compose, please refer to the
-[CHANGELOG](https://github.com/docker/compose/blob/master/CHANGELOG.md).
diff --git a/docs/install.md b/docs/install.md
deleted file mode 100644
index bb7f07b3..00000000
--- a/docs/install.md
+++ /dev/null
@@ -1,136 +0,0 @@
-<!--[metadata]>
-+++
-title = "Install Compose"
-description = "How to install Docker Compose"
-keywords = ["compose, orchestration, install, installation, docker, documentation"]
-[menu.main]
-parent="workw_compose"
-weight=-90
-+++
-<![end-metadata]-->
-
-
-# Install Docker Compose
-
-You can run Compose on OS X, Windows and 64-bit Linux. To install it, you'll need to install Docker first.
-
-To install Compose, do the following:
-
-1. Install Docker Engine:
-
-     * <a href="/engine/installation/mac/" target="_blank">Mac OS X installation</a>
-
-     * <a href="/engine/installation/windows/" target="_blank">Windows installation</a>
-
-     * <a href="/engine/installation/ubuntulinux/" target="_blank">Ubuntu installation</a>
-
-     * <a href="/engine/installation/" target="_blank">other system installations</a>
-
-2. The Docker Toolbox installation includes both Engine and Compose, so Mac and Windows users are done installing. Others should continue to the next step.
-
-3. Go to the <a href="https://github.com/docker/compose/releases" target="_blank">Compose repository release page on GitHub</a>.
-
-4. Follow the instructions from the release page and run the `curl` command,
-which the release page specifies, in your terminal.
-
-     > Note: If you get a "Permission denied" error, your `/usr/local/bin` directory
-     probably isn't writable and you'll need to install Compose as the superuser. Run
-     `sudo -i`, then the two commands below, then `exit`.
-
-     The following is an example command illustrating the format:
-
-        curl -L https://github.com/docker/compose/releases/download/1.8.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
-
-     If you have problems installing with `curl`, see
-     [Alternative Install Options](#alternative-install-options).
-
-5. Apply executable permissions to the binary:
-
-        $ chmod +x /usr/local/bin/docker-compose
-
-6.  Optionally, install [command completion](completion.md) for the
-`bash` and `zsh` shell.
-
-7. Test the installation.
-
-        $ docker-compose --version
-        docker-compose version: 1.8.0
-
-
-## Alternative install options
-
-### Install using pip
-
-Compose can be installed from [pypi](https://pypi.python.org/pypi/docker-compose)
-using `pip`.  If you install using `pip` it is highly recommended that you use a
-[virtualenv](https://virtualenv.pypa.io/en/latest/) because many operating systems
-have python system packages that conflict with docker-compose dependencies. See
-the [virtualenv tutorial](http://docs.python-guide.org/en/latest/dev/virtualenvs/)
-to get started.
-
-    $ pip install docker-compose
-
-> **Note:** pip version 6.0 or greater is required
-
-### Install as a container
-
-Compose can also be run inside a container, from a small bash script wrapper.
-To install compose as a container run:
-
-    $ curl -L https://github.com/docker/compose/releases/download/1.8.0/run.sh > /usr/local/bin/docker-compose
-    $ chmod +x /usr/local/bin/docker-compose
-
-## Master builds
-
-If you're interested in trying out a pre-release build you can download a
-binary from https://dl.bintray.com/docker-compose/master/. Pre-release
-builds allow you to try out new features before they are released, but may
-be less stable.
-
-
-## Upgrading
-
-If you're upgrading from Compose 1.2 or earlier, you'll need to remove or migrate
-your existing containers after upgrading Compose. This is because, as of version
-1.3, Compose uses Docker labels to keep track of containers, and so they need to
-be recreated with labels added.
-
-If Compose detects containers that were created without labels, it will refuse
-to run so that you don't end up with two sets of them. If you want to keep using
-your existing containers (for example, because they have data volumes you want
-to preserve) you can use compose 1.5.x to migrate them with the following command:
-
-    $ docker-compose migrate-to-labels
-
-Alternatively, if you're not worried about keeping them, you can remove them.
-Compose will just create new ones.
-
-    $ docker rm -f -v myapp_web_1 myapp_db_1 ...
-
-
-## Uninstallation
-
-To uninstall Docker Compose if you installed using `curl`:
-
-    $ rm /usr/local/bin/docker-compose
-
-
-To uninstall Docker Compose if you installed using `pip`:
-
-    $ pip uninstall docker-compose
-
->**Note**: If you get a "Permission denied" error using either of the above
->methods, you probably do not have the proper permissions to remove
->`docker-compose`.  To force the removal, prepend `sudo` to either of the above
->commands and run again.
-
-
-## Where to go next
-
-- [User guide](index.md)
-- [Getting Started](gettingstarted.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
diff --git a/docs/link-env-deprecated.md b/docs/link-env-deprecated.md
deleted file mode 100644
index b1f01b3b..00000000
--- a/docs/link-env-deprecated.md
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--[metadata]>
-+++
-title = "Link Environment Variables"
-description = "Compose CLI reference"
-keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
-aliases = ["/compose/env"]
-[menu.main]
-parent="workw_compose"
-weight=89
-+++
-<![end-metadata]-->
-
-# Link environment variables reference
-
-> **Note:** Environment variables are no longer the recommended method for connecting to linked services. Instead, you should use the link name (by default, the name of the linked service) as the hostname to connect to. See the [docker-compose.yml documentation](compose-file.md#links) for details.
->
-> Environment variables will only be populated if you're using the [legacy version 1 Compose file format](compose-file.md#versioning).
-
-Compose uses [Docker links](/engine/userguide/networking/default_network/dockerlinks.md)
-to expose services' containers to one another. Each linked container injects a set of
-environment variables, each of which begins with the uppercase name of the container.
-
-To see what environment variables are available to a service, run `docker-compose run SERVICE env`.
-
-<b><i>name</i>\_PORT</b><br>
-Full URL, e.g. `DB_PORT=tcp://172.17.0.5:5432`
-
-<b><i>name</i>\_PORT\_<i>num</i>\_<i>protocol</i></b><br>
-Full URL, e.g. `DB_PORT_5432_TCP=tcp://172.17.0.5:5432`
-
-<b><i>name</i>\_PORT\_<i>num</i>\_<i>protocol</i>\_ADDR</b><br>
-Container's IP address, e.g. `DB_PORT_5432_TCP_ADDR=172.17.0.5`
-
-<b><i>name</i>\_PORT\_<i>num</i>\_<i>protocol</i>\_PORT</b><br>
-Exposed port number, e.g. `DB_PORT_5432_TCP_PORT=5432`
-
-<b><i>name</i>\_PORT\_<i>num</i>\_<i>protocol</i>\_PROTO</b><br>
-Protocol (tcp or udp), e.g. `DB_PORT_5432_TCP_PROTO=tcp`
-
-<b><i>name</i>\_NAME</b><br>
-Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
-
-## Related Information
-
-- [User guide](index.md)
-- [Installing Compose](install.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
diff --git a/docs/networking.md b/docs/networking.md
deleted file mode 100644
index 9739a088..00000000
--- a/docs/networking.md
+++ /dev/null
@@ -1,154 +0,0 @@
-<!--[metadata]>
-+++
-title = "Networking in Compose"
-description = "How Compose sets up networking between containers"
-keywords = ["documentation, docs,  docker, compose, orchestration, containers, networking"]
-[menu.main]
-parent="workw_compose"
-weight=21
-+++
-<![end-metadata]-->
-
-
-# Networking in Compose
-
-> **Note:** This document only applies if you're using [version 2 of the Compose file format](compose-file.md#versioning). Networking features are not supported for version 1 (legacy) Compose files.
-
-By default Compose sets up a single
-[network](https://docs.docker.com/engine/reference/commandline/network_create/) for your app. Each
-container for a service joins the default network and is both *reachable* by
-other containers on that network, and *discoverable* by them at a hostname
-identical to the container name.
-
-> **Note:** Your app's network is given a name based on the "project name",
-> which is based on the name of the directory it lives in. You can override the
-> project name with either the [`--project-name`
-> flag](reference/overview.md) or the [`COMPOSE_PROJECT_NAME` environment
-> variable](reference/envvars.md#compose-project-name).
-
-For example, suppose your app is in a directory called `myapp`, and your `docker-compose.yml` looks like this:
-
-    version: '2'
-
-    services:
-      web:
-        build: .
-        ports:
-          - "8000:8000"
-      db:
-        image: postgres
-
-When you run `docker-compose up`, the following happens:
-
-1.  A network called `myapp_default` is created.
-2.  A container is created using `web`'s configuration. It joins the network
-    `myapp_default` under the name `web`.
-3.  A container is created using `db`'s configuration. It joins the network
-    `myapp_default` under the name `db`.
-
-Each container can now look up the hostname `web` or `db` and
-get back the appropriate container's IP address. For example, `web`'s
-application code could connect to the URL `postgres://db:5432` and start
-using the Postgres database.
-
-Because `web` explicitly maps a port, it's also accessible from the outside world via port 8000 on your Docker host's network interface.
-
-## Updating containers
-
-If you make a configuration change to a service and run `docker-compose up` to update it, the old container will be removed and the new one will join the network under a different IP address but the same name. Running containers will be able to look up that name and connect to the new address, but the old address will stop working.
-
-If any containers have connections open to the old container, they will be closed. It is a container's responsibility to detect this condition, look up the name again and reconnect.
-
-## Links
-
-Links allow you to define extra aliases by which a service is reachable from another service. They are not required to enable services to communicate - by default, any service can reach any other service at that service's name. In the following example, `db` is reachable from `web` at the hostnames `db` and `database`:
-
-    version: '2'
-    services:
-      web:
-        build: .
-        links:
-          - "db:database"
-      db:
-        image: postgres
-
-See the [links reference](compose-file.md#links) for more information.
-
-## Multi-host networking
-
-When [deploying a Compose application to a Swarm cluster](swarm.md), you can make use of the built-in `overlay` driver to enable multi-host communication between containers with no changes to your Compose file or application code.
-
-Consult the [Getting started with multi-host networking](https://docs.docker.com/engine/userguide/networking/get-started-overlay/) to see how to set up a Swarm cluster. The cluster will use the `overlay` driver by default, but you can specify it explicitly if you prefer - see below for how to do this.
-
-## Specifying custom networks
-
-Instead of just using the default app network, you can specify your own networks with the top-level `networks` key. This lets you create more complex topologies and specify [custom network drivers](https://docs.docker.com/engine/extend/plugins_network/) and options. You can also use it to connect services to externally-created networks which aren't managed by Compose.
-
-Each service can specify what networks to connect to with the *service-level* `networks` key, which is a list of names referencing entries under the *top-level* `networks` key.
-
-Here's an example Compose file defining two custom networks. The `proxy` service is isolated from the `db` service, because they do not share a network in common - only `app` can talk to both.
-
-    version: '2'
-
-    services:
-      proxy:
-        build: ./proxy
-        networks:
-          - front
-      app:
-        build: ./app
-        networks:
-          - front
-          - back
-      db:
-        image: postgres
-        networks:
-          - back
-
-    networks:
-      front:
-        # Use a custom driver
-        driver: custom-driver-1
-      back:
-        # Use a custom driver which takes special options
-        driver: custom-driver-2
-        driver_opts:
-          foo: "1"
-          bar: "2"
-
-Networks can be configured with static IP addresses by setting the [ipv4_address and/or ipv6_address](compose-file.md#ipv4-address-ipv6-address) for each attached network.
-
-For full details of the network configuration options available, see the following references:
-
-- [Top-level `networks` key](compose-file.md#network-configuration-reference)
-- [Service-level `networks` key](compose-file.md#networks)
-
-## Configuring the default network
-
-Instead of (or as well as) specifying your own networks, you can also change the settings of the app-wide default network by defining an entry under `networks` named `default`:
-
-    version: '2'
-
-    services:
-      web:
-        build: .
-        ports:
-          - "8000:8000"
-      db:
-        image: postgres
-
-    networks:
-      default:
-        # Use a custom driver
-        driver: custom-driver-1
-
-## Using a pre-existing network
-
-If you want your containers to join a pre-existing network, use the [`external` option](compose-file.md#network-configuration-reference):
-
-    networks:
-      default:
-        external:
-          name: my-pre-existing-network
-
-Instead of attemping to create a network called `[projectname]_default`, Compose will look for a network called `my-pre-existing-network` and connect your app's containers to it.
diff --git a/docs/overview.md b/docs/overview.md
deleted file mode 100644
index ef07a45b..00000000
--- a/docs/overview.md
+++ /dev/null
@@ -1,188 +0,0 @@
-<!--[metadata]>
-+++
-title = "Overview of Docker Compose"
-description = "Introduction and Overview of Compose"
-keywords = ["documentation, docs,  docker, compose, orchestration,  containers"]
-[menu.main]
-parent="workw_compose"
-weight=-99
-+++
-<![end-metadata]-->
-
-
-# Overview of Docker Compose
-
-Compose is a tool for defining and running multi-container Docker applications.
-With Compose, you use a Compose file to configure your application's services.
-Then, using a single command, you create and start all the services
-from your configuration. To learn more about all the features of Compose
-see [the list of features](#features).
-
-Compose is great for development, testing, and staging environments, as well as
-CI workflows. You can learn more about each case in
-[Common Use Cases](#common-use-cases).
-
-Using Compose is basically a three-step process.
-
-1. Define your app's environment with a `Dockerfile` so it can be reproduced
-anywhere.
-
-2. Define the services that make up your app in `docker-compose.yml`
-so they can be run together in an isolated environment.
-
-3. Lastly, run
-`docker-compose up` and Compose will start and run your entire app.
-
-A `docker-compose.yml` looks like this:
-
-    version: '2'
-    services:
-      web:
-        build: .
-        ports:
-        - "5000:5000"
-        volumes:
-        - .:/code
-        - logvolume01:/var/log
-        links:
-        - redis
-      redis:
-        image: redis
-    volumes:
-      logvolume01: {}
-
-For more information about the Compose file, see the
-[Compose file reference](compose-file.md)
-
-Compose has commands for managing the whole lifecycle of your application:
-
- * Start, stop and rebuild services
- * View the status of running services
- * Stream the log output of running services
- * Run a one-off command on a service
-
-## Compose documentation
-
-- [Installing Compose](install.md)
-- [Getting Started](gettingstarted.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
-- [Frequently asked questions](faq.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
-
-## Features
-
-The features of Compose that make it effective are:
-
-* [Multiple isolated environments on a single host](#Multiple-isolated-environments-on-a-single-host)
-* [Preserve volume data when containers are created](#preserve-volume-data-when-containers-are-created)
-* [Only recreate containers that have changed](#only-recreate-containers-that-have-changed)
-* [Variables and moving a composition between environments](#variables-and-moving-a-composition-between-environments)
-
-### Multiple isolated environments on a single host
-
-Compose uses a project name to isolate environments from each other. You can make use of this project name in several different contexts:
-
-* on a dev host, to create multiple copies of a single environment (e.g., you want to run a stable copy for each feature branch of a project)
-* on a CI server, to keep builds from interfering with each other, you can set
-  the project name to a unique build number
-* on a shared host or dev host, to prevent different projects, which may use the
-  same service names, from interfering with each other
-
-The default project name is the basename of the project directory. You can set
-a custom project name by using the
-[`-p` command line option](./reference/overview.md) or the
-[`COMPOSE_PROJECT_NAME` environment variable](./reference/envvars.md#compose-project-name).
-
-### Preserve volume data when containers are created
-
-Compose preserves all volumes used by your services. When `docker-compose up`
-runs, if it finds any containers from previous runs, it copies the volumes from
-the old container to the new container. This process ensures that any data
-you've created in volumes isn't lost.
-
-
-### Only recreate containers that have changed
-
-Compose caches the configuration used to create a container. When you
-restart a service that has not changed, Compose re-uses the existing
-containers. Re-using containers means that you can make changes to your
-environment very quickly.
-
-
-### Variables and moving a composition between environments
-
-Compose supports variables in the Compose file. You can use these variables
-to customize your composition for different environments, or different users.
-See [Variable substitution](compose-file.md#variable-substitution) for more
-details.
-
-You can extend a Compose file using the `extends` field or by creating multiple
-Compose files. See [extends](extends.md) for more details.
-
-
-## Common Use Cases
-
-Compose can be used in many different ways. Some common use cases are outlined
-below.
-
-### Development environments
-
-When you're developing software, the ability to run an application in an
-isolated environment and interact with it is crucial.  The Compose command
-line tool can be used to create the environment and interact with it.
-
-The [Compose file](compose-file.md) provides a way to document and configure
-all of the application's service dependencies (databases, queues, caches,
-web service APIs, etc). Using the Compose command line tool you can create
-and start one or more containers for each dependency with a single command
-(`docker-compose up`).
-
-Together, these features provide a convenient way for developers to get
-started on a project.  Compose can reduce a multi-page "developer getting
-started guide" to a single machine readable Compose file and a few commands.
-
-### Automated testing environments
-
-An important part of any Continuous Deployment or Continuous Integration process
-is the automated test suite. Automated end-to-end testing requires an
-environment in which to run tests. Compose provides a convenient way to create
-and destroy isolated testing environments for your test suite. By defining the full environment in a [Compose file](compose-file.md) you can create and destroy these environments in just a few commands:
-
-    $ docker-compose up -d
-    $ ./run_tests
-    $ docker-compose down
-
-### Single host deployments
-
-Compose has traditionally been focused on development and testing workflows,
-but with each release we're making progress on more production-oriented features. You can use Compose to deploy to a remote Docker Engine. The Docker Engine may be a single instance provisioned with
-[Docker Machine](/machine/overview.md) or an entire
-[Docker Swarm](/swarm/overview.md) cluster.
-
-For details on using production-oriented features, see
-[compose in production](production.md) in this documentation.
-
-
-## Release Notes
-
-To see a detailed list of changes for past and current releases of Docker
-Compose, please refer to the
-[CHANGELOG](https://github.com/docker/compose/blob/master/CHANGELOG.md).
-
-## Getting help
-
-Docker Compose is under active development. If you need help, would like to
-contribute, or simply want to talk about the project with like-minded
-individuals, we have a number of open channels for communication.
-
-* To report bugs or file feature requests: please use the [issue tracker on Github](https://github.com/docker/compose/issues).
-
-* To talk about the project with people in real time: please join the
-  `#docker-compose` channel on freenode IRC.
-
-* To contribute code or documentation changes: please submit a [pull request on Github](https://github.com/docker/compose/pulls).
-
-For more information and resources, please visit the [Getting Help project page](https://docs.docker.com/opensource/get-help/).
diff --git a/docs/production.md b/docs/production.md
deleted file mode 100644
index cfb87293..00000000
--- a/docs/production.md
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--[metadata]>
-+++
-title = "Using Compose in Production"
-description = "Guide to using Docker Compose in production"
-keywords = ["documentation, docs,  docker, compose, orchestration, containers,  production"]
-[menu.main]
-parent="workw_compose"
-weight=22
-+++
-<![end-metadata]-->
-
-
-## Using Compose in production
-
-When you define your app with Compose in development, you can use this
-definition to run your application in different environments such as CI,
-staging, and production.
-
-The easiest way to deploy an application is to run it on a single server,
-similar to how you would run your development environment. If you want to scale
-up your application, you can run Compose apps on a Swarm cluster.
-
-### Modify your Compose file for production
-
-You'll almost certainly want to make changes to your app configuration that are
-more appropriate to a live environment. These changes may include:
-
-- Removing any volume bindings for application code, so that code stays inside
-  the container and can't be changed from outside
-- Binding to different ports on the host
-- Setting environment variables differently (e.g., to decrease the verbosity of
-  logging, or to enable email sending)
-- Specifying a restart policy (e.g., `restart: always`) to avoid downtime
-- Adding extra services (e.g., a log aggregator)
-
-For this reason, you'll probably want to define an additional Compose file, say
-`production.yml`, which specifies production-appropriate
-configuration. This configuration file only needs to include the changes you'd
-like to make from the original Compose file.  The additional Compose file
-can be applied over the original `docker-compose.yml` to create a new configuration.
-
-Once you've got a second configuration file, tell Compose to use it with the
-`-f` option:
-
-    $ docker-compose -f docker-compose.yml -f production.yml up -d
-
-See [Using multiple compose files](extends.md#different-environments) for a more
-complete example.
-
-### Deploying changes
-
-When you make changes to your app code, you'll need to rebuild your image and
-recreate your app's containers. To redeploy a service called
-`web`, you would use:
-
-    $ docker-compose build web
-    $ docker-compose up --no-deps -d web
-
-This will first rebuild the image for `web` and then stop, destroy, and recreate
-*just* the `web` service. The `--no-deps` flag prevents Compose from also
-recreating any services which `web` depends on.
-
-### Running Compose on a single server
-
-You can use Compose to deploy an app to a remote Docker host by setting the
-`DOCKER_HOST`, `DOCKER_TLS_VERIFY`, and `DOCKER_CERT_PATH` environment variables
-appropriately. For tasks like this,
-[Docker Machine](/machine/overview.md) makes managing local and
-remote Docker hosts very easy, and is recommended even if you're not deploying
-remotely.
-
-Once you've set up your environment variables, all the normal `docker-compose`
-commands will work with no further configuration.
-
-### Running Compose on a Swarm cluster
-
-[Docker Swarm](/swarm/overview.md), a Docker-native clustering
-system, exposes the same API as a single Docker host, which means you can use
-Compose against a Swarm instance and run your apps across multiple hosts.
-
-Read more about the Compose/Swarm integration in the
-[integration guide](swarm.md).
-
-## Compose documentation
-
-- [Installing Compose](install.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
diff --git a/docs/rails.md b/docs/rails.md
deleted file mode 100644
index 26777687..00000000
--- a/docs/rails.md
+++ /dev/null
@@ -1,174 +0,0 @@
-<!--[metadata]>
-+++
-title = "Quickstart: Compose and Rails"
-description = "Getting started with Docker Compose and Rails"
-keywords = ["documentation, docs,  docker, compose, orchestration, containers"]
-[menu.main]
-parent="workw_compose"
-weight=5
-+++
-<![end-metadata]-->
-
-## Quickstart: Docker Compose and Rails
-
-This Quickstart guide will show you how to use Docker Compose to set up and run a Rails/PostgreSQL app. Before starting, you'll need to have [Compose installed](install.md).
-
-### Define the project
-
-Start by setting up the three files you'll need to build the app. First, since
-your app is going to run inside a Docker container containing all of its
-dependencies, you'll need to define exactly what needs to be included in the
-container. This is done using a file called `Dockerfile`. To begin with, the
-Dockerfile consists of:
-
-    FROM ruby:2.2.0
-    RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
-    RUN mkdir /myapp
-    WORKDIR /myapp
-    ADD Gemfile /myapp/Gemfile
-    ADD Gemfile.lock /myapp/Gemfile.lock
-    RUN bundle install
-    ADD . /myapp
-
-That'll put your application code inside an image that will build a container
-with Ruby, Bundler and all your dependencies inside it. For more information on
-how to write Dockerfiles, see the [Docker user guide](/engine/tutorials/dockerimages.md#building-an-image-from-a-dockerfile) and the [Dockerfile reference](/engine/reference/builder.md).
-
-Next, create a bootstrap `Gemfile` which just loads Rails. It'll be overwritten in a moment by `rails new`.
-
-    source 'https://rubygems.org'
-    gem 'rails', '4.2.0'
-
-You'll need an empty `Gemfile.lock` in order to build our `Dockerfile`.
-
-    $ touch Gemfile.lock
-
-Finally, `docker-compose.yml` is where the magic happens. This file describes
-the services that comprise your app (a database and a web app), how to get each
-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.
-
-    version: '2'
-    services:
-      db:
-        image: postgres
-      web:
-        build: .
-        command: bundle exec rails s -p 3000 -b '0.0.0.0'
-        volumes:
-          - .:/myapp
-        ports:
-          - "3000:3000"
-        depends_on:
-          - db
-
-### Build the project
-
-With those three files in place, you can now generate the Rails skeleton app
-using `docker-compose run`:
-
-    $ docker-compose run web rails new . --force --database=postgresql --skip-bundle
-
-First, Compose will build the image for the `web` service using the `Dockerfile`. Then it'll run `rails new` inside a new container, using that image. Once it's done, you should have generated a fresh app:
-
-      $ ls -l
-      total 56
-      -rw-r--r--   1 user  staff   215 Feb 13 23:33 Dockerfile
-      -rw-r--r--   1 user  staff  1480 Feb 13 23:43 Gemfile
-      -rw-r--r--   1 user  staff  2535 Feb 13 23:43 Gemfile.lock
-      -rw-r--r--   1 root  root   478 Feb 13 23:43 README.rdoc
-      -rw-r--r--   1 root  root   249 Feb 13 23:43 Rakefile
-      drwxr-xr-x   8 root  root   272 Feb 13 23:43 app
-      drwxr-xr-x   6 root  root   204 Feb 13 23:43 bin
-      drwxr-xr-x  11 root  root   374 Feb 13 23:43 config
-      -rw-r--r--   1 root  root   153 Feb 13 23:43 config.ru
-      drwxr-xr-x   3 root  root   102 Feb 13 23:43 db
-      -rw-r--r--   1 user  staff   161 Feb 13 23:35 docker-compose.yml
-      drwxr-xr-x   4 root  root   136 Feb 13 23:43 lib
-      drwxr-xr-x   3 root  root   102 Feb 13 23:43 log
-      drwxr-xr-x   7 root  root   238 Feb 13 23:43 public
-      drwxr-xr-x   9 root  root   306 Feb 13 23:43 test
-      drwxr-xr-x   3 root  root   102 Feb 13 23:43 tmp
-      drwxr-xr-x   3 root  root   102 Feb 13 23:43 vendor
-
-
-If you are running Docker on Linux, the files `rails new`  created are owned by
-root. This happens because the container runs as the root user. Change the
-ownership of the the new files.
-
-      sudo chown -R $USER:$USER .
-
-If you are running Docker on Mac or Windows, you should already have ownership
-of all files, including those generated by `rails new`. List the files just to
-verify this.
-
-Uncomment the line in your new `Gemfile` which loads `therubyracer`, so you've
-got a Javascript runtime:
-
-    gem 'therubyracer', platforms: :ruby
-
-Now that you've got a new `Gemfile`, you need to build the image again. (This,
-and changes to the Dockerfile itself, should be the only times you'll need to
-rebuild.)
-
-    $ docker-compose build
-
-
-### Connect the database
-
-The app is now bootable, but you're not quite there yet. By default, Rails
-expects a database to be running on `localhost` - so you need to point it at the
-`db` container instead. You also need to change the database and username to
-align with the defaults set by the `postgres` image.
-
-Replace the contents of `config/database.yml` with the following:
-
-    development: &default
-      adapter: postgresql
-      encoding: unicode
-      database: postgres
-      pool: 5
-      username: postgres
-      password:
-      host: db
-
-    test:
-      <<: *default
-      database: myapp_test
-
-You can now boot the app with:
-
-    $ docker-compose up
-
-If all's well, you should see some PostgreSQL output, and then—after a few
-seconds—the familiar refrain:
-
-    myapp_web_1 | [2014-01-17 17:16:29] INFO  WEBrick 1.3.1
-    myapp_web_1 | [2014-01-17 17:16:29] INFO  ruby 2.2.0 (2014-12-25) [x86_64-linux-gnu]
-    myapp_web_1 | [2014-01-17 17:16:29] INFO  WEBrick::HTTPServer#start: pid=1 port=3000
-
-Finally, you need to create the database. In another terminal, run:
-
-    $ docker-compose run web rake db:create
-
-That's it. Your app should now be running on port 3000 on your Docker daemon. If you're using [Docker Machine](/machine/overview.md), then `docker-machine ip MACHINE_VM` returns the Docker host IP address.
-
-![Rails example](images/rails-welcome.png)
-
->**Note**: If you stop the example application and attempt to restart it, you might get the
-following error: `web_1 | A server is already running. Check
-/myapp/tmp/pids/server.pid.` One way to resolve this is to delete the file
-`tmp/pids/server.pid`, and then re-start the application with `docker-compose
-up`.
-
-
-## More Compose documentation
-
-- [User guide](index.md)
-- [Installing Compose](install.md)
-- [Getting Started](gettingstarted.md)
-- [Get started with Django](django.md)
-- [Get started with WordPress](wordpress.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
diff --git a/docs/reference/build.md b/docs/reference/build.md
deleted file mode 100644
index 84aefc25..00000000
--- a/docs/reference/build.md
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--[metadata]>
-+++
-title = "build"
-description = "build"
-keywords = ["fig, composition, compose, docker, orchestration, cli,  build"]
-[menu.main]
-identifier="build.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# build
-
-```
-Usage: build [options] [SERVICE...]
-
-Options:
---force-rm  Always remove intermediate containers.
---no-cache  Do not use cache when building the image.
---pull      Always attempt to pull a newer version of the image.
-```
-
-Services are built once and then tagged as `project_service`, e.g.,
-`composetest_db`. If you change a service's Dockerfile or the contents of its
-build directory, run `docker-compose build` to rebuild it.
diff --git a/docs/reference/bundle.md b/docs/reference/bundle.md
deleted file mode 100644
index fca93a8a..00000000
--- a/docs/reference/bundle.md
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--[metadata]>
-+++
-title = "bundle"
-description = "Create a distributed application bundle from the Compose file."
-keywords = ["fig, composition, compose, docker, orchestration, cli,  bundle"]
-[menu.main]
-identifier="bundle.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# bundle
-
-```
-Usage: bundle [options]
-
-Options:
-    --push-images              Automatically push images for any services
-                               which have a `build` option specified.
-
-    -o, --output PATH          Path to write the bundle file to.
-                               Defaults to "<project name>.dab".
-```
-
-Generate a Distributed Application Bundle (DAB) from the Compose file.
-
-Images must have digests stored, which requires interaction with a
-Docker registry. If digests aren't stored for all images, you can fetch
-them with `docker-compose pull` or `docker-compose push`. To push images
-automatically when bundling, pass `--push-images`. Only services with
-a `build` option specified will have their images pushed.
diff --git a/docs/reference/config.md b/docs/reference/config.md
deleted file mode 100644
index 1a9706f4..00000000
--- a/docs/reference/config.md
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--[metadata]>
-+++
-title = "config"
-description = "Config validates and view the compose file."
-keywords = ["fig, composition, compose, docker, orchestration, cli, config"]
-[menu.main]
-identifier="config.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# config
-
-```:
-Usage: config [options]
-
-Options:
--q, --quiet     Only validate the configuration, don't print
-                anything.
---services      Print the service names, one per line.
-```
-
-Validate and view the compose file.
diff --git a/docs/reference/create.md b/docs/reference/create.md
deleted file mode 100644
index 5065e8be..00000000
--- a/docs/reference/create.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--[metadata]>
-+++
-title = "create"
-description = "Create creates containers for a service."
-keywords = ["fig, composition, compose, docker, orchestration, cli, create"]
-[menu.main]
-identifier="create.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# create
-
-```
-Creates containers for a service.
-
-Usage: create [options] [SERVICE...]
-
-Options:
-    --force-recreate       Recreate containers even if their configuration and
-                           image haven't changed. Incompatible with --no-recreate.
-    --no-recreate          If containers already exist, don't recreate them.
-                           Incompatible with --force-recreate.
-    --no-build             Don't build an image, even if it's missing.
-    --build                Build images before creating containers.
-```
diff --git a/docs/reference/down.md b/docs/reference/down.md
deleted file mode 100644
index ffe88b4e..00000000
--- a/docs/reference/down.md
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--[metadata]>
-+++
-title = "down"
-description = "down"
-keywords = ["fig, composition, compose, docker, orchestration, cli,  down"]
-[menu.main]
-identifier="down.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# down
-
-```
-Usage: down [options]
-
-Options:
-    --rmi type          Remove images. Type must be one of:
-                        'all': Remove all images used by any service.
-                        'local': Remove only images that don't have a custom tag
-                        set by the `image` field.
-    -v, --volumes       Remove named volumes declared in the `volumes` section
-                        of the Compose file and anonymous volumes
-                        attached to containers.
-    --remove-orphans    Remove containers for services not defined in the
-                        Compose file
-```
-
-Stops containers and removes containers, networks, volumes, and images
-created by `up`.
-
-By default, the only things removed are:
-
-- Containers for services defined in the Compose file
-- Networks defined in the `networks` section of the Compose file
-- The default network, if one is used
-
-Networks and volumes defined as `external` are never removed.
diff --git a/docs/reference/envvars.md b/docs/reference/envvars.md
deleted file mode 100644
index 22516deb..00000000
--- a/docs/reference/envvars.md
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--[metadata]>
-+++
-title = "CLI Environment Variables"
-description = "CLI Environment Variables"
-keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
-[menu.main]
-parent = "smn_compose_cli"
-weight=-1
-+++
-<![end-metadata]-->
-
-
-# CLI Environment Variables
-
-Several environment variables are available for you to configure the Docker Compose command-line behaviour.
-
-Variables starting with `DOCKER_` are the same as those used to configure the
-Docker command-line client. If you're using `docker-machine`, then the `eval "$(docker-machine env my-docker-vm)"` command should set them to their correct values. (In this example, `my-docker-vm` is the name of a machine you created.)
-
-> Note: Some of these variables can also be provided using an
-> [environment file](../env-file.md)
-
-## COMPOSE\_PROJECT\_NAME
-
-Sets the project name. This value is prepended along with the service name to the container container on start up. For example, if you project name is `myapp` and it includes two services `db` and `web` then compose starts containers named  `myapp_db_1` and `myapp_web_1` respectively.
-
-Setting this is optional. If you do not set this, the `COMPOSE_PROJECT_NAME`
-defaults to the `basename` of the project directory. See also the `-p`
-[command-line option](overview.md).
-
-## COMPOSE\_FILE
-
-Specify the path to a Compose file. If not provided, Compose looks for a file named
-`docker-compose.yml` in the current directory and then each parent directory in
-succession until a file by that name is found.
-
-This variable supports multiple compose files separate by a path separator (on
-Linux and OSX the path separator is `:`, on Windows it is `;`). For example:
-`COMPOSE_FILE=docker-compose.yml:docker-compose.prod.yml`
-
-See also the `-f` [command-line option](overview.md).
-
-## COMPOSE\_API\_VERSION
-
-The Docker API only supports requests from clients which report a specific
-version. If you receive a `client and server don't have same version error` using
-`docker-compose`, you can workaround this error by setting this environment
-variable. Set the version value to match the server version.
-
-Setting this variable is intended as a workaround for situations where you need
-to run temporarily with a mismatch between the client and server version. For
-example, if you can upgrade the client but need to wait to upgrade the server.
-
-Running with this variable set and a known mismatch does prevent some Docker
-features from working properly. The exact features that fail would depend on the
-Docker client and server versions. For this reason, running with this variable
-set is only intended as a workaround and it is not officially supported.
-
-If you run into problems running with this set, resolve the mismatch through
-upgrade and remove this setting to see if your problems resolve before notifying
-support.
-
-## DOCKER\_HOST
-
-Sets the URL of the `docker` daemon. As with the Docker client, defaults to `unix:///var/run/docker.sock`.
-
-## DOCKER\_TLS\_VERIFY
-
-When set to anything other than an empty string, enables TLS communication with
-the `docker` daemon.
-
-## DOCKER\_CERT\_PATH
-
-Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TLS verification. Defaults to `~/.docker`.
-
-## COMPOSE\_HTTP\_TIMEOUT
-
-Configures the time (in seconds) a request to the Docker daemon is allowed to hang before Compose considers
-it failed. Defaults to 60 seconds.
-
-## COMPOSE\_TLS\_VERSION
-
-Configure which TLS version is used for TLS communication with the `docker`
-daemon. Defaults to `TLSv1`.
-Supported values are: `TLSv1`, `TLSv1_1`, `TLSv1_2`.
-
-## Related Information
-
-- [User guide](../index.md)
-- [Installing Compose](../install.md)
-- [Compose file reference](../compose-file.md)
-- [Environment file](../env-file.md)
diff --git a/docs/reference/events.md b/docs/reference/events.md
deleted file mode 100644
index 827258f2..00000000
--- a/docs/reference/events.md
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--[metadata]>
-+++
-title = "events"
-description = "Receive real time events from containers."
-keywords = ["fig, composition, compose, docker, orchestration, cli, events"]
-[menu.main]
-identifier="events.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# events
-
-```
-Usage: events [options] [SERVICE...]
-
-Options:
-    --json      Output events as a stream of json objects
-```
-
-Stream container events for every container in the project.
-
-With the `--json` flag, a json object will be printed one per line with the
-format:
-
-```
-{
-    "service": "web",
-    "event": "create",
-    "container": "213cf75fc39a",
-    "image": "alpine:edge",
-    "time": "2015-11-20T18:01:03.615550",
-}
-```
diff --git a/docs/reference/exec.md b/docs/reference/exec.md
deleted file mode 100644
index 6c0eeb04..00000000
--- a/docs/reference/exec.md
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--[metadata]>
-+++
-title = "exec"
-description = "exec"
-keywords = ["fig, composition, compose, docker, orchestration, cli,  exec"]
-[menu.main]
-identifier="exec.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# exec
-
-```
-Usage: exec [options] SERVICE COMMAND [ARGS...]
-
-Options:
--d                Detached mode: Run command in the background.
---privileged      Give extended privileges to the process.
---user USER       Run the command as this user.
--T                Disable pseudo-tty allocation. By default `docker-compose exec`
-                  allocates a TTY.
---index=index     index of the container if there are multiple
-                  instances of a service [default: 1]
-```
-
-This is equivalent of `docker exec`. With this subcommand you can run arbitrary
-commands in your services. Commands are by default allocating a TTY, so you can
-do e.g. `docker-compose exec web sh` to get an interactive prompt.
diff --git a/docs/reference/help.md b/docs/reference/help.md
deleted file mode 100644
index 613708ed..00000000
--- a/docs/reference/help.md
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--[metadata]>
-+++
-title = "help"
-description = "help"
-keywords = ["fig, composition, compose, docker, orchestration, cli,  help"]
-[menu.main]
-identifier="help.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# help
-
-```
-Usage: help COMMAND
-```
-
-Displays help and usage instructions for a command.
diff --git a/docs/reference/index.md b/docs/reference/index.md
deleted file mode 100644
index 2ac3676a..00000000
--- a/docs/reference/index.md
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--[metadata]>
-+++
-title = "Command-line Reference"
-description = "Compose CLI reference"
-keywords = ["fig, composition, compose, docker, orchestration, cli,  reference"]
-[menu.main]
-identifier = "smn_compose_cli"
-parent = "workw_compose"
-weight=80
-+++
-<![end-metadata]-->
-
-## Compose command-line reference
-
-The following pages describe the usage information for the [docker-compose](overview.md) subcommands. You can also see this information by running `docker-compose [SUBCOMMAND] --help` from the command line.
-
-* [docker-compose](overview.md)
-* [build](build.md)
-* [config](config.md)
-* [create](create.md)
-* [down](down.md)
-* [events](events.md)
-* [help](help.md)
-* [kill](kill.md)
-* [logs](logs.md)
-* [pause](pause.md)
-* [port](port.md)
-* [ps](ps.md)
-* [pull](pull.md)
-* [restart](restart.md)
-* [rm](rm.md)
-* [run](run.md)
-* [scale](scale.md)
-* [start](start.md)
-* [stop](stop.md)
-* [unpause](unpause.md)
-* [up](up.md)
-
-## Where to go next
-
-* [CLI environment variables](envvars.md)
-* [docker-compose Command](overview.md)
diff --git a/docs/reference/kill.md b/docs/reference/kill.md
deleted file mode 100644
index dc4bf23a..00000000
--- a/docs/reference/kill.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--[metadata]>
-+++
-title = "kill"
-description = "Forces running containers to stop."
-keywords = ["fig, composition, compose, docker, orchestration, cli,  kill"]
-[menu.main]
-identifier="kill.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# kill
-
-```
-Usage: kill [options] [SERVICE...]
-
-Options:
--s SIGNAL         SIGNAL to send to the container. Default signal is SIGKILL.
-```
-
-Forces running containers to stop by sending a `SIGKILL` signal. Optionally the
-signal can be passed, for example:
-
-    $ docker-compose kill -s SIGINT
diff --git a/docs/reference/logs.md b/docs/reference/logs.md
deleted file mode 100644
index 745d24f7..00000000
--- a/docs/reference/logs.md
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--[metadata]>
-+++
-title = "logs"
-description = "Displays log output from services."
-keywords = ["fig, composition, compose, docker, orchestration, cli,  logs"]
-[menu.main]
-identifier="logs.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# logs
-
-```
-Usage: logs [options] [SERVICE...]
-
-Options:
---no-color          Produce monochrome output.
--f, --follow        Follow log output
--t, --timestamps    Show timestamps
---tail              Number of lines to show from the end of the logs
-                    for each container.
-```
-
-Displays log output from services.
diff --git a/docs/reference/overview.md b/docs/reference/overview.md
deleted file mode 100644
index d59fa565..00000000
--- a/docs/reference/overview.md
+++ /dev/null
@@ -1,127 +0,0 @@
-<!--[metadata]>
-+++
-title = "Overview of docker-compose CLI"
-description = "Overview of docker-compose CLI"
-keywords = ["fig, composition, compose, docker, orchestration, cli,  docker-compose"]
-aliases = ["/compose/reference/docker-compose/"]
-[menu.main]
-parent = "smn_compose_cli"
-weight=-2
-+++
-<![end-metadata]-->
-
-
-# Overview of docker-compose CLI
-
-This page provides the usage information for the `docker-compose` Command.
-You can also see this information by running `docker-compose --help` from the
-command line.
-
-```
-Define and run multi-container applications with Docker.
-
-Usage:
-  docker-compose [-f=<arg>...] [options] [COMMAND] [ARGS...]
-  docker-compose -h|--help
-
-Options:
-  -f, --file FILE             Specify an alternate compose file (default: docker-compose.yml)
-  -p, --project-name NAME     Specify an alternate project name (default: directory name)
-  --verbose                   Show more output
-  -v, --version               Print version and exit
-  -H, --host HOST             Daemon socket to connect to
-
-  --tls                       Use TLS; implied by --tlsverify
-  --tlscacert CA_PATH         Trust certs signed only by this CA
-  --tlscert CLIENT_CERT_PATH  Path to TLS certificate file
-  --tlskey TLS_KEY_PATH       Path to TLS key file
-  --tlsverify                 Use TLS and verify the remote
-  --skip-hostname-check       Don't check the daemon's hostname against the name specified
-                              in the client certificate (for example if your docker host
-                              is an IP address)
-
-Commands:
-  build              Build or rebuild services
-  config             Validate and view the compose file
-  create             Create services
-  down               Stop and remove containers, networks, images, and volumes
-  events             Receive real time events from containers
-  help               Get help on a command
-  kill               Kill containers
-  logs               View output from containers
-  pause              Pause services
-  port               Print the public port for a port binding
-  ps                 List containers
-  pull               Pulls service images
-  restart            Restart services
-  rm                 Remove stopped containers
-  run                Run a one-off command
-  scale              Set number of containers for a service
-  start              Start services
-  stop               Stop services
-  unpause            Unpause services
-  up                 Create and start containers
-  version            Show the Docker-Compose version information
-
-```
-
-The Docker Compose binary. You use this command to build and manage multiple
-services in Docker containers.
-
-Use the `-f` flag to specify the location of a Compose configuration file. You
-can supply multiple `-f` configuration files. When you supply multiple files,
-Compose combines them into a single configuration. Compose builds the
-configuration in the order you supply the files. Subsequent files override and
-add to their successors.
-
-For example, consider this command line:
-
-```
-$ docker-compose -f docker-compose.yml -f docker-compose.admin.yml run backup_db`
-```
-
-The `docker-compose.yml` file might specify a `webapp` service.
-
-```
-webapp:
-  image: examples/web
-  ports:
-    - "8000:8000"
-  volumes:
-    - "/data"
-```
-
-If the `docker-compose.admin.yml` also specifies this same service, any matching
-fields will override the previous file. New values, add to the `webapp` service
-configuration.
-
-```
-webapp:
-  build: .
-  environment:
-    - DEBUG=1
-```
-
-Use a `-f` with `-` (dash) as the filename to read the configuration from
-stdin. When stdin is used all paths in the configuration are
-relative to the current working directory.
-
-The `-f` flag is optional. If you don't provide this flag on the command line,
-Compose traverses the working directory and its parent directories looking for a
-`docker-compose.yml` and a `docker-compose.override.yml` file. You must
-supply at least the `docker-compose.yml` file. If both files are present on the
-same directory level, Compose combines the two files into a single configuration.
-The configuration in the `docker-compose.override.yml` file is applied over and
-in addition to the values in the `docker-compose.yml` file.
-
-See also the `COMPOSE_FILE` [environment variable](envvars.md#compose-file).
-
-Each configuration has a project name. If you supply a `-p` flag, you can
-specify a project name. If you don't specify the flag, Compose uses the current
-directory name. See also the `COMPOSE_PROJECT_NAME` [environment variable](
-envvars.md#compose-project-name)
-
-
-## Where to go next
-
-* [CLI environment variables](envvars.md)
diff --git a/docs/reference/pause.md b/docs/reference/pause.md
deleted file mode 100644
index a0ffab03..00000000
--- a/docs/reference/pause.md
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--[metadata]>
-+++
-title = "pause"
-description = "Pauses running containers for a service."
-keywords = ["fig, composition, compose, docker, orchestration, cli, pause"]
-[menu.main]
-identifier="pause.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# pause
-
-```
-Usage: pause [SERVICE...]
-```
-
-Pauses running containers of a service. They can be unpaused with `docker-compose unpause`.
diff --git a/docs/reference/port.md b/docs/reference/port.md
deleted file mode 100644
index c946a97d..00000000
--- a/docs/reference/port.md
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--[metadata]>
-+++
-title = "port"
-description = "Prints the public port for a port binding.s"
-keywords = ["fig, composition, compose, docker, orchestration, cli,  port"]
-[menu.main]
-identifier="port.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# port
-
-```
-Usage: port [options] SERVICE PRIVATE_PORT
-
-Options:
---protocol=proto  tcp or udp [default: tcp]
---index=index     index of the container if there are multiple
-                  instances of a service [default: 1]
-```
-
-Prints the public port for a port binding.
diff --git a/docs/reference/ps.md b/docs/reference/ps.md
deleted file mode 100644
index 546d68e7..00000000
--- a/docs/reference/ps.md
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--[metadata]>
-+++
-title = "ps"
-description = "Lists containers."
-keywords = ["fig, composition, compose, docker, orchestration, cli,  ps"]
-[menu.main]
-identifier="ps.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# ps
-
-```
-Usage: ps [options] [SERVICE...]
-
-Options:
--q    Only display IDs
-```
-
-Lists containers.
diff --git a/docs/reference/pull.md b/docs/reference/pull.md
deleted file mode 100644
index 5ec184b7..00000000
--- a/docs/reference/pull.md
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--[metadata]>
-+++
-title = "pull"
-description = "Pulls service images."
-keywords = ["fig, composition, compose, docker, orchestration, cli,  pull"]
-[menu.main]
-identifier="pull.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# pull
-
-```
-Usage: pull [options] [SERVICE...]
-
-Options:
---ignore-pull-failures  Pull what it can and ignores images with pull failures.
-```
-
-Pulls service images.
diff --git a/docs/reference/push.md b/docs/reference/push.md
deleted file mode 100644
index bdc3112e..00000000
--- a/docs/reference/push.md
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--[metadata]>
-+++
-title = "push"
-description = "Pushes service images."
-keywords = ["fig, composition, compose, docker, orchestration, cli,  push"]
-[menu.main]
-identifier="push.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# push
-
-```
-Usage: push [options] [SERVICE...]
-
-Options:
-    --ignore-push-failures  Push what it can and ignores images with push failures.
-```
-
-Pushes images for services.
diff --git a/docs/reference/restart.md b/docs/reference/restart.md
deleted file mode 100644
index bbd4a68b..00000000
--- a/docs/reference/restart.md
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--[metadata]>
-+++
-title = "restart"
-description = "Restarts Docker Compose services."
-keywords = ["fig, composition, compose, docker, orchestration, cli,  restart"]
-[menu.main]
-identifier="restart.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# restart
-
-```
-Usage: restart [options] [SERVICE...]
-
-Options:
--t, --timeout TIMEOUT      Specify a shutdown timeout in seconds. (default: 10)
-```
-
-Restarts services.
diff --git a/docs/reference/rm.md b/docs/reference/rm.md
deleted file mode 100644
index 6351e6cf..00000000
--- a/docs/reference/rm.md
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--[metadata]>
-+++
-title = "rm"
-description = "Removes stopped service containers."
-keywords = ["fig, composition, compose, docker, orchestration, cli,  rm"]
-[menu.main]
-identifier="rm.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# rm
-
-```
-Usage: rm [options] [SERVICE...]
-
-Options:
-    -f, --force   Don't ask to confirm removal
-    -v            Remove any anonymous volumes attached to containers
-    -a, --all     Deprecated - no effect.
-```
-
-Removes stopped service containers.
-
-By default, anonymous volumes attached to containers will not be removed. You
-can override this with `-v`. To list all volumes, use `docker volume ls`.
-
-Any data which is not in a volume will be lost.
diff --git a/docs/reference/run.md b/docs/reference/run.md
deleted file mode 100644
index 86354424..00000000
--- a/docs/reference/run.md
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--[metadata]>
-+++
-title = "run"
-description = "Runs a one-off command on a service."
-keywords = ["fig, composition, compose, docker, orchestration, cli,  run"]
-[menu.main]
-identifier="run.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# run
-
-```
-Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]
-
-Options:
--d                    Detached mode: Run container in the background, print
-                          new container name.
---name NAME           Assign a name to the container
---entrypoint CMD      Override the entrypoint of the image.
--e KEY=VAL            Set an environment variable (can be used multiple times)
--u, --user=""         Run as specified username or uid
---no-deps             Don't start linked services.
---rm                  Remove container after run. Ignored in detached mode.
--p, --publish=[]      Publish a container's port(s) to the host
---service-ports       Run command with the service's ports enabled and mapped to the host.
--T                    Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.
--w, --workdir=""      Working directory inside the container
-```
-
-Runs a one-time command against a service. For example, the following command starts the `web` service and runs `bash` as its command.
-
-    $ docker-compose run web bash
-
-Commands you use with `run` start in new containers with the same configuration as defined by the service' configuration. This means the container has the same volumes, links, as defined in the configuration file. There two differences though.
-
-First, the command passed by `run` overrides the command defined in the service configuration. For example, if the  `web` service configuration is started with `bash`, then `docker-compose run web python app.py` overrides it with `python app.py`.
-
-The second difference is the `docker-compose run` command does not create any of the ports specified in the service configuration. This prevents the port collisions with already open ports. If you *do want* the service's ports created and mapped to the host, specify the `--service-ports` flag:
-
-    $ docker-compose run --service-ports web python manage.py shell
-
-Alternatively manual port mapping can be specified. Same as when running Docker's `run` command - using `--publish` or `-p` options:
-
-    $ docker-compose run --publish 8080:80 -p 2022:22 -p 127.0.0.1:2021:21 web python manage.py shell
-
-If you start a service configured with links, the `run` command first checks to see if the linked service is running and starts the service if it is stopped.  Once all the linked services are running, the `run` executes the command you passed it.  So, for example, you could run:
-
-    $ docker-compose run db psql -h db -U docker
-
-This would open up an interactive PostgreSQL shell for the linked `db` container.
-
-If you do not want the `run` command to start linked containers, specify the `--no-deps` flag:
-
-    $ docker-compose run --no-deps web python manage.py shell
diff --git a/docs/reference/scale.md b/docs/reference/scale.md
deleted file mode 100644
index 75140ee9..00000000
--- a/docs/reference/scale.md
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--[metadata]>
-+++
-title = "scale"
-description = "Sets the number of containers to run for a service."
-keywords = ["fig, composition, compose, docker, orchestration, cli,  scale"]
-[menu.main]
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# scale
-
-```
-Usage: scale [SERVICE=NUM...]
-```
-
-Sets the number of containers to run for a service.
-
-Numbers are specified as arguments in the form `service=num`. For example:
-
-    $ docker-compose scale web=2 worker=3
diff --git a/docs/reference/start.md b/docs/reference/start.md
deleted file mode 100644
index f0bdd5a9..00000000
--- a/docs/reference/start.md
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--[metadata]>
-+++
-title = "start"
-description = "Starts existing containers for a service."
-keywords = ["fig, composition, compose, docker, orchestration, cli,  start"]
-[menu.main]
-identifier="start.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# start
-
-```
-Usage: start [SERVICE...]
-```
-
-Starts existing containers for a service.
diff --git a/docs/reference/stop.md b/docs/reference/stop.md
deleted file mode 100644
index ec7e6688..00000000
--- a/docs/reference/stop.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--[metadata]>
-+++
-title = "stop"
-description = "Stops running containers without removing them. "
-keywords = ["fig, composition, compose, docker, orchestration, cli, stop"]
-[menu.main]
-identifier="stop.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# stop
-
-```
-Usage: stop [options] [SERVICE...]
-
-Options:
--t, --timeout TIMEOUT      Specify a shutdown timeout in seconds (default: 10).
-```
-
-Stops running containers without removing them. They can be started again with
-`docker-compose start`.
diff --git a/docs/reference/unpause.md b/docs/reference/unpause.md
deleted file mode 100644
index 846b229e..00000000
--- a/docs/reference/unpause.md
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--[metadata]>
-+++
-title = "unpause"
-description = "Unpauses paused containers for a service."
-keywords = ["fig, composition, compose, docker, orchestration, cli, unpause"]
-[menu.main]
-identifier="unpause.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# unpause
-
-```
-Usage: unpause [SERVICE...]
-```
-
-Unpauses paused containers of a service.
diff --git a/docs/reference/up.md b/docs/reference/up.md
deleted file mode 100644
index 3951f879..00000000
--- a/docs/reference/up.md
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--[metadata]>
-+++
-title = "up"
-description = "Builds, (re)creates, starts, and attaches to containers for a service."
-keywords = ["fig, composition, compose, docker, orchestration, cli,  up"]
-[menu.main]
-identifier="up.compose"
-parent = "smn_compose_cli"
-+++
-<![end-metadata]-->
-
-# up
-
-```
-Usage: up [options] [SERVICE...]
-
-Options:
-    -d                         Detached mode: Run containers in the background,
-                               print new container names.
-                               Incompatible with --abort-on-container-exit.
-    --no-color                 Produce monochrome output.
-    --no-deps                  Don't start linked services.
-    --force-recreate           Recreate containers even if their configuration
-                               and image haven't changed.
-                               Incompatible with --no-recreate.
-    --no-recreate              If containers already exist, don't recreate them.
-                               Incompatible with --force-recreate.
-    --no-build                 Don't build an image, even if it's missing.
-    --build                    Build images before starting containers.
-    --abort-on-container-exit  Stops all containers if any container was stopped.
-                               Incompatible with -d.
-    -t, --timeout TIMEOUT      Use this timeout in seconds for container shutdown
-                               when attached or when containers are already
-                               running. (default: 10)
-    --remove-orphans           Remove containers for services not defined in
-                               the Compose file
-
-```
-
-Builds, (re)creates, starts, and attaches to containers for a service.
-
-Unless they are already running, this command also starts any linked services.
-
-The `docker-compose up` command aggregates the output of each container. When
-the command exits, all containers are stopped. Running `docker-compose up -d`
-starts the containers in the background and leaves them running.
-
-If there are existing containers for a service, and the service's configuration
-or image was changed after the container's creation, `docker-compose up` picks
-up the changes by stopping and recreating the containers (preserving mounted
-volumes). To prevent Compose from picking up changes, use the `--no-recreate`
-flag.
-
-If you want to force Compose to stop and recreate all containers, use the
-`--force-recreate` flag.
diff --git a/docs/startup-order.md b/docs/startup-order.md
deleted file mode 100644
index c67e1829..00000000
--- a/docs/startup-order.md
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--[metadata]>
-+++
-title = "Controlling startup order"
-description = "How to control service startup order in Docker Compose"
-keywords = "documentation, docs,  docker, compose, startup, order"
-[menu.main]
-parent="workw_compose"
-weight=90
-+++
-<![end-metadata]-->
-
-# Controlling startup order in Compose
-
-You can control the order of service startup with the
-[depends_on](compose-file.md#depends-on) option. Compose always starts
-containers in dependency order, where dependencies are determined by
-`depends_on`, `links`, `volumes_from` and `network_mode: "service:..."`.
-
-However, Compose will not wait until a container is "ready" (whatever that means
-for your particular application) - only until it's running. There's a good
-reason for this.
-
-The problem of waiting for a database (for example) to be ready is really just
-a subset of a much larger problem of distributed systems. In production, your
-database could become unavailable or move hosts at any time. Your application
-needs to be resilient to these types of failures.
-
-To handle this, your application should attempt to re-establish a connection to
-the database after a failure. If the application retries the connection,
-it should eventually be able to connect to the database.
-
-The best solution is to perform this check in your application code, both at
-startup and whenever a connection is lost for any reason. However, if you don't
-need this level of resilience, you can work around the problem with a wrapper
-script:
-
--   Use a tool such as [wait-for-it](https://github.com/vishnubob/wait-for-it)
-    or [dockerize](https://github.com/jwilder/dockerize). These are small
-    wrapper scripts which you can include in your application's image and will
-    poll a given host and port until it's accepting TCP connections.
-
-    Supposing your application's image has a `CMD` set in its Dockerfile, you
-    can wrap it by setting the entrypoint in `docker-compose.yml`:
-
-        version: "2"
-        services:
-          web:
-            build: .
-            ports:
-              - "80:8000"
-            depends_on:
-              - "db"
-            entrypoint: ./wait-for-it.sh db:5432
-          db:
-            image: postgres
-
--   Write your own wrapper script to perform a more application-specific health
-    check. For example, you might want to wait until Postgres is definitely
-    ready to accept commands:
-
-        #!/bin/bash
-
-        set -e
-
-        host="$1"
-        shift
-        cmd="$@"
-
-        until psql -h "$host" -U "postgres" -c '\l'; do
-          >&2 echo "Postgres is unavailable - sleeping"
-          sleep 1
-        done
-
-        >&2 echo "Postgres is up - executing command"
-        exec $cmd
-
-    You can use this as a wrapper script as in the previous example, by setting
-    `entrypoint: ./wait-for-postgres.sh db`.
-
-
-## Compose documentation
-
-- [Installing Compose](install.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
diff --git a/docs/swarm.md b/docs/swarm.md
deleted file mode 100644
index f956f8c2..00000000
--- a/docs/swarm.md
+++ /dev/null
@@ -1,185 +0,0 @@
-<!--[metadata]>
-+++
-title = "Using Compose with Swarm"
-description = "How to use Compose and Swarm together to deploy apps to multi-host clusters"
-keywords = ["documentation, docs,  docker, compose, orchestration, containers, swarm"]
-[menu.main]
-parent="workw_compose"
-+++
-<![end-metadata]-->
-
-
-# Using Compose with Swarm
-
-> **Note:** “Swarm” here refers to [Docker Swarm](/swarm/overview.md), a product separate from Docker Engine. It does _not_ refer to [swarm mode](/engine/swarm), which is a built-in feature of Docker Engine introduced in version 1.12.
->
-> Integration between Compose and swarm mode is at the experimental stage. See [Docker Stacks and Bundles](bundles.md) for details.
-
-Docker Compose and [Docker Swarm](/swarm/overview.md) aim to have full integration, meaning
-you can point a Compose app at a Swarm cluster and have it all just work as if
-you were using a single Docker host.
-
-The actual extent of integration depends on which version of the [Compose file
-format](compose-file.md#versioning) you are using:
-
-1.  If you're using version 1 along with `links`, your app will work, but Swarm
-    will schedule all containers on one host, because links between containers
-    do not work across hosts with the old networking system.
-
-2. If you're using version 2, your app should work with no changes:
-
-    - subject to the [limitations](#limitations) described below,
-
-    - as long as the Swarm cluster is configured to use the [overlay driver](https://docs.docker.com/engine/userguide/networking/dockernetworks/#an-overlay-network),
-      or a custom driver which supports multi-host networking.
-
-Read [Get started with multi-host networking](https://docs.docker.com/engine/userguide/networking/get-started-overlay/) to see how to
-set up a Swarm cluster with [Docker Machine](/machine/overview.md) and the overlay driver. Once you've got it running, deploying your app to it should be as simple as:
-
-    $ eval "$(docker-machine env --swarm <name of swarm master machine>)"
-    $ docker-compose up
-
-
-## Limitations
-
-### Building images
-
-Swarm can build an image from a Dockerfile just like a single-host Docker
-instance can, but the resulting image will only live on a single node and won't
-be distributed to other nodes.
-
-If you want to use Compose to scale the service in question to multiple nodes,
-you'll have to build it yourself, push it to a registry (e.g. the Docker Hub)
-and reference it from `docker-compose.yml`:
-
-    $ docker build -t myusername/web .
-    $ docker push myusername/web
-
-    $ cat docker-compose.yml
-    web:
-      image: myusername/web
-
-    $ docker-compose up -d
-    $ docker-compose scale web=3
-
-### Multiple dependencies
-
-If a service has multiple dependencies of the type which force co-scheduling
-(see [Automatic scheduling](#automatic-scheduling) below), it's possible that
-Swarm will schedule the dependencies on different nodes, making the dependent
-service impossible to schedule. For example, here `foo` needs to be co-scheduled
-with `bar` and `baz`:
-
-    version: "2"
-    services:
-      foo:
-        image: foo
-        volumes_from: ["bar"]
-        network_mode: "service:baz"
-      bar:
-        image: bar
-      baz:
-        image: baz
-
-The problem is that Swarm might first schedule `bar` and `baz` on different
-nodes (since they're not dependent on one another), making it impossible to
-pick an appropriate node for `foo`.
-
-To work around this, use [manual scheduling](#manual-scheduling) to ensure that
-all three services end up on the same node:
-
-    version: "2"
-    services:
-      foo:
-        image: foo
-        volumes_from: ["bar"]
-        network_mode: "service:baz"
-        environment:
-          - "constraint:node==node-1"
-      bar:
-        image: bar
-        environment:
-          - "constraint:node==node-1"
-      baz:
-        image: baz
-        environment:
-          - "constraint:node==node-1"
-
-### Host ports and recreating containers
-
-If a service maps a port from the host, e.g. `80:8000`, then you may get an
-error like this when running `docker-compose up` on it after the first time:
-
-    docker: Error response from daemon: unable to find a node that satisfies
-    container==6ab2dfe36615ae786ef3fc35d641a260e3ea9663d6e69c5b70ce0ca6cb373c02.
-
-The usual cause of this error is that the container has a volume (defined either
-in its image or in the Compose file) without an explicit mapping, and so in
-order to preserve its data, Compose has directed Swarm to schedule the new
-container on the same node as the old container. This results in a port clash.
-
-There are two viable workarounds for this problem:
-
--   Specify a named volume, and use a volume driver which is capable of mounting
-    the volume into the container regardless of what node it's scheduled on.
-
-    Compose does not give Swarm any specific scheduling instructions if a
-    service uses only named volumes.
-
-        version: "2"
-
-        services:
-          web:
-            build: .
-            ports:
-              - "80:8000"
-            volumes:
-              - web-logs:/var/log/web
-
-        volumes:
-          web-logs:
-            driver: custom-volume-driver
-
--   Remove the old container before creating the new one. You will lose any data
-    in the volume.
-
-        $ docker-compose stop web
-        $ docker-compose rm -f web
-        $ docker-compose up web
-
-
-## Scheduling containers
-
-### Automatic scheduling
-
-Some configuration options will result in containers being automatically
-scheduled on the same Swarm node to ensure that they work correctly. These are:
-
--   `network_mode: "service:..."` and `network_mode: "container:..."` (and
-    `net: "container:..."` in the version 1 file format).
-
--   `volumes_from`
-
--   `links`
-
-### Manual scheduling
-
-Swarm offers a rich set of scheduling and affinity hints, enabling you to
-control where containers are located. They are specified via container
-environment variables, so you can use Compose's `environment` option to set
-them.
-
-    # Schedule containers on a specific node
-    environment:
-      - "constraint:node==node-1"
-
-    # Schedule containers on a node that has the 'storage' label set to 'ssd'
-    environment:
-      - "constraint:storage==ssd"
-
-    # Schedule containers where the 'redis' image is already pulled
-    environment:
-      - "affinity:image==redis"
-
-For the full set of available filters and expressions, see the [Swarm
-documentation](/swarm/scheduler/filter.md).
diff --git a/docs/wordpress.md b/docs/wordpress.md
deleted file mode 100644
index b39a8bbb..00000000
--- a/docs/wordpress.md
+++ /dev/null
@@ -1,112 +0,0 @@
-<!--[metadata]>
-+++
-title = "Quickstart: Compose and WordPress"
-description = "Getting started with Compose and WordPress"
-keywords = ["documentation, docs,  docker, compose, orchestration, containers"]
-[menu.main]
-parent="workw_compose"
-weight=6
-+++
-<![end-metadata]-->
-
-
-# Quickstart: Docker Compose and WordPress
-
-You can use Docker Compose to easily run WordPress in an isolated environment built
-with Docker containers. This quick-start guide demonstrates how to use Compose to set up and run WordPress. Before starting, you'll need to have
-[Compose installed](install.md).
-
-### Define the project
-
-1. Create an empty project directory.
-
-    You can name the directory something easy for you to remember. This directory is the context for your application image. The directory should only contain resources to build that image.
-
-    This project directory will contain a `docker-compose.yaml` file which will be complete in itself for a good starter wordpress project.
-
-2. Change directories into your project directory.
-
-    For example, if you named your directory `my_wordpress`:
-
-        $ cd my-wordpress/
-
-3. Create a `docker-compose.yml` file that will start your `Wordpress` blog and a separate `MySQL` instance with a volume mount for data persistence:
-
-        version: '2'
-        services:
-          db:
-            image: mysql:5.7
-            volumes:
-              - "./.data/db:/var/lib/mysql"
-            restart: always
-            environment:
-              MYSQL_ROOT_PASSWORD: wordpress
-              MYSQL_DATABASE: wordpress
-              MYSQL_USER: wordpress
-              MYSQL_PASSWORD: wordpress
-
-          wordpress:
-            depends_on:
-              - db
-            image: wordpress:latest
-            links:
-              - db
-            ports:
-              - "8000:80"
-            restart: always
-            environment:
-              WORDPRESS_DB_HOST: db:3306
-              WORDPRESS_DB_PASSWORD: wordpress
-
-    **NOTE**: The folder `./.data/db` will be automatically created in the project directory
-    alongside the `docker-compose.yml` which will persist any updates made by wordpress to the
-    database.
-
-### Build the project
-
-Now, run `docker-compose up -d` from your project directory.
-
-This pulls the needed images, and starts the wordpress and database containers, as shown in the example below.
-
-    $ docker-compose up -d
-    Creating network "my_wordpress_default" with the default driver
-    Pulling db (mysql:5.7)...
-    5.7: Pulling from library/mysql
-    efd26ecc9548: Pull complete
-    a3ed95caeb02: Pull complete
-    ...
-    Digest: sha256:34a0aca88e85f2efa5edff1cea77cf5d3147ad93545dbec99cfe705b03c520de
-    Status: Downloaded newer image for mysql:5.7
-    Pulling wordpress (wordpress:latest)...
-    latest: Pulling from library/wordpress
-    efd26ecc9548: Already exists
-    a3ed95caeb02: Pull complete
-    589a9d9a7c64: Pull complete
-    ...
-    Digest: sha256:ed28506ae44d5def89075fd5c01456610cd6c64006addfe5210b8c675881aff6
-    Status: Downloaded newer image for wordpress:latest
-    Creating my_wordpress_db_1
-    Creating my_wordpress_wordpress_1
-
-### Bring up WordPress in a web browser
-
-If you're using [Docker Machine](https://docs.docker.com/machine/), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.
-
-At this point, WordPress should be running on port `8000` of your Docker Host, and you can complete the "famous five-minute installation" as a WordPress administrator.
-
-**NOTE**: The Wordpress site will not be immediately available on port `8000` because the containers are still being initialized and may take a couple of minutes before the first load.
-
-![Choose language for WordPress install](images/wordpress-lang.png)
-
-![WordPress Welcome](images/wordpress-welcome.png)
-
-
-## More Compose documentation
-
-- [User guide](index.md)
-- [Installing Compose](install.md)
-- [Getting Started](gettingstarted.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)

From a8ff4285d1bdcafb0a4c1bd176c052a9898ec1e8 Mon Sep 17 00:00:00 2001
From: Victoria Bialas <victoria.bialas@docker.com>
Date: Wed, 5 Oct 2016 16:19:09 -0700
Subject: [PATCH 1157/1265] updated README per vnext branch plan

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
---
 docs/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/README.md b/docs/README.md
index 03d2e3a7..50c91d20 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -6,5 +6,11 @@ The documentation for Compose has been merged into
 The docs for Compose are now here:
 https://github.com/docker/docker.github.io/tree/master/compose
 
+Please submit pull requests for unpublished features on the `vnext-compose` branch (https://github.com/docker/docker.github.io/tree/vnext-compose).
+
+If you submit a PR to this codebase that has a docs impact, create a second docs PR on `docker.github.io`. Use the docs PR template provided (coming soon - watch this space).
+
+PRs for typos, additional information, etc. for already-published features should be labeled as `okay-to-publish` (we are still settling on a naming convention, will provide a label soon). You can submit these PRs either to `vnext-compose` or directly to `master` on `docker.github.io`
+
 As always, the docs remain open-source and we appreciate your feedback and
 pull requests!

From b50b14f937455889fa0d62c451941d58b3cec124 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 28 Sep 2016 13:13:04 -0700
Subject: [PATCH 1158/1265] Fix openssl dependency in OSX binary build

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 script/setup/osx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/script/setup/osx b/script/setup/osx
index 39941de2..e6ab62a8 100755
--- a/script/setup/osx
+++ b/script/setup/osx
@@ -10,12 +10,12 @@ openssl_version() {
   python -c "import ssl; print ssl.OPENSSL_VERSION"
 }
 
-desired_python_version="2.7.9"
-desired_python_brew_version="2.7.9"
-python_formula="https://raw.githubusercontent.com/Homebrew/homebrew/1681e193e4d91c9620c4901efd4458d9b6fcda8e/Library/Formula/python.rb"
+desired_python_version="2.7.12"
+desired_python_brew_version="2.7.12"
+python_formula="https://raw.githubusercontent.com/Homebrew/homebrew-core/737a2e34a89b213c1f0a2a24fc1a3c06635eed04/Formula/python.rb"
 
-desired_openssl_version="1.0.2h"
-desired_openssl_brew_version="1.0.2h"
+desired_openssl_version="1.0.2j"
+desired_openssl_brew_version="1.0.2j"
 openssl_formula="https://raw.githubusercontent.com/Homebrew/homebrew-core/30d3766453347f6e22b3ed6c74bb926d6def2eb5/Formula/openssl.rb"
 
 PATH="/usr/local/bin:$PATH"

From 2bce81508effe82c0bca3603769bdd2cc1b8d00f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 6 Oct 2016 17:04:19 -0400
Subject: [PATCH 1159/1265] Support non-alphanumeric default values.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/interpolation.py         | 2 +-
 tests/unit/config/interpolation_test.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index cb841437..1b270b9e 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -72,7 +72,7 @@ def recursive_interpolate(obj, interpolator):
 
 
 class TemplateWithDefaults(Template):
-    idpattern = r'[_a-z][_a-z0-9]*(?::?-[_a-z0-9]+)?'
+    idpattern = r'[_a-z][_a-z0-9]*(?::?-[^}]+)?'
 
     # Modified from python2.7/string.py
     def substitute(self, mapping):
diff --git a/tests/unit/config/interpolation_test.py b/tests/unit/config/interpolation_test.py
index 22444495..fd40153d 100644
--- a/tests/unit/config/interpolation_test.py
+++ b/tests/unit/config/interpolation_test.py
@@ -113,6 +113,7 @@ def test_interpolate_with_value(defaults_interpolator):
 def test_interpolate_missing_with_default(defaults_interpolator):
     assert defaults_interpolator("ok ${missing:-def}") == "ok def"
     assert defaults_interpolator("ok ${missing-def}") == "ok def"
+    assert defaults_interpolator("ok ${BAR:-/non:-alphanumeric}") == "ok /non:-alphanumeric"
 
 
 def test_interpolate_with_empty_and_default_value(defaults_interpolator):

From 17c5b45641a4fd7a210d1b73a96d6e6357a8cb12 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 6 Oct 2016 15:39:47 -0700
Subject: [PATCH 1160/1265] Handle formatter case where logrecord message is
 binary containing unicode characters.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/formatter.py         |  5 ++++-
 tests/unit/cli/formatter_test.py | 28 +++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/compose/cli/formatter.py b/compose/cli/formatter.py
index d0ed0f87..5f580645 100644
--- a/compose/cli/formatter.py
+++ b/compose/cli/formatter.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 import logging
 import os
 
+import six
 import texttable
 
 from compose.cli import colors
@@ -44,5 +45,7 @@ class ConsoleWarningFormatter(logging.Formatter):
         return ''
 
     def format(self, record):
+        if isinstance(record.msg, six.binary_type):
+            record.msg = record.msg.decode('utf-8')
         message = super(ConsoleWarningFormatter, self).format(record)
-        return self.get_level_message(record) + message
+        return '{0}{1}'.format(self.get_level_message(record), message)
diff --git a/tests/unit/cli/formatter_test.py b/tests/unit/cli/formatter_test.py
index 1c3b6a68..4aa025e6 100644
--- a/tests/unit/cli/formatter_test.py
+++ b/tests/unit/cli/formatter_test.py
@@ -11,8 +11,8 @@ from tests import unittest
 MESSAGE = 'this is the message'
 
 
-def makeLogRecord(level):
-    return logging.LogRecord('name', level, 'pathame', 0, MESSAGE, (), None)
+def make_log_record(level, message=None):
+    return logging.LogRecord('name', level, 'pathame', 0, message or MESSAGE, (), None)
 
 
 class ConsoleWarningFormatterTestCase(unittest.TestCase):
@@ -21,15 +21,33 @@ class ConsoleWarningFormatterTestCase(unittest.TestCase):
         self.formatter = ConsoleWarningFormatter()
 
     def test_format_warn(self):
-        output = self.formatter.format(makeLogRecord(logging.WARN))
+        output = self.formatter.format(make_log_record(logging.WARN))
         expected = colors.yellow('WARNING') + ': '
         assert output == expected + MESSAGE
 
     def test_format_error(self):
-        output = self.formatter.format(makeLogRecord(logging.ERROR))
+        output = self.formatter.format(make_log_record(logging.ERROR))
         expected = colors.red('ERROR') + ': '
         assert output == expected + MESSAGE
 
     def test_format_info(self):
-        output = self.formatter.format(makeLogRecord(logging.INFO))
+        output = self.formatter.format(make_log_record(logging.INFO))
         assert output == MESSAGE
+
+    def test_format_unicode_info(self):
+        message = b'\xec\xa0\x95\xec\x88\x98\xec\xa0\x95'
+        output = self.formatter.format(make_log_record(logging.INFO, message))
+        print(output)
+        assert output == message.decode('utf-8')
+
+    def test_format_unicode_warn(self):
+        message = b'\xec\xa0\x95\xec\x88\x98\xec\xa0\x95'
+        output = self.formatter.format(make_log_record(logging.WARN, message))
+        expected = colors.yellow('WARNING') + ': '
+        assert output == '{0}{1}'.format(expected, message.decode('utf-8'))
+
+    def test_format_unicode_error(self):
+        message = b'\xec\xa0\x95\xec\x88\x98\xec\xa0\x95'
+        output = self.formatter.format(make_log_record(logging.ERROR, message))
+        expected = colors.red('ERROR') + ': '
+        assert output == '{0}{1}'.format(expected, message.decode('utf-8'))

From e5ded6ff9b56835d9b40b3b6768658f02f347b07 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 29 Sep 2016 12:51:01 -0700
Subject: [PATCH 1161/1265] Add support for enable_ipv6 in network definition.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config_schema_v2.1.json |  3 +-
 compose/network.py                     |  5 ++-
 tests/integration/project_test.py      | 45 ++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
index de4ddf25..617f8ebe 100644
--- a/compose/config/config_schema_v2.1.json
+++ b/compose/config/config_schema_v2.1.json
@@ -246,7 +246,8 @@
             "name": {"type": "string"}
           },
           "additionalProperties": false
-        }
+        },
+        "enable_ipv6": {"type": "boolean"}
       },
       "additionalProperties": false
     },
diff --git a/compose/network.py b/compose/network.py
index 8962a892..c3af9aa1 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -15,7 +15,7 @@ log = logging.getLogger(__name__)
 
 class Network(object):
     def __init__(self, client, project, name, driver=None, driver_opts=None,
-                 ipam=None, external_name=None, internal=False):
+                 ipam=None, external_name=None, internal=False, enable_ipv6=False):
         self.client = client
         self.project = project
         self.name = name
@@ -24,6 +24,7 @@ class Network(object):
         self.ipam = create_ipam_config_from_dict(ipam)
         self.external_name = external_name
         self.internal = internal
+        self.enable_ipv6 = enable_ipv6
 
     def ensure(self):
         if self.external_name:
@@ -70,6 +71,7 @@ class Network(object):
                 options=self.driver_opts,
                 ipam=self.ipam,
                 internal=self.internal,
+                enable_ipv6=self.enable_ipv6
             )
 
     def remove(self):
@@ -118,6 +120,7 @@ def build_networks(name, config_data, client):
             ipam=data.get('ipam'),
             external_name=data.get('external_name'),
             internal=data.get('internal'),
+            enable_ipv6=data.get('enable_ipv6'),
         )
         for network_name, data in network_config.items()
     }
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 4427fe6b..94eac530 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -721,6 +721,51 @@ class ProjectTest(DockerClientTestCase):
         assert IPAMConfig.get('IPv4Address') == '172.16.100.100'
         assert IPAMConfig.get('IPv6Address') == 'fe80::1001:102'
 
+    @v2_1_only()
+    def test_up_with_enable_ipv6(self):
+        self.require_api_version('1.23')
+        config_data = config.Config(
+            version=V2_0,
+            services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'command': 'top',
+                'networks': {
+                    'static_test': {
+                        'ipv6_address': 'fe80::1001:102'
+                    }
+                },
+            }],
+            volumes={},
+            networks={
+                'static_test': {
+                    'driver': 'bridge',
+                    'enable_ipv6': True,
+                    'ipam': {
+                        'driver': 'default',
+                        'config': [
+                            {"subnet": "fe80::/64",
+                             "gateway": "fe80::1001:1"}
+                        ]
+                    }
+                }
+            }
+        )
+        project = Project.from_config(
+            client=self.client,
+            name='composetest',
+            config_data=config_data,
+        )
+        project.up(detached=True)
+        network = self.client.networks(names=['static_test'])[0]
+        service_container = project.get_service('web').containers()[0]
+
+        assert network['EnableIPv6'] is True
+        ipam_config = (service_container.inspect().get('NetworkSettings', {}).
+                       get('Networks', {}).get('composetest_static_test', {}).
+                       get('IPAMConfig', {}))
+        assert ipam_config.get('IPv6Address') == 'fe80::1001:102'
+
     @v2_only()
     def test_up_with_network_static_addresses_missing_subnet(self):
         config_data = config.Config(

From 0603b445e28502fc27850ce16dbdb158b3089f7e Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 4 Oct 2016 17:35:20 -0700
Subject: [PATCH 1162/1265] Properly merge logging dictionaries in overriding
 configs

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py         |  12 +++
 tests/unit/config/config_test.py | 158 ++++++++++++++++++++++++++++++-
 2 files changed, 169 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index aea1e094..8582d83c 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -760,6 +760,8 @@ def merge_service_dicts(base, override, version):
     for field in ['dns', 'dns_search', 'env_file', 'tmpfs']:
         md.merge_field(field, merge_list_or_string)
 
+    md.merge_field('logging', merge_logging)
+
     for field in set(ALLOWED_KEYS) - set(md):
         md.merge_scalar(field)
 
@@ -789,6 +791,16 @@ def merge_build(output, base, override):
     return dict(md)
 
 
+def merge_logging(base, override):
+    md = MergeDict(base, override)
+    md.merge_scalar('driver')
+    if md.get('driver') == base.get('driver') or base.get('driver') is None:
+        md.merge_mapping('options', lambda m: m or {})
+    else:
+        md['options'] = override.get('options')
+    return dict(md)
+
+
 def legacy_v1_merge_image_or_build(output, base, override):
     output.pop('image', None)
     output.pop('build', None)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 88b990e5..d9269ab4 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1330,7 +1330,7 @@ class ConfigTest(unittest.TestCase):
                     'image': 'alpine',
                     'group_add': ["docker", 777]
                 }
-             }
+            }
         }))
 
         assert actual.services == [
@@ -1429,6 +1429,162 @@ class ConfigTest(unittest.TestCase):
             'command': 'true',
         }
 
+    def test_merge_logging_v2(self):
+        base = {
+            'image': 'alpine:edge',
+            'logging': {
+                'driver': 'json-file',
+                'options': {
+                    'frequency': '2000',
+                    'timeout': '23'
+                }
+            }
+        }
+        override = {
+            'logging': {
+                'options': {
+                    'timeout': '360',
+                    'pretty-print': 'on'
+                }
+            }
+        }
+
+        actual = config.merge_service_dicts(base, override, V2_0)
+        assert actual == {
+            'image': 'alpine:edge',
+            'logging': {
+                'driver': 'json-file',
+                'options': {
+                    'frequency': '2000',
+                    'timeout': '360',
+                    'pretty-print': 'on'
+                }
+            }
+        }
+
+    def test_merge_logging_v2_override_driver(self):
+        base = {
+            'image': 'alpine:edge',
+            'logging': {
+                'driver': 'json-file',
+                'options': {
+                    'frequency': '2000',
+                    'timeout': '23'
+                }
+            }
+        }
+        override = {
+            'logging': {
+                'driver': 'syslog',
+                'options': {
+                    'timeout': '360',
+                    'pretty-print': 'on'
+                }
+            }
+        }
+
+        actual = config.merge_service_dicts(base, override, V2_0)
+        assert actual == {
+            'image': 'alpine:edge',
+            'logging': {
+                'driver': 'syslog',
+                'options': {
+                    'timeout': '360',
+                    'pretty-print': 'on'
+                }
+            }
+        }
+
+    def test_merge_logging_v2_no_base_driver(self):
+        base = {
+            'image': 'alpine:edge',
+            'logging': {
+                'options': {
+                    'frequency': '2000',
+                    'timeout': '23'
+                }
+            }
+        }
+        override = {
+            'logging': {
+                'driver': 'json-file',
+                'options': {
+                    'timeout': '360',
+                    'pretty-print': 'on'
+                }
+            }
+        }
+
+        actual = config.merge_service_dicts(base, override, V2_0)
+        assert actual == {
+            'image': 'alpine:edge',
+            'logging': {
+                'driver': 'json-file',
+                'options': {
+                    'frequency': '2000',
+                    'timeout': '360',
+                    'pretty-print': 'on'
+                }
+            }
+        }
+
+    def test_merge_logging_v2_no_drivers(self):
+        base = {
+            'image': 'alpine:edge',
+            'logging': {
+                'options': {
+                    'frequency': '2000',
+                    'timeout': '23'
+                }
+            }
+        }
+        override = {
+            'logging': {
+                'options': {
+                    'timeout': '360',
+                    'pretty-print': 'on'
+                }
+            }
+        }
+
+        actual = config.merge_service_dicts(base, override, V2_0)
+        assert actual == {
+            'image': 'alpine:edge',
+            'logging': {
+                'options': {
+                    'frequency': '2000',
+                    'timeout': '360',
+                    'pretty-print': 'on'
+                }
+            }
+        }
+
+    def test_merge_logging_v2_no_override_options(self):
+        base = {
+            'image': 'alpine:edge',
+            'logging': {
+                'driver': 'json-file',
+                'options': {
+                    'frequency': '2000',
+                    'timeout': '23'
+                }
+            }
+        }
+        override = {
+            'logging': {
+                'driver': 'syslog'
+            }
+        }
+
+        actual = config.merge_service_dicts(base, override, V2_0)
+        assert actual == {
+            'image': 'alpine:edge',
+            'logging': {
+                'driver': 'syslog',
+                'options': None
+            }
+        }
+
     def test_external_volume_config(self):
         config_details = build_config_details({
             'version': '2',

From bdcce13f4a50126ba42b76f70d1526dbe0ce3068 Mon Sep 17 00:00:00 2001
From: dbdd <wangtong2712@gmail.com>
Date: Tue, 27 Sep 2016 11:02:56 +0800
Subject: [PATCH 1163/1265] add support for creating volume and network with
 label definition

Signed-off-by: dbdd <wangtong2712@gmail.com>
---
 compose/config/config.py                  |  3 +
 compose/config/config_schema_v2.1.json    |  4 +-
 compose/network.py                        |  5 +-
 compose/volume.py                         |  8 ++-
 tests/acceptance/cli_test.py              | 41 ++++++++++++
 tests/fixtures/networks/network-label.yml | 13 ++++
 tests/fixtures/volumes/volume-label.yml   | 13 ++++
 tests/integration/project_test.py         | 76 +++++++++++++++++++++++
 tests/unit/config/config_test.py          | 53 ++++++++++++++++
 9 files changed, 211 insertions(+), 5 deletions(-)
 create mode 100644 tests/fixtures/networks/network-label.yml
 create mode 100644 tests/fixtures/volumes/volume-label.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 4d32b50c..b3e01778 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -361,6 +361,9 @@ def load_mapping(config_files, get_func, entity_type):
                     config['driver_opts']
                 )
 
+            if 'labels' in config:
+                config['labels'] = parse_labels(config['labels'])
+
     return mapping
 
 
diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
index de4ddf25..980e4ba1 100644
--- a/compose/config/config_schema_v2.1.json
+++ b/compose/config/config_schema_v2.1.json
@@ -246,7 +246,8 @@
             "name": {"type": "string"}
           },
           "additionalProperties": false
-        }
+        },
+        "labels": {"$ref": "#/definitions/list_or_dict"}
       },
       "additionalProperties": false
     },
@@ -268,6 +269,7 @@
             "name": {"type": "string"}
           }
         },
+        "labels": {"$ref": "#/definitions/list_or_dict"},
         "additionalProperties": false
       },
       "additionalProperties": false
diff --git a/compose/network.py b/compose/network.py
index 8962a892..796836fe 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -15,7 +15,7 @@ log = logging.getLogger(__name__)
 
 class Network(object):
     def __init__(self, client, project, name, driver=None, driver_opts=None,
-                 ipam=None, external_name=None, internal=False):
+                 ipam=None, external_name=None, internal=False, labels=None):
         self.client = client
         self.project = project
         self.name = name
@@ -24,6 +24,7 @@ class Network(object):
         self.ipam = create_ipam_config_from_dict(ipam)
         self.external_name = external_name
         self.internal = internal
+        self.labels = labels
 
     def ensure(self):
         if self.external_name:
@@ -70,6 +71,7 @@ class Network(object):
                 options=self.driver_opts,
                 ipam=self.ipam,
                 internal=self.internal,
+                labels=self.labels,
             )
 
     def remove(self):
@@ -118,6 +120,7 @@ def build_networks(name, config_data, client):
             ipam=data.get('ipam'),
             external_name=data.get('external_name'),
             internal=data.get('internal'),
+            labels=data.get('labels'),
         )
         for network_name, data in network_config.items()
     }
diff --git a/compose/volume.py b/compose/volume.py
index f440ba40..1fd1d51c 100644
--- a/compose/volume.py
+++ b/compose/volume.py
@@ -12,17 +12,18 @@ log = logging.getLogger(__name__)
 
 class Volume(object):
     def __init__(self, client, project, name, driver=None, driver_opts=None,
-                 external_name=None):
+                 external_name=None, labels=None):
         self.client = client
         self.project = project
         self.name = name
         self.driver = driver
         self.driver_opts = driver_opts
         self.external_name = external_name
+        self.labels = labels
 
     def create(self):
         return self.client.create_volume(
-            self.full_name, self.driver, self.driver_opts
+            self.full_name, self.driver, self.driver_opts, labels=self.labels
         )
 
     def remove(self):
@@ -68,7 +69,8 @@ class ProjectVolumes(object):
                 name=vol_name,
                 driver=data.get('driver'),
                 driver_opts=data.get('driver_opts'),
-                external_name=data.get('external_name')
+                external_name=data.get('external_name'),
+                labels=data.get('labels')
             )
             for vol_name, data in config_volumes.items()
         }
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 2247ffff..54737c7a 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -22,6 +22,7 @@ from compose.project import OneOffFilter
 from tests.integration.testcases import DockerClientTestCase
 from tests.integration.testcases import get_links
 from tests.integration.testcases import pull_busybox
+from tests.integration.testcases import v2_1_only
 from tests.integration.testcases import v2_only
 
 
@@ -767,6 +768,46 @@ class CLITestCase(DockerClientTestCase):
         container = self.project.containers()[0]
         assert list(container.get('NetworkSettings.Networks')) == [network_name]
 
+    @v2_1_only()
+    def test_up_with_network_labels(self):
+        filename = 'network-label.yml'
+
+        self.base_dir = 'tests/fixtures/networks'
+        self._project = get_project(self.base_dir, [filename])
+
+        self.dispatch(['-f', filename, 'up', '-d'], returncode=0)
+
+        network_with_label = '{}_network_with_label'.format(self.project.name)
+
+        networks = [
+            n for n in self.client.networks()
+            if n['Name'].startswith('{}_'.format(self.project.name))
+        ]
+
+        assert [n['Name'] for n in networks] == [network_with_label]
+
+        assert networks[0]['Labels'] == {'label_key': 'label_val'}
+
+    @v2_1_only()
+    def test_up_with_volume_labels(self):
+        filename = 'volume-label.yml'
+
+        self.base_dir = 'tests/fixtures/volumes'
+        self._project = get_project(self.base_dir, [filename])
+
+        self.dispatch(['-f', filename, 'up', '-d'], returncode=0)
+
+        volume_with_label = '{}_volume_with_label'.format(self.project.name)
+
+        volumes = [
+            v for v in self.client.volumes().get('Volumes', [])
+            if v['Name'].startswith('{}_'.format(self.project.name))
+        ]
+
+        assert [v['Name'] for v in volumes] == [volume_with_label]
+
+        assert volumes[0]['Labels'] == {'label_key': 'label_val'}
+
     @v2_only()
     def test_up_no_services(self):
         self.base_dir = 'tests/fixtures/no-services'
diff --git a/tests/fixtures/networks/network-label.yml b/tests/fixtures/networks/network-label.yml
new file mode 100644
index 00000000..fdb24f65
--- /dev/null
+++ b/tests/fixtures/networks/network-label.yml
@@ -0,0 +1,13 @@
+version: "2.1"
+
+services:
+  web:
+    image: busybox
+    command: top
+    networks:
+      - network_with_label
+
+networks:
+  network_with_label:
+    labels:
+      - "label_key=label_val"
diff --git a/tests/fixtures/volumes/volume-label.yml b/tests/fixtures/volumes/volume-label.yml
new file mode 100644
index 00000000..a5f33a5a
--- /dev/null
+++ b/tests/fixtures/volumes/volume-label.yml
@@ -0,0 +1,13 @@
+version: "2.1"
+
+services:
+  web:
+    image: busybox
+    command: top
+    volumes:
+      - volume_with_label:/data
+
+volumes:
+  volume_with_label:
+    labels:
+      - "label_key=label_val"
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 4427fe6b..149facfe 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -821,6 +821,42 @@ class ProjectTest(DockerClientTestCase):
 
         assert network['Internal'] is True
 
+    @v2_1_only()
+    def test_project_up_with_network_label(self):
+        self.require_api_version('1.23')
+
+        network_name = 'network_with_label'
+
+        config_data = config.Config(
+            version=V2_0,
+            services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'networks': {network_name: None}
+            }],
+            volumes={},
+            networks={
+                network_name: {'labels': {'label_key': 'label_val'}}
+            }
+        )
+
+        project = Project.from_config(
+            client=self.client,
+            name='composetest',
+            config_data=config_data
+        )
+
+        project.up()
+
+        networks = [
+            n for n in self.client.networks()
+            if n['Name'].startswith('composetest_')
+        ]
+
+        assert [n['Name'] for n in networks] == ['composetest_{}'.format(network_name)]
+
+        assert networks[0]['Labels'] == {'label_key': 'label_val'}
+
     @v2_only()
     def test_project_up_volumes(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
@@ -847,6 +883,46 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(volume_data['Name'], full_vol_name)
         self.assertEqual(volume_data['Driver'], 'local')
 
+    @v2_1_only()
+    def test_project_up_with_volume_labels(self):
+        self.require_api_version('1.23')
+
+        volume_name = 'volume_with_label'
+
+        config_data = config.Config(
+            version=V2_0,
+            services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'volumes': [VolumeSpec.parse('{}:/data'.format(volume_name))]
+            }],
+            volumes={
+                volume_name: {
+                    'labels': {
+                        'label_key': 'label_val'
+                    }
+                }
+            },
+            networks={},
+        )
+
+        project = Project.from_config(
+            client=self.client,
+            name='composetest',
+            config_data=config_data,
+        )
+
+        project.up()
+
+        volumes = [
+            v for v in self.client.volumes().get('Volumes', [])
+            if v['Name'].startswith('composetest_')
+        ]
+
+        assert [v['Name'] for v in volumes] == ['composetest_{}'.format(volume_name)]
+
+        assert volumes[0]['Labels'] == {'label_key': 'label_val'}
+
     @v2_only()
     def test_project_up_logging_with_multiple_files(self):
         base_file = config.ConfigFile(
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 88b990e5..7a8832d2 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -376,6 +376,59 @@ class ConfigTest(unittest.TestCase):
             }
         }
 
+    def test_load_config_volume_and_network_labels(self):
+        base_file = config.ConfigFile(
+            'base.yaml',
+            {
+                'version': '2.1',
+                'services': {
+                    'web': {
+                        'image': 'example/web',
+                    },
+                },
+                'networks': {
+                    'with_label': {
+                        'labels': {
+                            'label_key': 'label_val'
+                        }
+                    }
+                },
+                'volumes': {
+                    'with_label': {
+                        'labels': {
+                            'label_key': 'label_val'
+                        }
+                    }
+                }
+            }
+        )
+
+        details = config.ConfigDetails('.', [base_file])
+        network_dict = config.load(details).networks
+        volume_dict = config.load(details).volumes
+
+        self.assertEqual(
+            network_dict,
+            {
+                'with_label': {
+                    'labels': {
+                        'label_key': 'label_val'
+                    }
+                }
+            }
+        )
+
+        self.assertEqual(
+            volume_dict,
+            {
+                'with_label': {
+                    'labels': {
+                        'label_key': 'label_val'
+                    }
+                }
+            }
+        )
+
     def test_load_config_invalid_service_names(self):
         for invalid_name in ['?not?allowed', ' ', '', '!', '/', '\xe2']:
             with pytest.raises(ConfigurationError) as exc:

From 22d91f60bea78cbe232a1ac86ba747930ecf7d1a Mon Sep 17 00:00:00 2001
From: realityone <realityone@me.com>
Date: Fri, 14 Oct 2016 18:20:55 +0800
Subject: [PATCH 1164/1265] fix serialize restart spec with null string

Signed-off-by: realityone <realityone@me.com>
---
 compose/config/types.py                   | 2 ++
 tests/acceptance/cli_test.py              | 4 ++++
 tests/fixtures/restart/docker-compose.yml | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/compose/config/types.py b/compose/config/types.py
index 9664b580..c450a0f9 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -93,6 +93,8 @@ def parse_restart_spec(restart_config):
 
 
 def serialize_restart_spec(restart_spec):
+    if not restart_spec:
+        return ''
     parts = [restart_spec['Name']]
     if restart_spec['MaximumRetryCount']:
         parts.append(six.text_type(restart_spec['MaximumRetryCount']))
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 0c7c17bd..e2c02798 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -236,6 +236,10 @@ class CLITestCase(DockerClientTestCase):
                     'image': 'busybox',
                     'restart': 'on-failure:5',
                 },
+                'restart-null': {
+                    'image': 'busybox',
+                    'restart': ''
+                },
             },
             'networks': {},
             'volumes': {},
diff --git a/tests/fixtures/restart/docker-compose.yml b/tests/fixtures/restart/docker-compose.yml
index 2d10aa39..ecfdfbf5 100644
--- a/tests/fixtures/restart/docker-compose.yml
+++ b/tests/fixtures/restart/docker-compose.yml
@@ -12,3 +12,6 @@ services:
   on-failure-5:
     image: busybox
     restart: "on-failure:5"
+  restart-null:
+    image: busybox
+    restart: ""

From 8b383ad79571fd15e47c88dff71e2a4836bd3ffd Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 14 Oct 2016 17:27:57 +0100
Subject: [PATCH 1165/1265] Refactor "docker not found" message generation, add
 Windows message

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/errors.py | 38 ++++++++++++++++++--------------------
 compose/cli/utils.py  |  5 +++++
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index f9a20b9e..4fdec08a 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -17,6 +17,7 @@ from .utils import call_silently
 from .utils import is_docker_for_mac_installed
 from .utils import is_mac
 from .utils import is_ubuntu
+from .utils import is_windows
 
 
 log = logging.getLogger(__name__)
@@ -90,11 +91,7 @@ def exit_with_error(msg):
 
 def get_conn_error_message(url):
     if call_silently(['which', 'docker']) != 0:
-        if is_mac():
-            return docker_not_found_mac
-        if is_ubuntu():
-            return docker_not_found_ubuntu
-        return docker_not_found_generic
+        return docker_not_found_msg("Couldn't connect to Docker daemon.")
     if is_docker_for_mac_installed():
         return conn_error_docker_for_mac
     if call_silently(['which', 'docker-machine']) == 0:
@@ -102,25 +99,26 @@ def get_conn_error_message(url):
     return conn_error_generic.format(url=url)
 
 
-docker_not_found_mac = """
-    Couldn't connect to Docker daemon. You might need to install Docker:
-
-    https://docs.docker.com/engine/installation/mac/
-"""
+def docker_not_found_msg(problem):
+    return "{} You might need to install Docker:\n\n{}".format(
+        problem, docker_install_url())
 
 
-docker_not_found_ubuntu = """
-    Couldn't connect to Docker daemon. You might need to install Docker:
-
-    https://docs.docker.com/engine/installation/ubuntulinux/
-"""
+def docker_install_url():
+    if is_mac():
+        return docker_install_url_mac
+    elif is_ubuntu():
+        return docker_install_url_ubuntu
+    elif is_windows():
+        return docker_install_url_windows
+    else:
+        return docker_install_url_generic
 
 
-docker_not_found_generic = """
-    Couldn't connect to Docker daemon. You might need to install Docker:
-
-    https://docs.docker.com/engine/installation/
-"""
+docker_install_url_mac = "https://docs.docker.com/engine/installation/mac/"
+docker_install_url_ubuntu = "https://docs.docker.com/engine/installation/ubuntulinux/"
+docker_install_url_windows = "https://docs.docker.com/engine/installation/windows/"
+docker_install_url_generic = "https://docs.docker.com/engine/installation/"
 
 
 conn_error_docker_machine = """
diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index e10a3674..580bd1b0 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -11,6 +11,7 @@ import sys
 import docker
 
 import compose
+from ..const import IS_WINDOWS_PLATFORM
 
 # WindowsError is not defined on non-win32 platforms. Avoid runtime errors by
 # defining it as OSError (its parent class) if missing.
@@ -73,6 +74,10 @@ def is_ubuntu():
     return platform.system() == 'Linux' and platform.linux_distribution()[0] == 'Ubuntu'
 
 
+def is_windows():
+    return IS_WINDOWS_PLATFORM
+
+
 def get_version_info(scope):
     versioninfo = 'docker-compose version {}, build {}'.format(
         compose.__version__,

From 8314a48a2e96a0e34e913fb6b3a2973f1bceec5a Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 26 Sep 2016 13:18:16 +0100
Subject: [PATCH 1166/1265] Attach interactively on Windows by shelling out

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py | 60 ++++++++++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 438753a2..cbbb1325 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -7,6 +7,7 @@ import functools
 import json
 import logging
 import re
+import subprocess
 import sys
 from inspect import getdoc
 from operator import attrgetter
@@ -406,11 +407,6 @@ class TopLevelCommand(object):
         service = self.project.get_service(options['SERVICE'])
         detach = options['-d']
 
-        if IS_WINDOWS_PLATFORM and not detach:
-            raise UserError(
-                "Interactive mode is not yet supported on Windows.\n"
-                "Please pass the -d flag when using `docker-compose exec`."
-            )
         try:
             container = service.get_container(number=index)
         except ValueError as e:
@@ -418,6 +414,28 @@ class TopLevelCommand(object):
         command = [options['COMMAND']] + options['ARGS']
         tty = not options["-T"]
 
+        if IS_WINDOWS_PLATFORM and not detach:
+            args = ["docker", "exec"]
+
+            if options["-d"]:
+                args += ["--detach"]
+            else:
+                args += ["--interactive"]
+
+            if not options["-T"]:
+                args += ["--tty"]
+
+            if options["--privileged"]:
+                args += ["--privileged"]
+
+            if options["--user"]:
+                args += ["--user", options["--user"]]
+
+            args += [container.id]
+            args += command
+
+            sys.exit(subprocess.call(args))
+
         create_exec_options = {
             "privileged": options["--privileged"],
             "user": options["--user"],
@@ -675,12 +693,6 @@ class TopLevelCommand(object):
         service = self.project.get_service(options['SERVICE'])
         detach = options['-d']
 
-        if IS_WINDOWS_PLATFORM and not detach:
-            raise UserError(
-                "Interactive mode is not yet supported on Windows.\n"
-                "Please pass the -d flag when using `docker-compose run`."
-            )
-
         if options['--publish'] and options['--service-ports']:
             raise UserError(
                 'Service port mapping and manual port mapping '
@@ -969,17 +981,21 @@ def run_one_off_container(container_options, project, service, options):
     signals.set_signal_handler_to_shutdown()
     try:
         try:
-            operation = RunOperation(
-                project.client,
-                container.id,
-                interactive=not options['-T'],
-                logs=False,
-            )
-            pty = PseudoTerminal(project.client, operation)
-            sockets = pty.sockets()
-            service.start_container(container)
-            pty.start(sockets)
-            exit_code = container.wait()
+            if IS_WINDOWS_PLATFORM:
+                args = ["docker", "start", "--attach", "--interactive", container.id]
+                exit_code = subprocess.call(args)
+            else:
+                operation = RunOperation(
+                    project.client,
+                    container.id,
+                    interactive=not options['-T'],
+                    logs=False,
+                )
+                pty = PseudoTerminal(project.client, operation)
+                sockets = pty.sockets()
+                service.start_container(container)
+                pty.start(sockets)
+                exit_code = container.wait()
         except signals.ShutdownException:
             project.client.stop(container.id)
             exit_code = 1

From 925915eb2535a069d3eefe4c14d35e5964182ff9 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 14 Oct 2016 17:30:10 +0100
Subject: [PATCH 1167/1265] Show clear error when docker binary can't be found

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/main.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index cbbb1325..58b95c2f 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -6,6 +6,7 @@ import contextlib
 import functools
 import json
 import logging
+import pipes
 import re
 import subprocess
 import sys
@@ -415,7 +416,7 @@ class TopLevelCommand(object):
         tty = not options["-T"]
 
         if IS_WINDOWS_PLATFORM and not detach:
-            args = ["docker", "exec"]
+            args = ["exec"]
 
             if options["-d"]:
                 args += ["--detach"]
@@ -434,7 +435,7 @@ class TopLevelCommand(object):
             args += [container.id]
             args += command
 
-            sys.exit(subprocess.call(args))
+            sys.exit(call_docker(args))
 
         create_exec_options = {
             "privileged": options["--privileged"],
@@ -982,8 +983,7 @@ def run_one_off_container(container_options, project, service, options):
     try:
         try:
             if IS_WINDOWS_PLATFORM:
-                args = ["docker", "start", "--attach", "--interactive", container.id]
-                exit_code = subprocess.call(args)
+                exit_code = call_docker(["start", "--attach", "--interactive", container.id])
             else:
                 operation = RunOperation(
                     project.client,
@@ -1060,3 +1060,15 @@ def exit_if(condition, message, exit_code):
     if condition:
         log.error(message)
         raise SystemExit(exit_code)
+
+
+def call_docker(args):
+    try:
+        executable_path = subprocess.check_output(["which", "docker"]).strip()
+    except subprocess.CalledProcessError:
+        raise UserError(errors.docker_not_found_msg("Couldn't find `docker` binary."))
+
+    args = [executable_path] + args
+    log.debug(" ".join(map(pipes.quote, args)))
+
+    return subprocess.call(args)

From 882084932dd86ecf5e695c8d48f3621b134006d2 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 11 Oct 2016 17:56:02 -0700
Subject: [PATCH 1168/1265] Upgrade docker-py to latest version Adjust required
 requests version

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 4 ++--
 setup.py         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7acdd130..474efbdf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 PyYAML==3.11
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.2.0
-docker-py==1.10.3
+docker-py==1.10.4
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4; python_version < '3.4'
@@ -9,7 +9,7 @@ functools32==3.2.3.post2; python_version < '3.2'
 ipaddress==1.0.16
 jsonschema==2.5.1
 pypiwin32==219; sys_platform == 'win32'
-requests==2.7.0
+requests==2.11.1
 six==1.10.0
 texttable==0.8.4
 websocket-client==0.32.0
diff --git a/setup.py b/setup.py
index 80258fbd..442bc80c 100644
--- a/setup.py
+++ b/setup.py
@@ -31,10 +31,10 @@ install_requires = [
     'cached-property >= 1.2.0, < 2',
     'docopt >= 0.6.1, < 0.7',
     'PyYAML >= 3.10, < 4',
-    'requests >= 2.6.1, < 2.8',
+    'requests >= 2.6.1, != 2.11.0, < 2.12',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.10.3, < 2.0',
+    'docker-py >= 1.10.4, < 2.0',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

From efb09af271a1522914431818409b1c16c4bd24a9 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 10 Oct 2016 17:44:49 -0700
Subject: [PATCH 1169/1265] Do not normalize volume paths on Windows by default
 Add environment variable to enable normalization if needed. Do not normalize
 internal paths

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py        |  5 ++-
 compose/config/types.py         | 27 +++++++++++----
 tests/unit/config/types_test.py | 58 +++++++++++++++++++++++++--------
 tests/unit/service_test.py      | 16 ++++-----
 4 files changed, 77 insertions(+), 29 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 870bbad9..437ed389 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -651,7 +651,10 @@ def finalize_service(service_config, service_names, version, environment):
 
     if 'volumes' in service_dict:
         service_dict['volumes'] = [
-            VolumeSpec.parse(v) for v in service_dict['volumes']]
+            VolumeSpec.parse(
+                v, environment.get('COMPOSE_CONVERT_WINDOWS_PATHS')
+            ) for v in service_dict['volumes']
+        ]
 
     if 'net' in service_dict:
         network_mode = service_dict.pop('net')
diff --git a/compose/config/types.py b/compose/config/types.py
index c450a0f9..4c106747 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -5,6 +5,7 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import os
+import re
 from collections import namedtuple
 
 import six
@@ -14,6 +15,8 @@ from compose.config.errors import ConfigurationError
 from compose.const import IS_WINDOWS_PLATFORM
 from compose.utils import splitdrive
 
+win32_root_path_pattern = re.compile(r'^[A-Za-z]\:\\.*')
+
 
 class VolumeFromSpec(namedtuple('_VolumeFromSpec', 'source mode type')):
 
@@ -154,7 +157,7 @@ class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
         return cls(external, internal, mode)
 
     @classmethod
-    def _parse_win32(cls, volume_config):
+    def _parse_win32(cls, volume_config, normalize):
         # relative paths in windows expand to include the drive, eg C:\
         # so we join the first 2 parts back together to count as one
         mode = 'rw'
@@ -168,13 +171,13 @@ class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
 
         parts = separate_next_section(volume_config)
         if len(parts) == 1:
-            internal = normalize_path_for_engine(os.path.normpath(parts[0]))
+            internal = parts[0]
             external = None
         else:
             external = parts[0]
             parts = separate_next_section(parts[1])
-            external = normalize_path_for_engine(os.path.normpath(external))
-            internal = normalize_path_for_engine(os.path.normpath(parts[0]))
+            external = os.path.normpath(external)
+            internal = parts[0]
             if len(parts) > 1:
                 if ':' in parts[1]:
                     raise ConfigurationError(
@@ -183,15 +186,18 @@ class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
                     )
                 mode = parts[1]
 
+        if normalize:
+            external = normalize_path_for_engine(external) if external else None
+
         return cls(external, internal, mode)
 
     @classmethod
-    def parse(cls, volume_config):
+    def parse(cls, volume_config, normalize=False):
         """Parse a volume_config path and split it into external:internal[:mode]
         parts to be returned as a valid VolumeSpec.
         """
         if IS_WINDOWS_PLATFORM:
-            return cls._parse_win32(volume_config)
+            return cls._parse_win32(volume_config, normalize)
         else:
             return cls._parse_unix(volume_config)
 
@@ -201,7 +207,14 @@ class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
 
     @property
     def is_named_volume(self):
-        return self.external and not self.external.startswith(('.', '/', '~'))
+        res = self.external and not self.external.startswith(('.', '/', '~'))
+        if not IS_WINDOWS_PLATFORM:
+            return res
+
+        return (
+            res and not self.external.startswith('\\') and
+            not win32_root_path_pattern.match(self.external)
+        )
 
 
 class ServiceLink(namedtuple('_ServiceLink', 'target alias')):
diff --git a/tests/unit/config/types_test.py b/tests/unit/config/types_test.py
index 8dfa65d5..11427352 100644
--- a/tests/unit/config/types_test.py
+++ b/tests/unit/config/types_test.py
@@ -63,35 +63,67 @@ class TestVolumeSpec(object):
             VolumeSpec.parse('one:two:three:four')
         assert 'has incorrect format' in exc.exconly()
 
-    def test_parse_volume_windows_absolute_path(self):
-        windows_path = "c:\\Users\\me\\Documents\\shiny\\config:\\opt\\shiny\\config:ro"
-        assert VolumeSpec._parse_win32(windows_path) == (
+    def test_parse_volume_windows_absolute_path_normalized(self):
+        windows_path = "c:\\Users\\me\\Documents\\shiny\\config:/opt/shiny/config:ro"
+        assert VolumeSpec._parse_win32(windows_path, True) == (
             "/c/Users/me/Documents/shiny/config",
             "/opt/shiny/config",
             "ro"
         )
 
-    def test_parse_volume_windows_internal_path(self):
+    def test_parse_volume_windows_absolute_path_native(self):
+        windows_path = "c:\\Users\\me\\Documents\\shiny\\config:/opt/shiny/config:ro"
+        assert VolumeSpec._parse_win32(windows_path, False) == (
+            "c:\\Users\\me\\Documents\\shiny\\config",
+            "/opt/shiny/config",
+            "ro"
+        )
+
+    def test_parse_volume_windows_internal_path_normalized(self):
         windows_path = 'C:\\Users\\reimu\\scarlet:C:\\scarlet\\app:ro'
-        assert VolumeSpec._parse_win32(windows_path) == (
+        assert VolumeSpec._parse_win32(windows_path, True) == (
             '/c/Users/reimu/scarlet',
-            '/c/scarlet/app',
+            'C:\\scarlet\\app',
             'ro'
         )
 
-    def test_parse_volume_windows_just_drives(self):
+    def test_parse_volume_windows_internal_path_native(self):
+        windows_path = 'C:\\Users\\reimu\\scarlet:C:\\scarlet\\app:ro'
+        assert VolumeSpec._parse_win32(windows_path, False) == (
+            'C:\\Users\\reimu\\scarlet',
+            'C:\\scarlet\\app',
+            'ro'
+        )
+
+    def test_parse_volume_windows_just_drives_normalized(self):
         windows_path = 'E:\\:C:\\:ro'
-        assert VolumeSpec._parse_win32(windows_path) == (
+        assert VolumeSpec._parse_win32(windows_path, True) == (
             '/e/',
-            '/c/',
+            'C:\\',
             'ro'
         )
 
-    def test_parse_volume_windows_mixed_notations(self):
-        windows_path = '/c/Foo:C:\\bar'
-        assert VolumeSpec._parse_win32(windows_path) == (
+    def test_parse_volume_windows_just_drives_native(self):
+        windows_path = 'E:\\:C:\\:ro'
+        assert VolumeSpec._parse_win32(windows_path, False) == (
+            'E:\\',
+            'C:\\',
+            'ro'
+        )
+
+    def test_parse_volume_windows_mixed_notations_normalized(self):
+        windows_path = 'C:\\Foo:/root/foo'
+        assert VolumeSpec._parse_win32(windows_path, True) == (
             '/c/Foo',
-            '/c/bar',
+            '/root/foo',
+            'rw'
+        )
+
+    def test_parse_volume_windows_mixed_notations_native(self):
+        windows_path = 'C:\\Foo:/root/foo'
+        assert VolumeSpec._parse_win32(windows_path, False) == (
+            'C:\\Foo',
+            '/root/foo',
             'rw'
         )
 
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index a259c476..1d5aa10f 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -786,7 +786,7 @@ class ServiceVolumesTest(unittest.TestCase):
         self.mock_client = mock.create_autospec(docker.Client)
 
     def test_build_volume_binding(self):
-        binding = build_volume_binding(VolumeSpec.parse('/outside:/inside'))
+        binding = build_volume_binding(VolumeSpec.parse('/outside:/inside', True))
         assert binding == ('/inside', '/outside:/inside:rw')
 
     def test_get_container_data_volumes(self):
@@ -845,10 +845,10 @@ class ServiceVolumesTest(unittest.TestCase):
 
     def test_merge_volume_bindings(self):
         options = [
-            VolumeSpec.parse('/host/volume:/host/volume:ro'),
-            VolumeSpec.parse('/host/rw/volume:/host/rw/volume'),
-            VolumeSpec.parse('/new/volume'),
-            VolumeSpec.parse('/existing/volume'),
+            VolumeSpec.parse('/host/volume:/host/volume:ro', True),
+            VolumeSpec.parse('/host/rw/volume:/host/rw/volume', True),
+            VolumeSpec.parse('/new/volume', True),
+            VolumeSpec.parse('/existing/volume', True),
         ]
 
         self.mock_client.inspect_image.return_value = {
@@ -882,8 +882,8 @@ class ServiceVolumesTest(unittest.TestCase):
             'web',
             image='busybox',
             volumes=[
-                VolumeSpec.parse('/host/path:/data1'),
-                VolumeSpec.parse('/host/path:/data2'),
+                VolumeSpec.parse('/host/path:/data1', True),
+                VolumeSpec.parse('/host/path:/data2', True),
             ],
             client=self.mock_client,
         )
@@ -1007,7 +1007,7 @@ class ServiceVolumesTest(unittest.TestCase):
             'web',
             client=self.mock_client,
             image='busybox',
-            volumes=[VolumeSpec.parse(volume)],
+            volumes=[VolumeSpec.parse(volume, True)],
         ).create_container()
 
         assert self.mock_client.create_container.call_count == 1

From cd94c37f5d3f1c901002d44b9a17b29f68147e24 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 18 Oct 2016 14:09:31 -0700
Subject: [PATCH 1170/1265] Fix merge error (missing Network.labels attribute)

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/network.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/network.py b/compose/network.py
index 00d68aa4..e581a4fe 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -26,6 +26,7 @@ class Network(object):
         self.external_name = external_name
         self.internal = internal
         self.enable_ipv6 = enable_ipv6
+        self.labels = labels
 
     def ensure(self):
         if self.external_name:

From f039c8b43cae5fab4b8a22004ae6ab56d4d698b8 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 20 Oct 2016 17:39:55 -0700
Subject: [PATCH 1171/1265] Update release process document to account for
 recent changes.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 project/RELEASE-PROCESS.md | 62 ++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 930af15a..c1834f2f 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -20,18 +20,30 @@ release.
 
 As part of this script you'll be asked to:
 
-1.  Update the version in `docs/install.md` and `compose/__init__.py`.
+1.  Update the version in `compose/__init__.py` and `script/run/run.sh`.
 
-    If the next release will be an RC, append `rcN`, e.g. `1.4.0rc1`.
+    If the next release will be an RC, append `-rcN`, e.g. `1.4.0-rc1`.
 
 2.  Write release notes in `CHANGES.md`.
 
-    Almost every feature enhancement should be mentioned, with the most visible/exciting ones first. Use descriptive sentences and give context where appropriate.
+    Almost every feature enhancement should be mentioned, with the most
+    visible/exciting ones first. Use descriptive sentences and give context
+    where appropriate.
 
-    Bug fixes are worth mentioning if it's likely that they've affected lots of people, or if they were regressions in the previous version.
+    Bug fixes are worth mentioning if it's likely that they've affected lots
+    of people, or if they were regressions in the previous version.
 
     Improvements to the code are not worth mentioning.
 
+3.  Create a new repository on [bintray](https://bintray.com/docker-compose).
+    The name has to match the name of the branch (e.g. `bump-1.9.0`) and the
+    type should be "Generic". Other fields can be left blank.
+
+4.  Check that the `vnext-compose` branch on
+    [the docs repo](https://github.com/docker/docker.github.io/) has
+    documentation for all the new additions in the upcoming release, and create
+    a PR there for what needs to be amended.
+
 
 ## When a PR is merged into master that we want in the release
 
@@ -55,8 +67,8 @@ Check out the bump branch and run the `build-binaries` script
 
 When prompted build the non-linux binaries and test them.
 
-1.  Download the osx binary from Bintray. Make sure that the latest build has
-    finished, otherwise you'll be downloading an old binary.
+1.  Download the osx binary from Bintray. Make sure that the latest Travis
+    build has finished, otherwise you'll be downloading an old binary.
 
     https://dl.bintray.com/docker-compose/$BRANCH_NAME/
 
@@ -67,22 +79,24 @@ When prompted build the non-linux binaries and test them.
 3.  Draft a release from the tag on GitHub (the script will open the window for
     you)
 
-    In the "Tag version" dropdown, select the tag you just pushed.
+    The tag will only be present on Github when you run the `push-release`
+    script in step 7, but you can pre-fill it at that point.
 
-4.  Paste in installation instructions and release notes. Here's an example - change the Compose version and Docker version as appropriate:
+4.  Paste in installation instructions and release notes. Here's an example -
+    change the Compose version and Docker version as appropriate:
 
-        Firstly, note that Compose 1.5.0 requires Docker 1.8.0 or later.
+        If you're a Mac or Windows user, the best way to install Compose and keep it up-to-date is **[Docker for Mac and Windows](https://www.docker.com/products/docker)**.
 
-        Secondly, if you're a Mac user, the **[Docker Toolbox](https://www.docker.com/toolbox)** will install Compose 1.5.0 for you, alongside the latest versions of the Docker Engine, Machine and Kitematic.
+        Note that Compose 1.9.0 requires Docker Engine 1.10.0 or later for version 2 of the Compose File format, and Docker Engine 1.9.1 or later for version 1. Docker for Mac and Windows will automatically install the latest version of Docker Engine for you.
 
-        Otherwise, you can use the usual commands to install/upgrade. Either download the binary:
+        Alternatively, you can use the usual commands to install or upgrade Compose:
 
-            curl -L https://github.com/docker/compose/releases/download/1.5.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
-            chmod +x /usr/local/bin/docker-compose
+        ```
+        curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+        chmod +x /usr/local/bin/docker-compose
+        ```
 
-        Or install the PyPi package:
-
-            pip install -U docker-compose==1.5.0
+        See the [install docs](https://docs.docker.com/compose/install/) for more install options and instructions.
 
         Here's what's new:
 
@@ -99,6 +113,8 @@ When prompted build the non-linux binaries and test them.
         ./script/release/push-release
 
 
+8.  Merge the bump PR.
+
 8.  Publish the release on GitHub.
 
 9.  Check that all the binaries download (following the install instructions) and run.
@@ -107,19 +123,7 @@ When prompted build the non-linux binaries and test them.
 
 ## If it’s a stable release (not an RC)
 
-1. Merge the bump PR.
-
-2. Make sure `origin/release` is updated locally:
-
-        git fetch origin
-
-3. Update the `docs` branch on the upstream repo:
-
-        git push git@github.com:docker/compose.git origin/release:docs
-
-4. Let the docs team know that it’s been updated so they can publish it.
-
-5. Close the release’s milestone.
+1. Close the release’s milestone.
 
 ## If it’s a minor release (1.x.0), rather than a patch release (1.x.y)
 

From 3d8dc6f47a1484b0b6f8e3bd5cbf6115524d3892 Mon Sep 17 00:00:00 2001
From: Michal Zdrojewski <code@strayobject.co.uk>
Date: Mon, 24 Oct 2016 15:05:01 +0100
Subject: [PATCH 1172/1265] fix(docs): updated documentation links

Signed-off-by: Michal Zdrojewski <code@strayobject.co.uk>
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 93550f5a..5cf69b05 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,11 @@ Compose is a tool for defining and running multi-container Docker applications.
 With Compose, you use a Compose file to configure your application's services.
 Then, using a single command, you create and start all the services
 from your configuration. To learn more about all the features of Compose
-see [the list of features](https://github.com/docker/compose/blob/release/docs/overview.md#features).
+see [the list of features](https://github.com/docker/docker.github.io/blob/master/compose/overview.md#features).
 
 Compose is great for development, testing, and staging environments, as well as
 CI workflows. You can learn more about each case in
-[Common Use Cases](https://github.com/docker/compose/blob/release/docs/overview.md#common-use-cases).
+[Common Use Cases](https://github.com/docker/docker.github.io/blob/master/compose/overview.md#common-use-cases).
 
 Using Compose is basically a three-step process.
 
@@ -35,7 +35,7 @@ A `docker-compose.yml` looks like this:
         image: redis
 
 For more information about the Compose file, see the
-[Compose file reference](https://github.com/docker/compose/blob/release/docs/compose-file.md)
+[Compose file reference](https://github.com/docker/docker.github.io/blob/master/compose/compose-file.md)
 
 Compose has commands for managing the whole lifecycle of your application:
 

From 2c24bc3a083e138898cfe619a9cbf414f6df12d8 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 24 Oct 2016 10:55:04 -0700
Subject: [PATCH 1173/1265] Add missing config schema to docker-compose.spec

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 docker-compose.spec | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker-compose.spec b/docker-compose.spec
index 3a165dd6..e57d6b7a 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -27,6 +27,11 @@ exe = EXE(pyz,
                 'compose/config/config_schema_v2.0.json',
                 'DATA'
             ),
+            (
+                'compose/config/config_schema_v2.1.json',
+                'compose/config/config_schema_v2.1.json',
+                'DATA'
+            ),
             (
                 'compose/GITSHA',
                 'compose/GITSHA',

From ea68be3441ef2c0c100b8bac9499fa4180106eb5 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 24 Oct 2016 11:36:44 -0700
Subject: [PATCH 1174/1265] Do not print Swarm mode warning when connecting to
 a UCP server

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/project.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compose/project.py b/compose/project.py
index f85e285f..60647fe9 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -538,6 +538,10 @@ def get_volumes_from(project, service_dict):
 def warn_for_swarm_mode(client):
     info = client.info()
     if info.get('Swarm', {}).get('LocalNodeState') == 'active':
+        if info.get('ServerVersion', '').startswith('ucp'):
+            # UCP does multi-node scheduling with traditional Compose files.
+            return
+
         log.warn(
             "The Docker Engine you're using is running in swarm mode.\n\n"
             "Compose does not use swarm mode to deploy services to multiple nodes in a swarm. "

From 43e29b41c04dfa00fee294f57ccd2e5d1a80f99a Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 24 Oct 2016 11:51:45 -0700
Subject: [PATCH 1175/1265] Fix schema divergence - add missing fields to
 compose 2.1 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config_schema_v2.1.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
index f30b9054..3561a8cf 100644
--- a/compose/config/config_schema_v2.1.json
+++ b/compose/config/config_schema_v2.1.json
@@ -140,6 +140,7 @@
         "mac_address": {"type": "string"},
         "mem_limit": {"type": ["number", "string"]},
         "memswap_limit": {"type": ["number", "string"]},
+        "mem_swappiness": {"type": "integer"},
         "network_mode": {"type": "string"},
 
         "networks": {
@@ -168,6 +169,14 @@
             }
           ]
         },
+        "oom_score_adj": {"type": "integer", "minimum": -1000, "maximum": 1000},
+        "group_add": {
+            "type": "array",
+            "items": {
+                "type": ["string", "number"]
+            },
+            "uniqueItems": true
+        },
         "pid": {"type": ["string", "null"]},
 
         "ports": {
@@ -248,6 +257,7 @@
           },
           "additionalProperties": false
         },
+        "internal": {"type": "boolean"},
         "enable_ipv6": {"type": "boolean"},
         "labels": {"$ref": "#/definitions/list_or_dict"}
       },

From d2fb146913a1204b805ceb05e3d2b1b1a1006675 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 24 Oct 2016 12:12:19 -0700
Subject: [PATCH 1176/1265] Replace "which" calls with the portable
 find_executable function

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/errors.py         | 6 +++---
 compose/cli/main.py           | 6 +++---
 tests/unit/cli/errors_test.py | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compose/cli/errors.py b/compose/cli/errors.py
index 4fdec08a..5b977095 100644
--- a/compose/cli/errors.py
+++ b/compose/cli/errors.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 import contextlib
 import logging
 import socket
+from distutils.spawn import find_executable
 from textwrap import dedent
 
 from docker.errors import APIError
@@ -13,7 +14,6 @@ from requests.exceptions import SSLError
 from requests.packages.urllib3.exceptions import ReadTimeoutError
 
 from ..const import API_VERSION_TO_ENGINE_VERSION
-from .utils import call_silently
 from .utils import is_docker_for_mac_installed
 from .utils import is_mac
 from .utils import is_ubuntu
@@ -90,11 +90,11 @@ def exit_with_error(msg):
 
 
 def get_conn_error_message(url):
-    if call_silently(['which', 'docker']) != 0:
+    if find_executable('docker') is None:
         return docker_not_found_msg("Couldn't connect to Docker daemon.")
     if is_docker_for_mac_installed():
         return conn_error_docker_for_mac
-    if call_silently(['which', 'docker-machine']) == 0:
+    if find_executable('docker-machine') is not None:
         return conn_error_docker_machine
     return conn_error_generic.format(url=url)
 
diff --git a/compose/cli/main.py b/compose/cli/main.py
index 58b95c2f..08e58e37 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -10,6 +10,7 @@ import pipes
 import re
 import subprocess
 import sys
+from distutils.spawn import find_executable
 from inspect import getdoc
 from operator import attrgetter
 
@@ -1063,9 +1064,8 @@ def exit_if(condition, message, exit_code):
 
 
 def call_docker(args):
-    try:
-        executable_path = subprocess.check_output(["which", "docker"]).strip()
-    except subprocess.CalledProcessError:
+    executable_path = find_executable('docker')
+    if not executable_path:
         raise UserError(errors.docker_not_found_msg("Couldn't find `docker` binary."))
 
     args = [executable_path] + args
diff --git a/tests/unit/cli/errors_test.py b/tests/unit/cli/errors_test.py
index 1d454a08..a7b57562 100644
--- a/tests/unit/cli/errors_test.py
+++ b/tests/unit/cli/errors_test.py
@@ -16,9 +16,9 @@ def mock_logging():
         yield mock_log
 
 
-def patch_call_silently(side_effect):
+def patch_find_executable(side_effect):
     return mock.patch(
-        'compose.cli.errors.call_silently',
+        'compose.cli.errors.find_executable',
         autospec=True,
         side_effect=side_effect)
 
@@ -27,7 +27,7 @@ class TestHandleConnectionErrors(object):
 
     def test_generic_connection_error(self, mock_logging):
         with pytest.raises(errors.ConnectionError):
-            with patch_call_silently([0, 1]):
+            with patch_find_executable(['/bin/docker', None]):
                 with handle_connection_errors(mock.Mock()):
                     raise ConnectionError()
 

From 60d005b055119ce976265eaf34e4daa6483ead58 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 24 Oct 2016 13:58:45 -0700
Subject: [PATCH 1177/1265] Improve robustness of a couple integration tests
 with occasional failures

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/integration/project_test.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index e3c34af9..3afefb5a 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -826,9 +826,9 @@ class ProjectTest(DockerClientTestCase):
             name='composetest',
             config_data=config_data
         )
-        project.up()
+        project.up(detached=True)
 
-        service_container = project.get_service('web').containers()[0]
+        service_container = project.get_service('web').containers(stopped=True)[0]
         ipam_config = service_container.inspect().get(
             'NetworkSettings', {}
         ).get(
@@ -857,8 +857,8 @@ class ProjectTest(DockerClientTestCase):
             name='composetest',
             config_data=config_data
         )
-        project.up()
-        service_container = project.get_service('web').containers()[0]
+        project.up(detached=True)
+        service_container = project.get_service('web').containers(stopped=True)[0]
         assert service_container.inspect()['HostConfig']['Isolation'] == 'default'
 
     @v2_1_only()

From 99343fd76cc632d30ff2132ea715728317e10250 Mon Sep 17 00:00:00 2001
From: Albin Kerouanton <albin.kerouanton@knplabs.com>
Date: Tue, 25 Oct 2016 11:06:39 +0200
Subject: [PATCH 1178/1265] Fix path of the parent dir of COMPOSE_FILE

Signed-off-by: Albin Kerouanton <albin.kerouanton@knplabs.com>
---
 script/run/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/run/run.sh b/script/run/run.sh
index 6205747a..5872b081 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -35,7 +35,7 @@ if [ "$(pwd)" != '/' ]; then
     VOLUMES="-v $(pwd):$(pwd)"
 fi
 if [ -n "$COMPOSE_FILE" ]; then
-    compose_dir=$(dirname $COMPOSE_FILE)
+    compose_dir=$(realpath $(dirname $COMPOSE_FILE))
 fi
 # TODO: also check --file argument
 if [ -n "$compose_dir" ]; then

From 4871523d5e113e1f16a4ce50533d9b6f0bb80237 Mon Sep 17 00:00:00 2001
From: Mike Dougherty <mike.dougherty@docker.com>
Date: Fri, 22 Apr 2016 12:56:07 -0700
Subject: [PATCH 1179/1265] Update Jenkinsfile to perform existing jenkins
 tasks

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
---
 Jenkinsfile     | 84 +++++++++++++++++++++++++++++++++++++++++++++----
 script/test/all |  3 +-
 2 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index fa29520b..5de9a3fb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,8 +1,80 @@
-// Only run on Linux atm
-wrappedNode(label: 'docker') {
-  deleteDir()
-  stage "checkout"
-  checkout scm
+#!groovy
 
-  documentationChecker("docs")
+def image
+
+def checkDocs = { ->
+  wrappedNode(label: 'linux') {
+    deleteDir(); checkout(scm)
+    documentationChecker("docs")
+  }
 }
+
+def buildImage = { ->
+  wrappedNode(label: "linux && !zfs") {
+    stage("build image") {
+      deleteDir(); checkout(scm)
+      def imageName = "dockerbuildbot/compose:${gitCommit()}"
+      image = docker.image(imageName)
+      try {
+        image.pull()
+      } catch (Exception exc) {
+        image = docker.build(imageName, ".")
+        image.push()
+      }
+    }
+  }
+}
+
+def runTests = { Map settings ->
+  def dockerVersions = settings.get("dockerVersions", null)
+  def pythonVersions = settings.get("pythonVersions", null)
+
+  if (!pythonVersions) {
+    throw new Exception("Need Python versions to test. e.g.: `runTests(pythonVersions: 'py27,py34')`")
+  }
+  if (!dockerVersions) {
+    throw new Exception("Need Docker versions to test. e.g.: `runTests(dockerVersions: 'all')`")
+  }
+
+  { ->
+    wrappedNode(label: "linux && !zfs") {
+      stage("test python=${pythonVersions} / docker=${dockerVersions}") {
+        deleteDir(); checkout(scm)
+        def storageDriver = sh(script: 'docker info | awk -F \': \' \'$1 == "Storage Driver" { print $2; exit }\'', returnStdout: true).trim()
+        echo "Using local system's storage driver: ${storageDriver}"
+        sh """docker run \\
+          -t \\
+          --rm \\
+          --privileged \\
+          --volume="\$(pwd)/.git:/code/.git" \\
+          --volume="/var/run/docker.sock:/var/run/docker.sock" \\
+          -e "TAG=${image.id}" \\
+          -e "STORAGE_DRIVER=${storageDriver}" \\
+          -e "DOCKER_VERSIONS=${dockerVersions}" \\
+          -e "BUILD_NUMBER=\$BUILD_TAG" \\
+          -e "PY_TEST_VERSIONS=${pythonVersions}" \\
+          --entrypoint="script/ci" \\
+          ${image.id} \\
+          --verbose
+        """
+      }
+    }
+  }
+}
+
+def buildAndTest = { ->
+  buildImage()
+  // TODO: break this out into meaningful "DOCKER_VERSIONS" values instead of all
+  parallel(
+    failFast: true,
+    all_py27: runTests(pythonVersions: "py27", dockerVersions: "all"),
+    all_py34: runTests(pythonVersions: "py34", dockerVersions: "all"),
+  )
+}
+
+
+parallel(
+  failFast: false,
+  docs: checkDocs,
+  test: buildAndTest
+)
diff --git a/script/test/all b/script/test/all
index 08bf1618..7151a75e 100755
--- a/script/test/all
+++ b/script/test/all
@@ -24,6 +24,7 @@ fi
 
 
 BUILD_NUMBER=${BUILD_NUMBER-$USER}
+PY_TEST_VERSIONS=${PY_TEST_VERSIONS:-py27,py34}
 
 for version in $DOCKER_VERSIONS; do
   >&2 echo "Running tests against Docker $version"
@@ -58,6 +59,6 @@ for version in $DOCKER_VERSIONS; do
     --env="DOCKER_VERSION=$version" \
     --entrypoint="tox" \
     "$TAG" \
-    -e py27,py34 -- "$@"
+    -e "$PY_TEST_VERSIONS" -- "$@"
 
 done

From 046144e8f40de571b0d9c0029329e20712ca4736 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 27 Oct 2016 12:13:32 -0700
Subject: [PATCH 1180/1265] Bump docker-py version to include latest patch

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 474efbdf..e72a88e7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 PyYAML==3.11
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.2.0
-docker-py==1.10.4
+docker-py==1.10.5
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4; python_version < '3.4'
diff --git a/setup.py b/setup.py
index 442bc80c..19ff5c6a 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ install_requires = [
     'requests >= 2.6.1, != 2.11.0, < 2.12',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.10.4, < 2.0',
+    'docker-py >= 1.10.5, < 2.0',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

From ba43d08fbdc1e7ec25978cc9068c3a9a7be91aab Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 1 Nov 2016 11:09:29 -0700
Subject: [PATCH 1181/1265] Add whitelisted driver option added by the overlay
 driver to avoid breakage

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/network.py         | 21 +++++++++++++++++
 tests/unit/network_test.py | 47 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 tests/unit/network_test.py

diff --git a/compose/network.py b/compose/network.py
index e581a4fe..8e38401c 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -12,6 +12,10 @@ from .config import ConfigurationError
 
 log = logging.getLogger(__name__)
 
+OPTS_EXCEPTIONS = [
+    'com.docker.network.driver.overlay.vxlanid_list',
+]
+
 
 class Network(object):
     def __init__(self, client, project, name, driver=None, driver_opts=None,
@@ -113,6 +117,23 @@ def create_ipam_config_from_dict(ipam_dict):
     )
 
 
+def check_remote_network_config(remote, local):
+    if local.driver and remote['Driver'] != local.driver:
+        raise ConfigurationError(
+            'Network "{}" needs to be recreated - driver has changed'
+            .format(local.full_name)
+        )
+    local_opts = local.driver_opts or {}
+    for k in set.union(set(remote['Options'].keys()), set(local_opts.keys())):
+        if k in OPTS_EXCEPTIONS:
+            continue
+        if remote['Options'].get(k) != local_opts.get(k):
+            raise ConfigurationError(
+                'Network "{}" needs to be recreated - options have changed'
+                .format(local.full_name)
+            )
+
+
 def build_networks(name, config_data, client):
     network_config = config_data.networks or {}
     networks = {
diff --git a/tests/unit/network_test.py b/tests/unit/network_test.py
new file mode 100644
index 00000000..4720b053
--- /dev/null
+++ b/tests/unit/network_test.py
@@ -0,0 +1,47 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import pytest
+
+from .. import unittest
+from compose.config import ConfigurationError
+from compose.network import check_remote_network_config
+from compose.network import Network
+
+
+class NetworkTest(unittest.TestCase):
+    def test_check_remote_network_config_success(self):
+        options = {'com.docker.network.driver.foo': 'bar'}
+        net = Network(
+            None, 'compose_test', 'net1', 'bridge',
+            options
+        )
+        check_remote_network_config(
+            {'Driver': 'bridge', 'Options': options}, net
+        )
+
+    def test_check_remote_network_config_whitelist(self):
+        options = {'com.docker.network.driver.foo': 'bar'}
+        remote_options = {
+            'com.docker.network.driver.overlay.vxlanid_list': '257',
+            'com.docker.network.driver.foo': 'bar'
+        }
+        net = Network(
+            None, 'compose_test', 'net1', 'overlay',
+            options
+        )
+        check_remote_network_config(
+            {'Driver': 'overlay', 'Options': remote_options}, net
+        )
+
+    def test_check_remote_network_config_driver_mismatch(self):
+        net = Network(None, 'compose_test', 'net1', 'overlay')
+        with pytest.raises(ConfigurationError):
+            check_remote_network_config({'Driver': 'bridge', 'Options': {}}, net)
+
+    def test_check_remote_network_config_options_mismatch(self):
+        net = Network(None, 'compose_test', 'net1', 'overlay')
+        with pytest.raises(ConfigurationError):
+            check_remote_network_config({'Driver': 'overlay', 'Options': {
+                'com.docker.network.driver.foo': 'baz'
+            }}, net)

From 7a430dbe96ad01831e21eab7eaebf26fdaa9249c Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 2 Nov 2016 16:43:29 -0700
Subject: [PATCH 1182/1265] Updated docker-py dependency to latest version

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index e72a88e7..933146c7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 PyYAML==3.11
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.2.0
-docker-py==1.10.5
+docker-py==1.10.6
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4; python_version < '3.4'
diff --git a/setup.py b/setup.py
index 19ff5c6a..672ea80e 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ install_requires = [
     'requests >= 2.6.1, != 2.11.0, < 2.12',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.10.5, < 2.0',
+    'docker-py >= 1.10.6, < 2.0',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

From da1508051dcc7f106f891078b688bc31db7e43c5 Mon Sep 17 00:00:00 2001
From: Mike Dougherty <mike.dougherty@docker.com>
Date: Thu, 3 Nov 2016 13:59:56 -0700
Subject: [PATCH 1183/1265] Remove docs checker from Jenkinsfile and use
 cleanWorkspace option on wrappedNode

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
---
 Jenkinsfile | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5de9a3fb..e2f86daa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,17 +2,10 @@
 
 def image
 
-def checkDocs = { ->
-  wrappedNode(label: 'linux') {
-    deleteDir(); checkout(scm)
-    documentationChecker("docs")
-  }
-}
-
 def buildImage = { ->
-  wrappedNode(label: "linux && !zfs") {
+  wrappedNode(label: "linux && !zfs", cleanWorkspace: true) {
     stage("build image") {
-      deleteDir(); checkout(scm)
+      checkout(scm)
       def imageName = "dockerbuildbot/compose:${gitCommit()}"
       image = docker.image(imageName)
       try {
@@ -37,9 +30,9 @@ def runTests = { Map settings ->
   }
 
   { ->
-    wrappedNode(label: "linux && !zfs") {
+    wrappedNode(label: "linux && !zfs", cleanWorkspace: true) {
       stage("test python=${pythonVersions} / docker=${dockerVersions}") {
-        deleteDir(); checkout(scm)
+        checkout(scm)
         def storageDriver = sh(script: 'docker info | awk -F \': \' \'$1 == "Storage Driver" { print $2; exit }\'', returnStdout: true).trim()
         echo "Using local system's storage driver: ${storageDriver}"
         sh """docker run \\
@@ -62,19 +55,10 @@ def runTests = { Map settings ->
   }
 }
 
-def buildAndTest = { ->
-  buildImage()
-  // TODO: break this out into meaningful "DOCKER_VERSIONS" values instead of all
-  parallel(
-    failFast: true,
-    all_py27: runTests(pythonVersions: "py27", dockerVersions: "all"),
-    all_py34: runTests(pythonVersions: "py34", dockerVersions: "all"),
-  )
-}
-
-
+buildImage()
+// TODO: break this out into meaningful "DOCKER_VERSIONS" values instead of all
 parallel(
-  failFast: false,
-  docs: checkDocs,
-  test: buildAndTest
+  failFast: true,
+  all_py27: runTests(pythonVersions: "py27", dockerVersions: "all"),
+  all_py34: runTests(pythonVersions: "py34", dockerVersions: "all"),
 )

From 10417eebd70f028f57e56ef9a04d8ed51abdad99 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 3 Nov 2016 16:28:44 -0700
Subject: [PATCH 1184/1265] Fix logging dict merging

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py         |  2 +-
 tests/unit/config/config_test.py | 45 ++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 437ed389..9d23b34d 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -771,7 +771,7 @@ def merge_service_dicts(base, override, version):
     for field in ['dns', 'dns_search', 'env_file', 'tmpfs']:
         md.merge_field(field, merge_list_or_string)
 
-    md.merge_field('logging', merge_logging)
+    md.merge_field('logging', merge_logging, default={})
 
     for field in set(ALLOWED_KEYS) - set(md):
         md.merge_scalar(field)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index d205e282..66ae0147 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1657,6 +1657,51 @@ class ConfigTest(unittest.TestCase):
             }
         }
 
+    def test_merge_logging_v2_no_base(self):
+        base = {
+            'image': 'alpine:edge'
+        }
+        override = {
+            'logging': {
+                'driver': 'json-file',
+                'options': {
+                    'frequency': '2000'
+                }
+            }
+        }
+        actual = config.merge_service_dicts(base, override, V2_0)
+        assert actual == {
+            'image': 'alpine:edge',
+            'logging': {
+                'driver': 'json-file',
+                'options': {
+                    'frequency': '2000'
+                }
+            }
+        }
+
+    def test_merge_logging_v2_no_override(self):
+        base = {
+            'image': 'alpine:edge',
+            'logging': {
+                'driver': 'syslog',
+                'options': {
+                    'frequency': '2000'
+                }
+            }
+        }
+        override = {}
+        actual = config.merge_service_dicts(base, override, V2_0)
+        assert actual == {
+            'image': 'alpine:edge',
+            'logging': {
+                'driver': 'syslog',
+                'options': {
+                    'frequency': '2000'
+                }
+            }
+        }
+
     def test_external_volume_config(self):
         config_details = build_config_details({
             'version': '2',

From 4aa7d15d9771fadd22e8c1ff952526fdd6a67d77 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 4 Nov 2016 10:51:14 -0700
Subject: [PATCH 1185/1265] Call check_remote_network_config from
 Network.ensure

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/network.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/compose/network.py b/compose/network.py
index 8e38401c..06935a46 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -53,14 +53,7 @@ class Network(object):
 
         try:
             data = self.inspect()
-            if self.driver and data['Driver'] != self.driver:
-                raise ConfigurationError(
-                    'Network "{}" needs to be recreated - driver has changed'
-                    .format(self.full_name))
-            if data['Options'] != (self.driver_opts or {}):
-                raise ConfigurationError(
-                    'Network "{}" needs to be recreated - options have changed'
-                    .format(self.full_name))
+            check_remote_network_config(data, self)
         except NotFound:
             driver_name = 'the default driver'
             if self.driver:

From ba249e51796e6b35ed13e5f03716a9520a2dacfc Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 9 Nov 2016 15:10:02 +0000
Subject: [PATCH 1186/1265] Test that values in 'environment' override env
 files

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/unit/config/config_test.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 66ae0147..51c5e226 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -2493,6 +2493,15 @@ class EnvTest(unittest.TestCase):
             {'ONE': '2', 'TWO': '1', 'THREE': '3', 'FOO': 'bar'},
         )
 
+    def test_environment_overrides_env_file(self):
+        self.assertEqual(
+            resolve_environment({
+                'environment': {'FOO': 'baz'},
+                'env_file': ['tests/fixtures/env/one.env'],
+            }),
+            {'ONE': '2', 'TWO': '1', 'THREE': '3', 'FOO': 'baz'},
+        )
+
     def test_resolve_environment_with_multiple_env_files(self):
         service_dict = {
             'env_file': [

From 91620ae97bbffd247e2f78132255c0fe97910c4f Mon Sep 17 00:00:00 2001
From: Jari Takkala <jtakkala@gmail.com>
Date: Fri, 29 Jul 2016 06:46:42 -0400
Subject: [PATCH 1187/1265] Add sysctl option support when creating service
 Closes #3765

Signed-off-by: Jari Takkala <jtakkala@gmail.com>
---
 compose/config/config.py               | 16 +++++++++++-----
 compose/config/config_schema_v2.1.json |  1 +
 compose/service.py                     |  2 ++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 9d23b34d..57039e69 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -83,6 +83,7 @@ DOCKER_CONFIG_KEYS = [
     'shm_size',
     'stdin_open',
     'stop_signal',
+    'sysctls',
     'tty',
     'user',
     'volume_driver',
@@ -629,6 +630,9 @@ def process_service(service_config):
     if 'extra_hosts' in service_dict:
         service_dict['extra_hosts'] = parse_extra_hosts(service_dict['extra_hosts'])
 
+    if 'sysctls' in service_dict:
+        service_dict['sysctls'] = build_string_dict(parse_sysctls(service_dict['sysctls']))
+
     for field in ['dns', 'dns_search', 'tmpfs']:
         if field in service_dict:
             service_dict[field] = to_list(service_dict[field])
@@ -757,6 +761,7 @@ def merge_service_dicts(base, override, version):
     md.merge_mapping('labels', parse_labels)
     md.merge_mapping('ulimits', parse_ulimits)
     md.merge_mapping('networks', parse_networks)
+    md.merge_mapping('sysctls', parse_sysctls)
     md.merge_sequence('links', ServiceLink.parse)
 
     for field in ['volumes', 'devices']:
@@ -831,11 +836,11 @@ def merge_environment(base, override):
     return env
 
 
-def split_label(label):
-    if '=' in label:
-        return label.split('=', 1)
+def split_kv(kvpair):
+    if '=' in kvpair:
+        return kvpair.split('=', 1)
     else:
-        return label, ''
+        return kvpair, ''
 
 
 def parse_dict_or_list(split_func, type_name, arguments):
@@ -856,8 +861,9 @@ def parse_dict_or_list(split_func, type_name, arguments):
 
 parse_build_arguments = functools.partial(parse_dict_or_list, split_env, 'build arguments')
 parse_environment = functools.partial(parse_dict_or_list, split_env, 'environment')
-parse_labels = functools.partial(parse_dict_or_list, split_label, 'labels')
+parse_labels = functools.partial(parse_dict_or_list, split_kv, 'labels')
 parse_networks = functools.partial(parse_dict_or_list, lambda k: (k, None), 'networks')
+parse_sysctls = functools.partial(parse_dict_or_list, split_kv, 'sysctls')
 
 
 def parse_ulimits(ulimits):
diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
index 3561a8cf..fc95f2cb 100644
--- a/compose/config/config_schema_v2.1.json
+++ b/compose/config/config_schema_v2.1.json
@@ -193,6 +193,7 @@
         "restart": {"type": "string"},
         "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "shm_size": {"type": ["number", "string"]},
+        "sysctls": {"$ref": "#/definitions/list_or_dict"},
         "stdin_open": {"type": "boolean"},
         "stop_signal": {"type": "string"},
         "tmpfs": {"$ref": "#/definitions/string_or_list"},
diff --git a/compose/service.py b/compose/service.py
index 760d29a7..c917aac4 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -62,6 +62,7 @@ DOCKER_START_KEYS = [
     'restart',
     'security_opt',
     'shm_size',
+    'sysctls',
     'volumes_from',
 ]
 
@@ -707,6 +708,7 @@ class Service(object):
             cgroup_parent=options.get('cgroup_parent'),
             cpu_quota=options.get('cpu_quota'),
             shm_size=options.get('shm_size'),
+            sysctls=options.get('sysctls'),
             tmpfs=options.get('tmpfs'),
             oom_score_adj=options.get('oom_score_adj'),
             mem_swappiness=options.get('mem_swappiness'),

From 0291d9ade5574ff31aecc1a9f263f1ec21a901cf Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 14 Nov 2016 17:23:25 -0800
Subject: [PATCH 1188/1265] Limit testing pool to Ubuntu hosts to avoid errors
 with dind not starting properly.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e2f86daa..51136b1f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,7 @@
 def image
 
 def buildImage = { ->
-  wrappedNode(label: "linux && !zfs", cleanWorkspace: true) {
+  wrappedNode(label: "ubuntu && !zfs", cleanWorkspace: true) {
     stage("build image") {
       checkout(scm)
       def imageName = "dockerbuildbot/compose:${gitCommit()}"
@@ -30,7 +30,7 @@ def runTests = { Map settings ->
   }
 
   { ->
-    wrappedNode(label: "linux && !zfs", cleanWorkspace: true) {
+    wrappedNode(label: "ubuntu && !zfs", cleanWorkspace: true) {
       stage("test python=${pythonVersions} / docker=${dockerVersions}") {
         checkout(scm)
         def storageDriver = sh(script: 'docker info | awk -F \': \' \'$1 == "Storage Driver" { print $2; exit }\'', returnStdout: true).trim()

From efb4ed1b9e130ca5ac54f6e0fb23ce68c3689c1f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 14 Nov 2016 18:03:26 -0800
Subject: [PATCH 1189/1265] Handle new pull failures behavior in Engine 1.13

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/service.py           | 6 +++---
 tests/acceptance/cli_test.py | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 760d29a7..ad426706 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -10,6 +10,7 @@ from operator import attrgetter
 import enum
 import six
 from docker.errors import APIError
+from docker.errors import NotFound
 from docker.utils import LogConfig
 from docker.utils.ports import build_port_bindings
 from docker.utils.ports import split_port
@@ -829,12 +830,11 @@ class Service(object):
         repo, tag, separator = parse_repository_tag(self.options['image'])
         tag = tag or 'latest'
         log.info('Pulling %s (%s%s%s)...' % (self.name, repo, separator, tag))
-        output = self.client.pull(repo, tag=tag, stream=True)
-
         try:
+            output = self.client.pull(repo, tag=tag, stream=True)
             return progress_stream.get_digest_from_pull(
                 stream_output(output, sys.stdout))
-        except StreamOutputError as e:
+        except (StreamOutputError, NotFound) as e:
             if not ignore_pull_failures:
                 raise
             else:
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index a7cd78f1..f153bd95 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -330,12 +330,13 @@ class CLITestCase(DockerClientTestCase):
     def test_pull_with_ignore_pull_failures(self):
         result = self.dispatch([
             '-f', 'ignore-pull-failures.yml',
-            'pull', '--ignore-pull-failures'])
+            'pull', '--ignore-pull-failures']
+        )
 
         assert 'Pulling simple (busybox:latest)...' in result.stderr
         assert 'Pulling another (nonexisting-image:latest)...' in result.stderr
-        assert 'Error: image library/nonexisting-image' in result.stderr
-        assert 'not found' in result.stderr
+        assert ('repository nonexisting-image not found' in result.stderr or
+                'image library/nonexisting-image:latest not found' in result.stderr)
 
     def test_build_plain(self):
         self.base_dir = 'tests/fixtures/simple-dockerfile'

From 7f60ff5ae6b320dc0b38f8f2bcc850eca95f49ae Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 9 Nov 2016 15:38:09 -0800
Subject: [PATCH 1190/1265] Avoid breaking when remote driver options are null.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/network.py         |  7 ++++---
 tests/unit/network_test.py | 10 +++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/compose/network.py b/compose/network.py
index 06935a46..3b57cb94 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -111,16 +111,17 @@ def create_ipam_config_from_dict(ipam_dict):
 
 
 def check_remote_network_config(remote, local):
-    if local.driver and remote['Driver'] != local.driver:
+    if local.driver and remote.get('Driver') != local.driver:
         raise ConfigurationError(
             'Network "{}" needs to be recreated - driver has changed'
             .format(local.full_name)
         )
     local_opts = local.driver_opts or {}
-    for k in set.union(set(remote['Options'].keys()), set(local_opts.keys())):
+    remote_opts = remote.get('Options') or {}
+    for k in set.union(set(remote_opts.keys()), set(local_opts.keys())):
         if k in OPTS_EXCEPTIONS:
             continue
-        if remote['Options'].get(k) != local_opts.get(k):
+        if remote_opts.get(k) != local_opts.get(k):
             raise ConfigurationError(
                 'Network "{}" needs to be recreated - options have changed'
                 .format(local.full_name)
diff --git a/tests/unit/network_test.py b/tests/unit/network_test.py
index 4720b053..12d06f41 100644
--- a/tests/unit/network_test.py
+++ b/tests/unit/network_test.py
@@ -37,7 +37,9 @@ class NetworkTest(unittest.TestCase):
     def test_check_remote_network_config_driver_mismatch(self):
         net = Network(None, 'compose_test', 'net1', 'overlay')
         with pytest.raises(ConfigurationError):
-            check_remote_network_config({'Driver': 'bridge', 'Options': {}}, net)
+            check_remote_network_config(
+                {'Driver': 'bridge', 'Options': {}}, net
+            )
 
     def test_check_remote_network_config_options_mismatch(self):
         net = Network(None, 'compose_test', 'net1', 'overlay')
@@ -45,3 +47,9 @@ class NetworkTest(unittest.TestCase):
             check_remote_network_config({'Driver': 'overlay', 'Options': {
                 'com.docker.network.driver.foo': 'baz'
             }}, net)
+
+    def test_check_remote_network_config_null_remote(self):
+        net = Network(None, 'compose_test', 'net1', 'overlay')
+        check_remote_network_config(
+            {'Driver': 'overlay', 'Options': None}, net
+        )

From d717c88b6e81f5eb0769bc0670a6b78de842b2ce Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 9 Nov 2016 17:16:36 +0000
Subject: [PATCH 1191/1265] Support version 3.0 of the Compose file format

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py                  |  13 +-
 compose/config/config_schema_v3.0.json    | 378 ++++++++++++++++++++++
 compose/config/errors.py                  |   4 +-
 compose/config/serialize.py               |   3 +-
 compose/const.py                          |   3 +
 tests/acceptance/cli_test.py              |  55 ++++
 tests/fixtures/v3-full/docker-compose.yml |  37 +++
 tests/unit/config/config_test.py          |   6 +
 8 files changed, 491 insertions(+), 8 deletions(-)
 create mode 100644 compose/config/config_schema_v3.0.json
 create mode 100644 tests/fixtures/v3-full/docker-compose.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 9d23b34d..fb77436d 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -15,6 +15,7 @@ from cached_property import cached_property
 from ..const import COMPOSEFILE_V1 as V1
 from ..const import COMPOSEFILE_V2_0 as V2_0
 from ..const import COMPOSEFILE_V2_1 as V2_1
+from ..const import COMPOSEFILE_V3_0 as V3_0
 from ..utils import build_string_dict
 from ..utils import splitdrive
 from .environment import env_vars_from_file
@@ -175,7 +176,10 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
         if version == '2':
             version = V2_0
 
-        if version not in (V2_0, V2_1):
+        if version == '3':
+            version = V3_0
+
+        if version not in (V2_0, V2_1, V3_0):
             raise ConfigurationError(
                 'Version in "{}" is unsupported. {}'
                 .format(self.filename, VERSION_EXPLANATION))
@@ -433,7 +437,7 @@ def process_config_file(config_file, environment, service_name=None):
         'service',
         environment)
 
-    if config_file.version in (V2_0, V2_1):
+    if config_file.version in (V2_0, V2_1, V3_0):
         processed_config = dict(config_file.config)
         processed_config['services'] = services
         processed_config['volumes'] = interpolate_config_section(
@@ -446,9 +450,10 @@ def process_config_file(config_file, environment, service_name=None):
             config_file.get_networks(),
             'network',
             environment)
-
-    if config_file.version == V1:
+    elif config_file.version == V1:
         processed_config = services
+    else:
+        raise Exception("Unsupported version: {}".format(repr(config_file.version)))
 
     config_file = config_file._replace(config=processed_config)
     validate_against_config_schema(config_file)
diff --git a/compose/config/config_schema_v3.0.json b/compose/config/config_schema_v3.0.json
new file mode 100644
index 00000000..9ac31b1f
--- /dev/null
+++ b/compose/config/config_schema_v3.0.json
@@ -0,0 +1,378 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "config_schema_v3.0.json",
+  "type": "object",
+  "required": ["version"],
+
+  "properties": {
+    "version": {
+      "type": "string"
+    },
+
+    "services": {
+      "id": "#/properties/services",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/service"
+        }
+      },
+      "additionalProperties": false
+    },
+
+    "networks": {
+      "id": "#/properties/networks",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/network"
+        }
+      }
+    },
+
+    "volumes": {
+      "id": "#/properties/volumes",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/volume"
+        }
+      },
+      "additionalProperties": false
+    }
+  },
+
+  "additionalProperties": false,
+
+  "definitions": {
+
+    "service": {
+      "id": "#/definitions/service",
+      "type": "object",
+
+      "properties": {
+        "deploy": {"$ref": "#/definitions/deployment"},
+        "build": {
+          "oneOf": [
+            {"type": "string"},
+            {
+              "type": "object",
+              "properties": {
+                "context": {"type": "string"},
+                "dockerfile": {"type": "string"},
+                "args": {"$ref": "#/definitions/list_or_dict"}
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "cgroup_parent": {"type": "string"},
+        "command": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
+        "container_name": {"type": "string"},
+        "depends_on": {"$ref": "#/definitions/list_of_strings"},
+        "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "dns": {"$ref": "#/definitions/string_or_list"},
+        "dns_search": {"$ref": "#/definitions/string_or_list"},
+        "domainname": {"type": "string"},
+        "entrypoint": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
+        "env_file": {"$ref": "#/definitions/string_or_list"},
+        "environment": {"$ref": "#/definitions/list_or_dict"},
+
+        "expose": {
+          "type": "array",
+          "items": {
+            "type": ["string", "number"],
+            "format": "expose"
+          },
+          "uniqueItems": true
+        },
+
+        "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
+        "healthcheck": {"$ref": "#/definitions/healthcheck"},
+        "hostname": {"type": "string"},
+        "image": {"type": "string"},
+        "ipc": {"type": "string"},
+        "labels": {"$ref": "#/definitions/list_or_dict"},
+        "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+
+        "logging": {
+            "type": "object",
+
+            "properties": {
+                "driver": {"type": "string"},
+                "options": {
+                  "type": "object",
+                  "patternProperties": {
+                    "^.+$": {"type": ["string", "number", "null"]}
+                  }
+                }
+            },
+            "additionalProperties": false
+        },
+
+        "mac_address": {"type": "string"},
+        "network_mode": {"type": "string"},
+
+        "networks": {
+          "oneOf": [
+            {"$ref": "#/definitions/list_of_strings"},
+            {
+              "type": "object",
+              "patternProperties": {
+                "^[a-zA-Z0-9._-]+$": {
+                  "oneOf": [
+                    {
+                      "type": "object",
+                      "properties": {
+                        "aliases": {"$ref": "#/definitions/list_of_strings"},
+                        "ipv4_address": {"type": "string"},
+                        "ipv6_address": {"type": "string"}
+                      },
+                      "additionalProperties": false
+                    },
+                    {"type": "null"}
+                  ]
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "pid": {"type": ["string", "null"]},
+
+        "ports": {
+          "type": "array",
+          "items": {
+            "type": ["string", "number"],
+            "format": "ports"
+          },
+          "uniqueItems": true
+        },
+
+        "privileged": {"type": "boolean"},
+        "read_only": {"type": "boolean"},
+        "restart": {"type": "string"},
+        "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "shm_size": {"type": ["number", "string"]},
+        "stdin_open": {"type": "boolean"},
+        "stop_signal": {"type": "string"},
+        "stop_grace_period": {"type": "string", "format": "duration"},
+        "tmpfs": {"$ref": "#/definitions/string_or_list"},
+        "tty": {"type": "boolean"},
+        "ulimits": {
+          "type": "object",
+          "patternProperties": {
+            "^[a-z]+$": {
+              "oneOf": [
+                {"type": "integer"},
+                {
+                  "type":"object",
+                  "properties": {
+                    "hard": {"type": "integer"},
+                    "soft": {"type": "integer"}
+                  },
+                  "required": ["soft", "hard"],
+                  "additionalProperties": false
+                }
+              ]
+            }
+          }
+        },
+        "user": {"type": "string"},
+        "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "working_dir": {"type": "string"}
+      },
+      "additionalProperties": false
+    },
+
+    "healthcheck": {
+      "id": "#/definitions/healthcheck",
+      "type": ["object", "null"],
+      "properties": {
+        "interval": {"type":"string"},
+        "timeout": {"type":"string"},
+        "retries": {"type": "number"},
+        "command": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
+    "deployment": {
+      "id": "#/definitions/deployment",
+      "type": ["object", "null"],
+      "properties": {
+        "mode": {"type": "string"},
+        "replicas": {"type": "integer"},
+        "labels": {"$ref": "#/definitions/list_or_dict"},
+        "update_config": {
+          "type": "object",
+          "properties": {
+            "parallelism": {"type": "integer"},
+            "delay": {"type": "string", "format": "duration"},
+            "failure_action": {"type": "string"},
+            "monitor": {"type": "string", "format": "duration"},
+            "max_failure_ratio": {"type": "number"}
+          },
+          "additionalProperties": false
+        },
+        "resources": {
+          "type": "object",
+          "properties": {
+            "limits": {"$ref": "#/definitions/resource"},
+            "reservations": {"$ref": "#/definitions/resource"}
+          }
+        },
+        "restart_policy": {
+          "type": "object",
+          "properties": {
+            "condition": {"type": "string"},
+            "delay": {"type": "string", "format": "duration"},
+            "max_attempts": {"type": "integer"},
+            "window": {"type": "string", "format": "duration"}
+          },
+          "additionalProperties": false
+        },
+        "placement": {
+          "type": "object",
+          "properties": {
+            "constraints": {"type": "array", "items": {"type": "string"}}
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+
+    "resource": {
+      "id": "#/definitions/resource",
+      "type": "object",
+      "properties": {
+        "cpus": {"type": "string"},
+        "memory": {"type": "string"}
+      },
+      "additionaProperties": false
+    },
+
+    "network": {
+      "id": "#/definitions/network",
+      "type": ["object", "null"],
+      "properties": {
+        "driver": {"type": "string"},
+        "driver_opts": {
+          "type": "object",
+          "patternProperties": {
+            "^.+$": {"type": ["string", "number"]}
+          }
+        },
+        "ipam": {
+          "type": "object",
+          "properties": {
+            "driver": {"type": "string"},
+            "config": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "subnet": {"type": "string"}
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "additionalProperties": false
+        },
+        "external": {
+          "type": ["boolean", "object"],
+          "properties": {
+            "name": {"type": "string"}
+          },
+          "additionalProperties": false
+        },
+        "labels": {"$ref": "#/definitions/list_or_dict"}
+      },
+      "additionalProperties": false
+    },
+
+    "volume": {
+      "id": "#/definitions/volume",
+      "type": ["object", "null"],
+      "properties": {
+        "driver": {"type": "string"},
+        "driver_opts": {
+          "type": "object",
+          "patternProperties": {
+            "^.+$": {"type": ["string", "number"]}
+          }
+        },
+        "external": {
+          "type": ["boolean", "object"],
+          "properties": {
+            "name": {"type": "string"}
+          }
+        }
+      },
+      "labels": {"$ref": "#/definitions/list_or_dict"},
+      "additionalProperties": false
+    },
+
+    "string_or_list": {
+      "oneOf": [
+        {"type": "string"},
+        {"$ref": "#/definitions/list_of_strings"}
+      ]
+    },
+
+    "list_of_strings": {
+      "type": "array",
+      "items": {"type": "string"},
+      "uniqueItems": true
+    },
+
+    "list_or_dict": {
+      "oneOf": [
+        {
+          "type": "object",
+          "patternProperties": {
+            ".+": {
+              "type": ["string", "number", "null"]
+            }
+          },
+          "additionalProperties": false
+        },
+        {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
+      ]
+    },
+
+    "constraints": {
+      "service": {
+        "id": "#/definitions/constraints/service",
+        "anyOf": [
+          {"required": ["build"]},
+          {"required": ["image"]}
+        ],
+        "properties": {
+          "build": {
+            "required": ["context"]
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/compose/config/errors.py b/compose/config/errors.py
index d14cbbdd..16ed01b8 100644
--- a/compose/config/errors.py
+++ b/compose/config/errors.py
@@ -3,8 +3,8 @@ from __future__ import unicode_literals
 
 
 VERSION_EXPLANATION = (
-    'You might be seeing this error because you\'re using the wrong Compose '
-    'file version. Either specify a version of "2" (or "2.0") and place your '
+    'You might be seeing this error because you\'re using the wrong Compose file version. '
+    'Either specify a supported version ("2.0", "2.1", "3.0") and place your '
     'service definitions under the `services` key, or omit the `version` key '
     'and place your service definitions at the root of the file to use '
     'version 1.\nFor more on the Compose file format versions, see '
diff --git a/compose/config/serialize.py b/compose/config/serialize.py
index 95b1387f..768f3d47 100644
--- a/compose/config/serialize.py
+++ b/compose/config/serialize.py
@@ -6,7 +6,6 @@ import yaml
 
 from compose.config import types
 from compose.config.config import V1
-from compose.config.config import V2_0
 from compose.config.config import V2_1
 
 
@@ -34,7 +33,7 @@ def denormalize_config(config):
             del net_conf['external_name']
 
     version = config.version
-    if version not in (V2_0, V2_1):
+    if version == V1:
         version = V2_1
 
     return {
diff --git a/compose/const.py b/compose/const.py
index e7b1ae97..3da39855 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -17,15 +17,18 @@ LABEL_CONFIG_HASH = 'com.docker.compose.config-hash'
 COMPOSEFILE_V1 = '1'
 COMPOSEFILE_V2_0 = '2.0'
 COMPOSEFILE_V2_1 = '2.1'
+COMPOSEFILE_V3_0 = '3.0'
 
 API_VERSIONS = {
     COMPOSEFILE_V1: '1.21',
     COMPOSEFILE_V2_0: '1.22',
     COMPOSEFILE_V2_1: '1.24',
+    COMPOSEFILE_V3_0: '1.24',
 }
 
 API_VERSION_TO_ENGINE_VERSION = {
     API_VERSIONS[COMPOSEFILE_V1]: '1.9.0',
     API_VERSIONS[COMPOSEFILE_V2_0]: '1.10.0',
     API_VERSIONS[COMPOSEFILE_V2_1]: '1.12.0',
+    API_VERSIONS[COMPOSEFILE_V3_0]: '1.12.0',
 }
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index f153bd95..e9a41691 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -285,6 +285,61 @@ class CLITestCase(DockerClientTestCase):
             'volumes': {},
         }
 
+    def test_config_v3(self):
+        self.base_dir = 'tests/fixtures/v3-full'
+        result = self.dispatch(['config'])
+
+        assert yaml.load(result.stdout) == {
+            'version': '3.0',
+            'networks': {},
+            'volumes': {},
+            'services': {
+                'web': {
+                    'image': 'busybox',
+                    'deploy': {
+                        'mode': 'replicated',
+                        'replicas': 6,
+                        'labels': ['FOO=BAR'],
+                        'update_config': {
+                            'parallelism': 3,
+                            'delay': '10s',
+                            'failure_action': 'continue',
+                            'monitor': '60s',
+                            'max_failure_ratio': 0.3,
+                        },
+                        'resources': {
+                            'limits': {
+                                'cpus': '0.001',
+                                'memory': '50M',
+                            },
+                            'reservations': {
+                                    'cpus': '0.0001',
+                                    'memory': '20M',
+                            },
+                        },
+                        'restart_policy': {
+                            'condition': 'on_failure',
+                            'delay': '5s',
+                            'max_attempts': 3,
+                            'window': '120s',
+                        },
+                        'placement': {
+                            'constraints': ['node=foo'],
+                        },
+                    },
+
+                    'healthcheck': {
+                        'command': 'cat /etc/passwd',
+                        'interval': '10s',
+                        'timeout': '1s',
+                        'retries': 5,
+                    },
+
+                    'stop_grace_period': '20s',
+                },
+            },
+        }
+
     def test_ps(self):
         self.project.get_service('simple').create_container()
         result = self.dispatch(['ps'])
diff --git a/tests/fixtures/v3-full/docker-compose.yml b/tests/fixtures/v3-full/docker-compose.yml
new file mode 100644
index 00000000..1187dd7b
--- /dev/null
+++ b/tests/fixtures/v3-full/docker-compose.yml
@@ -0,0 +1,37 @@
+version: "3"
+services:
+  web:
+    image: busybox
+
+    deploy:
+      mode: replicated
+      replicas: 6
+      labels: [FOO=BAR]
+      update_config:
+        parallelism: 3
+        delay: 10s
+        failure_action: continue
+        monitor: 60s
+        max_failure_ratio: 0.3
+      resources:
+        limits:
+          cpus: '0.001'
+          memory: 50M
+        reservations:
+          cpus: '0.0001'
+          memory: 20M
+      restart_policy:
+        condition: on_failure
+        delay: 5s
+        max_attempts: 3
+        window: 120s
+      placement:
+        constraints: [node=foo]
+
+    healthcheck:
+      command: cat /etc/passwd
+      interval: 10s
+      timeout: 1s
+      retries: 5
+
+    stop_grace_period: 20s
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 51c5e226..114145e1 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -18,6 +18,7 @@ from compose.config.config import resolve_environment
 from compose.config.config import V1
 from compose.config.config import V2_0
 from compose.config.config import V2_1
+from compose.config.config import V3_0
 from compose.config.environment import Environment
 from compose.config.errors import ConfigurationError
 from compose.config.errors import VERSION_EXPLANATION
@@ -156,9 +157,14 @@ class ConfigTest(unittest.TestCase):
         for version in ['2', '2.0']:
             cfg = config.load(build_config_details({'version': version}))
             assert cfg.version == V2_0
+
         cfg = config.load(build_config_details({'version': '2.1'}))
         assert cfg.version == V2_1
 
+        for version in ['3', '3.0']:
+            cfg = config.load(build_config_details({'version': version}))
+            assert cfg.version == V3_0
+
     def test_v1_file_version(self):
         cfg = config.load(build_config_details({'web': {'image': 'busybox'}}))
         assert cfg.version == V1

From f75ef6862fe20f378c9702cda652deb34a49f946 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 10 Nov 2016 17:30:46 +0000
Subject: [PATCH 1192/1265] Warn if any services use 'deploy'

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/compose/config/config.py b/compose/config/config.py
index fb77436d..940b9eb0 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -330,6 +330,14 @@ def load(config_details):
         for service_dict in service_dicts:
             match_named_volumes(service_dict, volumes)
 
+    services_using_deploy = [s for s in service_dicts if s.get('deploy')]
+    if services_using_deploy:
+        log.warn(
+            "Some services ({}) use the 'deploy' key, which will be ignored. "
+            "Compose does not support deploy configuration - use the experimental "
+            "`docker deploy` command to deploy to a swarm."
+            .format(", ".join(sorted(s['name'] for s in services_using_deploy))))
+
     return Config(main_file.version, service_dicts, volumes, networks)
 
 

From 6cac48c0564f7f6b4e4d91055f50ec8c86505dd9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 10 Nov 2016 17:38:19 -0500
Subject: [PATCH 1193/1265] Add a vendored and modified pytimeparse

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/timeparse.py         | 96 ++++++++++++++++++++++++++++++++++++
 tests/unit/timeparse_test.py | 52 +++++++++++++++++++
 2 files changed, 148 insertions(+)
 create mode 100644 compose/timeparse.py
 create mode 100644 tests/unit/timeparse_test.py

diff --git a/compose/timeparse.py b/compose/timeparse.py
new file mode 100644
index 00000000..16ef8a6d
--- /dev/null
+++ b/compose/timeparse.py
@@ -0,0 +1,96 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+'''
+timeparse.py
+(c) Will Roberts <wildwilhelm@gmail.com>  1 February, 2014
+
+This is a vendored and modified copy of:
+github.com/wroberts/pytimeparse @ cc0550d
+
+It has been modified to mimic the behaviour of
+https://golang.org/pkg/time/#ParseDuration
+'''
+# MIT LICENSE
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import re
+
+HOURS = r'(?P<hours>[\d.]+)h'
+MINS = r'(?P<mins>[\d.]+)m'
+SECS = r'(?P<secs>[\d.]+)s'
+MILLI = r'(?P<milli>[\d.]+)ms'
+MICRO = r'(?P<micro>[\d.]+)(?:us|µs)'
+NANO = r'(?P<nano>[\d.]+)ns'
+
+
+def opt(x):
+    return r'(?:{x})?'.format(x=x)
+
+
+TIMEFORMAT = r'{HOURS}{MINS}{SECS}{MILLI}{MICRO}{NANO}'.format(
+    HOURS=opt(HOURS),
+    MINS=opt(MINS),
+    SECS=opt(SECS),
+    MILLI=opt(MILLI),
+    MICRO=opt(MICRO),
+    NANO=opt(NANO),
+)
+
+MULTIPLIERS = dict([
+    ('hours',   60 * 60),
+    ('mins',    60),
+    ('secs',    1),
+    ('milli',   1.0 / 1000),
+    ('micro',   1.0 / 1000.0 / 1000),
+    ('nano',    1.0 / 1000.0 / 1000.0 / 1000.0),
+])
+
+
+def timeparse(sval):
+    """Parse a time expression, returning it as a number of seconds.  If
+    possible, the return value will be an `int`; if this is not
+    possible, the return will be a `float`.  Returns `None` if a time
+    expression cannot be parsed from the given string.
+
+    Arguments:
+    - `sval`: the string value to parse
+
+    >>> timeparse('1m24s')
+    84
+    >>> timeparse('1.2 minutes')
+    72
+    >>> timeparse('1.2 seconds')
+    1.2
+    """
+    match = re.match(r'\s*' + TIMEFORMAT + r'\s*$', sval, re.I)
+    if not match or not match.group(0).strip():
+        return
+
+    mdict = match.groupdict()
+    return sum(
+        MULTIPLIERS[k] * cast(v) for (k, v) in mdict.items() if v is not None)
+
+
+def cast(value):
+    return int(value, 10) if value.isdigit() else float(value)
diff --git a/tests/unit/timeparse_test.py b/tests/unit/timeparse_test.py
new file mode 100644
index 00000000..e9fe6c24
--- /dev/null
+++ b/tests/unit/timeparse_test.py
@@ -0,0 +1,52 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+from compose import timeparse
+
+
+def test_milli():
+    assert timeparse.timeparse('5ms') == 0.005
+
+
+def test_milli_float():
+    assert timeparse.timeparse('50.5ms') == 0.0505
+
+
+def test_second_milli():
+    assert timeparse.timeparse('200s5ms') == 200.005
+
+
+def test_second_milli_micro():
+    assert timeparse.timeparse('200s5ms10us') == 200.00501
+
+
+def test_second():
+    assert timeparse.timeparse('200s') == 200
+
+
+def test_second_as_float():
+    assert timeparse.timeparse('20.5s') == 20.5
+
+
+def test_minute():
+    assert timeparse.timeparse('32m') == 1920
+
+
+def test_hour_minute():
+    assert timeparse.timeparse('2h32m') == 9120
+
+
+def test_minute_as_float():
+    assert timeparse.timeparse('1.5m') == 90
+
+
+def test_hour_minute_second():
+    assert timeparse.timeparse('5h34m56s') == 20096
+
+
+def test_invalid_with_space():
+    assert timeparse.timeparse('5h 34m 56s') is None
+
+
+def test_invalid_with_comma():
+    assert timeparse.timeparse('5h,34m,56s') is None

From 079c95c3401adb0f837e6b4e54132cdd41eada68 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 10 Nov 2016 17:47:05 -0500
Subject: [PATCH 1194/1265] Use stop grace period for container stop.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py          | 14 +++++++++-----
 compose/parallel.py          |  4 ----
 compose/project.py           | 20 ++++++++++++++++----
 compose/service.py           | 23 ++++++++++++++++-------
 tests/unit/timeparse_test.py |  4 ++++
 5 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 08e58e37..cf53f6aa 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -24,7 +24,6 @@ from ..config import ConfigurationError
 from ..config import parse_environment
 from ..config.environment import Environment
 from ..config.serialize import serialize_config
-from ..const import DEFAULT_TIMEOUT
 from ..const import IS_WINDOWS_PLATFORM
 from ..errors import StreamParseError
 from ..progress_stream import StreamOutputError
@@ -726,7 +725,7 @@ class TopLevelCommand(object):
           -t, --timeout TIMEOUT      Specify a shutdown timeout in seconds.
                                      (default: 10)
         """
-        timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
+        timeout = timeout_from_opts(options)
 
         for s in options['SERVICE=NUM']:
             if '=' not in s:
@@ -760,7 +759,7 @@ class TopLevelCommand(object):
           -t, --timeout TIMEOUT      Specify a shutdown timeout in seconds.
                                      (default: 10)
         """
-        timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
+        timeout = timeout_from_opts(options)
         self.project.stop(service_names=options['SERVICE'], timeout=timeout)
 
     def restart(self, options):
@@ -773,7 +772,7 @@ class TopLevelCommand(object):
           -t, --timeout TIMEOUT      Specify a shutdown timeout in seconds.
                                      (default: 10)
         """
-        timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
+        timeout = timeout_from_opts(options)
         containers = self.project.restart(service_names=options['SERVICE'], timeout=timeout)
         exit_if(not containers, 'No containers to restart', 1)
 
@@ -831,7 +830,7 @@ class TopLevelCommand(object):
         start_deps = not options['--no-deps']
         cascade_stop = options['--abort-on-container-exit']
         service_names = options['SERVICE']
-        timeout = int(options.get('--timeout') or DEFAULT_TIMEOUT)
+        timeout = timeout_from_opts(options)
         remove_orphans = options['--remove-orphans']
         detached = options.get('-d')
 
@@ -896,6 +895,11 @@ def convergence_strategy_from_opts(options):
     return ConvergenceStrategy.changed
 
 
+def timeout_from_opts(options):
+    timeout = options.get('--timeout')
+    return None if timeout is None else int(timeout)
+
+
 def image_type_from_opt(flag, value):
     if not value:
         return ImageType.none
diff --git a/compose/parallel.py b/compose/parallel.py
index 7ac66b37..26718872 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -248,7 +248,3 @@ def parallel_unpause(containers, options):
 
 def parallel_kill(containers, options):
     parallel_operation(containers, 'kill', options, 'Killing')
-
-
-def parallel_restart(containers, options):
-    parallel_operation(containers, 'restart', options, 'Restarting')
diff --git a/compose/project.py b/compose/project.py
index 60647fe9..eef2f3b8 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -14,7 +14,6 @@ from .config import ConfigurationError
 from .config.config import V1
 from .config.sort_services import get_container_name_from_network_mode
 from .config.sort_services import get_service_name_from_network_mode
-from .const import DEFAULT_TIMEOUT
 from .const import IMAGE_EVENTS
 from .const import LABEL_ONE_OFF
 from .const import LABEL_PROJECT
@@ -250,7 +249,7 @@ class Project(object):
 
         parallel.parallel_execute(
             containers,
-            operator.methodcaller('stop', **options),
+            self.build_container_operation_with_timeout_func('stop', options),
             operator.attrgetter('name'),
             'Stopping',
             get_deps)
@@ -291,7 +290,12 @@ class Project(object):
 
     def restart(self, service_names=None, **options):
         containers = self.containers(service_names, stopped=True)
-        parallel.parallel_restart(containers, options)
+
+        parallel.parallel_execute(
+            containers,
+            self.build_container_operation_with_timeout_func('restart', options),
+            operator.attrgetter('name'),
+            'Restarting')
         return containers
 
     def build(self, service_names=None, no_cache=False, pull=False, force_rm=False):
@@ -365,7 +369,7 @@ class Project(object):
            start_deps=True,
            strategy=ConvergenceStrategy.changed,
            do_build=BuildAction.none,
-           timeout=DEFAULT_TIMEOUT,
+           timeout=None,
            detached=False,
            remove_orphans=False):
 
@@ -506,6 +510,14 @@ class Project(object):
         dep_services.append(service)
         return acc + dep_services
 
+    def build_container_operation_with_timeout_func(self, operation, options):
+        def container_operation_with_timeout(container):
+            if options.get('timeout') is None:
+                service = self.get_service(container.service)
+                options['timeout'] = service.stop_timeout(None)
+            return getattr(container, operation)(**options)
+        return container_operation_with_timeout
+
 
 def get_volumes_from(project, service_dict):
     volumes_from = service_dict.pop('volumes_from', None)
diff --git a/compose/service.py b/compose/service.py
index ad426706..39737694 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -17,6 +17,7 @@ from docker.utils.ports import split_port
 
 from . import __version__
 from . import progress_stream
+from . import timeparse
 from .config import DOCKER_CONFIG_KEYS
 from .config import merge_environment
 from .config.types import VolumeSpec
@@ -169,7 +170,7 @@ class Service(object):
             self.start_container_if_stopped(c, **options)
         return containers
 
-    def scale(self, desired_num, timeout=DEFAULT_TIMEOUT):
+    def scale(self, desired_num, timeout=None):
         """
         Adjusts the number of containers to the specified number and ensures
         they are running.
@@ -196,7 +197,7 @@ class Service(object):
             return container
 
         def stop_and_remove(container):
-            container.stop(timeout=timeout)
+            container.stop(timeout=self.stop_timeout(timeout))
             container.remove()
 
         running_containers = self.containers(stopped=False)
@@ -374,7 +375,7 @@ class Service(object):
 
     def execute_convergence_plan(self,
                                  plan,
-                                 timeout=DEFAULT_TIMEOUT,
+                                 timeout=None,
                                  detached=False,
                                  start=True):
         (action, containers) = plan
@@ -421,7 +422,7 @@ class Service(object):
     def recreate_container(
             self,
             container,
-            timeout=DEFAULT_TIMEOUT,
+            timeout=None,
             attach_logs=False,
             start_new_container=True):
         """Recreate a container.
@@ -432,7 +433,7 @@ class Service(object):
         """
         log.info("Recreating %s" % container.name)
 
-        container.stop(timeout=timeout)
+        container.stop(timeout=self.stop_timeout(timeout))
         container.rename_to_tmp_name()
         new_container = self.create_container(
             previous_container=container,
@@ -446,6 +447,14 @@ class Service(object):
         container.remove()
         return new_container
 
+    def stop_timeout(self, timeout):
+        if timeout is not None:
+            return timeout
+        timeout = timeparse.timeparse(self.options.get('stop_grace_period') or '')
+        if timeout is not None:
+            return timeout
+        return DEFAULT_TIMEOUT
+
     def start_container_if_stopped(self, container, attach_logs=False, quiet=False):
         if not container.is_running:
             if not quiet:
@@ -483,10 +492,10 @@ class Service(object):
                 link_local_ips=netdefs.get('link_local_ips', None),
             )
 
-    def remove_duplicate_containers(self, timeout=DEFAULT_TIMEOUT):
+    def remove_duplicate_containers(self, timeout=None):
         for c in self.duplicate_containers():
             log.info('Removing %s' % c.name)
-            c.stop(timeout=timeout)
+            c.stop(timeout=self.stop_timeout(timeout))
             c.remove()
 
     def duplicate_containers(self):
diff --git a/tests/unit/timeparse_test.py b/tests/unit/timeparse_test.py
index e9fe6c24..9915932c 100644
--- a/tests/unit/timeparse_test.py
+++ b/tests/unit/timeparse_test.py
@@ -50,3 +50,7 @@ def test_invalid_with_space():
 
 def test_invalid_with_comma():
     assert timeparse.timeparse('5h,34m,56s') is None
+
+
+def test_invalid_with_empty_string():
+    assert timeparse.timeparse('') is None

From b93211881b913091501a76d062f033754a653740 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 16 Nov 2016 13:35:29 -0800
Subject: [PATCH 1195/1265] Changelog update

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 CHANGELOG.md | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ec7d5b5..17487890 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,106 @@
 Change log
 ==========
 
+1.9.0 (2016-11-16)
+-----------------
+
+**Breaking changes**
+
+- When using Compose with Docker Toolbox/Machine on Windows, volume paths are
+  no longer converted from `C:\Users` to `/c/Users`-style by default. To
+  re-enable this conversion so that your volumes keep working, set the
+  environment variable `COMPOSE_CONVERT_WINDOWS_PATHS=1`. Users of
+  Docker for Windows are not affected and do not need to set the variable.
+
+New Features
+
+- Interactive mode for `docker-compose run` and `docker-compose exec` is
+  now supported on Windows platforms. Please note that the `docker` binary
+  is required to be present on the system for this feature to work.
+
+- Introduced version 2.1 of the `docker-compose.yml` specification. This
+  version requires to be used with Docker Engine 1.12 or above.
+    - Added support for setting volume labels and network labels in
+  `docker-compose.yml`.
+    - Added support for the `isolation` parameter in service definitions.
+    - Added support for link-local IPs in the service networks definitions.
+    - Added support for shell-style inline defaults in variable interpolation.
+      The supported forms are `${FOO-default}` (fall back if FOO is unset) and
+      `${FOO:-default}` (fall back if FOO is unset or empty).
+
+- Added support for the `group_add` and `oom_score_adj` parameters in
+  service definitions.
+
+- Added support for the `internal` and `enable_ipv6` parameters in network
+  definitions.
+
+- Compose now defaults to using the `npipe` protocol on Windows.
+
+- Overriding a `logging` configuration will now properly merge the `options`
+  mappings if the `driver` values do not conflict.
+
+Bug Fixes
+
+- Fixed several bugs related to `npipe` protocol support on Windows.
+
+- Fixed an issue with Windows paths being incorrectly converted when
+  using Docker on Windows Server.
+
+- Fixed a bug where an empty `restart` value would sometimes result in an
+  exception being raised.
+
+- Fixed an issue where service logs containing unicode characters would
+  sometimes cause an error to occur.
+
+- Fixed a bug where unicode values in environment variables would sometimes
+  raise a unicode exception when retrieved.
+
+- Fixed an issue where Compose would incorrectly detect a configuration
+  mismatch for overlay networks.
+
+
+1.8.1 (2016-09-22)
+-----------------
+
+Bug Fixes
+
+- Fixed a bug where users using a credentials store were not able
+  to access their private images.
+
+- Fixed a bug where users using identity tokens to authenticate
+  were not able to access their private images.
+
+- Fixed a bug where an `HttpHeaders` entry in the docker configuration
+  file would cause Compose to crash when trying to build an image.
+
+- Fixed a few bugs related to the handling of Windows paths in volume
+  binding declarations.
+
+- Fixed a bug where Compose would sometimes crash while trying to
+  read a streaming response from the engine.
+
+- Fixed an issue where Compose would crash when encountering an API error
+  while streaming container logs.
+
+- Fixed an issue where Compose would erroneously try to output logs from
+  drivers not handled by the Engine's API.
+
+- Fixed a bug where options from the `docker-machine config` command would
+  not be properly interpreted by Compose.
+
+- Fixed a bug where the connection to the Docker Engine would
+  sometimes fail when running a large number of services simultaneously.
+
+- Fixed an issue where Compose would sometimes print a misleading
+  suggestion message when running the `bundle` command.
+
+- Fixed a bug where connection errors would not be handled properly by
+  Compose during the project initialization phase.
+
+- Fixed a bug where a misleading error would appear when encountering
+  a connection timeout.
+
+
 1.8.0 (2016-06-14)
 -----------------
 

From 716a6baa59c62266af0bb7628ec88586f470140c Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 14 Nov 2016 18:31:38 +0000
Subject: [PATCH 1196/1265] Implement 'healthcheck' option

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/config.py                      | 29 +++++++++++
 compose/config/config_schema_v3.0.json        |  5 +-
 compose/service.py                            |  4 +-
 compose/utils.py                              | 16 ++++++
 requirements.txt                              |  2 +-
 tests/acceptance/cli_test.py                  | 50 +++++++++++++++++--
 tests/fixtures/healthcheck/docker-compose.yml | 24 +++++++++
 tests/fixtures/v3-full/docker-compose.yml     |  2 +-
 tests/unit/config/config_test.py              | 49 ++++++++++++++++++
 9 files changed, 172 insertions(+), 9 deletions(-)
 create mode 100644 tests/fixtures/healthcheck/docker-compose.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 940b9eb0..e5a37e84 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -17,6 +17,7 @@ from ..const import COMPOSEFILE_V2_0 as V2_0
 from ..const import COMPOSEFILE_V2_1 as V2_1
 from ..const import COMPOSEFILE_V3_0 as V3_0
 from ..utils import build_string_dict
+from ..utils import parse_nanoseconds_int
 from ..utils import splitdrive
 from .environment import env_vars_from_file
 from .environment import Environment
@@ -65,6 +66,7 @@ DOCKER_CONFIG_KEYS = [
     'extra_hosts',
     'group_add',
     'hostname',
+    'healthcheck',
     'image',
     'ipc',
     'labels',
@@ -642,6 +644,10 @@ def process_service(service_config):
     if 'extra_hosts' in service_dict:
         service_dict['extra_hosts'] = parse_extra_hosts(service_dict['extra_hosts'])
 
+    if 'healthcheck' in service_dict:
+        service_dict['healthcheck'] = process_healthcheck(
+            service_dict['healthcheck'], service_config.name)
+
     for field in ['dns', 'dns_search', 'tmpfs']:
         if field in service_dict:
             service_dict[field] = to_list(service_dict[field])
@@ -649,6 +655,29 @@ def process_service(service_config):
     return service_dict
 
 
+def process_healthcheck(raw, service_name):
+    hc = {}
+
+    if raw.get('disable'):
+        if len(raw) > 1:
+            raise ConfigurationError(
+                'Service "{}" defines an invalid healthcheck: '
+                '"disable: true" cannot be combined with other options'
+                .format(service_name))
+        hc['test'] = ['NONE']
+    elif 'test' in raw:
+        hc['test'] = raw['test']
+
+    if 'interval' in raw:
+        hc['interval'] = parse_nanoseconds_int(raw['interval'])
+    if 'timeout' in raw:
+        hc['timeout'] = parse_nanoseconds_int(raw['timeout'])
+    if 'retries' in raw:
+        hc['retries'] = raw['retries']
+
+    return hc
+
+
 def finalize_service(service_config, service_names, version, environment):
     service_dict = dict(service_config.config)
 
diff --git a/compose/config/config_schema_v3.0.json b/compose/config/config_schema_v3.0.json
index 9ac31b1f..4edd8dd4 100644
--- a/compose/config/config_schema_v3.0.json
+++ b/compose/config/config_schema_v3.0.json
@@ -205,12 +205,13 @@
         "interval": {"type":"string"},
         "timeout": {"type":"string"},
         "retries": {"type": "number"},
-        "command": {
+        "test": {
           "oneOf": [
             {"type": "string"},
             {"type": "array", "items": {"type": "string"}}
           ]
-        }
+        },
+        "disable": {"type": "boolean"}
       },
       "additionalProperties": false
     },
diff --git a/compose/service.py b/compose/service.py
index 39737694..cf52d489 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -17,7 +17,6 @@ from docker.utils.ports import split_port
 
 from . import __version__
 from . import progress_stream
-from . import timeparse
 from .config import DOCKER_CONFIG_KEYS
 from .config import merge_environment
 from .config.types import VolumeSpec
@@ -35,6 +34,7 @@ from .parallel import parallel_start
 from .progress_stream import stream_output
 from .progress_stream import StreamOutputError
 from .utils import json_hash
+from .utils import parse_seconds_float
 
 
 log = logging.getLogger(__name__)
@@ -450,7 +450,7 @@ class Service(object):
     def stop_timeout(self, timeout):
         if timeout is not None:
             return timeout
-        timeout = timeparse.timeparse(self.options.get('stop_grace_period') or '')
+        timeout = parse_seconds_float(self.options.get('stop_grace_period'))
         if timeout is not None:
             return timeout
         return DEFAULT_TIMEOUT
diff --git a/compose/utils.py b/compose/utils.py
index 8f05e308..b8bdf732 100644
--- a/compose/utils.py
+++ b/compose/utils.py
@@ -11,6 +11,7 @@ import ntpath
 import six
 
 from .errors import StreamParseError
+from .timeparse import timeparse
 
 
 json_decoder = json.JSONDecoder()
@@ -107,6 +108,21 @@ def microseconds_from_time_nano(time_nano):
     return int(time_nano % 1000000000 / 1000)
 
 
+def nanoseconds_from_time_seconds(time_seconds):
+    return time_seconds * 1000000000
+
+
+def parse_seconds_float(value):
+    return timeparse(value or '')
+
+
+def parse_nanoseconds_int(value):
+    parsed = timeparse(value or '')
+    if parsed is None:
+        return None
+    return int(parsed * 1000000000)
+
+
 def build_string_dict(source_dict):
     return dict((k, str(v if v is not None else '')) for k, v in source_dict.items())
 
diff --git a/requirements.txt b/requirements.txt
index 933146c7..63469799 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
 PyYAML==3.11
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.2.0
-docker-py==1.10.6
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4; python_version < '3.4'
 functools32==3.2.3.post2; python_version < '3.2'
+git+https://github.com/docker/docker-py.git@2ff7371ae7703033f981e1b137a3be0caf7a4f9c#egg=docker-py
 ipaddress==1.0.16
 jsonschema==2.5.1
 pypiwin32==219; sys_platform == 'win32'
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index e9a41691..97518f4f 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -21,6 +21,7 @@ from .. import mock
 from compose.cli.command import get_project
 from compose.container import Container
 from compose.project import OneOffFilter
+from compose.utils import nanoseconds_from_time_seconds
 from tests.integration.testcases import DockerClientTestCase
 from tests.integration.testcases import get_links
 from tests.integration.testcases import pull_busybox
@@ -329,9 +330,9 @@ class CLITestCase(DockerClientTestCase):
                     },
 
                     'healthcheck': {
-                        'command': 'cat /etc/passwd',
-                        'interval': '10s',
-                        'timeout': '1s',
+                        'test': 'cat /etc/passwd',
+                        'interval': 10000000000,
+                        'timeout': 1000000000,
                         'retries': 5,
                     },
 
@@ -925,6 +926,49 @@ class CLITestCase(DockerClientTestCase):
         assert foo_container.get('HostConfig.NetworkMode') == \
             'container:{}'.format(bar_container.id)
 
+    def test_up_with_healthcheck(self):
+        def wait_on_health_status(container, status):
+            def condition():
+                container.inspect()
+                return container.get('State.Health.Status') == status
+
+            return wait_on_condition(condition, delay=0.5)
+
+        self.base_dir = 'tests/fixtures/healthcheck'
+        self.dispatch(['up', '-d'], None)
+
+        passes = self.project.get_service('passes')
+        passes_container = passes.containers()[0]
+
+        assert passes_container.get('Config.Healthcheck') == {
+            "Test": ["CMD-SHELL", "/bin/true"],
+            "Interval": nanoseconds_from_time_seconds(1),
+            "Timeout": nanoseconds_from_time_seconds(30*60),
+            "Retries": 1,
+        }
+
+        wait_on_health_status(passes_container, 'healthy')
+
+        fails = self.project.get_service('fails')
+        fails_container = fails.containers()[0]
+
+        assert fails_container.get('Config.Healthcheck') == {
+            "Test": ["CMD", "/bin/false"],
+            "Interval": nanoseconds_from_time_seconds(2.5),
+            "Retries": 2,
+        }
+
+        wait_on_health_status(fails_container, 'unhealthy')
+
+        disabled = self.project.get_service('disabled')
+        disabled_container = disabled.containers()[0]
+
+        assert disabled_container.get('Config.Healthcheck') == {
+            "Test": ["NONE"],
+        }
+
+        assert 'Health' not in disabled_container.get('State')
+
     def test_up_with_no_deps(self):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['up', '-d', '--no-deps', 'web'], None)
diff --git a/tests/fixtures/healthcheck/docker-compose.yml b/tests/fixtures/healthcheck/docker-compose.yml
new file mode 100644
index 00000000..2c45b8d8
--- /dev/null
+++ b/tests/fixtures/healthcheck/docker-compose.yml
@@ -0,0 +1,24 @@
+version: "3"
+services:
+  passes:
+    image: busybox
+    command: top
+    healthcheck:
+      test: "/bin/true"
+      interval: 1s
+      timeout: 30m
+      retries: 1
+
+  fails:
+    image: busybox
+    command: top
+    healthcheck:
+      test: ["CMD", "/bin/false"]
+      interval: 2.5s
+      retries: 2
+
+  disabled:
+    image: busybox
+    command: top
+    healthcheck:
+      disable: true
diff --git a/tests/fixtures/v3-full/docker-compose.yml b/tests/fixtures/v3-full/docker-compose.yml
index 1187dd7b..b4d1b642 100644
--- a/tests/fixtures/v3-full/docker-compose.yml
+++ b/tests/fixtures/v3-full/docker-compose.yml
@@ -29,7 +29,7 @@ services:
         constraints: [node=foo]
 
     healthcheck:
-      command: cat /etc/passwd
+      test: cat /etc/passwd
       interval: 10s
       timeout: 1s
       retries: 5
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 114145e1..f7df3aee 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -24,6 +24,7 @@ from compose.config.errors import ConfigurationError
 from compose.config.errors import VERSION_EXPLANATION
 from compose.config.types import VolumeSpec
 from compose.const import IS_WINDOWS_PLATFORM
+from compose.utils import nanoseconds_from_time_seconds
 from tests import mock
 from tests import unittest
 
@@ -3171,6 +3172,54 @@ class BuildPathTest(unittest.TestCase):
             assert 'build path' in exc.exconly()
 
 
+class HealthcheckTest(unittest.TestCase):
+    def test_healthcheck(self):
+        service_dict = make_service_dict(
+            'test',
+            {'healthcheck': {
+                'test': ['CMD', 'true'],
+                'interval': '1s',
+                'timeout': '1m',
+                'retries': 3,
+            }},
+            '.',
+        )
+
+        assert service_dict['healthcheck'] == {
+            'test': ['CMD', 'true'],
+            'interval': nanoseconds_from_time_seconds(1),
+            'timeout': nanoseconds_from_time_seconds(60),
+            'retries': 3,
+        }
+
+    def test_disable(self):
+        service_dict = make_service_dict(
+            'test',
+            {'healthcheck': {
+                'disable': True,
+            }},
+            '.',
+        )
+
+        assert service_dict['healthcheck'] == {
+            'test': ['NONE'],
+        }
+
+    def test_disable_with_other_config_is_invalid(self):
+        with pytest.raises(ConfigurationError) as excinfo:
+            make_service_dict(
+                'invalid-healthcheck',
+                {'healthcheck': {
+                    'disable': True,
+                    'interval': '1s',
+                }},
+                '.',
+            )
+
+        assert 'invalid-healthcheck' in excinfo.exconly()
+        assert 'disable' in excinfo.exconly()
+
+
 class GetDefaultConfigFilesTestCase(unittest.TestCase):
 
     files = [

From c26a2afaf36443fbc4ea813e34027bdb05ded0e1 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 21 Nov 2016 16:34:49 -0500
Subject: [PATCH 1197/1265] Update messages about docker stack deploy.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py | 4 ++--
 compose/project.py       | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 940b9eb0..5215b361 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -334,8 +334,8 @@ def load(config_details):
     if services_using_deploy:
         log.warn(
             "Some services ({}) use the 'deploy' key, which will be ignored. "
-            "Compose does not support deploy configuration - use the experimental "
-            "`docker deploy` command to deploy to a swarm."
+            "Compose does not support deploy configuration - use "
+            "`docker stack deploy` to deploy to a swarm."
             .format(", ".join(sorted(s['name'] for s in services_using_deploy))))
 
     return Config(main_file.version, service_dicts, volumes, networks)
diff --git a/compose/project.py b/compose/project.py
index eef2f3b8..0178bbab 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -559,9 +559,7 @@ def warn_for_swarm_mode(client):
             "Compose does not use swarm mode to deploy services to multiple nodes in a swarm. "
             "All containers will be scheduled on the current node.\n\n"
             "To deploy your application across the swarm, "
-            "use the bundle feature of the Docker experimental build.\n\n"
-            "More info:\n"
-            "https://docs.docker.com/compose/bundles\n"
+            "use `docker stack deploy`.\n"
         )
 
 

From 024b5dd6da4c96822ea84e31cedcb88a8949a245 Mon Sep 17 00:00:00 2001
From: Thomas Grainger <tom.grainger@procensus.com>
Date: Tue, 22 Nov 2016 11:14:56 +0000
Subject: [PATCH 1198/1265] case PyPI correctly

Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
---
 CHANGELOG.md                | 2 +-
 script/release/push-release | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17487890..9780df98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -814,7 +814,7 @@ Fig has been renamed to Docker Compose, or just Compose for short. This has seve
 
 - The command you type is now `docker-compose`, not `fig`.
 - You should rename your fig.yml to docker-compose.yml.
-- If you’re installing via PyPi, the package is now `docker-compose`, so install it with `pip install docker-compose`.
+- If you’re installing via PyPI, the package is now `docker-compose`, so install it with `pip install docker-compose`.
 
 Besides that, there’s a lot of new stuff in this release:
 
diff --git a/script/release/push-release b/script/release/push-release
index 33d0d777..d5ae3de9 100755
--- a/script/release/push-release
+++ b/script/release/push-release
@@ -54,7 +54,7 @@ git push $GITHUB_REPO $VERSION
 echo "Uploading the docker image"
 docker push docker/compose:$VERSION
 
-echo "Uploading sdist to pypi"
+echo "Uploading sdist to PyPI"
 pandoc -f markdown -t rst README.md -o README.rst
 sed -i -e 's/logo.png?raw=true/https:\/\/github.com\/docker\/compose\/raw\/master\/logo.png?raw=true/' README.rst
 ./script/build/write-git-sha

From dc9184a90fd22b13265162c4bc8e04c9867a768d Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@docker.com>
Date: Fri, 25 Nov 2016 10:12:22 +0000
Subject: [PATCH 1199/1265] progress_stream: Avoid undefined ANSI escape codes

The ANSI escape codes \e[0A (cursor up 0 lines) and \e[0B (cursor down 0 lines)
are not well defined and are treated differently by different terminals. In
particular xterm treats 0 as a missing parameter and therefore defaults to 1,
whereas rxvt-unicode treats these escapes as a request to move 0 lines.

However the use of these codes is unnecessary and were really just hiding the
fact that we were not correctly computing diff when adding a new line. Having
added the new line to the ids map and output the corresponding \n the correct
diff would be 1 and not 0 (which xterm interprets as 1) as currently.

Rather than changing the hardcoded 0 to a 1 pull the diff calculation out and
always do it since it produces the correct answer in both cases.

This fixes similar corruption when compose is pulling an image to that seen
with `docker pull` and rxvt-unicode (and likely other terminals in that family)
seen in docker/docker#28111.

This is the same as the fix made to Docker's pkg/jsonmessage in
https://github.com/docker/docker/pull/28238 (and I have shamelessly ripped off
most of this commit message from there).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
---
 compose/progress_stream.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index a0f5601f..5314f89f 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -32,12 +32,11 @@ def stream_output(output, stream):
         if not image_id:
             continue
 
-        if image_id in lines:
-            diff = len(lines) - lines[image_id]
-        else:
+        if image_id not in lines:
             lines[image_id] = len(lines)
             stream.write("\n")
-            diff = 0
+
+        diff = len(lines) - lines[image_id]
 
         # move cursor up `diff` rows
         stream.write("%c[%dA" % (27, diff))

From 6aacf5142750654a9b1f165223478fab3a424eeb Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 2 Dec 2016 16:10:15 -0800
Subject: [PATCH 1200/1265] Win32 interactive run - Connect container to
 networks before starting

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index cf53f6aa..c25ccbfa 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -988,6 +988,7 @@ def run_one_off_container(container_options, project, service, options):
     try:
         try:
             if IS_WINDOWS_PLATFORM:
+                service.connect_container_to_networks(container)
                 exit_code = call_docker(["start", "--attach", "--interactive", container.id])
             else:
                 operation = RunOperation(

From 62f8b1402e1bbe726cf83ea204077754385fe53a Mon Sep 17 00:00:00 2001
From: Yong Wen Chua <me@yongwen.xyz>
Date: Mon, 5 Dec 2016 14:25:56 +0800
Subject: [PATCH 1201/1265] Implement `userns_mode` HostConfig for services

Fixes #3349

This allows the key `userns_mode` to be used in service definitions.
Since `userns_mode` requires API version > 1.23, this is only available
in 2.1 and 3.0 versions of compose file

Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
---
 compose/config/config.py               |  1 +
 compose/config/config_schema_v2.1.json |  1 +
 compose/config/config_schema_v3.0.json |  1 +
 compose/service.py                     |  4 +++-
 tests/integration/service_test.py      | 13 +++++++++++++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 5215b361..b83b12bf 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -86,6 +86,7 @@ DOCKER_CONFIG_KEYS = [
     'stop_signal',
     'tty',
     'user',
+    'userns_mode',
     'volume_driver',
     'volumes',
     'volumes_from',
diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
index 3561a8cf..b5d614d6 100644
--- a/compose/config/config_schema_v2.1.json
+++ b/compose/config/config_schema_v2.1.json
@@ -217,6 +217,7 @@
           }
         },
         "user": {"type": "string"},
+        "userns_mode": {"type": "string"},
         "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "volume_driver": {"type": "string"},
         "volumes_from": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
diff --git a/compose/config/config_schema_v3.0.json b/compose/config/config_schema_v3.0.json
index 9ac31b1f..297c60be 100644
--- a/compose/config/config_schema_v3.0.json
+++ b/compose/config/config_schema_v3.0.json
@@ -192,6 +192,7 @@
           }
         },
         "user": {"type": "string"},
+        "userns_mode": {"type": "string"},
         "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "working_dir": {"type": "string"}
       },
diff --git a/compose/service.py b/compose/service.py
index 39737694..6a62067b 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -64,6 +64,7 @@ DOCKER_START_KEYS = [
     'restart',
     'security_opt',
     'shm_size',
+    'userns_mode',
     'volumes_from',
 ]
 
@@ -720,7 +721,8 @@ class Service(object):
             tmpfs=options.get('tmpfs'),
             oom_score_adj=options.get('oom_score_adj'),
             mem_swappiness=options.get('mem_swappiness'),
-            group_add=options.get('group_add')
+            group_add=options.get('group_add'),
+            userns_mode=options.get('userns_mode')
         )
 
         # TODO: Add as an argument to create_host_config once it's supported
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index a5ca81ee..09758eee 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -30,6 +30,7 @@ from compose.service import ConvergencePlan
 from compose.service import ConvergenceStrategy
 from compose.service import NetworkMode
 from compose.service import Service
+from tests.integration.testcases import v2_1_only
 from tests.integration.testcases import v2_only
 
 
@@ -842,6 +843,18 @@ class ServiceTest(DockerClientTestCase):
         container = create_and_start_container(service)
         self.assertEqual(container.get('HostConfig.PidMode'), 'host')
 
+    @v2_1_only()
+    def test_userns_mode_none_defined(self):
+        service = self.create_service('web', userns_mode=None)
+        container = create_and_start_container(service)
+        self.assertEqual(container.get('HostConfig.UsernsMode'), '')
+
+    @v2_1_only()
+    def test_userns_mode_host(self):
+        service = self.create_service('web', userns_mode='host')
+        container = create_and_start_container(service)
+        self.assertEqual(container.get('HostConfig.UsernsMode'), 'host')
+
     def test_dns_no_value(self):
         service = self.create_service('web')
         container = create_and_start_container(service)

From 4d0575355c1a0201ed7fc11063a4efbca6971a96 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 6 Dec 2016 17:14:05 -0800
Subject: [PATCH 1202/1265] Bump master version to 1.10.0dev

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/__init__.py b/compose/__init__.py
index 6e610652..6f05b282 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.9.0dev'
+__version__ = '1.10.0dev'

From e04a12b5ca9fb30d152ab6a83ae8c0ec15ac85b0 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 6 Dec 2016 17:01:35 -0500
Subject: [PATCH 1203/1265] Increase minimum version for v3.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/const.py               |  4 ++--
 tests/acceptance/cli_test.py   |  2 ++
 tests/integration/testcases.py | 23 +++++++++++------------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/compose/const.py b/compose/const.py
index 3da39855..ca8d7fe5 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -23,12 +23,12 @@ API_VERSIONS = {
     COMPOSEFILE_V1: '1.21',
     COMPOSEFILE_V2_0: '1.22',
     COMPOSEFILE_V2_1: '1.24',
-    COMPOSEFILE_V3_0: '1.24',
+    COMPOSEFILE_V3_0: '1.25',
 }
 
 API_VERSION_TO_ENGINE_VERSION = {
     API_VERSIONS[COMPOSEFILE_V1]: '1.9.0',
     API_VERSIONS[COMPOSEFILE_V2_0]: '1.10.0',
     API_VERSIONS[COMPOSEFILE_V2_1]: '1.12.0',
-    API_VERSIONS[COMPOSEFILE_V3_0]: '1.12.0',
+    API_VERSIONS[COMPOSEFILE_V3_0]: '1.13.0',
 }
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index e9a41691..0d5d5058 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -26,6 +26,7 @@ from tests.integration.testcases import get_links
 from tests.integration.testcases import pull_busybox
 from tests.integration.testcases import v2_1_only
 from tests.integration.testcases import v2_only
+from tests.integration.testcases import v3_only
 
 
 ProcessResult = namedtuple('ProcessResult', 'stdout stderr')
@@ -285,6 +286,7 @@ class CLITestCase(DockerClientTestCase):
             'volumes': {},
         }
 
+    @v3_only()
     def test_config_v3(self):
         self.base_dir = 'tests/fixtures/v3-full'
         result = self.dispatch(['config'])
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index c7743fb8..f6bc402b 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -45,11 +45,11 @@ def engine_max_version():
     return V2_1
 
 
-def v2_only():
+def build_version_required_decorator(ignored_versions):
     def decorator(f):
         @functools.wraps(f)
         def wrapper(self, *args, **kwargs):
-            if engine_max_version() == V1:
+            if engine_max_version() in ignored_versions:
                 skip("Engine version is too low")
                 return
             return f(self, *args, **kwargs)
@@ -58,17 +58,16 @@ def v2_only():
     return decorator
 
 
-def v2_1_only():
-    def decorator(f):
-        @functools.wraps(f)
-        def wrapper(self, *args, **kwargs):
-            if engine_max_version() in (V1, V2_0):
-                skip('Engine version is too low')
-                return
-            return f(self, *args, **kwargs)
-        return wrapper
+def v2_only():
+    return build_version_required_decorator((V1,))
 
-    return decorator
+
+def v2_1_only():
+    return build_version_required_decorator((V1, V2_0))
+
+
+def v3_only():
+    return build_version_required_decorator((V1, V2_0, V2_1))
 
 
 class DockerClientTestCase(unittest.TestCase):

From 04e5925a230d07a6ffd855b4c3812f5a6b54a523 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 5 Dec 2016 17:42:07 -0800
Subject: [PATCH 1204/1265] Use docker SDK 2.0

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/docker_client.py |  4 ++--
 compose/network.py           |  8 ++++----
 compose/service.py           |  2 +-
 requirements.txt             |  2 +-
 setup.py                     |  2 +-
 tests/unit/bundle_test.py    |  2 +-
 tests/unit/cli_test.py       |  4 ++--
 tests/unit/container_test.py |  2 +-
 tests/unit/project_test.py   |  2 +-
 tests/unit/service_test.py   | 10 +++++-----
 tests/unit/volume_test.py    |  2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
index b196d303..018d2451 100644
--- a/compose/cli/docker_client.py
+++ b/compose/cli/docker_client.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 import logging
 
-from docker import Client
+from docker import APIClient
 from docker.errors import TLSParameterError
 from docker.tls import TLSConfig
 from docker.utils import kwargs_from_env
@@ -71,4 +71,4 @@ def docker_client(environment, version=None, tls_config=None, host=None,
 
     kwargs['user_agent'] = generate_user_agent()
 
-    return Client(**kwargs)
+    return APIClient(**kwargs)
diff --git a/compose/network.py b/compose/network.py
index 3b57cb94..8a29b73e 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -4,8 +4,8 @@ from __future__ import unicode_literals
 import logging
 
 from docker.errors import NotFound
-from docker.utils import create_ipam_config
-from docker.utils import create_ipam_pool
+from docker.types import IPAMConfig
+from docker.types import IPAMPool
 
 from .config import ConfigurationError
 
@@ -96,10 +96,10 @@ def create_ipam_config_from_dict(ipam_dict):
     if not ipam_dict:
         return None
 
-    return create_ipam_config(
+    return IPAMConfig(
         driver=ipam_dict.get('driver'),
         pool_configs=[
-            create_ipam_pool(
+            IPAMPool(
                 subnet=config.get('subnet'),
                 iprange=config.get('ip_range'),
                 gateway=config.get('gateway'),
diff --git a/compose/service.py b/compose/service.py
index cf52d489..c32788fe 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -11,7 +11,7 @@ import enum
 import six
 from docker.errors import APIError
 from docker.errors import NotFound
-from docker.utils import LogConfig
+from docker.types import LogConfig
 from docker.utils.ports import build_port_bindings
 from docker.utils.ports import split_port
 
diff --git a/requirements.txt b/requirements.txt
index 63469799..8f6fe169 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
 PyYAML==3.11
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.2.0
+docker==2.0.0
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4; python_version < '3.4'
 functools32==3.2.3.post2; python_version < '3.2'
-git+https://github.com/docker/docker-py.git@2ff7371ae7703033f981e1b137a3be0caf7a4f9c#egg=docker-py
 ipaddress==1.0.16
 jsonschema==2.5.1
 pypiwin32==219; sys_platform == 'win32'
diff --git a/setup.py b/setup.py
index 672ea80e..9dba2167 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ install_requires = [
     'requests >= 2.6.1, != 2.11.0, < 2.12',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.10.6, < 2.0',
+    'docker >= 2.0.0, < 3.0',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',
diff --git a/tests/unit/bundle_test.py b/tests/unit/bundle_test.py
index 223b3b07..a279cab0 100644
--- a/tests/unit/bundle_test.py
+++ b/tests/unit/bundle_test.py
@@ -15,7 +15,7 @@ from compose.config.config import Config
 def mock_service():
     return mock.create_autospec(
         service.Service,
-        client=mock.create_autospec(docker.Client),
+        client=mock.create_autospec(docker.APIClient),
         options={})
 
 
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 2c90b29b..f9b60bff 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -97,7 +97,7 @@ class CLITestCase(unittest.TestCase):
     @mock.patch('compose.cli.main.RunOperation', autospec=True)
     @mock.patch('compose.cli.main.PseudoTerminal', autospec=True)
     def test_run_interactive_passes_logs_false(self, mock_pseudo_terminal, mock_run_operation):
-        mock_client = mock.create_autospec(docker.Client)
+        mock_client = mock.create_autospec(docker.APIClient)
         project = Project.from_config(
             name='composetest',
             client=mock_client,
@@ -128,7 +128,7 @@ class CLITestCase(unittest.TestCase):
         assert call_kwargs['logs'] is False
 
     def test_run_service_with_restart_always(self):
-        mock_client = mock.create_autospec(docker.Client)
+        mock_client = mock.create_autospec(docker.APIClient)
 
         project = Project.from_config(
             name='composetest',
diff --git a/tests/unit/container_test.py b/tests/unit/container_test.py
index 62e3aa2c..04f43016 100644
--- a/tests/unit/container_test.py
+++ b/tests/unit/container_test.py
@@ -98,7 +98,7 @@ class ContainerTest(unittest.TestCase):
         self.assertEqual(container.name_without_project, "custom_name_of_container")
 
     def test_inspect_if_not_inspected(self):
-        mock_client = mock.create_autospec(docker.Client)
+        mock_client = mock.create_autospec(docker.APIClient)
         container = Container(mock_client, dict(Id="the_id"))
 
         container.inspect_if_not_inspected()
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 9569adc9..9a12438f 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -19,7 +19,7 @@ from compose.service import Service
 
 class ProjectTest(unittest.TestCase):
     def setUp(self):
-        self.mock_client = mock.create_autospec(docker.Client)
+        self.mock_client = mock.create_autospec(docker.APIClient)
 
     def test_from_config(self):
         config = Config(
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 1d5aa10f..2d5b1761 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -34,7 +34,7 @@ from compose.service import warn_on_masked_volume
 class ServiceTest(unittest.TestCase):
 
     def setUp(self):
-        self.mock_client = mock.create_autospec(docker.Client)
+        self.mock_client = mock.create_autospec(docker.APIClient)
 
     def test_containers(self):
         service = Service('db', self.mock_client, 'myproject', image='foo')
@@ -666,7 +666,7 @@ class ServiceTest(unittest.TestCase):
 class TestServiceNetwork(object):
 
     def test_connect_container_to_networks_short_aliase_exists(self):
-        mock_client = mock.create_autospec(docker.Client)
+        mock_client = mock.create_autospec(docker.APIClient)
         service = Service(
             'db',
             mock_client,
@@ -751,7 +751,7 @@ class NetTestCase(unittest.TestCase):
     def test_network_mode_service(self):
         container_id = 'bbbb'
         service_name = 'web'
-        mock_client = mock.create_autospec(docker.Client)
+        mock_client = mock.create_autospec(docker.APIClient)
         mock_client.containers.return_value = [
             {'Id': container_id, 'Name': container_id, 'Image': 'abcd'},
         ]
@@ -765,7 +765,7 @@ class NetTestCase(unittest.TestCase):
 
     def test_network_mode_service_no_containers(self):
         service_name = 'web'
-        mock_client = mock.create_autospec(docker.Client)
+        mock_client = mock.create_autospec(docker.APIClient)
         mock_client.containers.return_value = []
 
         service = Service(name=service_name, client=mock_client)
@@ -783,7 +783,7 @@ def build_mount(destination, source, mode='rw'):
 class ServiceVolumesTest(unittest.TestCase):
 
     def setUp(self):
-        self.mock_client = mock.create_autospec(docker.Client)
+        self.mock_client = mock.create_autospec(docker.APIClient)
 
     def test_build_volume_binding(self):
         binding = build_volume_binding(VolumeSpec.parse('/outside:/inside', True))
diff --git a/tests/unit/volume_test.py b/tests/unit/volume_test.py
index d7ad0792..24829192 100644
--- a/tests/unit/volume_test.py
+++ b/tests/unit/volume_test.py
@@ -10,7 +10,7 @@ from tests import mock
 
 @pytest.fixture
 def mock_client():
-    return mock.create_autospec(docker.Client)
+    return mock.create_autospec(docker.APIClient)
 
 
 class TestVolume(object):

From fb165d9c1505e2505f637cb2cede77e4d0731884 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 16 Dec 2016 12:21:59 -0800
Subject: [PATCH 1205/1265] Add v3_only marker to healthcheck test

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/acceptance/cli_test.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 856b8f93..2d0ce715 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -316,8 +316,8 @@ class CLITestCase(DockerClientTestCase):
                                 'memory': '50M',
                             },
                             'reservations': {
-                                    'cpus': '0.0001',
-                                    'memory': '20M',
+                                'cpus': '0.0001',
+                                'memory': '20M',
                             },
                         },
                         'restart_policy': {
@@ -928,6 +928,7 @@ class CLITestCase(DockerClientTestCase):
         assert foo_container.get('HostConfig.NetworkMode') == \
             'container:{}'.format(bar_container.id)
 
+    @v3_only()
     def test_up_with_healthcheck(self):
         def wait_on_health_status(container, status):
             def condition():
@@ -945,7 +946,7 @@ class CLITestCase(DockerClientTestCase):
         assert passes_container.get('Config.Healthcheck') == {
             "Test": ["CMD-SHELL", "/bin/true"],
             "Interval": nanoseconds_from_time_seconds(1),
-            "Timeout": nanoseconds_from_time_seconds(30*60),
+            "Timeout": nanoseconds_from_time_seconds(30 * 60),
             "Retries": 1,
         }
 

From e736151ee497a65df4e7e271ebd059731e250760 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 5 Dec 2016 16:11:21 -0800
Subject: [PATCH 1206/1265] Make created networks attachable for file format
 >=2.1

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/network.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compose/network.py b/compose/network.py
index 8a29b73e..eb76e292 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -6,6 +6,7 @@ import logging
 from docker.errors import NotFound
 from docker.types import IPAMConfig
 from docker.types import IPAMPool
+from docker.utils import version_gte
 
 from .config import ConfigurationError
 
@@ -72,6 +73,7 @@ class Network(object):
                 internal=self.internal,
                 enable_ipv6=self.enable_ipv6,
                 labels=self.labels,
+                attachable=version_gte(self.client._version, '1.24') or None
             )
 
     def remove(self):

From eb6441c8e337a1e797adee26b77c0c03465375a2 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 19 Dec 2016 20:35:09 -0800
Subject: [PATCH 1207/1265] Add sysctls option to 3.0 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config_schema_v3.0.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/config/config_schema_v3.0.json b/compose/config/config_schema_v3.0.json
index 8b8ceac0..1f93347f 100644
--- a/compose/config/config_schema_v3.0.json
+++ b/compose/config/config_schema_v3.0.json
@@ -167,6 +167,7 @@
         "restart": {"type": "string"},
         "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "shm_size": {"type": ["number", "string"]},
+        "sysctls": {"$ref": "#/definitions/list_or_dict"},
         "stdin_open": {"type": "boolean"},
         "stop_signal": {"type": "string"},
         "stop_grace_period": {"type": "string", "format": "duration"},

From 346802715dd3869c2a33c5d361ec8a56fa3352c5 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 24 Oct 2016 16:27:47 -0700
Subject: [PATCH 1208/1265] Use colorama to enable colored output on Windows

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/colors.py | 4 ++++
 requirements.txt      | 1 +
 setup.py              | 1 +
 3 files changed, 6 insertions(+)

diff --git a/compose/cli/colors.py b/compose/cli/colors.py
index 3c18886f..6677a376 100644
--- a/compose/cli/colors.py
+++ b/compose/cli/colors.py
@@ -1,5 +1,8 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
+
+import colorama
+
 NAMES = [
     'grey',
     'red',
@@ -30,6 +33,7 @@ def make_color_fn(code):
     return lambda s: ansi_color(code, s)
 
 
+colorama.init()
 for (name, code) in get_pairs():
     globals()[name] = make_color_fn(code)
 
diff --git a/requirements.txt b/requirements.txt
index 8f6fe169..bae5d9ea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,7 @@
 PyYAML==3.11
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.2.0
+colorama==0.3.7
 docker==2.0.0
 dockerpty==0.4.1
 docopt==0.6.1
diff --git a/setup.py b/setup.py
index 9dba2167..8b4cf709 100644
--- a/setup.py
+++ b/setup.py
@@ -29,6 +29,7 @@ def find_version(*file_paths):
 
 install_requires = [
     'cached-property >= 1.2.0, < 2',
+    'colorama >= 0.3.7, < 0.4',
     'docopt >= 0.6.1, < 0.7',
     'PyYAML >= 3.10, < 4',
     'requests >= 2.6.1, != 2.11.0, < 2.12',

From ba47fb99ba7670fc8435af0a958a3ed01188711a Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 5 Dec 2016 18:21:10 -0800
Subject: [PATCH 1209/1265] Add default labels to networks and volumes created
 by Compose

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/const.py                  |  2 ++
 compose/network.py                | 18 ++++++++++++++++--
 compose/volume.py                 | 16 +++++++++++++++-
 tests/acceptance/cli_test.py      |  8 ++++----
 tests/integration/network_test.py | 17 +++++++++++++++++
 tests/integration/project_test.py |  7 ++++---
 tests/integration/volume_test.py  | 10 ++++++++++
 7 files changed, 68 insertions(+), 10 deletions(-)
 create mode 100644 tests/integration/network_test.py

diff --git a/compose/const.py b/compose/const.py
index ca8d7fe5..1b1be5c7 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -11,7 +11,9 @@ LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
 LABEL_ONE_OFF = 'com.docker.compose.oneoff'
 LABEL_PROJECT = 'com.docker.compose.project'
 LABEL_SERVICE = 'com.docker.compose.service'
+LABEL_NETWORK = 'com.docker.compose.network'
 LABEL_VERSION = 'com.docker.compose.version'
+LABEL_VOLUME = 'com.docker.compose.volume'
 LABEL_CONFIG_HASH = 'com.docker.compose.config-hash'
 
 COMPOSEFILE_V1 = '1'
diff --git a/compose/network.py b/compose/network.py
index eb76e292..d98f68d2 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -7,8 +7,11 @@ from docker.errors import NotFound
 from docker.types import IPAMConfig
 from docker.types import IPAMPool
 from docker.utils import version_gte
+from docker.utils import version_lt
 
 from .config import ConfigurationError
+from .const import LABEL_NETWORK
+from .const import LABEL_PROJECT
 
 
 log = logging.getLogger(__name__)
@@ -72,8 +75,8 @@ class Network(object):
                 ipam=self.ipam,
                 internal=self.internal,
                 enable_ipv6=self.enable_ipv6,
-                labels=self.labels,
-                attachable=version_gte(self.client._version, '1.24') or None
+                labels=self._labels,
+                attachable=version_gte(self.client._version, '1.24') or None,
             )
 
     def remove(self):
@@ -93,6 +96,17 @@ class Network(object):
             return self.external_name
         return '{0}_{1}'.format(self.project, self.name)
 
+    @property
+    def _labels(self):
+        if version_lt(self.client._version, '1.23'):
+            return None
+        labels = self.labels.copy() if self.labels else {}
+        labels.update({
+            LABEL_PROJECT: self.project,
+            LABEL_NETWORK: self.name,
+        })
+        return labels
+
 
 def create_ipam_config_from_dict(ipam_dict):
     if not ipam_dict:
diff --git a/compose/volume.py b/compose/volume.py
index 1fd1d51c..ab6a88fa 100644
--- a/compose/volume.py
+++ b/compose/volume.py
@@ -4,8 +4,11 @@ from __future__ import unicode_literals
 import logging
 
 from docker.errors import NotFound
+from docker.utils import version_lt
 
 from .config import ConfigurationError
+from .const import LABEL_PROJECT
+from .const import LABEL_VOLUME
 
 log = logging.getLogger(__name__)
 
@@ -23,7 +26,7 @@ class Volume(object):
 
     def create(self):
         return self.client.create_volume(
-            self.full_name, self.driver, self.driver_opts, labels=self.labels
+            self.full_name, self.driver, self.driver_opts, labels=self._labels
         )
 
     def remove(self):
@@ -53,6 +56,17 @@ class Volume(object):
             return self.external_name
         return '{0}_{1}'.format(self.project, self.name)
 
+    @property
+    def _labels(self):
+        if version_lt(self.client._version, '1.23'):
+            return None
+        labels = self.labels.copy() if self.labels else {}
+        labels.update({
+            LABEL_PROJECT: self.project,
+            LABEL_VOLUME: self.name,
+        })
+        return labels
+
 
 class ProjectVolumes(object):
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 2d0ce715..b9766226 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -850,8 +850,8 @@ class CLITestCase(DockerClientTestCase):
         ]
 
         assert [n['Name'] for n in networks] == [network_with_label]
-
-        assert networks[0]['Labels'] == {'label_key': 'label_val'}
+        assert 'label_key' in networks[0]['Labels']
+        assert networks[0]['Labels']['label_key'] == 'label_val'
 
     @v2_1_only()
     def test_up_with_volume_labels(self):
@@ -870,8 +870,8 @@ class CLITestCase(DockerClientTestCase):
         ]
 
         assert [v['Name'] for v in volumes] == [volume_with_label]
-
-        assert volumes[0]['Labels'] == {'label_key': 'label_val'}
+        assert 'label_key' in volumes[0]['Labels']
+        assert volumes[0]['Labels']['label_key'] == 'label_val'
 
     @v2_only()
     def test_up_no_services(self):
diff --git a/tests/integration/network_test.py b/tests/integration/network_test.py
new file mode 100644
index 00000000..2ff610fb
--- /dev/null
+++ b/tests/integration/network_test.py
@@ -0,0 +1,17 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+from .testcases import DockerClientTestCase
+from compose.const import LABEL_NETWORK
+from compose.const import LABEL_PROJECT
+from compose.network import Network
+
+
+class NetworkTest(DockerClientTestCase):
+    def test_network_default_labels(self):
+        net = Network(self.client, 'composetest', 'foonet')
+        net.ensure()
+        net_data = net.inspect()
+        labels = net_data['Labels']
+        assert labels[LABEL_NETWORK] == net.name
+        assert labels[LABEL_PROJECT] == net.project
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 3afefb5a..de073239 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -942,8 +942,8 @@ class ProjectTest(DockerClientTestCase):
         ]
 
         assert [n['Name'] for n in networks] == ['composetest_{}'.format(network_name)]
-
-        assert networks[0]['Labels'] == {'label_key': 'label_val'}
+        assert 'label_key' in networks[0]['Labels']
+        assert networks[0]['Labels']['label_key'] == 'label_val'
 
     @v2_only()
     def test_project_up_volumes(self):
@@ -1009,7 +1009,8 @@ class ProjectTest(DockerClientTestCase):
 
         assert [v['Name'] for v in volumes] == ['composetest_{}'.format(volume_name)]
 
-        assert volumes[0]['Labels'] == {'label_key': 'label_val'}
+        assert 'label_key' in volumes[0]['Labels']
+        assert volumes[0]['Labels']['label_key'] == 'label_val'
 
     @v2_only()
     def test_project_up_logging_with_multiple_files(self):
diff --git a/tests/integration/volume_test.py b/tests/integration/volume_test.py
index a75250ac..add16962 100644
--- a/tests/integration/volume_test.py
+++ b/tests/integration/volume_test.py
@@ -4,6 +4,8 @@ from __future__ import unicode_literals
 from docker.errors import DockerException
 
 from .testcases import DockerClientTestCase
+from compose.const import LABEL_PROJECT
+from compose.const import LABEL_VOLUME
 from compose.volume import Volume
 
 
@@ -94,3 +96,11 @@ class VolumeTest(DockerClientTestCase):
         assert vol.exists() is False
         vol.create()
         assert vol.exists() is True
+
+    def test_volume_default_labels(self):
+        vol = self.create_volume('volume01')
+        vol.create()
+        vol_data = vol.inspect()
+        labels = vol_data['Labels']
+        assert labels[LABEL_VOLUME] == vol.name
+        assert labels[LABEL_PROJECT] == vol.project

From a74b2f2f70a82bc56fb463d46480ea1baad9d4ab Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 28 Dec 2016 15:16:53 -0500
Subject: [PATCH 1210/1265] Fix schema typo.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config_schema_v3.0.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/config/config_schema_v3.0.json b/compose/config/config_schema_v3.0.json
index 1f93347f..6212058c 100644
--- a/compose/config/config_schema_v3.0.json
+++ b/compose/config/config_schema_v3.0.json
@@ -270,7 +270,7 @@
         "cpus": {"type": "string"},
         "memory": {"type": "string"}
       },
-      "additionaProperties": false
+      "additionalProperties": false
     },
 
     "network": {

From c73fc26824f2bffa791472a27039da0d2dd1ccbe Mon Sep 17 00:00:00 2001
From: Jun Guo <blackhumour.gj@gmail.com>
Date: Wed, 4 Jan 2017 15:31:12 +0800
Subject: [PATCH 1211/1265] Fix 404 issue, change APIError to more accureate
 ImageNotFound

Signed-off-by: Jun Guo <blackhumour.gj@gmail.com>
---
 compose/service.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index e3862b6e..ee8c88a9 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -10,6 +10,7 @@ from operator import attrgetter
 import enum
 import six
 from docker.errors import APIError
+from docker.errors import ImageNotFound
 from docker.errors import NotFound
 from docker.types import LogConfig
 from docker.utils.ports import build_port_bindings
@@ -318,11 +319,8 @@ class Service(object):
     def image(self):
         try:
             return self.client.inspect_image(self.image_name)
-        except APIError as e:
-            if e.response.status_code == 404 and e.explanation and 'No such image' in str(e.explanation):
-                raise NoSuchImageError("Image '{}' not found".format(self.image_name))
-            else:
-                raise
+        except ImageNotFound:
+            raise NoSuchImageError("Image '{}' not found".format(self.image_name))
 
     @property
     def image_name(self):

From 2648af6807f83f0dd85b236e89e4bc3ee5db15fc Mon Sep 17 00:00:00 2001
From: Thomas Grainger <tom.grainger@procensus.com>
Date: Tue, 22 Nov 2016 11:09:56 +0000
Subject: [PATCH 1212/1265] enable universal wheels

Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
---
 Dockerfile.run              |  2 +-
 script/build/image          |  4 ++--
 script/release/push-release |  6 +++---
 setup.cfg                   |  2 ++
 setup.py                    | 23 ++++++++++++++++++++++-
 5 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 setup.cfg

diff --git a/Dockerfile.run b/Dockerfile.run
index 4e76d64f..c6852af1 100644
--- a/Dockerfile.run
+++ b/Dockerfile.run
@@ -7,7 +7,7 @@ RUN     apk -U add \
 COPY    requirements.txt /code/requirements.txt
 RUN     pip install -r /code/requirements.txt
 
-ADD     dist/docker-compose-release.tar.gz /code/docker-compose
+ADD     dist/docker-compose-release-py2.py3-none-any.whl /code/docker-compose
 RUN     pip install --no-deps /code/docker-compose/docker-compose-*
 
 ENTRYPOINT ["/usr/bin/docker-compose"]
diff --git a/script/build/image b/script/build/image
index bdd98f03..28aa2047 100755
--- a/script/build/image
+++ b/script/build/image
@@ -11,6 +11,6 @@ TAG=$1
 VERSION="$(python setup.py --version)"
 
 ./script/build/write-git-sha
-python setup.py sdist
-cp dist/docker-compose-$VERSION.tar.gz dist/docker-compose-release.tar.gz
+python setup.py sdist bdist_wheel
+cp dist/docker-compose-$VERSION-py2.py3-none-any.whl dist/docker-compose-release-py2.py3-none-any.whl
 docker build -t docker/compose:$TAG -f Dockerfile.run .
diff --git a/script/release/push-release b/script/release/push-release
index d5ae3de9..d1a9e3f6 100755
--- a/script/release/push-release
+++ b/script/release/push-release
@@ -54,13 +54,13 @@ git push $GITHUB_REPO $VERSION
 echo "Uploading the docker image"
 docker push docker/compose:$VERSION
 
-echo "Uploading sdist to PyPI"
+echo "Uploading package to PyPI"
 pandoc -f markdown -t rst README.md -o README.rst
 sed -i -e 's/logo.png?raw=true/https:\/\/github.com\/docker\/compose\/raw\/master\/logo.png?raw=true/' README.rst
 ./script/build/write-git-sha
-python setup.py sdist
+python setup.py sdist bdist_wheel
 if [ "$(command -v twine 2> /dev/null)" ]; then
-    twine upload ./dist/docker-compose-${VERSION/-/}.tar.gz
+    twine upload ./dist/docker-compose-${VERSION/-/}.tar.gz ./dist/docker-compose-${VERSION/-/}-py2.py3-none-any.whl
 else
     python setup.py upload
 fi
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 00000000..3c6e79cf
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
diff --git a/setup.py b/setup.py
index 8b4cf709..00ca9f4c 100644
--- a/setup.py
+++ b/setup.py
@@ -4,10 +4,12 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import codecs
+import logging
 import os
 import re
 import sys
 
+import pkg_resources
 from setuptools import find_packages
 from setuptools import setup
 
@@ -49,7 +51,25 @@ tests_require = [
 
 if sys.version_info[:2] < (3, 4):
     tests_require.append('mock >= 1.0.1')
-    install_requires.append('enum34 >= 1.0.4, < 2')
+
+extras_require = {
+    ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2']
+}
+
+
+try:
+    if 'bdist_wheel' not in sys.argv:
+        for key, value in extras_require.items():
+            if key.startswith(':') and pkg_resources.evaluate_marker(key[1:]):
+                install_requires.extend(value)
+except Exception:
+    logging.getLogger(__name__).exception(
+        'Something went wrong calculating platform specific dependencies, so '
+        "you're getting them all!"
+    )
+    for key, value in extras_require.items():
+        if key.startswith(':'):
+            install_requires.extend(value)
 
 
 setup(
@@ -63,6 +83,7 @@ setup(
     include_package_data=True,
     test_suite='nose.collector',
     install_requires=install_requires,
+    extras_require=extras_require,
     tests_require=tests_require,
     entry_points="""
     [console_scripts]

From 0edfe08bf017841a1a2624b98e4a05bb11fc6d4f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 13 Dec 2016 16:54:41 -0800
Subject: [PATCH 1213/1265] Add healthchecks to 2.1 schema. Update depends_on

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config_schema_v2.1.json | 42 +++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
index 3057f2de..5ab9f71f 100644
--- a/compose/config/config_schema_v2.1.json
+++ b/compose/config/config_schema_v2.1.json
@@ -77,7 +77,28 @@
         "cpu_shares": {"type": ["number", "string"]},
         "cpu_quota": {"type": ["number", "string"]},
         "cpuset": {"type": "string"},
-        "depends_on": {"$ref": "#/definitions/list_of_strings"},
+        "depends_on": {
+          "oneOf": [
+            {"$ref": "#/definitions/list_of_strings"},
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "patternProperties": {
+                "^[a-zA-Z0-9._-]+$": {
+                  "type": "object",
+                  "additionalProperties": false,
+                  "properties": {
+                    "condition": {
+                      "type": "string",
+                      "enum": ["service_started", "service_healthy"]
+                    }
+                  },
+                  "required": ["condition"]
+                }
+              }
+            }
+          ]
+        },
         "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "dns": {"$ref": "#/definitions/string_or_list"},
         "dns_search": {"$ref": "#/definitions/string_or_list"},
@@ -120,6 +141,7 @@
 
         "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
+        "healthcheck": {"$ref": "#/definitions/healthcheck"},
         "hostname": {"type": "string"},
         "image": {"type": "string"},
         "ipc": {"type": "string"},
@@ -231,6 +253,24 @@
       "additionalProperties": false
     },
 
+    "healthcheck": {
+      "id": "#/definitions/healthcheck",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "disabled": {"type": "boolean"},
+        "interval": {"type": "string"},
+        "retries": {"type": "number"},
+        "test": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
+        "timeout": {"type": "string"}
+      }
+    },
+
     "network": {
       "id": "#/definitions/network",
       "type": "object",

From f6edd610f36ec9f6ffdd16df970f3d6cefb1169d Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 14 Dec 2016 15:39:42 -0800
Subject: [PATCH 1214/1265] Add 3.0 schema to docker-compose.spec

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 docker-compose.spec | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker-compose.spec b/docker-compose.spec
index e57d6b7a..ec5a2039 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -32,6 +32,11 @@ exe = EXE(pyz,
                 'compose/config/config_schema_v2.1.json',
                 'DATA'
             ),
+            (
+                'compose/config/config_schema_v3.0.json',
+                'compose/config/config_schema_v3.0.json',
+                'DATA'
+            ),
             (
                 'compose/GITSHA',
                 'compose/GITSHA',

From 04394b1d0a82f4507edc8863c4ab9cf64944f6d9 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 19 Dec 2016 20:20:03 -0800
Subject: [PATCH 1215/1265] Expand depends_on to allow different conditions
 (service_start, service_healthy) Rework "up" and "start" to wait on
 conditional state of dependent services Add integration tests

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py          |  12 +++-
 compose/config/validation.py      |   8 ++-
 compose/errors.py                 |  21 ++++++
 compose/parallel.py               |   7 +-
 compose/project.py                |  12 +++-
 compose/service.py                |  59 ++++++++++++++--
 tests/acceptance/cli_test.py      |   2 +-
 tests/integration/project_test.py | 114 ++++++++++++++++++++++++++++++
 tests/unit/config/config_test.py  |   9 ++-
 tests/unit/parallel_test.py       |   2 +-
 10 files changed, 228 insertions(+), 18 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index dccd11e0..73a34017 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -649,6 +649,8 @@ def process_service(service_config):
     if 'sysctls' in service_dict:
         service_dict['sysctls'] = build_string_dict(parse_sysctls(service_dict['sysctls']))
 
+    service_dict = process_depends_on(service_dict)
+
     for field in ['dns', 'dns_search', 'tmpfs']:
         if field in service_dict:
             service_dict[field] = to_list(service_dict[field])
@@ -658,6 +660,14 @@ def process_service(service_config):
     return service_dict
 
 
+def process_depends_on(service_dict):
+    if 'depends_on' in service_dict and not isinstance(service_dict['depends_on'], dict):
+        service_dict['depends_on'] = dict([
+            (svc, {'condition': 'service_started'}) for svc in service_dict['depends_on']
+        ])
+    return service_dict
+
+
 def process_healthcheck(service_dict, service_name):
     if 'healthcheck' not in service_dict:
         return service_dict
@@ -665,7 +675,7 @@ def process_healthcheck(service_dict, service_name):
     hc = {}
     raw = service_dict['healthcheck']
 
-    if raw.get('disable'):
+    if raw.get('disable') or raw.get('disabled'):
         if len(raw) > 1:
             raise ConfigurationError(
                 'Service "{}" defines an invalid healthcheck: '
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 7452e984..3f23f0a7 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -180,11 +180,13 @@ def validate_links(service_config, service_names):
 
 
 def validate_depends_on(service_config, service_names):
-    for dependency in service_config.config.get('depends_on', []):
+    deps = service_config.config.get('depends_on', {})
+    for dependency in deps.keys():
         if dependency not in service_names:
             raise ConfigurationError(
                 "Service '{s.name}' depends on service '{dep}' which is "
-                "undefined.".format(s=service_config, dep=dependency))
+                "undefined.".format(s=service_config, dep=dependency)
+            )
 
 
 def get_unsupported_config_msg(path, error_key):
@@ -201,7 +203,7 @@ def anglicize_json_type(json_type):
 
 
 def is_service_dict_schema(schema_id):
-    return schema_id in ('config_schema_v1.json',  '#/properties/services')
+    return schema_id in ('config_schema_v1.json', '#/properties/services')
 
 
 def handle_error_for_schema_with_id(error, path):
diff --git a/compose/errors.py b/compose/errors.py
index 376cc555..415b41e7 100644
--- a/compose/errors.py
+++ b/compose/errors.py
@@ -10,3 +10,24 @@ class OperationFailedError(Exception):
 class StreamParseError(RuntimeError):
     def __init__(self, reason):
         self.msg = reason
+
+
+class HealthCheckException(Exception):
+    def __init__(self, reason):
+        self.msg = reason
+
+
+class HealthCheckFailed(HealthCheckException):
+    def __init__(self, container_id):
+        super(HealthCheckFailed, self).__init__(
+            'Container "{}" is unhealthy.'.format(container_id)
+        )
+
+
+class NoHealthCheckConfigured(HealthCheckException):
+    def __init__(self, service_name):
+        super(NoHealthCheckConfigured, self).__init__(
+            'Service "{}" is missing a healthcheck configuration'.format(
+                service_name
+            )
+        )
diff --git a/compose/parallel.py b/compose/parallel.py
index 26718872..b2654dcf 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -165,13 +165,14 @@ def feed_queue(objects, func, get_deps, results, state):
     for obj in pending:
         deps = get_deps(obj)
 
-        if any(dep in state.failed for dep in deps):
+        if any(dep[0] in state.failed for dep in deps):
             log.debug('{} has upstream errors - not processing'.format(obj))
             results.put((obj, None, UpstreamError()))
             state.failed.add(obj)
         elif all(
-            dep not in objects or dep in state.finished
-            for dep in deps
+            dep not in objects or (
+                dep in state.finished and (not ready_check or ready_check(dep))
+            ) for dep, ready_check in deps
         ):
             log.debug('Starting producer thread for {}'.format(obj))
             t = Thread(target=producer, args=(obj, func, results))
diff --git a/compose/project.py b/compose/project.py
index 0178bbab..d99ef7c9 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -227,7 +227,10 @@ class Project(object):
         services = self.get_services(service_names)
 
         def get_deps(service):
-            return {self.get_service(dep) for dep in service.get_dependency_names()}
+            return {
+                (self.get_service(dep), config)
+                for dep, config in service.get_dependency_configs().items()
+            }
 
         parallel.parallel_execute(
             services,
@@ -243,7 +246,7 @@ class Project(object):
 
         def get_deps(container):
             # actually returning inversed dependencies
-            return {other for other in containers
+            return {(other, None) for other in containers
                     if container.service in
                     self.get_service(other.service).get_dependency_names()}
 
@@ -394,7 +397,10 @@ class Project(object):
             )
 
         def get_deps(service):
-            return {self.get_service(dep) for dep in service.get_dependency_names()}
+            return {
+                (self.get_service(dep), config)
+                for dep, config in service.get_dependency_configs().items()
+            }
 
         results, errors = parallel.parallel_execute(
             services,
diff --git a/compose/service.py b/compose/service.py
index e3862b6e..1338f154 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -28,6 +28,8 @@ from .const import LABEL_PROJECT
 from .const import LABEL_SERVICE
 from .const import LABEL_VERSION
 from .container import Container
+from .errors import HealthCheckFailed
+from .errors import NoHealthCheckConfigured
 from .errors import OperationFailedError
 from .parallel import parallel_execute
 from .parallel import parallel_start
@@ -69,6 +71,9 @@ DOCKER_START_KEYS = [
     'volumes_from',
 ]
 
+CONDITION_STARTED = 'service_started'
+CONDITION_HEALTHY = 'service_healthy'
+
 
 class BuildError(Exception):
     def __init__(self, service, reason):
@@ -533,10 +538,38 @@ class Service(object):
 
     def get_dependency_names(self):
         net_name = self.network_mode.service_name
-        return (self.get_linked_service_names() +
-                self.get_volumes_from_names() +
-                ([net_name] if net_name else []) +
-                self.options.get('depends_on', []))
+        return (
+            self.get_linked_service_names() +
+            self.get_volumes_from_names() +
+            ([net_name] if net_name else []) +
+            list(self.options.get('depends_on', {}).keys())
+        )
+
+    def get_dependency_configs(self):
+        net_name = self.network_mode.service_name
+        configs = dict(
+            [(name, None) for name in self.get_linked_service_names()]
+        )
+        configs.update(dict(
+            [(name, None) for name in self.get_volumes_from_names()]
+        ))
+        configs.update({net_name: None} if net_name else {})
+        configs.update(self.options.get('depends_on', {}))
+        for svc, config in self.options.get('depends_on', {}).items():
+            if config['condition'] == CONDITION_STARTED:
+                configs[svc] = lambda s: True
+            elif config['condition'] == CONDITION_HEALTHY:
+                configs[svc] = lambda s: s.is_healthy()
+            else:
+                # The config schema already prevents this, but it might be
+                # bypassed if Compose is called programmatically.
+                raise ValueError(
+                    'depends_on condition "{}" is invalid.'.format(
+                        config['condition']
+                    )
+                )
+
+        return configs
 
     def get_linked_service_names(self):
         return [service.name for (service, _) in self.links]
@@ -871,6 +904,24 @@ class Service(object):
             else:
                 log.error(six.text_type(e))
 
+    def is_healthy(self):
+        """ Check that all containers for this service report healthy.
+            Returns false if at least one healthcheck is pending.
+            If an unhealthy container is detected, raise a HealthCheckFailed
+            exception.
+        """
+        result = True
+        for ctnr in self.containers():
+            ctnr.inspect()
+            status = ctnr.get('State.Health.Status')
+            if status is None:
+                raise NoHealthCheckConfigured(self.name)
+            elif status == 'starting':
+                result = False
+            elif status == 'unhealthy':
+                raise HealthCheckFailed(ctnr.short_id)
+        return result
+
 
 def short_id_alias_exists(container, network):
     aliases = container.get(
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index b9766226..77d57840 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -928,7 +928,7 @@ class CLITestCase(DockerClientTestCase):
         assert foo_container.get('HostConfig.NetworkMode') == \
             'container:{}'.format(bar_container.id)
 
-    @v3_only()
+    @v2_1_only()
     def test_up_with_healthcheck(self):
         def wait_on_health_status(container, status):
             def condition():
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index de073239..855974de 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -19,6 +19,8 @@ from compose.config.types import VolumeSpec
 from compose.const import LABEL_PROJECT
 from compose.const import LABEL_SERVICE
 from compose.container import Container
+from compose.errors import HealthCheckFailed
+from compose.errors import NoHealthCheckConfigured
 from compose.project import Project
 from compose.project import ProjectError
 from compose.service import ConvergenceStrategy
@@ -1375,3 +1377,115 @@ class ProjectTest(DockerClientTestCase):
             ctnr for ctnr in project._labeled_containers()
             if ctnr.labels.get(LABEL_SERVICE) == 'service1'
         ]) == 0
+
+    @v2_1_only()
+    def test_project_up_healthy_dependency(self):
+        config_dict = {
+            'version': '2.1',
+            'services': {
+                'svc1': {
+                    'image': 'busybox:latest',
+                    'command': 'top',
+                    'healthcheck': {
+                        'test': 'exit 0',
+                        'retries': 1,
+                        'timeout': '10s',
+                        'interval': '0.1s'
+                    },
+                },
+                'svc2': {
+                    'image': 'busybox:latest',
+                    'command': 'top',
+                    'depends_on': {
+                        'svc1': {'condition': 'service_healthy'},
+                    }
+                }
+            }
+        }
+        config_data = build_config(config_dict)
+        project = Project.from_config(
+            name='composetest', config_data=config_data, client=self.client
+        )
+        project.up()
+        containers = project.containers()
+        assert len(containers) == 2
+
+        svc1 = project.get_service('svc1')
+        svc2 = project.get_service('svc2')
+        assert 'svc1' in svc2.get_dependency_names()
+        assert svc1.is_healthy()
+
+    @v2_1_only()
+    def test_project_up_unhealthy_dependency(self):
+        config_dict = {
+            'version': '2.1',
+            'services': {
+                'svc1': {
+                    'image': 'busybox:latest',
+                    'command': 'top',
+                    'healthcheck': {
+                        'test': 'exit 1',
+                        'retries': 1,
+                        'timeout': '10s',
+                        'interval': '0.1s'
+                    },
+                },
+                'svc2': {
+                    'image': 'busybox:latest',
+                    'command': 'top',
+                    'depends_on': {
+                        'svc1': {'condition': 'service_healthy'},
+                    }
+                }
+            }
+        }
+        config_data = build_config(config_dict)
+        project = Project.from_config(
+            name='composetest', config_data=config_data, client=self.client
+        )
+        with pytest.raises(HealthCheckFailed):
+            project.up()
+        containers = project.containers()
+        assert len(containers) == 1
+
+        svc1 = project.get_service('svc1')
+        svc2 = project.get_service('svc2')
+        assert 'svc1' in svc2.get_dependency_names()
+        with pytest.raises(HealthCheckFailed):
+            svc1.is_healthy()
+
+    @v2_1_only()
+    def test_project_up_no_healthcheck_dependency(self):
+        config_dict = {
+            'version': '2.1',
+            'services': {
+                'svc1': {
+                    'image': 'busybox:latest',
+                    'command': 'top',
+                    'healthcheck': {
+                        'disabled': True
+                    },
+                },
+                'svc2': {
+                    'image': 'busybox:latest',
+                    'command': 'top',
+                    'depends_on': {
+                        'svc1': {'condition': 'service_healthy'},
+                    }
+                }
+            }
+        }
+        config_data = build_config(config_dict)
+        project = Project.from_config(
+            name='composetest', config_data=config_data, client=self.client
+        )
+        with pytest.raises(NoHealthCheckConfigured):
+            project.up()
+        containers = project.containers()
+        assert len(containers) == 1
+
+        svc1 = project.get_service('svc1')
+        svc2 = project.get_service('svc2')
+        assert 'svc1' in svc2.get_dependency_names()
+        with pytest.raises(NoHealthCheckConfigured):
+            svc1.is_healthy()
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index f7df3aee..7a68333f 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -920,7 +920,10 @@ class ConfigTest(unittest.TestCase):
                 'build': {'context': os.path.abspath('/')},
                 'image': 'example/web',
                 'volumes': [VolumeSpec.parse('/home/user/project:/code')],
-                'depends_on': ['db', 'other'],
+                'depends_on': {
+                    'db': {'condition': 'container_start'},
+                    'other': {'condition': 'container_start'},
+                },
             },
             {
                 'name': 'db',
@@ -3055,7 +3058,9 @@ class ExtendsTest(unittest.TestCase):
                 image: example
         """)
         services = load_from_filename(str(tmpdir.join('docker-compose.yml')))
-        assert service_sort(services)[2]['depends_on'] == ['other']
+        assert service_sort(services)[2]['depends_on'] == {
+            'other': {'condition': 'container_start'}
+        }
 
 
 @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
diff --git a/tests/unit/parallel_test.py b/tests/unit/parallel_test.py
index 479c0f1d..2a50b718 100644
--- a/tests/unit/parallel_test.py
+++ b/tests/unit/parallel_test.py
@@ -25,7 +25,7 @@ deps = {
 
 
 def get_deps(obj):
-    return deps[obj]
+    return [(dep, None) for dep in deps[obj]]
 
 
 def test_parallel_execute():

From bef230853012d78e7ab58de65b653839401be974 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 19 Dec 2016 20:39:16 -0800
Subject: [PATCH 1216/1265] Fix condition name in config tests

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/acceptance/cli_test.py     | 2 +-
 tests/unit/config/config_test.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 77d57840..b9766226 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -928,7 +928,7 @@ class CLITestCase(DockerClientTestCase):
         assert foo_container.get('HostConfig.NetworkMode') == \
             'container:{}'.format(bar_container.id)
 
-    @v2_1_only()
+    @v3_only()
     def test_up_with_healthcheck(self):
         def wait_on_health_status(container, status):
             def condition():
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 7a68333f..31a888ed 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -921,8 +921,8 @@ class ConfigTest(unittest.TestCase):
                 'image': 'example/web',
                 'volumes': [VolumeSpec.parse('/home/user/project:/code')],
                 'depends_on': {
-                    'db': {'condition': 'container_start'},
-                    'other': {'condition': 'container_start'},
+                    'db': {'condition': 'service_started'},
+                    'other': {'condition': 'service_started'},
                 },
             },
             {
@@ -3059,7 +3059,7 @@ class ExtendsTest(unittest.TestCase):
         """)
         services = load_from_filename(str(tmpdir.join('docker-compose.yml')))
         assert service_sort(services)[2]['depends_on'] == {
-            'other': {'condition': 'container_start'}
+            'other': {'condition': 'service_started'}
         }
 
 

From 8145429399346a8d800369aad17f5fe69237c2ad Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 4 Jan 2017 13:14:23 -0800
Subject: [PATCH 1217/1265] Unify healthcheck spec definition in v2 and v3

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py               |  2 +-
 compose/config/config_schema_v2.1.json |  2 +-
 compose/config/config_schema_v3.0.json | 12 ++++++------
 tests/integration/project_test.py      |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 73a34017..fd935591 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -675,7 +675,7 @@ def process_healthcheck(service_dict, service_name):
     hc = {}
     raw = service_dict['healthcheck']
 
-    if raw.get('disable') or raw.get('disabled'):
+    if raw.get('disable'):
         if len(raw) > 1:
             raise ConfigurationError(
                 'Service "{}" defines an invalid healthcheck: '
diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
index 5ab9f71f..d0d5233a 100644
--- a/compose/config/config_schema_v2.1.json
+++ b/compose/config/config_schema_v2.1.json
@@ -258,7 +258,7 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "disabled": {"type": "boolean"},
+        "disable": {"type": "boolean"},
         "interval": {"type": "string"},
         "retries": {"type": "number"},
         "test": {
diff --git a/compose/config/config_schema_v3.0.json b/compose/config/config_schema_v3.0.json
index 1f93347f..8d075d47 100644
--- a/compose/config/config_schema_v3.0.json
+++ b/compose/config/config_schema_v3.0.json
@@ -202,10 +202,11 @@
 
     "healthcheck": {
       "id": "#/definitions/healthcheck",
-      "type": ["object", "null"],
+      "type": "object",
+      "additionalProperties": false,
       "properties": {
-        "interval": {"type":"string"},
-        "timeout": {"type":"string"},
+        "disable": {"type": "boolean"},
+        "interval": {"type": "string"},
         "retries": {"type": "number"},
         "test": {
           "oneOf": [
@@ -213,9 +214,8 @@
             {"type": "array", "items": {"type": "string"}}
           ]
         },
-        "disable": {"type": "boolean"}
-      },
-      "additionalProperties": false
+        "timeout": {"type": "string"}
+      }
     },
     "deployment": {
       "id": "#/definitions/deployment",
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 855974de..c5e3cf50 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -1463,7 +1463,7 @@ class ProjectTest(DockerClientTestCase):
                     'image': 'busybox:latest',
                     'command': 'top',
                     'healthcheck': {
-                        'disabled': True
+                        'disable': True
                     },
                 },
                 'svc2': {

From 1be41f59c9119c72b3c39045e4e4031608fa18df Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 4 Jan 2017 14:30:20 -0800
Subject: [PATCH 1218/1265] Add support for stop_grace_period in v2

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config_schema_v2.0.json | 1 +
 compose/config/config_schema_v2.1.json | 1 +
 compose/config/config_schema_v3.0.json | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/compose/config/config_schema_v2.0.json b/compose/config/config_schema_v2.0.json
index 76688916..77494715 100644
--- a/compose/config/config_schema_v2.0.json
+++ b/compose/config/config_schema_v2.0.json
@@ -192,6 +192,7 @@
         "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "shm_size": {"type": ["number", "string"]},
         "stdin_open": {"type": "boolean"},
+        "stop_grace_period": {"type": "string", "format": "duration"},
         "stop_signal": {"type": "string"},
         "tmpfs": {"$ref": "#/definitions/string_or_list"},
         "tty": {"type": "boolean"},
diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
index d0d5233a..97ec5fa1 100644
--- a/compose/config/config_schema_v2.1.json
+++ b/compose/config/config_schema_v2.1.json
@@ -217,6 +217,7 @@
         "shm_size": {"type": ["number", "string"]},
         "sysctls": {"$ref": "#/definitions/list_or_dict"},
         "stdin_open": {"type": "boolean"},
+        "stop_grace_period": {"type": "string", "format": "duration"},
         "stop_signal": {"type": "string"},
         "tmpfs": {"$ref": "#/definitions/string_or_list"},
         "tty": {"type": "boolean"},
diff --git a/compose/config/config_schema_v3.0.json b/compose/config/config_schema_v3.0.json
index 8d075d47..2b410446 100644
--- a/compose/config/config_schema_v3.0.json
+++ b/compose/config/config_schema_v3.0.json
@@ -169,8 +169,8 @@
         "shm_size": {"type": ["number", "string"]},
         "sysctls": {"$ref": "#/definitions/list_or_dict"},
         "stdin_open": {"type": "boolean"},
-        "stop_signal": {"type": "string"},
         "stop_grace_period": {"type": "string", "format": "duration"},
+        "stop_signal": {"type": "string"},
         "tmpfs": {"$ref": "#/definitions/string_or_list"},
         "tty": {"type": "boolean"},
         "ulimits": {

From 534b4ed820ec2b2e2f7b296e0065c42ebf3489cd Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 4 Jan 2017 15:26:11 -0800
Subject: [PATCH 1219/1265] Falsy values in COMPOSE_CONVERT_WINDOWS_PATHS are
 properly recognized

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py              |  2 +-
 compose/config/environment.py         | 11 ++++++++
 tests/unit/config/environment_test.py | 40 +++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit/config/environment_test.py

diff --git a/compose/config/config.py b/compose/config/config.py
index fd935591..c11460fa 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -712,7 +712,7 @@ def finalize_service(service_config, service_names, version, environment):
     if 'volumes' in service_dict:
         service_dict['volumes'] = [
             VolumeSpec.parse(
-                v, environment.get('COMPOSE_CONVERT_WINDOWS_PATHS')
+                v, environment.get_boolean('COMPOSE_CONVERT_WINDOWS_PATHS')
             ) for v in service_dict['volumes']
         ]
 
diff --git a/compose/config/environment.py b/compose/config/environment.py
index 5d6b5af6..7b926930 100644
--- a/compose/config/environment.py
+++ b/compose/config/environment.py
@@ -105,3 +105,14 @@ class Environment(dict):
                 super(Environment, self).get(key.upper(), *args, **kwargs)
             )
         return super(Environment, self).get(key, *args, **kwargs)
+
+    def get_boolean(self, key):
+        # Convert a value to a boolean using "common sense" rules.
+        # Unset, empty, "0" and "false" (i-case) yield False.
+        # All other values yield True.
+        value = self.get(key)
+        if not value:
+            return False
+        if value.lower() in ['0', 'false']:
+            return False
+        return True
diff --git a/tests/unit/config/environment_test.py b/tests/unit/config/environment_test.py
new file mode 100644
index 00000000..20446d2b
--- /dev/null
+++ b/tests/unit/config/environment_test.py
@@ -0,0 +1,40 @@
+# encoding: utf-8
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from compose.config.environment import Environment
+from tests import unittest
+
+
+class EnvironmentTest(unittest.TestCase):
+    def test_get_simple(self):
+        env = Environment({
+            'FOO': 'bar',
+            'BAR': '1',
+            'BAZ': ''
+        })
+
+        assert env.get('FOO') == 'bar'
+        assert env.get('BAR') == '1'
+        assert env.get('BAZ') == ''
+
+    def test_get_undefined(self):
+        env = Environment({
+            'FOO': 'bar'
+        })
+        assert env.get('FOOBAR') is None
+
+    def test_get_boolean(self):
+        env = Environment({
+            'FOO': '',
+            'BAR': '0',
+            'BAZ': 'FALSE',
+            'FOOBAR': 'true',
+        })
+
+        assert env.get_boolean('FOO') is False
+        assert env.get_boolean('BAR') is False
+        assert env.get_boolean('BAZ') is False
+        assert env.get_boolean('FOOBAR') is True
+        assert env.get_boolean('UNDEFINED') is False

From e063c5739fedeb56450075920451e3fd8b57a826 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 5 Jan 2017 11:15:24 -0800
Subject: [PATCH 1220/1265] Fix config schemas (misplaced
 "additionalProperties")

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config_schema_v2.0.json | 6 +++---
 compose/config/config_schema_v2.1.json | 6 +++---
 compose/config/config_schema_v3.0.json | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/compose/config/config_schema_v2.0.json b/compose/config/config_schema_v2.0.json
index 77494715..59c7b30c 100644
--- a/compose/config/config_schema_v2.0.json
+++ b/compose/config/config_schema_v2.0.json
@@ -276,9 +276,9 @@
           "type": ["boolean", "object"],
           "properties": {
             "name": {"type": "string"}
-          }
-        },
-        "additionalProperties": false
+          },
+          "additionalProperties": false
+        }
       },
       "additionalProperties": false
     },
diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
index 97ec5fa1..d1ffff89 100644
--- a/compose/config/config_schema_v2.1.json
+++ b/compose/config/config_schema_v2.1.json
@@ -322,10 +322,10 @@
           "type": ["boolean", "object"],
           "properties": {
             "name": {"type": "string"}
-          }
+          },
+          "additionalProperties": false
         },
-        "labels": {"$ref": "#/definitions/list_or_dict"},
-        "additionalProperties": false
+        "labels": {"$ref": "#/definitions/list_or_dict"}
       },
       "additionalProperties": false
     },
diff --git a/compose/config/config_schema_v3.0.json b/compose/config/config_schema_v3.0.json
index 2b410446..194fd8e6 100644
--- a/compose/config/config_schema_v3.0.json
+++ b/compose/config/config_schema_v3.0.json
@@ -328,7 +328,8 @@
           "type": ["boolean", "object"],
           "properties": {
             "name": {"type": "string"}
-          }
+          },
+          "additionalProperties": false
         }
       },
       "labels": {"$ref": "#/definitions/list_or_dict"},

From 2c157e8fa9a94d71637643a6ec807db8b21a9d29 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 6 Jan 2017 17:45:57 -0800
Subject: [PATCH 1221/1265] Use docker SDK 2.0.1

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index bae5d9ea..4b7c7b76 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ PyYAML==3.11
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.2.0
 colorama==0.3.7
-docker==2.0.0
+docker==2.0.1
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4; python_version < '3.4'
diff --git a/setup.py b/setup.py
index 8b4cf709..7954d92b 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ install_requires = [
     'requests >= 2.6.1, != 2.11.0, < 2.12',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker >= 2.0.0, < 3.0',
+    'docker >= 2.0.1, < 3.0',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

From 52792b7a963af9c593e61c78c7f0c7f62550a85b Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 10 Jan 2017 14:57:32 -0800
Subject: [PATCH 1222/1265] Update setup.py extra_requires

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 setup.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 0ceb2a22..2f2ba742 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,9 @@ if sys.version_info[:2] < (3, 4):
     tests_require.append('mock >= 1.0.1')
 
 extras_require = {
-    ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2']
+    ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
+    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
+    ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
 }
 
 
@@ -64,8 +66,8 @@ try:
                 install_requires.extend(value)
 except Exception:
     logging.getLogger(__name__).exception(
-        'Something went wrong calculating platform specific dependencies, so '
-        "you're getting them all!"
+        'Failed to compute platform dependencies. All dependencies will be '
+        'installed as a result.'
     )
     for key, value in extras_require.items():
         if key.startswith(':'):

From 19190ea0df43978d1a9c9f0fefd644ca5b08aee3 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 10 Jan 2017 16:43:26 -0800
Subject: [PATCH 1223/1265] Fix docker image build script when using universal
 wheels

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 Dockerfile.run     | 5 +++--
 script/build/image | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.run b/Dockerfile.run
index c6852af1..de46e35e 100644
--- a/Dockerfile.run
+++ b/Dockerfile.run
@@ -1,5 +1,6 @@
 
 FROM    alpine:3.4
+ARG     version
 RUN     apk -U add \
             python \
             py-pip
@@ -7,7 +8,7 @@ RUN     apk -U add \
 COPY    requirements.txt /code/requirements.txt
 RUN     pip install -r /code/requirements.txt
 
-ADD     dist/docker-compose-release-py2.py3-none-any.whl /code/docker-compose
-RUN     pip install --no-deps /code/docker-compose/docker-compose-*
+COPY     dist/docker_compose-${version}-py2.py3-none-any.whl /code/
+RUN     pip install --no-deps /code/docker_compose-${version}-py2.py3-none-any.whl
 
 ENTRYPOINT ["/usr/bin/docker-compose"]
diff --git a/script/build/image b/script/build/image
index 28aa2047..3590ce14 100755
--- a/script/build/image
+++ b/script/build/image
@@ -12,5 +12,4 @@ VERSION="$(python setup.py --version)"
 
 ./script/build/write-git-sha
 python setup.py sdist bdist_wheel
-cp dist/docker-compose-$VERSION-py2.py3-none-any.whl dist/docker-compose-release-py2.py3-none-any.whl
-docker build -t docker/compose:$TAG -f Dockerfile.run .
+docker build --build-arg version=$VERSION -t docker/compose:$TAG -f Dockerfile.run .

From 29b46d5b26055ade86a2e0e608342dd298e5a8c3 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 11 Jan 2017 15:39:48 -0800
Subject: [PATCH 1224/1265] Use correct wheel file name in twine upload command

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 script/release/push-release | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/release/push-release b/script/release/push-release
index d1a9e3f6..9db6f689 100755
--- a/script/release/push-release
+++ b/script/release/push-release
@@ -60,12 +60,13 @@ sed -i -e 's/logo.png?raw=true/https:\/\/github.com\/docker\/compose\/raw\/maste
 ./script/build/write-git-sha
 python setup.py sdist bdist_wheel
 if [ "$(command -v twine 2> /dev/null)" ]; then
-    twine upload ./dist/docker-compose-${VERSION/-/}.tar.gz ./dist/docker-compose-${VERSION/-/}-py2.py3-none-any.whl
+    twine upload ./dist/docker-compose-${VERSION/-/}.tar.gz ./dist/docker_compose-${VERSION/-/}-py2.py3-none-any.whl
 else
     python setup.py upload
 fi
 
 echo "Testing pip package"
+deactivate || true
 virtualenv venv-test
 source venv-test/bin/activate
 pip install docker-compose==$VERSION

From 2df31bb13c9a6820aba1d9b5a827329eded2b9cd Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 11 Jan 2017 16:25:40 -0800
Subject: [PATCH 1225/1265] Provide valid serialization of depends_on when
 format is not 2.1

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/serialize.py      |  9 ++++++++-
 tests/unit/config/config_test.py | 31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/compose/config/serialize.py b/compose/config/serialize.py
index 768f3d47..05ac0d60 100644
--- a/compose/config/serialize.py
+++ b/compose/config/serialize.py
@@ -56,9 +56,16 @@ def denormalize_service_dict(service_dict, version):
     service_dict = service_dict.copy()
 
     if 'restart' in service_dict:
-        service_dict['restart'] = types.serialize_restart_spec(service_dict['restart'])
+        service_dict['restart'] = types.serialize_restart_spec(
+            service_dict['restart']
+        )
 
     if version == V1 and 'network_mode' not in service_dict:
         service_dict['network_mode'] = 'bridge'
 
+    if 'depends_on' in service_dict and version != V2_1:
+        service_dict['depends_on'] = sorted([
+            svc for svc in service_dict['depends_on'].keys()
+        ])
+
     return service_dict
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 31a888ed..ca7c6168 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -22,6 +22,7 @@ from compose.config.config import V3_0
 from compose.config.environment import Environment
 from compose.config.errors import ConfigurationError
 from compose.config.errors import VERSION_EXPLANATION
+from compose.config.serialize import denormalize_service_dict
 from compose.config.types import VolumeSpec
 from compose.const import IS_WINDOWS_PLATFORM
 from compose.utils import nanoseconds_from_time_seconds
@@ -3269,3 +3270,33 @@ def get_config_filename_for_files(filenames, subdir=None):
         return os.path.basename(filename)
     finally:
         shutil.rmtree(project_dir)
+
+
+class SerializeTest(unittest.TestCase):
+    def test_denormalize_depends_on_v3(self):
+        service_dict = {
+            'image': 'busybox',
+            'command': 'true',
+            'depends_on': {
+                'service2': {'condition': 'service_started'},
+                'service3': {'condition': 'service_started'},
+            }
+        }
+
+        assert denormalize_service_dict(service_dict, V3_0) == {
+            'image': 'busybox',
+            'command': 'true',
+            'depends_on': ['service2', 'service3']
+        }
+
+    def test_denormalize_depends_on_v2_1(self):
+        service_dict = {
+            'image': 'busybox',
+            'command': 'true',
+            'depends_on': {
+                'service2': {'condition': 'service_started'},
+                'service3': {'condition': 'service_started'},
+            }
+        }
+
+        assert denormalize_service_dict(service_dict, V2_1) == service_dict

From 931027c59828f242391de41cbeadfd6d1664588a Mon Sep 17 00:00:00 2001
From: muicoder <muicoder@gmail.com>
Date: Mon, 16 Jan 2017 10:43:29 +0800
Subject: [PATCH 1226/1265] add IMAGE_EVENTS: load/save

Signed-off-by: muicoder <muicoder@gmail.com>
---
 compose/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/const.py b/compose/const.py
index 1b1be5c7..354c6d76 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -5,7 +5,7 @@ import sys
 
 DEFAULT_TIMEOUT = 10
 HTTP_TIMEOUT = 60
-IMAGE_EVENTS = ['delete', 'import', 'pull', 'push', 'tag', 'untag']
+IMAGE_EVENTS = ['delete', 'import', 'load', 'pull', 'push', 'save', 'tag', 'untag']
 IS_WINDOWS_PLATFORM = (sys.platform == "win32")
 LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
 LABEL_ONE_OFF = 'com.docker.compose.oneoff'

From 56a1b02aac33d09ec7761729a8d6ddcb0fbdea0e Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 17 Jan 2017 13:22:16 -0800
Subject: [PATCH 1227/1265] Catch healthcheck exceptions in parallel_execute

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/parallel.py               | 40 ++++++++++++++++++-------------
 tests/integration/project_test.py |  4 ++--
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/compose/parallel.py b/compose/parallel.py
index b2654dcf..e495410c 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -12,6 +12,8 @@ from six.moves.queue import Empty
 from six.moves.queue import Queue
 
 from compose.cli.signals import ShutdownException
+from compose.errors import HealthCheckFailed
+from compose.errors import NoHealthCheckConfigured
 from compose.errors import OperationFailedError
 from compose.utils import get_output_stream
 
@@ -48,7 +50,7 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None):
         elif isinstance(exception, APIError):
             errors[get_name(obj)] = exception.explanation
             writer.write(get_name(obj), 'error')
-        elif isinstance(exception, OperationFailedError):
+        elif isinstance(exception, (OperationFailedError, HealthCheckFailed, NoHealthCheckConfigured)):
             errors[get_name(obj)] = exception.msg
             writer.write(get_name(obj), 'error')
         elif isinstance(exception, UpstreamError):
@@ -164,21 +166,27 @@ def feed_queue(objects, func, get_deps, results, state):
 
     for obj in pending:
         deps = get_deps(obj)
-
-        if any(dep[0] in state.failed for dep in deps):
-            log.debug('{} has upstream errors - not processing'.format(obj))
-            results.put((obj, None, UpstreamError()))
-            state.failed.add(obj)
-        elif all(
-            dep not in objects or (
-                dep in state.finished and (not ready_check or ready_check(dep))
-            ) for dep, ready_check in deps
-        ):
-            log.debug('Starting producer thread for {}'.format(obj))
-            t = Thread(target=producer, args=(obj, func, results))
-            t.daemon = True
-            t.start()
-            state.started.add(obj)
+        try:
+            if any(dep[0] in state.failed for dep in deps):
+                log.debug('{} has upstream errors - not processing'.format(obj))
+                results.put((obj, None, UpstreamError()))
+                state.failed.add(obj)
+            elif all(
+                dep not in objects or (
+                    dep in state.finished and (not ready_check or ready_check(dep))
+                ) for dep, ready_check in deps
+            ):
+                log.debug('Starting producer thread for {}'.format(obj))
+                t = Thread(target=producer, args=(obj, func, results))
+                t.daemon = True
+                t.start()
+                state.started.add(obj)
+        except (HealthCheckFailed, NoHealthCheckConfigured) as e:
+            log.debug(
+                'Healthcheck for service(s) upstream of {} failed - '
+                'not processing'.format(obj)
+            )
+            results.put((obj, None, e))
 
     if state.is_done():
         results.put(STOP)
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index c5e3cf50..ee2b7817 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -1443,7 +1443,7 @@ class ProjectTest(DockerClientTestCase):
         project = Project.from_config(
             name='composetest', config_data=config_data, client=self.client
         )
-        with pytest.raises(HealthCheckFailed):
+        with pytest.raises(ProjectError):
             project.up()
         containers = project.containers()
         assert len(containers) == 1
@@ -1479,7 +1479,7 @@ class ProjectTest(DockerClientTestCase):
         project = Project.from_config(
             name='composetest', config_data=config_data, client=self.client
         )
-        with pytest.raises(NoHealthCheckConfigured):
+        with pytest.raises(ProjectError):
             project.up()
         containers = project.containers()
         assert len(containers) == 1

From 1a02121ab55876f92bcceb62d1e81b7f114f0c79 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 18 Jan 2017 17:52:03 -0800
Subject: [PATCH 1228/1265] depends_on merge now retains condition information
 when present

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py         |  6 +++++-
 tests/unit/config/config_test.py | 34 ++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index c11460fa..7e77421e 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -818,6 +818,7 @@ def merge_service_dicts(base, override, version):
     md.merge_mapping('ulimits', parse_ulimits)
     md.merge_mapping('networks', parse_networks)
     md.merge_mapping('sysctls', parse_sysctls)
+    md.merge_mapping('depends_on', parse_depends_on)
     md.merge_sequence('links', ServiceLink.parse)
 
     for field in ['volumes', 'devices']:
@@ -825,7 +826,7 @@ def merge_service_dicts(base, override, version):
 
     for field in [
         'ports', 'cap_add', 'cap_drop', 'expose', 'external_links',
-        'security_opt', 'volumes_from', 'depends_on',
+        'security_opt', 'volumes_from',
     ]:
         md.merge_field(field, merge_unique_items_lists, default=[])
 
@@ -920,6 +921,9 @@ parse_environment = functools.partial(parse_dict_or_list, split_env, 'environmen
 parse_labels = functools.partial(parse_dict_or_list, split_kv, 'labels')
 parse_networks = functools.partial(parse_dict_or_list, lambda k: (k, None), 'networks')
 parse_sysctls = functools.partial(parse_dict_or_list, split_kv, 'sysctls')
+parse_depends_on = functools.partial(
+    parse_dict_or_list, lambda k: (k, {'condition': 'service_started'}), 'depends_on'
+)
 
 
 def parse_ulimits(ulimits):
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index ca7c6168..ab8bfcfc 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1713,6 +1713,40 @@ class ConfigTest(unittest.TestCase):
             }
         }
 
+    def test_merge_depends_on_no_override(self):
+        base = {
+            'image': 'busybox',
+            'depends_on': {
+                'app1': {'condition': 'service_started'},
+                'app2': {'condition': 'service_healthy'}
+            }
+        }
+        override = {}
+        actual = config.merge_service_dicts(base, override, V2_1)
+        assert actual == base
+
+    def test_merge_depends_on_mixed_syntax(self):
+        base = {
+            'image': 'busybox',
+            'depends_on': {
+                'app1': {'condition': 'service_started'},
+                'app2': {'condition': 'service_healthy'}
+            }
+        }
+        override = {
+            'depends_on': ['app3']
+        }
+
+        actual = config.merge_service_dicts(base, override, V2_1)
+        assert actual == {
+            'image': 'busybox',
+            'depends_on': {
+                'app1': {'condition': 'service_started'},
+                'app2': {'condition': 'service_healthy'},
+                'app3': {'condition': 'service_started'}
+            }
+        }
+
     def test_external_volume_config(self):
         config_details = build_config_details({
             'version': '2',

From 169289c8b66dcab760cdc7e1534fc0bece326d44 Mon Sep 17 00:00:00 2001
From: "Aaron.L.Xu" <likexu@harmonycloud.cn>
Date: Fri, 20 Jan 2017 00:52:13 +0800
Subject: [PATCH 1229/1265] find a fishbone

Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
---
 script/test/versions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/test/versions.py b/script/test/versions.py
index 45ead143..0c3b8162 100755
--- a/script/test/versions.py
+++ b/script/test/versions.py
@@ -5,7 +5,7 @@ version tags for recent releases, or the default release.
 
 The default release is the most recent non-RC version.
 
-Recent is a list of unqiue major.minor versions, where each is the most
+Recent is a list of unique major.minor versions, where each is the most
 recent version in the series.
 
 For example, if the list of versions is:

From 1c46525c2baf8532434c320bf0443a520381431d Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 19 Jan 2017 14:47:31 -0800
Subject: [PATCH 1230/1265] 1.11.0dev

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 CHANGELOG.md        | 48 +++++++++++++++++++++++++++++++++++++++++++++
 compose/__init__.py |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c645ca2..6699f880 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,54 @@
 Change log
 ==========
 
+1.10.0 (2017-01-18)
+-------------------
+
+### New Features
+
+#### Compose file version 3.0
+
+- Introduced version 3.0 of the `docker-compose.yml` specification. This
+  version requires to be used with Docker Engine 1.13 or above and is
+  specifically designed to work with the `docker stack` commands.
+
+#### Compose file version 2.1 and up
+
+- Healthcheck configuration can now be done in the service definition using
+  the `healthcheck` parameter
+
+- Containers dependencies can now be set up to wait on positive healthchecks
+  when declared using `depends_on`. See the documentation for the updated
+  syntax.
+  **Note:** This feature will not be ported to version 3 Compose files.
+
+- Added support for the `sysctls` parameter in service definitions
+
+- Added support for the `userns_mode` parameter in service definitions
+
+- Compose now adds identifying labels to networks and volumes it creates
+
+#### Compose file version 2.0 and up
+
+- Added support for the `stop_grace_period` option in service definitions.
+
+### Bugfixes
+
+- Colored output now works properly on Windows.
+
+- Fixed a bug where docker-compose run would fail to set up link aliases
+  in interactive mode on Windows.
+
+- Networks created by Compose are now always made attachable
+  (Compose files v2.1 and up).
+
+- Fixed a bug where falsy values of `COMPOSE_CONVERT_WINDOWS_PATHS`
+  (`0`, `false`, empty value) were being interpreted as true.
+
+- Fixed a bug where forward slashes in some .dockerignore patterns weren't
+  being parsed correctly on Windows
+
+
 1.9.0 (2016-11-16)
 -----------------
 
diff --git a/compose/__init__.py b/compose/__init__.py
index 6f05b282..38417836 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.10.0dev'
+__version__ = '1.11.0dev'

From 5c2165eaafbb625eb2058b199b571a228e86df03 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 19 Jan 2017 15:41:31 -0800
Subject: [PATCH 1231/1265] Fix volume definition in v3 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config_schema_v3.0.json    | 4 ++--
 tests/acceptance/cli_test.py              | 8 +++++++-
 tests/fixtures/v3-full/docker-compose.yml | 4 ++++
 tests/integration/testcases.py            | 7 +++++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/compose/config/config_schema_v3.0.json b/compose/config/config_schema_v3.0.json
index ae4c0530..584b6ef5 100644
--- a/compose/config/config_schema_v3.0.json
+++ b/compose/config/config_schema_v3.0.json
@@ -330,9 +330,9 @@
             "name": {"type": "string"}
           },
           "additionalProperties": false
-        }
+        },
+        "labels": {"$ref": "#/definitions/list_or_dict"}
       },
-      "labels": {"$ref": "#/definitions/list_or_dict"},
       "additionalProperties": false
     },
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index b9766226..ce31dd18 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -295,7 +295,13 @@ class CLITestCase(DockerClientTestCase):
         assert yaml.load(result.stdout) == {
             'version': '3.0',
             'networks': {},
-            'volumes': {},
+            'volumes': {
+                'foobar': {
+                    'labels': {
+                        'com.docker.compose.test': 'true',
+                    },
+                },
+            },
             'services': {
                 'web': {
                     'image': 'busybox',
diff --git a/tests/fixtures/v3-full/docker-compose.yml b/tests/fixtures/v3-full/docker-compose.yml
index b4d1b642..a1661ab9 100644
--- a/tests/fixtures/v3-full/docker-compose.yml
+++ b/tests/fixtures/v3-full/docker-compose.yml
@@ -35,3 +35,7 @@ services:
       retries: 5
 
     stop_grace_period: 20s
+volumes:
+  foobar:
+    labels:
+      com.docker.compose.test: 'true'
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index f6bc402b..230bd2d9 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -13,6 +13,7 @@ from compose.config.config import resolve_environment
 from compose.config.config import V1
 from compose.config.config import V2_0
 from compose.config.config import V2_1
+from compose.config.config import V3_0
 from compose.config.environment import Environment
 from compose.const import API_VERSIONS
 from compose.const import LABEL_PROJECT
@@ -36,13 +37,15 @@ def get_links(container):
 
 def engine_max_version():
     if 'DOCKER_VERSION' not in os.environ:
-        return V2_1
+        return V3_0
     version = os.environ['DOCKER_VERSION'].partition('-')[0]
     if version_lt(version, '1.10'):
         return V1
     elif version_lt(version, '1.12'):
         return V2_0
-    return V2_1
+    elif version_lt(version, '1.13'):
+        return V2_1
+    return V3_0
 
 
 def build_version_required_decorator(ignored_versions):

From d83d31889ea937524db798aa8260638036503764 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 19 Jan 2017 16:05:13 -0800
Subject: [PATCH 1232/1265] Remove external_name from volume def in config
 output

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/serialize.py                 |  7 ++++++-
 tests/acceptance/cli_test.py                | 14 ++++++++++++++
 tests/fixtures/volumes/docker-compose.yml   |  2 ++
 tests/fixtures/volumes/external-volumes.yml | 16 ++++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/fixtures/volumes/docker-compose.yml
 create mode 100644 tests/fixtures/volumes/external-volumes.yml

diff --git a/compose/config/serialize.py b/compose/config/serialize.py
index 05ac0d60..9ea287a4 100644
--- a/compose/config/serialize.py
+++ b/compose/config/serialize.py
@@ -32,6 +32,11 @@ def denormalize_config(config):
         if 'external_name' in net_conf:
             del net_conf['external_name']
 
+    volumes = config.volumes.copy()
+    for vol_name, vol_conf in volumes.items():
+        if 'external_name' in vol_conf:
+            del vol_conf['external_name']
+
     version = config.version
     if version == V1:
         version = V2_1
@@ -40,7 +45,7 @@ def denormalize_config(config):
         'version': version,
         'services': services,
         'networks': networks,
-        'volumes': config.volumes,
+        'volumes': volumes,
     }
 
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index b9766226..287c043c 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -262,6 +262,20 @@ class CLITestCase(DockerClientTestCase):
             }
         }
 
+    def test_config_external_volume(self):
+        self.base_dir = 'tests/fixtures/volumes'
+        result = self.dispatch(['-f', 'external-volumes.yml', 'config'])
+        json_result = yaml.load(result.stdout)
+        assert 'volumes' in json_result
+        assert json_result['volumes'] == {
+            'foo': {
+                'external': True
+            },
+            'bar': {
+                'external': {'name': 'some_bar'}
+            }
+        }
+
     def test_config_v1(self):
         self.base_dir = 'tests/fixtures/v1-config'
         result = self.dispatch(['config'])
diff --git a/tests/fixtures/volumes/docker-compose.yml b/tests/fixtures/volumes/docker-compose.yml
new file mode 100644
index 00000000..da711ac4
--- /dev/null
+++ b/tests/fixtures/volumes/docker-compose.yml
@@ -0,0 +1,2 @@
+version: '2.1'
+services: {}
diff --git a/tests/fixtures/volumes/external-volumes.yml b/tests/fixtures/volumes/external-volumes.yml
new file mode 100644
index 00000000..05c6c484
--- /dev/null
+++ b/tests/fixtures/volumes/external-volumes.yml
@@ -0,0 +1,16 @@
+version: "2.1"
+
+services:
+  web:
+    image: busybox
+    command: top
+    volumes:
+      - foo:/var/lib/
+      - bar:/etc/
+
+volumes:
+  foo:
+    external: true
+  bar:
+    external:
+      name: some_bar

From 644e1716c33e0b3a3dcb4e5227b7dac0a289cffd Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 20 Jan 2017 12:55:59 -0500
Subject: [PATCH 1233/1265] Add missing network.internal to v3 schema.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config_schema_v3.0.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/config/config_schema_v3.0.json b/compose/config/config_schema_v3.0.json
index 584b6ef5..fbcd8bb8 100644
--- a/compose/config/config_schema_v3.0.json
+++ b/compose/config/config_schema_v3.0.json
@@ -308,6 +308,7 @@
           },
           "additionalProperties": false
         },
+        "internal": {"type": "boolean"},
         "labels": {"$ref": "#/definitions/list_or_dict"}
       },
       "additionalProperties": false

From 20d6f450b5e37e5c634fdf517df32d7484a2b3ff Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 20 Jan 2017 15:05:53 -0800
Subject: [PATCH 1234/1265] Don't encode build context path on Windows

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/service.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/compose/service.py b/compose/service.py
index 20a40c68..724e0565 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -22,6 +22,7 @@ from .config import DOCKER_CONFIG_KEYS
 from .config import merge_environment
 from .config.types import VolumeSpec
 from .const import DEFAULT_TIMEOUT
+from .const import IS_WINDOWS_PLATFORM
 from .const import LABEL_CONFIG_HASH
 from .const import LABEL_CONTAINER_NUMBER
 from .const import LABEL_ONE_OFF
@@ -769,9 +770,9 @@ class Service(object):
 
         build_opts = self.options.get('build', {})
         path = build_opts.get('context')
-        # python2 os.path() doesn't support unicode, so we need to encode it to
-        # a byte string
-        if not six.PY3:
+        # python2 os.stat() doesn't support unicode on some UNIX, so we
+        # encode it to a bytestring to be safe
+        if not six.PY3 and not IS_WINDOWS_PLATFORM:
             path = path.encode('utf8')
 
         build_output = self.client.build(

From e10d1140b95d33a589b1a971e0edda703bfb1e9b Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 25 Jan 2017 18:00:09 -0800
Subject: [PATCH 1235/1265] Convert time data back to string values when
 serializing config

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/serialize.py      | 29 +++++++++++++++++++++++++
 tests/acceptance/cli_test.py     |  4 ++--
 tests/unit/config/config_test.py | 36 ++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/compose/config/serialize.py b/compose/config/serialize.py
index 9ea287a4..3745de82 100644
--- a/compose/config/serialize.py
+++ b/compose/config/serialize.py
@@ -57,6 +57,25 @@ def serialize_config(config):
         width=80)
 
 
+def serialize_ns_time_value(value):
+    result = (value, 'ns')
+    table = [
+        (1000., 'us'),
+        (1000., 'ms'),
+        (1000., 's'),
+        (60., 'm'),
+        (60., 'h')
+    ]
+    for stage in table:
+        tmp = value / stage[0]
+        if tmp == int(value / stage[0]):
+            value = tmp
+            result = (int(value), stage[1])
+        else:
+            break
+    return '{0}{1}'.format(*result)
+
+
 def denormalize_service_dict(service_dict, version):
     service_dict = service_dict.copy()
 
@@ -73,4 +92,14 @@ def denormalize_service_dict(service_dict, version):
             svc for svc in service_dict['depends_on'].keys()
         ])
 
+    if 'healthcheck' in service_dict:
+        if 'interval' in service_dict['healthcheck']:
+            service_dict['healthcheck']['interval'] = serialize_ns_time_value(
+                service_dict['healthcheck']['interval']
+            )
+        if 'timeout' in service_dict['healthcheck']:
+            service_dict['healthcheck']['timeout'] = serialize_ns_time_value(
+                service_dict['healthcheck']['timeout']
+            )
+
     return service_dict
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 41a06c95..58160c80 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -353,8 +353,8 @@ class CLITestCase(DockerClientTestCase):
 
                     'healthcheck': {
                         'test': 'cat /etc/passwd',
-                        'interval': 10000000000,
-                        'timeout': 1000000000,
+                        'interval': '10s',
+                        'timeout': '1s',
                         'retries': 5,
                     },
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index ab8bfcfc..d7947a4e 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -23,6 +23,7 @@ from compose.config.environment import Environment
 from compose.config.errors import ConfigurationError
 from compose.config.errors import VERSION_EXPLANATION
 from compose.config.serialize import denormalize_service_dict
+from compose.config.serialize import serialize_ns_time_value
 from compose.config.types import VolumeSpec
 from compose.const import IS_WINDOWS_PLATFORM
 from compose.utils import nanoseconds_from_time_seconds
@@ -3334,3 +3335,38 @@ class SerializeTest(unittest.TestCase):
         }
 
         assert denormalize_service_dict(service_dict, V2_1) == service_dict
+
+    def test_serialize_time(self):
+        data = {
+            9: '9ns',
+            9000: '9us',
+            9000000: '9ms',
+            90000000: '90ms',
+            900000000: '900ms',
+            999999999: '999999999ns',
+            1000000000: '1s',
+            60000000000: '1m',
+            60000000001: '60000000001ns',
+            9000000000000: '150m',
+            90000000000000: '25h',
+        }
+
+        for k, v in data.items():
+            assert serialize_ns_time_value(k) == v
+
+    def test_denormalize_healthcheck(self):
+        service_dict = {
+            'image': 'test',
+            'healthcheck': {
+                'test': 'exit 1',
+                'interval': '1m40s',
+                'timeout': '30s',
+                'retries': 5
+            }
+        }
+        processed_service = config.process_service(config.ServiceConfig(
+            '.', 'test', 'test', service_dict
+        ))
+        denormalized_service = denormalize_service_dict(processed_service, V2_1)
+        assert denormalized_service['healthcheck']['interval'] == '100s'
+        assert denormalized_service['healthcheck']['timeout'] == '30s'

From 5895d8bbc9939524b449e296ac93d8e98aa70eb0 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 24 Jan 2017 15:02:27 -0800
Subject: [PATCH 1236/1265] Detect conflicting version of the docker python SDK
 and prevent execution until issue is fixed

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/main.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index c25ccbfa..db068272 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -14,6 +14,30 @@ from distutils.spawn import find_executable
 from inspect import getdoc
 from operator import attrgetter
 
+
+# Attempt to detect https://github.com/docker/compose/issues/4344
+try:
+    # A regular import statement causes PyInstaller to freak out while
+    # trying to load pip. This way it is simply ignored.
+    pip = __import__('pip')
+    pip_packages = pip.get_installed_distributions()
+    if 'docker-py' in [pkg.project_name for pkg in pip_packages]:
+        from .colors import red
+        print(
+            red('ERROR:'),
+            "Dependency conflict: an older version of the 'docker-py' package "
+            "is polluting the namespace. "
+            "Run the following command to remedy the issue:\n"
+            "pip uninstall docker docker-py; pip install docker",
+            file=sys.stderr
+        )
+        sys.exit(1)
+except ImportError:
+    # pip is not available, which indicates it's probably the binary
+    # distribution of Compose which is not affected
+    pass
+
+
 from . import errors
 from . import signals
 from .. import __version__

From 22249add84831a02976f6c98020f05eb7418b287 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 6 Jun 2016 15:48:47 -0700
Subject: [PATCH 1237/1265] Use newer version of PyInstaller to fix prelinking
 issues

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements-build.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-build.txt b/requirements-build.txt
index 3f1dbd75..27f610ca 100644
--- a/requirements-build.txt
+++ b/requirements-build.txt
@@ -1 +1 @@
-pyinstaller==3.1.1
+pyinstaller==3.2.1

From 2593366a3ef1fb0673049687f0ca6733a28cf03f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 30 Jan 2017 16:26:35 -0800
Subject: [PATCH 1238/1265] Bump docker SDK version

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4b7c7b76..3b06bff4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ PyYAML==3.11
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.2.0
 colorama==0.3.7
-docker==2.0.1
+docker==2.0.2
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4; python_version < '3.4'
diff --git a/setup.py b/setup.py
index 2f2ba742..0b1d4e08 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ install_requires = [
     'requests >= 2.6.1, != 2.11.0, < 2.12',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker >= 2.0.1, < 3.0',
+    'docker >= 2.0.2, < 3.0',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

From a82de8863ebdc586a45f54aef348cd17340089e3 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 28 Dec 2016 15:44:33 -0500
Subject: [PATCH 1239/1265] Add v3.1 with secrets.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config_schema_v3.1.json | 426 +++++++++++++++++++++++++
 1 file changed, 426 insertions(+)
 create mode 100644 compose/config/config_schema_v3.1.json

diff --git a/compose/config/config_schema_v3.1.json b/compose/config/config_schema_v3.1.json
new file mode 100644
index 00000000..16616498
--- /dev/null
+++ b/compose/config/config_schema_v3.1.json
@@ -0,0 +1,426 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "config_schema_v3.1.json",
+  "type": "object",
+  "required": ["version"],
+
+  "properties": {
+    "version": {
+      "type": "string"
+    },
+
+    "services": {
+      "id": "#/properties/services",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/service"
+        }
+      },
+      "additionalProperties": false
+    },
+
+    "networks": {
+      "id": "#/properties/networks",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/network"
+        }
+      }
+    },
+
+    "volumes": {
+      "id": "#/properties/volumes",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/volume"
+        }
+      },
+      "additionalProperties": false
+    },
+
+    "secrets": {
+      "id": "#/properties/secrets",
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9._-]+$": {
+          "$ref": "#/definitions/secrets"
+        }
+      },
+      "additionalProperties": false
+    }
+  },
+
+  "additionalProperties": false,
+
+  "definitions": {
+
+    "service": {
+      "id": "#/definitions/service",
+      "type": "object",
+
+      "properties": {
+        "deploy": {"$ref": "#/definitions/deployment"},
+        "build": {
+          "oneOf": [
+            {"type": "string"},
+            {
+              "type": "object",
+              "properties": {
+                "context": {"type": "string"},
+                "dockerfile": {"type": "string"},
+                "args": {"$ref": "#/definitions/list_or_dict"}
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "cgroup_parent": {"type": "string"},
+        "command": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
+        "container_name": {"type": "string"},
+        "depends_on": {"$ref": "#/definitions/list_of_strings"},
+        "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "dns": {"$ref": "#/definitions/string_or_list"},
+        "dns_search": {"$ref": "#/definitions/string_or_list"},
+        "domainname": {"type": "string"},
+        "entrypoint": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
+        "env_file": {"$ref": "#/definitions/string_or_list"},
+        "environment": {"$ref": "#/definitions/list_or_dict"},
+
+        "expose": {
+          "type": "array",
+          "items": {
+            "type": ["string", "number"],
+            "format": "expose"
+          },
+          "uniqueItems": true
+        },
+
+        "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
+        "healthcheck": {"$ref": "#/definitions/healthcheck"},
+        "hostname": {"type": "string"},
+        "image": {"type": "string"},
+        "ipc": {"type": "string"},
+        "labels": {"$ref": "#/definitions/list_or_dict"},
+        "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+
+        "logging": {
+            "type": "object",
+
+            "properties": {
+                "driver": {"type": "string"},
+                "options": {
+                  "type": "object",
+                  "patternProperties": {
+                    "^.+$": {"type": ["string", "number", "null"]}
+                  }
+                }
+            },
+            "additionalProperties": false
+        },
+
+        "mac_address": {"type": "string"},
+        "network_mode": {"type": "string"},
+
+        "networks": {
+          "oneOf": [
+            {"$ref": "#/definitions/list_of_strings"},
+            {
+              "type": "object",
+              "patternProperties": {
+                "^[a-zA-Z0-9._-]+$": {
+                  "oneOf": [
+                    {
+                      "type": "object",
+                      "properties": {
+                        "aliases": {"$ref": "#/definitions/list_of_strings"},
+                        "ipv4_address": {"type": "string"},
+                        "ipv6_address": {"type": "string"}
+                      },
+                      "additionalProperties": false
+                    },
+                    {"type": "null"}
+                  ]
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "pid": {"type": ["string", "null"]},
+
+        "ports": {
+          "type": "array",
+          "items": {
+            "type": ["string", "number"],
+            "format": "ports"
+          },
+          "uniqueItems": true
+        },
+
+        "privileged": {"type": "boolean"},
+        "read_only": {"type": "boolean"},
+        "restart": {"type": "string"},
+        "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "shm_size": {"type": ["number", "string"]},
+        "secrets": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {"type": "string"},
+              {
+                "type": "object",
+                "properties": {
+                  "source": {"type": "string"},
+                  "target": {"type": "string"},
+                  "uid": {"type": "number"},
+                  "gid": {"type": "number"},
+                  "mode": {"type": "number"}
+                }
+              }
+            ]
+          }
+        },
+        "sysctls": {"$ref": "#/definitions/list_or_dict"},
+        "stdin_open": {"type": "boolean"},
+        "stop_signal": {"type": "string"},
+        "stop_grace_period": {"type": "string", "format": "duration"},
+        "tmpfs": {"$ref": "#/definitions/string_or_list"},
+        "tty": {"type": "boolean"},
+        "ulimits": {
+          "type": "object",
+          "patternProperties": {
+            "^[a-z]+$": {
+              "oneOf": [
+                {"type": "integer"},
+                {
+                  "type":"object",
+                  "properties": {
+                    "hard": {"type": "integer"},
+                    "soft": {"type": "integer"}
+                  },
+                  "required": ["soft", "hard"],
+                  "additionalProperties": false
+                }
+              ]
+            }
+          }
+        },
+        "user": {"type": "string"},
+        "userns_mode": {"type": "string"},
+        "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "working_dir": {"type": "string"}
+      },
+      "additionalProperties": false
+    },
+
+    "healthcheck": {
+      "id": "#/definitions/healthcheck",
+      "type": ["object", "null"],
+      "properties": {
+        "interval": {"type":"string"},
+        "timeout": {"type":"string"},
+        "retries": {"type": "number"},
+        "test": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
+        "disable": {"type": "boolean"}
+      },
+      "additionalProperties": false
+    },
+    "deployment": {
+      "id": "#/definitions/deployment",
+      "type": ["object", "null"],
+      "properties": {
+        "mode": {"type": "string"},
+        "replicas": {"type": "integer"},
+        "labels": {"$ref": "#/definitions/list_or_dict"},
+        "update_config": {
+          "type": "object",
+          "properties": {
+            "parallelism": {"type": "integer"},
+            "delay": {"type": "string", "format": "duration"},
+            "failure_action": {"type": "string"},
+            "monitor": {"type": "string", "format": "duration"},
+            "max_failure_ratio": {"type": "number"}
+          },
+          "additionalProperties": false
+        },
+        "resources": {
+          "type": "object",
+          "properties": {
+            "limits": {"$ref": "#/definitions/resource"},
+            "reservations": {"$ref": "#/definitions/resource"}
+          }
+        },
+        "restart_policy": {
+          "type": "object",
+          "properties": {
+            "condition": {"type": "string"},
+            "delay": {"type": "string", "format": "duration"},
+            "max_attempts": {"type": "integer"},
+            "window": {"type": "string", "format": "duration"}
+          },
+          "additionalProperties": false
+        },
+        "placement": {
+          "type": "object",
+          "properties": {
+            "constraints": {"type": "array", "items": {"type": "string"}}
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+
+    "resource": {
+      "id": "#/definitions/resource",
+      "type": "object",
+      "properties": {
+        "cpus": {"type": "string"},
+        "memory": {"type": "string"}
+      },
+      "additionalProperties": false
+    },
+
+    "network": {
+      "id": "#/definitions/network",
+      "type": ["object", "null"],
+      "properties": {
+        "driver": {"type": "string"},
+        "driver_opts": {
+          "type": "object",
+          "patternProperties": {
+            "^.+$": {"type": ["string", "number"]}
+          }
+        },
+        "ipam": {
+          "type": "object",
+          "properties": {
+            "driver": {"type": "string"},
+            "config": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "subnet": {"type": "string"}
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "additionalProperties": false
+        },
+        "external": {
+          "type": ["boolean", "object"],
+          "properties": {
+            "name": {"type": "string"}
+          },
+          "additionalProperties": false
+        },
+        "labels": {"$ref": "#/definitions/list_or_dict"}
+      },
+      "additionalProperties": false
+    },
+
+    "volume": {
+      "id": "#/definitions/volume",
+      "type": ["object", "null"],
+      "properties": {
+        "driver": {"type": "string"},
+        "driver_opts": {
+          "type": "object",
+          "patternProperties": {
+            "^.+$": {"type": ["string", "number"]}
+          }
+        },
+        "external": {
+          "type": ["boolean", "object"],
+          "properties": {
+            "name": {"type": "string"}
+          }
+        }
+      },
+      "labels": {"$ref": "#/definitions/list_or_dict"},
+      "additionalProperties": false
+    },
+
+    "secret": {
+      "id": "#/definitions/secret",
+      "type": "object",
+      "properties": {
+        "file": {"type": "string"},
+        "external": {
+          "type": ["boolean", "object"],
+          "properties": {
+            "name": {"type": "string"}
+          }
+        }
+      },
+      "labels": {"$ref": "#/definitions/list_or_dict"},
+      "additionalProperties": false
+    },
+
+    "string_or_list": {
+      "oneOf": [
+        {"type": "string"},
+        {"$ref": "#/definitions/list_of_strings"}
+      ]
+    },
+
+    "list_of_strings": {
+      "type": "array",
+      "items": {"type": "string"},
+      "uniqueItems": true
+    },
+
+    "list_or_dict": {
+      "oneOf": [
+        {
+          "type": "object",
+          "patternProperties": {
+            ".+": {
+              "type": ["string", "number", "null"]
+            }
+          },
+          "additionalProperties": false
+        },
+        {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
+      ]
+    },
+
+    "constraints": {
+      "service": {
+        "id": "#/definitions/constraints/service",
+        "anyOf": [
+          {"required": ["build"]},
+          {"required": ["image"]}
+        ],
+        "properties": {
+          "build": {
+            "required": ["context"]
+          }
+        }
+      }
+    }
+  }
+}

From add56ce8182328fefd7fbe4500360a929ea511df Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 4 Jan 2017 15:58:14 -0500
Subject: [PATCH 1240/1265] Read service secrets as a type.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py               | 13 +++++++++++--
 compose/config/config_schema_v3.1.json |  6 +++---
 compose/config/types.py                | 23 +++++++++++++++++++++--
 compose/const.py                       |  3 +++
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 7e77421e..3ca994a7 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -12,10 +12,12 @@ import six
 import yaml
 from cached_property import cached_property
 
+from . import types
 from ..const import COMPOSEFILE_V1 as V1
 from ..const import COMPOSEFILE_V2_0 as V2_0
 from ..const import COMPOSEFILE_V2_1 as V2_1
 from ..const import COMPOSEFILE_V3_0 as V3_0
+from ..const import COMPOSEFILE_V3_1 as V3_1
 from ..utils import build_string_dict
 from ..utils import parse_nanoseconds_int
 from ..utils import splitdrive
@@ -82,6 +84,7 @@ DOCKER_CONFIG_KEYS = [
     'privileged',
     'read_only',
     'restart',
+    'secrets',
     'security_opt',
     'shm_size',
     'stdin_open',
@@ -202,8 +205,11 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
     def get_networks(self):
         return {} if self.version == V1 else self.config.get('networks', {})
 
+    def get_secrets(self):
+        return {} if self.version < V3_1 else self.config.get('secrets', {})
 
-class Config(namedtuple('_Config', 'version services volumes networks')):
+
+class Config(namedtuple('_Config', 'version services volumes networks secrets')):
     """
     :param version: configuration version
     :type  version: int
@@ -328,6 +334,8 @@ def load(config_details):
     networks = load_mapping(
         config_details.config_files, 'get_networks', 'Network'
     )
+    secrets = load_mapping(
+        config_details.config_files, 'get_secrets', 'Secrets')
     service_dicts = load_services(config_details, main_file)
 
     if main_file.version != V1:
@@ -342,7 +350,7 @@ def load(config_details):
             "`docker stack deploy` to deploy to a swarm."
             .format(", ".join(sorted(s['name'] for s in services_using_deploy))))
 
-    return Config(main_file.version, service_dicts, volumes, networks)
+    return Config(main_file.version, service_dicts, volumes, networks, secrets)
 
 
 def load_mapping(config_files, get_func, entity_type):
@@ -820,6 +828,7 @@ def merge_service_dicts(base, override, version):
     md.merge_mapping('sysctls', parse_sysctls)
     md.merge_mapping('depends_on', parse_depends_on)
     md.merge_sequence('links', ServiceLink.parse)
+    md.merge_sequence('secrets', types.ServiceSecret.parse)
 
     for field in ['volumes', 'devices']:
         md.merge_field(field, merge_path_mappings)
diff --git a/compose/config/config_schema_v3.1.json b/compose/config/config_schema_v3.1.json
index 16616498..c43f296b 100644
--- a/compose/config/config_schema_v3.1.json
+++ b/compose/config/config_schema_v3.1.json
@@ -46,7 +46,7 @@
       "type": "object",
       "patternProperties": {
         "^[a-zA-Z0-9._-]+$": {
-          "$ref": "#/definitions/secrets"
+          "$ref": "#/definitions/secret"
         }
       },
       "additionalProperties": false
@@ -188,8 +188,8 @@
                 "properties": {
                   "source": {"type": "string"},
                   "target": {"type": "string"},
-                  "uid": {"type": "number"},
-                  "gid": {"type": "number"},
+                  "uid": {"type": "string"},
+                  "gid": {"type": "string"},
                   "mode": {"type": "number"}
                 }
               }
diff --git a/compose/config/types.py b/compose/config/types.py
index 4c106747..17d5c8b3 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -10,8 +10,8 @@ from collections import namedtuple
 
 import six
 
-from compose.config.config import V1
-from compose.config.errors import ConfigurationError
+from ..const import COMPOSEFILE_V1 as V1
+from .errors import ConfigurationError
 from compose.const import IS_WINDOWS_PLATFORM
 from compose.utils import splitdrive
 
@@ -234,3 +234,22 @@ class ServiceLink(namedtuple('_ServiceLink', 'target alias')):
     @property
     def merge_field(self):
         return self.alias
+
+
+class ServiceSecret(namedtuple('_ServiceSecret', 'source target uid gid mode')):
+
+    @classmethod
+    def parse(cls, spec):
+        if isinstance(spec, six.string_types):
+            return cls(spec, None, None, None, None)
+        return cls(
+            spec.get('source'),
+            spec.get('target'),
+            spec.get('uid'),
+            spec.get('gid'),
+            spec.get('mode'),
+        )
+
+    @property
+    def merge_field(self):
+        return self.source
diff --git a/compose/const.py b/compose/const.py
index 1b1be5c7..0f2b00c4 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -20,12 +20,14 @@ COMPOSEFILE_V1 = '1'
 COMPOSEFILE_V2_0 = '2.0'
 COMPOSEFILE_V2_1 = '2.1'
 COMPOSEFILE_V3_0 = '3.0'
+COMPOSEFILE_V3_1 = '3.1'
 
 API_VERSIONS = {
     COMPOSEFILE_V1: '1.21',
     COMPOSEFILE_V2_0: '1.22',
     COMPOSEFILE_V2_1: '1.24',
     COMPOSEFILE_V3_0: '1.25',
+    COMPOSEFILE_V3_1: '1.25',
 }
 
 API_VERSION_TO_ENGINE_VERSION = {
@@ -33,4 +35,5 @@ API_VERSION_TO_ENGINE_VERSION = {
     API_VERSIONS[COMPOSEFILE_V2_0]: '1.10.0',
     API_VERSIONS[COMPOSEFILE_V2_1]: '1.12.0',
     API_VERSIONS[COMPOSEFILE_V3_0]: '1.13.0',
+    API_VERSIONS[COMPOSEFILE_V3_1]: '1.13.0',
 }

From e0c6397999464dfe94f7e738dc36b2225f88972f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 4 Jan 2017 17:18:04 -0500
Subject: [PATCH 1241/1265] Implement secrets using bind mounts

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py   | 48 +++++++++++++++++++++++++++-----------
 compose/const.py           |  2 ++
 compose/project.py         | 27 +++++++++++++++++++++
 compose/service.py         | 23 +++++++++++++++---
 tests/unit/bundle_test.py  |  3 ++-
 tests/unit/project_test.py | 12 ++++++++++
 6 files changed, 98 insertions(+), 17 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 3ca994a7..0e8b52e7 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -334,8 +334,7 @@ def load(config_details):
     networks = load_mapping(
         config_details.config_files, 'get_networks', 'Network'
     )
-    secrets = load_mapping(
-        config_details.config_files, 'get_secrets', 'Secrets')
+    secrets = load_secrets(config_details.config_files, config_details.working_dir)
     service_dicts = load_services(config_details, main_file)
 
     if main_file.version != V1:
@@ -364,22 +363,12 @@ def load_mapping(config_files, get_func, entity_type):
 
             external = config.get('external')
             if external:
-                if len(config.keys()) > 1:
-                    raise ConfigurationError(
-                        '{} {} declared as external but specifies'
-                        ' additional attributes ({}). '.format(
-                            entity_type,
-                            name,
-                            ', '.join([k for k in config.keys() if k != 'external'])
-                        )
-                    )
+                validate_external(entity_type, name, config)
                 if isinstance(external, dict):
                     config['external_name'] = external.get('name')
                 else:
                     config['external_name'] = name
 
-            mapping[name] = config
-
             if 'driver_opts' in config:
                 config['driver_opts'] = build_string_dict(
                     config['driver_opts']
@@ -391,6 +380,39 @@ def load_mapping(config_files, get_func, entity_type):
     return mapping
 
 
+def validate_external(entity_type, name, config):
+    if len(config.keys()) <= 1:
+        return
+
+    raise ConfigurationError(
+        "{} {} declared as external but specifies additional attributes "
+        "({}).".format(
+            entity_type, name, ', '.join(k for k in config if k != 'external')))
+
+
+def load_secrets(config_files, working_dir):
+    mapping = {}
+
+    for config_file in config_files:
+        for name, config in config_file.get_secrets().items():
+            mapping[name] = config or {}
+            if not config:
+                continue
+
+            external = config.get('external')
+            if external:
+                validate_external('Secret', name, config)
+                if isinstance(external, dict):
+                    config['external_name'] = external.get('name')
+                else:
+                    config['external_name'] = name
+
+            if 'file' in config:
+                config['file'] = expand_path(working_dir, config['file'])
+
+    return mapping
+
+
 def load_services(config_details, config_file):
     def build_service(service_name, service_dict, service_names):
         service_config = ServiceConfig.with_abs_paths(
diff --git a/compose/const.py b/compose/const.py
index 0f2b00c4..3f8f90ab 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -16,6 +16,8 @@ LABEL_VERSION = 'com.docker.compose.version'
 LABEL_VOLUME = 'com.docker.compose.volume'
 LABEL_CONFIG_HASH = 'com.docker.compose.config-hash'
 
+SECRETS_PATH = '/run/secrets'
+
 COMPOSEFILE_V1 = '1'
 COMPOSEFILE_V2_0 = '2.0'
 COMPOSEFILE_V2_1 = '2.1'
diff --git a/compose/project.py b/compose/project.py
index d99ef7c9..22576e86 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -104,6 +104,11 @@ class Project(object):
                     for volume_spec in service_dict.get('volumes', [])
                 ]
 
+            secrets = get_secrets(
+                service_dict['name'],
+                service_dict.get('secrets') or [],
+                config_data.secrets)
+
             project.services.append(
                 Service(
                     service_dict.pop('name'),
@@ -114,6 +119,7 @@ class Project(object):
                     links=links,
                     network_mode=network_mode,
                     volumes_from=volumes_from,
+                    secrets=secrets,
                     **service_dict)
             )
 
@@ -553,6 +559,27 @@ def get_volumes_from(project, service_dict):
     return [build_volume_from(vf) for vf in volumes_from]
 
 
+def get_secrets(service, service_secrets, secret_defs):
+    secrets = []
+
+    for secret in service_secrets:
+        secret_def = secret_defs.get(secret.source)
+        if not secret_def:
+            raise ConfigurationError(
+                "Service \"{service}\" uses an undefined secret \"{secret}\" "
+                .format(service=service, secret=secret.source))
+
+        if secret_def.get('external_name'):
+            log.warn("Service \"{service}\" uses secret \"{secret}\" which is external. "
+                     "External secrets are not available to containers created by "
+                     "docker-compose.".format(service=service, secret=secret.source))
+            continue
+
+        secrets.append({'secret': secret, 'file': secret_def.get('file')})
+
+    return secrets
+
+
 def warn_for_swarm_mode(client):
     info = client.info()
     if info.get('Swarm', {}).get('LocalNodeState') == 'active':
diff --git a/compose/service.py b/compose/service.py
index 724e0565..9f2fc68b 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -17,6 +17,7 @@ from docker.utils.ports import build_port_bindings
 from docker.utils.ports import split_port
 
 from . import __version__
+from . import const
 from . import progress_stream
 from .config import DOCKER_CONFIG_KEYS
 from .config import merge_environment
@@ -139,6 +140,7 @@ class Service(object):
         volumes_from=None,
         network_mode=None,
         networks=None,
+        secrets=None,
         **options
     ):
         self.name = name
@@ -149,6 +151,7 @@ class Service(object):
         self.volumes_from = volumes_from or []
         self.network_mode = network_mode or NetworkMode(None)
         self.networks = networks or {}
+        self.secrets = secrets or []
         self.options = options
 
     def __repr__(self):
@@ -692,9 +695,14 @@ class Service(object):
         override_options['binds'] = binds
         container_options['environment'].update(affinity)
 
-        if 'volumes' in container_options:
-            container_options['volumes'] = dict(
-                (v.internal, {}) for v in container_options['volumes'])
+        container_options['volumes'] = dict(
+            (v.internal, {}) for v in container_options.get('volumes') or {})
+
+        secret_volumes = self.get_secret_volumes()
+        if secret_volumes:
+            override_options['binds'].extend(v.repr() for v in secret_volumes)
+            container_options['volumes'].update(
+                (v.internal, {}) for v in secret_volumes)
 
         container_options['image'] = self.image_name
 
@@ -765,6 +773,15 @@ class Service(object):
 
         return host_config
 
+    def get_secret_volumes(self):
+        def build_spec(secret):
+            target = '{}/{}'.format(
+                const.SECRETS_PATH,
+                secret['secret'].target or secret['secret'].source)
+            return VolumeSpec(secret['file'], target, 'ro')
+
+        return [build_spec(secret) for secret in self.secrets]
+
     def build(self, no_cache=False, pull=False, force_rm=False):
         log.info('Building %s' % self.name)
 
diff --git a/tests/unit/bundle_test.py b/tests/unit/bundle_test.py
index a279cab0..21bdb31b 100644
--- a/tests/unit/bundle_test.py
+++ b/tests/unit/bundle_test.py
@@ -77,7 +77,8 @@ def test_to_bundle():
         version=2,
         services=services,
         volumes={'special': {}},
-        networks={'extra': {}})
+        networks={'extra': {}},
+        secrets={})
 
     with mock.patch('compose.bundle.log.warn', autospec=True) as mock_log:
         output = bundle.to_bundle(config, image_digests)
diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py
index 9a12438f..32d0adfa 100644
--- a/tests/unit/project_test.py
+++ b/tests/unit/project_test.py
@@ -36,6 +36,7 @@ class ProjectTest(unittest.TestCase):
             ],
             networks=None,
             volumes=None,
+            secrets=None,
         )
         project = Project.from_config(
             name='composetest',
@@ -64,6 +65,7 @@ class ProjectTest(unittest.TestCase):
             ],
             networks=None,
             volumes=None,
+            secrets=None,
         )
         project = Project.from_config('composetest', config, None)
         self.assertEqual(len(project.services), 2)
@@ -170,6 +172,7 @@ class ProjectTest(unittest.TestCase):
                 }],
                 networks=None,
                 volumes=None,
+                secrets=None,
             ),
         )
         assert project.get_service('test')._get_volumes_from() == [container_id + ":rw"]
@@ -202,6 +205,7 @@ class ProjectTest(unittest.TestCase):
                 ],
                 networks=None,
                 volumes=None,
+                secrets=None,
             ),
         )
         assert project.get_service('test')._get_volumes_from() == [container_name + ":rw"]
@@ -227,6 +231,7 @@ class ProjectTest(unittest.TestCase):
                 ],
                 networks=None,
                 volumes=None,
+                secrets=None,
             ),
         )
         with mock.patch.object(Service, 'containers') as mock_return:
@@ -360,6 +365,7 @@ class ProjectTest(unittest.TestCase):
                 ],
                 networks=None,
                 volumes=None,
+                secrets=None,
             ),
         )
         service = project.get_service('test')
@@ -384,6 +390,7 @@ class ProjectTest(unittest.TestCase):
                 ],
                 networks=None,
                 volumes=None,
+                secrets=None,
             ),
         )
         service = project.get_service('test')
@@ -417,6 +424,7 @@ class ProjectTest(unittest.TestCase):
                 ],
                 networks=None,
                 volumes=None,
+                secrets=None,
             ),
         )
 
@@ -437,6 +445,7 @@ class ProjectTest(unittest.TestCase):
                 ],
                 networks=None,
                 volumes=None,
+                secrets=None,
             ),
         )
 
@@ -457,6 +466,7 @@ class ProjectTest(unittest.TestCase):
                 ],
                 networks={'custom': {}},
                 volumes=None,
+                secrets=None,
             ),
         )
 
@@ -487,6 +497,7 @@ class ProjectTest(unittest.TestCase):
                 }],
                 networks=None,
                 volumes=None,
+                secrets=None,
             ),
         )
         self.assertEqual([c.id for c in project.containers()], ['1'])
@@ -503,6 +514,7 @@ class ProjectTest(unittest.TestCase):
                 }],
                 networks={'default': {}},
                 volumes={'data': {}},
+                secrets=None,
             ),
         )
         self.mock_client.remove_network.side_effect = NotFound(None, None, 'oops')

From 4053adc7d356270143f8389d41f857a128d9febb Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 5 Jan 2017 14:54:35 -0500
Subject: [PATCH 1242/1265] Add an integration test for secrets using bind
 mounts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/project.py                |   2 +-
 tests/fixtures/secrets/default    |   1 +
 tests/integration/project_test.py | 132 ++++++++++++++++++------------
 tests/integration/testcases.py    |   9 +-
 4 files changed, 86 insertions(+), 58 deletions(-)
 create mode 100644 tests/fixtures/secrets/default

diff --git a/compose/project.py b/compose/project.py
index 22576e86..e522e2ec 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -106,7 +106,7 @@ class Project(object):
 
             secrets = get_secrets(
                 service_dict['name'],
-                service_dict.get('secrets') or [],
+                service_dict.pop('secrets', None) or [],
                 config_data.secrets)
 
             project.services.append(
diff --git a/tests/fixtures/secrets/default b/tests/fixtures/secrets/default
new file mode 100644
index 00000000..f9dc2014
--- /dev/null
+++ b/tests/fixtures/secrets/default
@@ -0,0 +1 @@
+This is the secret
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index ee2b7817..30b107e8 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import os.path
 import random
 
 import py
@@ -8,12 +9,14 @@ import pytest
 from docker.errors import NotFound
 
 from .. import mock
-from ..helpers import build_config
+from ..helpers import build_config as load_config
 from .testcases import DockerClientTestCase
 from compose.config import config
 from compose.config import ConfigurationError
+from compose.config import types
 from compose.config.config import V2_0
 from compose.config.config import V2_1
+from compose.config.config import V3_1
 from compose.config.types import VolumeFromSpec
 from compose.config.types import VolumeSpec
 from compose.const import LABEL_PROJECT
@@ -26,6 +29,16 @@ from compose.project import ProjectError
 from compose.service import ConvergenceStrategy
 from tests.integration.testcases import v2_1_only
 from tests.integration.testcases import v2_only
+from tests.integration.testcases import v3_only
+
+
+def build_config(**kwargs):
+    return config.Config(
+        version=kwargs.get('version'),
+        services=kwargs.get('services'),
+        volumes=kwargs.get('volumes'),
+        networks=kwargs.get('networks'),
+        secrets=kwargs.get('secrets'))
 
 
 class ProjectTest(DockerClientTestCase):
@@ -70,7 +83,7 @@ class ProjectTest(DockerClientTestCase):
     def test_volumes_from_service(self):
         project = Project.from_config(
             name='composetest',
-            config_data=build_config({
+            config_data=load_config({
                 'data': {
                     'image': 'busybox:latest',
                     'volumes': ['/var/data'],
@@ -96,7 +109,7 @@ class ProjectTest(DockerClientTestCase):
         )
         project = Project.from_config(
             name='composetest',
-            config_data=build_config({
+            config_data=load_config({
                 'db': {
                     'image': 'busybox:latest',
                     'volumes_from': ['composetest_data_container'],
@@ -112,7 +125,7 @@ class ProjectTest(DockerClientTestCase):
         project = Project.from_config(
             name='composetest',
             client=self.client,
-            config_data=build_config({
+            config_data=load_config({
                 'version': V2_0,
                 'services': {
                     'net': {
@@ -139,7 +152,7 @@ class ProjectTest(DockerClientTestCase):
         def get_project():
             return Project.from_config(
                 name='composetest',
-                config_data=build_config({
+                config_data=load_config({
                     'version': V2_0,
                     'services': {
                         'web': {
@@ -174,7 +187,7 @@ class ProjectTest(DockerClientTestCase):
     def test_net_from_service_v1(self):
         project = Project.from_config(
             name='composetest',
-            config_data=build_config({
+            config_data=load_config({
                 'net': {
                     'image': 'busybox:latest',
                     'command': ["top"]
@@ -198,7 +211,7 @@ class ProjectTest(DockerClientTestCase):
         def get_project():
             return Project.from_config(
                 name='composetest',
-                config_data=build_config({
+                config_data=load_config({
                     'web': {
                         'image': 'busybox:latest',
                         'net': 'container:composetest_net_container'
@@ -469,7 +482,7 @@ class ProjectTest(DockerClientTestCase):
     def test_project_up_starts_depends(self):
         project = Project.from_config(
             name='composetest',
-            config_data=build_config({
+            config_data=load_config({
                 'console': {
                     'image': 'busybox:latest',
                     'command': ["top"],
@@ -504,7 +517,7 @@ class ProjectTest(DockerClientTestCase):
     def test_project_up_with_no_deps(self):
         project = Project.from_config(
             name='composetest',
-            config_data=build_config({
+            config_data=load_config({
                 'console': {
                     'image': 'busybox:latest',
                     'command': ["top"],
@@ -564,7 +577,7 @@ class ProjectTest(DockerClientTestCase):
 
     @v2_only()
     def test_project_up_networks(self):
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
@@ -576,7 +589,6 @@ class ProjectTest(DockerClientTestCase):
                     'baz': {'aliases': ['extra']},
                 },
             }],
-            volumes={},
             networks={
                 'foo': {'driver': 'bridge'},
                 'bar': {'driver': None},
@@ -610,14 +622,13 @@ class ProjectTest(DockerClientTestCase):
 
     @v2_only()
     def test_up_with_ipam_config(self):
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'networks': {'front': None},
             }],
-            volumes={},
             networks={
                 'front': {
                     'driver': 'bridge',
@@ -671,7 +682,7 @@ class ProjectTest(DockerClientTestCase):
 
     @v2_only()
     def test_up_with_network_static_addresses(self):
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
@@ -684,7 +695,6 @@ class ProjectTest(DockerClientTestCase):
                     }
                 },
             }],
-            volumes={},
             networks={
                 'static_test': {
                     'driver': 'bridge',
@@ -726,7 +736,7 @@ class ProjectTest(DockerClientTestCase):
     @v2_1_only()
     def test_up_with_enable_ipv6(self):
         self.require_api_version('1.23')
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
@@ -738,7 +748,6 @@ class ProjectTest(DockerClientTestCase):
                     }
                 },
             }],
-            volumes={},
             networks={
                 'static_test': {
                     'driver': 'bridge',
@@ -770,7 +779,7 @@ class ProjectTest(DockerClientTestCase):
 
     @v2_only()
     def test_up_with_network_static_addresses_missing_subnet(self):
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
@@ -782,7 +791,6 @@ class ProjectTest(DockerClientTestCase):
                     }
                 },
             }],
-            volumes={},
             networks={
                 'static_test': {
                     'driver': 'bridge',
@@ -807,7 +815,7 @@ class ProjectTest(DockerClientTestCase):
 
     @v2_1_only()
     def test_up_with_network_link_local_ips(self):
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_1,
             services=[{
                 'name': 'web',
@@ -818,7 +826,6 @@ class ProjectTest(DockerClientTestCase):
                     }
                 }
             }],
-            volumes={},
             networks={
                 'linklocaltest': {'driver': 'bridge'}
             }
@@ -844,15 +851,13 @@ class ProjectTest(DockerClientTestCase):
     @v2_1_only()
     def test_up_with_isolation(self):
         self.require_api_version('1.24')
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_1,
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'isolation': 'default'
             }],
-            volumes={},
-            networks={}
         )
         project = Project.from_config(
             client=self.client,
@@ -866,15 +871,13 @@ class ProjectTest(DockerClientTestCase):
     @v2_1_only()
     def test_up_with_invalid_isolation(self):
         self.require_api_version('1.24')
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_1,
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'isolation': 'foobar'
             }],
-            volumes={},
-            networks={}
         )
         project = Project.from_config(
             client=self.client,
@@ -887,14 +890,13 @@ class ProjectTest(DockerClientTestCase):
     @v2_only()
     def test_project_up_with_network_internal(self):
         self.require_api_version('1.23')
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'networks': {'internal': None},
             }],
-            volumes={},
             networks={
                 'internal': {'driver': 'bridge', 'internal': True},
             },
@@ -917,14 +919,13 @@ class ProjectTest(DockerClientTestCase):
 
         network_name = 'network_with_label'
 
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'networks': {network_name: None}
             }],
-            volumes={},
             networks={
                 network_name: {'labels': {'label_key': 'label_val'}}
             }
@@ -951,7 +952,7 @@ class ProjectTest(DockerClientTestCase):
     def test_project_up_volumes(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
@@ -959,7 +960,6 @@ class ProjectTest(DockerClientTestCase):
                 'command': 'top'
             }],
             volumes={vol_name: {'driver': 'local'}},
-            networks={},
         )
 
         project = Project.from_config(
@@ -979,7 +979,7 @@ class ProjectTest(DockerClientTestCase):
 
         volume_name = 'volume_with_label'
 
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
@@ -993,7 +993,6 @@ class ProjectTest(DockerClientTestCase):
                     }
                 }
             },
-            networks={},
         )
 
         project = Project.from_config(
@@ -1106,7 +1105,7 @@ class ProjectTest(DockerClientTestCase):
     def test_initialize_volumes(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
@@ -1114,7 +1113,6 @@ class ProjectTest(DockerClientTestCase):
                 'command': 'top'
             }],
             volumes={vol_name: {}},
-            networks={},
         )
 
         project = Project.from_config(
@@ -1124,14 +1122,14 @@ class ProjectTest(DockerClientTestCase):
         project.volumes.initialize()
 
         volume_data = self.client.inspect_volume(full_vol_name)
-        self.assertEqual(volume_data['Name'], full_vol_name)
-        self.assertEqual(volume_data['Driver'], 'local')
+        assert volume_data['Name'] == full_vol_name
+        assert volume_data['Driver'] == 'local'
 
     @v2_only()
     def test_project_up_implicit_volume_driver(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
@@ -1139,7 +1137,6 @@ class ProjectTest(DockerClientTestCase):
                 'command': 'top'
             }],
             volumes={vol_name: {}},
-            networks={},
         )
 
         project = Project.from_config(
@@ -1152,11 +1149,45 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(volume_data['Name'], full_vol_name)
         self.assertEqual(volume_data['Driver'], 'local')
 
+    @v3_only()
+    def test_project_up_with_secrets(self):
+        config_data = build_config(
+            version=V3_1,
+            services=[{
+                'name': 'web',
+                'image': 'busybox:latest',
+                'command': 'cat /run/secrets/special',
+                'secrets': [
+                    types.ServiceSecret.parse({'source': 'super', 'target': 'special'}),
+                ],
+            }],
+            secrets={
+                'super': {
+                    'file': os.path.abspath('tests/fixtures/secrets/default'),
+                },
+            },
+        )
+
+        project = Project.from_config(
+            client=self.client,
+            name='composetest',
+            config_data=config_data,
+        )
+        project.up()
+        project.stop()
+
+        containers = project.containers(stopped=True)
+        assert len(containers) == 1
+        container, = containers
+
+        output = container.logs()
+        assert output == "This is the secret\n"
+
     @v2_only()
     def test_initialize_volumes_invalid_volume_driver(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
 
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
@@ -1164,7 +1195,6 @@ class ProjectTest(DockerClientTestCase):
                 'command': 'top'
             }],
             volumes={vol_name: {'driver': 'foobar'}},
-            networks={},
         )
 
         project = Project.from_config(
@@ -1179,7 +1209,7 @@ class ProjectTest(DockerClientTestCase):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
 
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
@@ -1187,7 +1217,6 @@ class ProjectTest(DockerClientTestCase):
                 'command': 'top'
             }],
             volumes={vol_name: {'driver': 'local'}},
-            networks={},
         )
         project = Project.from_config(
             name='composetest',
@@ -1218,7 +1247,7 @@ class ProjectTest(DockerClientTestCase):
         vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
 
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
@@ -1226,7 +1255,6 @@ class ProjectTest(DockerClientTestCase):
                 'command': 'top'
             }],
             volumes={vol_name: {'driver': 'local'}},
-            networks={},
         )
         project = Project.from_config(
             name='composetest',
@@ -1257,7 +1285,7 @@ class ProjectTest(DockerClientTestCase):
         vol_name = 'composetest_{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
         self.client.create_volume(vol_name)
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
@@ -1267,7 +1295,6 @@ class ProjectTest(DockerClientTestCase):
             volumes={
                 vol_name: {'external': True, 'external_name': vol_name}
             },
-            networks=None,
         )
         project = Project.from_config(
             name='composetest',
@@ -1282,7 +1309,7 @@ class ProjectTest(DockerClientTestCase):
     def test_initialize_volumes_inexistent_external_volume(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
 
-        config_data = config.Config(
+        config_data = build_config(
             version=V2_0,
             services=[{
                 'name': 'web',
@@ -1292,7 +1319,6 @@ class ProjectTest(DockerClientTestCase):
             volumes={
                 vol_name: {'external': True, 'external_name': vol_name}
             },
-            networks=None,
         )
         project = Project.from_config(
             name='composetest',
@@ -1349,7 +1375,7 @@ class ProjectTest(DockerClientTestCase):
             }
         }
 
-        config_data = build_config(config_dict)
+        config_data = load_config(config_dict)
         project = Project.from_config(
             name='composetest', config_data=config_data, client=self.client
         )
@@ -1357,7 +1383,7 @@ class ProjectTest(DockerClientTestCase):
         config_dict['service2'] = config_dict['service1']
         del config_dict['service1']
 
-        config_data = build_config(config_dict)
+        config_data = load_config(config_dict)
         project = Project.from_config(
             name='composetest', config_data=config_data, client=self.client
         )
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 230bd2d9..efc1551b 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -41,9 +41,9 @@ def engine_max_version():
     version = os.environ['DOCKER_VERSION'].partition('-')[0]
     if version_lt(version, '1.10'):
         return V1
-    elif version_lt(version, '1.12'):
+    if version_lt(version, '1.12'):
         return V2_0
-    elif version_lt(version, '1.13'):
+    if version_lt(version, '1.13'):
         return V2_1
     return V3_0
 
@@ -52,8 +52,9 @@ def build_version_required_decorator(ignored_versions):
     def decorator(f):
         @functools.wraps(f)
         def wrapper(self, *args, **kwargs):
-            if engine_max_version() in ignored_versions:
-                skip("Engine version is too low")
+            max_version = engine_max_version()
+            if max_version in ignored_versions:
+                skip("Engine version %s is too low" % max_version)
                 return
             return f(self, *args, **kwargs)
         return wrapper

From 0d609b68acd12948f181200b3dac85b24c9e1441 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 5 Jan 2017 15:00:33 -0500
Subject: [PATCH 1243/1265] Add a warning for unsupported secret fields.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/project.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/compose/project.py b/compose/project.py
index e522e2ec..0330ab80 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -575,6 +575,12 @@ def get_secrets(service, service_secrets, secret_defs):
                      "docker-compose.".format(service=service, secret=secret.source))
             continue
 
+        if secret.uid or secret.gid or secret.mode:
+            log.warn("Service \"{service}\" uses secret \"{secret}\" with uid, "
+                     "gid, or mode. These fields are not supported by this "
+                     "implementation of the Compose file".format(
+                        service=service, secret=secret.source))
+
         secrets.append({'secret': secret, 'file': secret_def.get('file')})
 
     return secrets

From 3a2735abb933fc8f067e888e6009eac9e2be3132 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 20 Jan 2017 17:10:23 -0500
Subject: [PATCH 1244/1265] Rebase compose v3.1 on the latest v3

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config_schema_v3.1.json | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/compose/config/config_schema_v3.1.json b/compose/config/config_schema_v3.1.json
index c43f296b..b7037485 100644
--- a/compose/config/config_schema_v3.1.json
+++ b/compose/config/config_schema_v3.1.json
@@ -198,8 +198,8 @@
         },
         "sysctls": {"$ref": "#/definitions/list_or_dict"},
         "stdin_open": {"type": "boolean"},
-        "stop_signal": {"type": "string"},
         "stop_grace_period": {"type": "string", "format": "duration"},
+        "stop_signal": {"type": "string"},
         "tmpfs": {"$ref": "#/definitions/string_or_list"},
         "tty": {"type": "boolean"},
         "ulimits": {
@@ -231,10 +231,11 @@
 
     "healthcheck": {
       "id": "#/definitions/healthcheck",
-      "type": ["object", "null"],
+      "type": "object",
+      "additionalProperties": false,
       "properties": {
-        "interval": {"type":"string"},
-        "timeout": {"type":"string"},
+        "disable": {"type": "boolean"},
+        "interval": {"type": "string"},
         "retries": {"type": "number"},
         "test": {
           "oneOf": [
@@ -242,9 +243,8 @@
             {"type": "array", "items": {"type": "string"}}
           ]
         },
-        "disable": {"type": "boolean"}
-      },
-      "additionalProperties": false
+        "timeout": {"type": "string"}
+      }
     },
     "deployment": {
       "id": "#/definitions/deployment",
@@ -337,6 +337,7 @@
           },
           "additionalProperties": false
         },
+        "internal": {"type": "boolean"},
         "labels": {"$ref": "#/definitions/list_or_dict"}
       },
       "additionalProperties": false
@@ -357,10 +358,11 @@
           "type": ["boolean", "object"],
           "properties": {
             "name": {"type": "string"}
-          }
-        }
+          },
+          "additionalProperties": false
+        },
+        "labels": {"$ref": "#/definitions/list_or_dict"}
       },
-      "labels": {"$ref": "#/definitions/list_or_dict"},
       "additionalProperties": false
     },
 
@@ -374,9 +376,9 @@
           "properties": {
             "name": {"type": "string"}
           }
-        }
+        },
+        "labels": {"$ref": "#/definitions/list_or_dict"}
       },
-      "labels": {"$ref": "#/definitions/list_or_dict"},
       "additionalProperties": false
     },
 

From 59d1847d9bc88f9b4248267e93fe0435ce973da9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 27 Jan 2017 12:51:05 -0500
Subject: [PATCH 1245/1265] Fix some test failures.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 tests/integration/project_test.py | 37 +++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 30b107e8..28762cd2 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -1151,6 +1151,8 @@ class ProjectTest(DockerClientTestCase):
 
     @v3_only()
     def test_project_up_with_secrets(self):
+        create_host_file(self.client, os.path.abspath('tests/fixtures/secrets/default'))
+
         config_data = build_config(
             version=V3_1,
             services=[{
@@ -1181,7 +1183,7 @@ class ProjectTest(DockerClientTestCase):
         container, = containers
 
         output = container.logs()
-        assert output == "This is the secret\n"
+        assert output == b"This is the secret\n"
 
     @v2_only()
     def test_initialize_volumes_invalid_volume_driver(self):
@@ -1428,7 +1430,7 @@ class ProjectTest(DockerClientTestCase):
                 }
             }
         }
-        config_data = build_config(config_dict)
+        config_data = load_config(config_dict)
         project = Project.from_config(
             name='composetest', config_data=config_data, client=self.client
         )
@@ -1465,7 +1467,7 @@ class ProjectTest(DockerClientTestCase):
                 }
             }
         }
-        config_data = build_config(config_dict)
+        config_data = load_config(config_dict)
         project = Project.from_config(
             name='composetest', config_data=config_data, client=self.client
         )
@@ -1501,7 +1503,7 @@ class ProjectTest(DockerClientTestCase):
                 }
             }
         }
-        config_data = build_config(config_dict)
+        config_data = load_config(config_dict)
         project = Project.from_config(
             name='composetest', config_data=config_data, client=self.client
         )
@@ -1515,3 +1517,30 @@ class ProjectTest(DockerClientTestCase):
         assert 'svc1' in svc2.get_dependency_names()
         with pytest.raises(NoHealthCheckConfigured):
             svc1.is_healthy()
+
+
+def create_host_file(client, filename):
+    dirname = os.path.dirname(filename)
+
+    with open(filename, 'r') as fh:
+        content = fh.read()
+
+    container = client.create_container(
+        'busybox:latest',
+        ['sh', '-c', 'echo -n "{}" > {}'.format(content, filename)],
+        volumes={dirname: {}},
+        host_config=client.create_host_config(
+            binds={dirname: {'bind': dirname, 'ro': False}},
+            network_mode='none',
+        ),
+    )
+    try:
+        client.start(container)
+        exitcode = client.wait(container)
+
+        if exitcode != 0:
+            output = client.logs(container)
+            raise Exception(
+                "Container exited with code {}:\n{}".format(exitcode, output))
+    finally:
+        client.remove_container(container, force=True)

From 8efb7e6e8bbd1542db768fc1b90c6c7282f0944b Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 31 Jan 2017 12:51:46 -0800
Subject: [PATCH 1246/1265] Don't strip ANSI color codes when output is not a
 TTY

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/colors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/cli/colors.py b/compose/cli/colors.py
index 6677a376..f1251e43 100644
--- a/compose/cli/colors.py
+++ b/compose/cli/colors.py
@@ -33,7 +33,7 @@ def make_color_fn(code):
     return lambda s: ansi_color(code, s)
 
 
-colorama.init()
+colorama.init(strip=False)
 for (name, code) in get_pairs():
     globals()[name] = make_color_fn(code)
 

From 84774cacd210bb176c2daf73106c7dc849a6a0d7 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 30 Jan 2017 15:16:09 -0800
Subject: [PATCH 1247/1265] Upgrade python and pip versions in Dockerfile Add
 libbz2 dependency

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 Dockerfile | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 63fac3eb..a03e1510 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ RUN set -ex; \
         ca-certificates \
         curl \
         libsqlite3-dev \
+        libbz2-dev \
     ; \
     rm -rf /var/lib/apt/lists/*
 
@@ -20,40 +21,32 @@ RUN curl https://get.docker.com/builds/Linux/x86_64/docker-1.8.3 \
         -o /usr/local/bin/docker && \
     chmod +x /usr/local/bin/docker
 
-# Build Python 2.7.9 from source
+# Build Python 2.7.13 from source
 RUN set -ex; \
-    curl -L https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz | tar -xz; \
-    cd Python-2.7.9; \
+    curl -L https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz | tar -xz; \
+    cd Python-2.7.13; \
     ./configure --enable-shared; \
     make; \
     make install; \
     cd ..; \
-    rm -rf /Python-2.7.9
+    rm -rf /Python-2.7.13
 
 # Build python 3.4 from source
 RUN set -ex; \
-    curl -L https://www.python.org/ftp/python/3.4.3/Python-3.4.3.tgz | tar -xz; \
-    cd Python-3.4.3; \
+    curl -L https://www.python.org/ftp/python/3.4.6/Python-3.4.6.tgz | tar -xz; \
+    cd Python-3.4.6; \
     ./configure --enable-shared; \
     make; \
     make install; \
     cd ..; \
-    rm -rf /Python-3.4.3
+    rm -rf /Python-3.4.6
 
 # Make libpython findable
 ENV LD_LIBRARY_PATH /usr/local/lib
 
-# Install setuptools
-RUN set -ex; \
-    curl -L https://bootstrap.pypa.io/ez_setup.py | python
-
 # Install pip
 RUN set -ex; \
-    curl -L https://pypi.python.org/packages/source/p/pip/pip-8.1.1.tar.gz | tar -xz; \
-    cd pip-8.1.1; \
-    python setup.py install; \
-    cd ..; \
-    rm -rf pip-8.1.1
+    curl -L https://bootstrap.pypa.io/get-pip.py | python
 
 # Python3 requires a valid locale
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen

From a67500ee5728032aa902a640014bc35b6ab4d715 Mon Sep 17 00:00:00 2001
From: Peter Urda <peter.urda@gmail.com>
Date: Fri, 14 Oct 2016 00:44:52 -0700
Subject: [PATCH 1248/1265] Added `top` to `docker-compose` to display running
 processes.

This commit allows `docker-compose` to access `top` for containers
much like running `docker top` directly on a given container.

This commit includes:

* `docker-compose` CLI changes to expose `top`
* Completions for `bash` and `zsh`
* Required testing for the new `top` command

Signed-off-by: Peter Urda <peter.urda@gmail.com>
---
 compose/cli/main.py                    | 28 ++++++++++++++++++++++++++
 contrib/completion/bash/docker-compose | 13 ++++++++++++
 contrib/completion/zsh/_docker-compose |  5 +++++
 tests/acceptance/cli_test.py           | 20 ++++++++++++++++++
 tests/fixtures/top/docker-compose.yml  |  6 ++++++
 5 files changed, 72 insertions(+)
 create mode 100644 tests/fixtures/top/docker-compose.yml

diff --git a/compose/cli/main.py b/compose/cli/main.py
index db068272..e2ebce48 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -215,6 +215,7 @@ class TopLevelCommand(object):
       scale              Set number of containers for a service
       start              Start services
       stop               Stop services
+      top                Display the running processes
       unpause            Unpause services
       up                 Create and start containers
       version            Show the Docker-Compose version information
@@ -800,6 +801,33 @@ class TopLevelCommand(object):
         containers = self.project.restart(service_names=options['SERVICE'], timeout=timeout)
         exit_if(not containers, 'No containers to restart', 1)
 
+    def top(self, options):
+        """
+        Display the running processes
+
+        Usage: top [SERVICE...]
+
+        """
+        containers = sorted(
+            self.project.containers(service_names=options['SERVICE'], stopped=False) +
+            self.project.containers(service_names=options['SERVICE'], one_off=OneOffFilter.only),
+            key=attrgetter('name')
+        )
+
+        for idx, container in enumerate(containers):
+            if idx > 0:
+                print()
+
+            top_data = self.project.client.top(container.name)
+            headers = top_data.get("Titles")
+            rows = []
+
+            for process in top_data.get("Processes", []):
+                rows.append(process)
+
+            print(container.name)
+            print(Formatter().table(headers, rows))
+
     def unpause(self, options):
         """
         Unpause services.
diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 991f6572..77d02b42 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -434,6 +434,18 @@ _docker_compose_stop() {
 }
 
 
+_docker_compose_top() {
+	case "$cur" in
+		-*)
+			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
+			;;
+		*)
+			__docker_compose_services_running
+			;;
+	esac
+}
+
+
 _docker_compose_unpause() {
 	case "$cur" in
 		-*)
@@ -499,6 +511,7 @@ _docker_compose() {
 		scale
 		start
 		stop
+		top
 		unpause
 		up
 		version
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index ceb7d0f5..66d924f7 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -341,6 +341,11 @@ __docker-compose_subcommand() {
                 $opts_timeout \
                 '*:running services:__docker-compose_runningservices' && ret=0
             ;;
+        (top)
+            _arguments \
+                $opts_help \
+                '*:running services:__docker-compose_runningservices' && ret=0
+            ;;
         (unpause)
             _arguments \
                 $opts_help \
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 58160c80..160e1913 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1907,3 +1907,23 @@ class CLITestCase(DockerClientTestCase):
             "BAZ=2",
         ])
         self.assertTrue(expected_env <= set(web.get('Config.Env')))
+
+    def test_top_services_not_running(self):
+        self.base_dir = 'tests/fixtures/top'
+        result = self.dispatch(['top'])
+        assert len(result.stdout) == 0
+
+    def test_top_services_running(self):
+        self.base_dir = 'tests/fixtures/top'
+        self.dispatch(['up', '-d'])
+        result = self.dispatch(['top'])
+
+        self.assertIn('top_service_a', result.stdout)
+        self.assertIn('top_service_b', result.stdout)
+        self.assertNotIn('top_not_a_service', result.stdout)
+
+    def test_top_processes_running(self):
+        self.base_dir = 'tests/fixtures/top'
+        self.dispatch(['up', '-d'])
+        result = self.dispatch(['top'])
+        assert result.stdout.count("top") == 4
diff --git a/tests/fixtures/top/docker-compose.yml b/tests/fixtures/top/docker-compose.yml
new file mode 100644
index 00000000..d632a836
--- /dev/null
+++ b/tests/fixtures/top/docker-compose.yml
@@ -0,0 +1,6 @@
+service_a:
+  image: busybox:latest
+  command: top
+service_b:
+  image: busybox:latest
+  command: top

From 7e8958e6cab8edbfabd732e29a1c01b375a8bc02 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 1 Feb 2017 15:43:20 -0800
Subject: [PATCH 1249/1265] Add missing comma in DOCKER_CONFIG_KEYS list

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py         |  2 +-
 tests/unit/config/config_test.py | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 0e8b52e7..746f63d5 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -78,7 +78,7 @@ DOCKER_CONFIG_KEYS = [
     'memswap_limit',
     'mem_swappiness',
     'net',
-    'oom_score_adj'
+    'oom_score_adj',
     'pid',
     'ports',
     'privileged',
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index d7947a4e..860e5835 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1748,6 +1748,24 @@ class ConfigTest(unittest.TestCase):
             }
         }
 
+    def test_merge_pid(self):
+        # Regression: https://github.com/docker/compose/issues/4184
+        base = {
+            'image': 'busybox',
+            'pid': 'host'
+        }
+
+        override = {
+            'labels': {'com.docker.compose.test': 'yes'}
+        }
+
+        actual = config.merge_service_dicts(base, override, V2_0)
+        assert actual == {
+            'image': 'busybox',
+            'pid': 'host',
+            'labels': {'com.docker.compose.test': 'yes'}
+        }
+
     def test_external_volume_config(self):
         config_details = build_config_details({
             'version': '2',

From cf43e6edf7c734c3a98306bf9b4a01eb7f516005 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 2 Feb 2017 14:22:50 -0800
Subject: [PATCH 1250/1265] Don't re-parse healthcheck values coming from
 extended services

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py                 | 10 ++++++++--
 tests/fixtures/extends/healthcheck-1.yml |  9 +++++++++
 tests/fixtures/extends/healthcheck-2.yml |  6 ++++++
 tests/unit/config/config_test.py         | 13 +++++++++++++
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 tests/fixtures/extends/healthcheck-1.yml
 create mode 100644 tests/fixtures/extends/healthcheck-2.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 0e8b52e7..63ee25ab 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -716,9 +716,15 @@ def process_healthcheck(service_dict, service_name):
         hc['test'] = raw['test']
 
     if 'interval' in raw:
-        hc['interval'] = parse_nanoseconds_int(raw['interval'])
+        if not isinstance(raw['interval'], six.integer_types):
+            hc['interval'] = parse_nanoseconds_int(raw['interval'])
+        else:  # Conversion has been done previously
+            hc['interval'] = raw['interval']
     if 'timeout' in raw:
-        hc['timeout'] = parse_nanoseconds_int(raw['timeout'])
+        if not isinstance(raw['timeout'], six.integer_types):
+            hc['timeout'] = parse_nanoseconds_int(raw['timeout'])
+        else:  # Conversion has been done previously
+            hc['timeout'] = raw['timeout']
     if 'retries' in raw:
         hc['retries'] = raw['retries']
 
diff --git a/tests/fixtures/extends/healthcheck-1.yml b/tests/fixtures/extends/healthcheck-1.yml
new file mode 100644
index 00000000..4c311e62
--- /dev/null
+++ b/tests/fixtures/extends/healthcheck-1.yml
@@ -0,0 +1,9 @@
+version: '2.1'
+services:
+  demo:
+    image: foobar:latest
+    healthcheck:
+      test: ["CMD", "/health.sh"]
+      interval: 10s
+      timeout: 5s
+      retries: 36
diff --git a/tests/fixtures/extends/healthcheck-2.yml b/tests/fixtures/extends/healthcheck-2.yml
new file mode 100644
index 00000000..11bc9f09
--- /dev/null
+++ b/tests/fixtures/extends/healthcheck-2.yml
@@ -0,0 +1,6 @@
+version: '2.1'
+services:
+  demo:
+    extends:
+      file: healthcheck-1.yml
+      service: demo
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index d7947a4e..a3be6df8 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -3098,6 +3098,19 @@ class ExtendsTest(unittest.TestCase):
             'other': {'condition': 'service_started'}
         }
 
+    def test_extends_with_healthcheck(self):
+        service_dicts = load_from_filename('tests/fixtures/extends/healthcheck-2.yml')
+        assert service_sort(service_dicts) == [{
+            'name': 'demo',
+            'image': 'foobar:latest',
+            'healthcheck': {
+                'test': ['CMD', '/health.sh'],
+                'interval': 10000000000,
+                'timeout': 5000000000,
+                'retries': 36,
+            }
+        }]
+
 
 @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class ExpandPathTest(unittest.TestCase):

From a3a9d8944a413897ae1f0305d16d6d1071487ad6 Mon Sep 17 00:00:00 2001
From: Kevin Jing Qiu <kevin.qiu@points.com>
Date: Thu, 26 Jan 2017 14:23:12 -0500
Subject: [PATCH 1251/1265] Close the open file handle using context manager

Signed-off-by: Kevin Jing Qiu <kevin.qiu@points.com>
---
 compose/config/environment.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/compose/config/environment.py b/compose/config/environment.py
index 7b926930..4ba228c8 100644
--- a/compose/config/environment.py
+++ b/compose/config/environment.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import codecs
+import contextlib
 import logging
 import os
 
@@ -31,11 +32,12 @@ def env_vars_from_file(filename):
     elif not os.path.isfile(filename):
         raise ConfigurationError("%s is not a file." % (filename))
     env = {}
-    for line in codecs.open(filename, 'r', 'utf-8'):
-        line = line.strip()
-        if line and not line.startswith('#'):
-            k, v = split_env(line)
-            env[k] = v
+    with contextlib.closing(codecs.open(filename, 'r', 'utf-8')) as fileobj:
+        for line in fileobj:
+            line = line.strip()
+            if line and not line.startswith('#'):
+                k, v = split_env(line)
+                env[k] = v
     return env
 
 

From b392b6e12ed724ce39e0e65fd5582b70c47803af Mon Sep 17 00:00:00 2001
From: fate-grand-order <chenjg@harmonycloud.cn>
Date: Tue, 7 Feb 2017 15:59:34 +0800
Subject: [PATCH 1252/1265] fix typo in CHANGELOG.md

Signed-off-by: fate-grand-order <chenjg@harmonycloud.cn>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c645ca2..e969b453 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -525,7 +525,7 @@ Bug Fixes:
     if at least one container is using the network.
 
 -   When printings logs during `up` or `logs`, flush the output buffer after
-    each line to prevent buffering issues from hideing logs.
+    each line to prevent buffering issues from hiding logs.
 
 -   Recreate a container if one of its dependencies is being created.
     Previously a container was only recreated if it's dependencies already

From f0835268296111cac54faa8701b7aba751c0a239 Mon Sep 17 00:00:00 2001
From: "Aaron.L.Xu" <likexu@harmonycloud.cn>
Date: Wed, 8 Feb 2017 18:50:14 +0800
Subject: [PATCH 1253/1265] referencing right segment of code

Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
---
 compose/bundle.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/bundle.py b/compose/bundle.py
index 854cc799..505ce91f 100644
--- a/compose/bundle.py
+++ b/compose/bundle.py
@@ -202,7 +202,7 @@ def convert_service_to_bundle(name, service_dict, image_digest):
     return container_config
 
 
-# See https://github.com/docker/swarmkit/blob//agent/exec/container/container.go#L95
+# See https://github.com/docker/swarmkit/blob/agent/exec/container/container.go#L95
 def set_command_and_args(config, entrypoint, command):
     if isinstance(entrypoint, six.string_types):
         entrypoint = split_command(entrypoint)

From 979a0d53f7e989f13dc77865c7d1f4775f97319e Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 3 Feb 2017 15:26:34 -0800
Subject: [PATCH 1254/1265] Bump 1.11.0-rc1

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/__init__.py | 2 +-
 script/run/run.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose/__init__.py b/compose/__init__.py
index 38417836..ae8d759d 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.11.0dev'
+__version__ = '1.11.0-rc1'
diff --git a/script/run/run.sh b/script/run/run.sh
index 5872b081..9de11d5f 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.8.0"
+VERSION="1.11.0-rc1"
 IMAGE="docker/compose:$VERSION"
 
 

From 01d1895a350c445eab9deb37d1cd8b6fe3328b47 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 8 Feb 2017 11:30:29 -0800
Subject: [PATCH 1255/1265] Bump 1.11.0

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/__init__.py | 2 +-
 script/run/run.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose/__init__.py b/compose/__init__.py
index ae8d759d..d7468af2 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.11.0-rc1'
+__version__ = '1.11.0'
diff --git a/script/run/run.sh b/script/run/run.sh
index 9de11d5f..b45630f0 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.11.0-rc1"
+VERSION="1.11.0"
 IMAGE="docker/compose:$VERSION"
 
 

From 2cd6cb9a47b2d00cfad7d49a26641020f7f8a66a Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 30 Jan 2017 16:20:59 -0800
Subject: [PATCH 1256/1265] Bump 1.10.1

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 CHANGELOG.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6699f880..d0681e8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,53 @@
 Change log
 ==========
 
+1.11.0 (2017-02-08)
+-------------------
+
+### New Features
+
+#### Compose file version 3.1
+
+- Introduced version 3.1 of the `docker-compose.yml` specification. This
+  version requires Docker Engine 1.13.0 or above. It introduces support
+  for secrets. See the documentation for more information
+
+#### Compose file version 2.0 and up
+
+- Introduced the `docker-compose top` command that displays processes running
+  for the different services managed by Compose.
+
+### Bugfixes
+
+- Fixed a bug where extending a service defining a healthcheck dictionary
+  would cause `docker-compose` to error out.
+
+- Fixed an issue where the `pid` entry in a service definition was being
+  ignored when using multiple Compose files.
+
+1.10.1 (2017-02-01)
+------------------
+
+### Bugfixes
+
+- Fixed an issue where presence of older versions of the docker-py
+  package would cause unexpected crashes while running Compose
+
+- Fixed an issue where healthcheck dependencies would be lost when
+  using multiple compose files for a project
+
+- Fixed a few issues that made the output of the `config` command
+  invalid
+
+- Fixed an issue where adding volume labels to v3 Compose files would
+  result in an error
+
+- Fixed an issue on Windows where build context paths containing unicode
+  characters were being improperly encoded
+
+- Fixed a bug where Compose would occasionally crash while streaming logs
+  when containers would stop or restart
+
 1.10.0 (2017-01-18)
 -------------------
 

From fc7b74d7f900d6e94ebd46a05cdcadcfd1f7d407 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 8 Feb 2017 13:47:08 -0800
Subject: [PATCH 1257/1265] Bump to next dev version

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/__init__.py | 2 +-
 script/run/run.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose/__init__.py b/compose/__init__.py
index d7468af2..b2ca86f8 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.11.0'
+__version__ = '1.12.0dev'
diff --git a/script/run/run.sh b/script/run/run.sh
index b45630f0..4e173894 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.11.0"
+VERSION="1.12.0dev"
 IMAGE="docker/compose:$VERSION"
 
 

From 47e4442722373ce43f7878ee98fe9aceb1b9f177 Mon Sep 17 00:00:00 2001
From: kevinetc123 <kaiwentan@harmonycloud.cn>
Date: Thu, 9 Feb 2017 19:10:26 +0800
Subject: [PATCH 1258/1265] fix typo in project.py

Signed-off-by: kevinetc123 <kaiwentan@harmonycloud.cn>
---
 compose/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/project.py b/compose/project.py
index 0330ab80..133071e7 100644
--- a/compose/project.py
+++ b/compose/project.py
@@ -365,7 +365,7 @@ class Project(object):
 
             # TODO: get labels from the API v1.22 , see github issue 2618
             try:
-                # this can fail if the conatiner has been removed
+                # this can fail if the container has been removed
                 container = Container.from_id(self.client, event['id'])
             except APIError:
                 continue

From c092fa37de820e7d6dd20b30d2c4dec28f214dd3 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 9 Feb 2017 10:27:06 -0500
Subject: [PATCH 1259/1265] Fix version 3.1

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         | 11 ++++-------
 docker-compose.spec              |  5 +++++
 tests/unit/config/config_test.py |  4 ++++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index ae85674b..09a717be 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -186,11 +186,6 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
         if version == '3':
             version = V3_0
 
-        if version not in (V2_0, V2_1, V3_0):
-            raise ConfigurationError(
-                'Version in "{}" is unsupported. {}'
-                .format(self.filename, VERSION_EXPLANATION))
-
         return version
 
     def get_service(self, name):
@@ -479,7 +474,7 @@ def process_config_file(config_file, environment, service_name=None):
         'service',
         environment)
 
-    if config_file.version in (V2_0, V2_1, V3_0):
+    if config_file.version in (V2_0, V2_1, V3_0, V3_1):
         processed_config = dict(config_file.config)
         processed_config['services'] = services
         processed_config['volumes'] = interpolate_config_section(
@@ -495,7 +490,9 @@ def process_config_file(config_file, environment, service_name=None):
     elif config_file.version == V1:
         processed_config = services
     else:
-        raise Exception("Unsupported version: {}".format(repr(config_file.version)))
+        raise ConfigurationError(
+            'Version in "{}" is unsupported. {}'
+            .format(config_file.filename, VERSION_EXPLANATION))
 
     config_file = config_file._replace(config=processed_config)
     validate_against_config_schema(config_file)
diff --git a/docker-compose.spec b/docker-compose.spec
index ec5a2039..ef0e2593 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -37,6 +37,11 @@ exe = EXE(pyz,
                 'compose/config/config_schema_v3.0.json',
                 'DATA'
             ),
+            (
+                'compose/config/config_schema_v3.1.json',
+                'compose/config/config_schema_v3.1.json',
+                'DATA'
+            ),
             (
                 'compose/GITSHA',
                 'compose/GITSHA',
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 666b21f2..ef57bb57 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -19,6 +19,7 @@ from compose.config.config import V1
 from compose.config.config import V2_0
 from compose.config.config import V2_1
 from compose.config.config import V3_0
+from compose.config.config import V3_1
 from compose.config.environment import Environment
 from compose.config.errors import ConfigurationError
 from compose.config.errors import VERSION_EXPLANATION
@@ -168,6 +169,9 @@ class ConfigTest(unittest.TestCase):
             cfg = config.load(build_config_details({'version': version}))
             assert cfg.version == V3_0
 
+        cfg = config.load(build_config_details({'version': '3.1'}))
+        assert cfg.version == V3_1
+
     def test_v1_file_version(self):
         cfg = config.load(build_config_details({'web': {'image': 'busybox'}}))
         assert cfg.version == V1

From dc5b3f3b3eb53ce747003089c8ae5ff21f4b1f70 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 10 Feb 2017 17:05:33 -0500
Subject: [PATCH 1260/1265] Fix secrets config.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/config/config.py         |  5 ++
 compose/config/types.py          |  8 +++
 setup.py                         | 10 ++--
 tests/unit/config/config_test.py | 86 ++++++++++++++++++++++++++++++++
 4 files changed, 103 insertions(+), 6 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 09a717be..4c9cf423 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -763,6 +763,11 @@ def finalize_service(service_config, service_names, version, environment):
     if 'restart' in service_dict:
         service_dict['restart'] = parse_restart_spec(service_dict['restart'])
 
+    if 'secrets' in service_dict:
+        service_dict['secrets'] = [
+            types.ServiceSecret.parse(s) for s in service_dict['secrets']
+        ]
+
     normalize_build(service_dict, service_config.working_dir, environment)
 
     service_dict['name'] = service_config.name
diff --git a/compose/config/types.py b/compose/config/types.py
index 17d5c8b3..f86c0319 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -253,3 +253,11 @@ class ServiceSecret(namedtuple('_ServiceSecret', 'source target uid gid mode')):
     @property
     def merge_field(self):
         return self.source
+
+    def repr(self):
+        return dict(
+            source=self.source,
+            target=self.target,
+            uid=self.uid,
+            gid=self.gid,
+            mode=self.mode)
diff --git a/setup.py b/setup.py
index 0b1d4e08..eafbc356 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import print_function
 from __future__ import unicode_literals
 
 import codecs
-import logging
 import os
 import re
 import sys
@@ -64,11 +64,9 @@ try:
         for key, value in extras_require.items():
             if key.startswith(':') and pkg_resources.evaluate_marker(key[1:]):
                 install_requires.extend(value)
-except Exception:
-    logging.getLogger(__name__).exception(
-        'Failed to compute platform dependencies. All dependencies will be '
-        'installed as a result.'
-    )
+except Exception as e:
+    print("Failed to compute platform dependencies: {}. ".format(e) +
+          "All dependencies will be installed as a result.", file=sys.stderr)
     for key, value in extras_require.items():
         if key.startswith(':'):
             install_requires.extend(value)
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index ef57bb57..d4d1ad2c 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -13,6 +13,7 @@ import pytest
 
 from ...helpers import build_config_details
 from compose.config import config
+from compose.config import types
 from compose.config.config import resolve_build_args
 from compose.config.config import resolve_environment
 from compose.config.config import V1
@@ -1849,6 +1850,91 @@ class ConfigTest(unittest.TestCase):
             config.load(config_details)
         assert 'has neither an image nor a build context' in exc.exconly()
 
+    def test_load_secrets(self):
+        base_file = config.ConfigFile(
+            'base.yaml',
+            {
+                'version': '3.1',
+                'services': {
+                    'web': {
+                        'image': 'example/web',
+                        'secrets': [
+                            'one',
+                            {
+                                'source': 'source',
+                                'target': 'target',
+                                'uid': '100',
+                                'gid': '200',
+                                'mode': 0o777,
+                            },
+                        ],
+                    },
+                },
+                'secrets': {
+                    'one': {'file': 'secret.txt'},
+                },
+            })
+        details = config.ConfigDetails('.', [base_file])
+        service_dicts = config.load(details).services
+        expected = [
+            {
+                'name': 'web',
+                'image': 'example/web',
+                'secrets': [
+                    types.ServiceSecret('one', None, None, None, None),
+                    types.ServiceSecret('source', 'target', '100', '200', 0o777),
+                ],
+            },
+        ]
+        assert service_sort(service_dicts) == service_sort(expected)
+
+    def test_load_secrets_multi_file(self):
+        base_file = config.ConfigFile(
+            'base.yaml',
+            {
+                'version': '3.1',
+                'services': {
+                    'web': {
+                        'image': 'example/web',
+                        'secrets': ['one'],
+                    },
+                },
+                'secrets': {
+                    'one': {'file': 'secret.txt'},
+                },
+            })
+        override_file = config.ConfigFile(
+            'base.yaml',
+            {
+                'version': '3.1',
+                'services': {
+                    'web': {
+                        'secrets': [
+                            {
+                                'source': 'source',
+                                'target': 'target',
+                                'uid': '100',
+                                'gid': '200',
+                                'mode': 0o777,
+                            },
+                        ],
+                    },
+                },
+            })
+        details = config.ConfigDetails('.', [base_file, override_file])
+        service_dicts = config.load(details).services
+        expected = [
+            {
+                'name': 'web',
+                'image': 'example/web',
+                'secrets': [
+                    types.ServiceSecret('one', None, None, None, None),
+                    types.ServiceSecret('source', 'target', '100', '200', 0o777),
+                ],
+            },
+        ]
+        assert service_sort(service_dicts) == service_sort(expected)
+
 
 class NetworkModeTest(unittest.TestCase):
     def test_network_mode_standard(self):

From 252699c1d124ba365e4b9078f4a44f3acbcb08be Mon Sep 17 00:00:00 2001
From: Petr Karmashev <smonkl@bk.ru>
Date: Sun, 12 Feb 2017 02:03:04 +0300
Subject: [PATCH 1261/1265] Compose file reference link fix in README.md

Signed-off-by: Petr Karmashev <smonkl@bk.ru>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5cf69b05..35a10b90 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ A `docker-compose.yml` looks like this:
         image: redis
 
 For more information about the Compose file, see the
-[Compose file reference](https://github.com/docker/docker.github.io/blob/master/compose/compose-file.md)
+[Compose file reference](https://github.com/docker/docker.github.io/blob/master/compose/compose-file/compose-versioning.md)
 
 Compose has commands for managing the whole lifecycle of your application:
 

From abce83ef25528fb36979208888ba0033c89f47a3 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 13 Feb 2017 16:04:06 -0800
Subject: [PATCH 1262/1265] Fix `config` command output with service.secrets
 section

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/serialize.py      |  3 ++
 compose/config/types.py          |  7 ++--
 tests/unit/config/config_test.py | 57 ++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/compose/config/serialize.py b/compose/config/serialize.py
index 3745de82..46d283f0 100644
--- a/compose/config/serialize.py
+++ b/compose/config/serialize.py
@@ -102,4 +102,7 @@ def denormalize_service_dict(service_dict, version):
                 service_dict['healthcheck']['timeout']
             )
 
+    if 'secrets' in service_dict:
+        service_dict['secrets'] = map(lambda s: s.repr(), service_dict['secrets'])
+
     return service_dict
diff --git a/compose/config/types.py b/compose/config/types.py
index f86c0319..811e6c1f 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -256,8 +256,5 @@ class ServiceSecret(namedtuple('_ServiceSecret', 'source target uid gid mode')):
 
     def repr(self):
         return dict(
-            source=self.source,
-            target=self.target,
-            uid=self.uid,
-            gid=self.gid,
-            mode=self.mode)
+            [(k, v) for k, v in self._asdict().items() if v is not None]
+        )
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index d4d1ad2c..c26272d9 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -54,6 +54,10 @@ def service_sort(services):
     return sorted(services, key=itemgetter('name'))
 
 
+def secret_sort(secrets):
+    return sorted(secrets, key=itemgetter('source'))
+
+
 class ConfigTest(unittest.TestCase):
     def test_load(self):
         service_dicts = config.load(
@@ -1771,6 +1775,38 @@ class ConfigTest(unittest.TestCase):
             'labels': {'com.docker.compose.test': 'yes'}
         }
 
+    def test_merge_different_secrets(self):
+        base = {
+            'image': 'busybox',
+            'secrets': [
+                {'source': 'src.txt'}
+            ]
+        }
+        override = {'secrets': ['other-src.txt']}
+
+        actual = config.merge_service_dicts(base, override, V3_1)
+        assert secret_sort(actual['secrets']) == secret_sort([
+            {'source': 'src.txt'},
+            {'source': 'other-src.txt'}
+        ])
+
+    def test_merge_secrets_override(self):
+        base = {
+            'image': 'busybox',
+            'secrets': ['src.txt'],
+        }
+        override = {
+            'secrets': [
+                {
+                    'source': 'src.txt',
+                    'target': 'data.txt',
+                    'mode': 0o400
+                }
+            ]
+        }
+        actual = config.merge_service_dicts(base, override, V3_1)
+        assert actual['secrets'] == override['secrets']
+
     def test_external_volume_config(self):
         config_details = build_config_details({
             'version': '2',
@@ -3491,3 +3527,24 @@ class SerializeTest(unittest.TestCase):
         denormalized_service = denormalize_service_dict(processed_service, V2_1)
         assert denormalized_service['healthcheck']['interval'] == '100s'
         assert denormalized_service['healthcheck']['timeout'] == '30s'
+
+    def test_denormalize_secrets(self):
+        service_dict = {
+            'name': 'web',
+            'image': 'example/web',
+            'secrets': [
+                types.ServiceSecret('one', None, None, None, None),
+                types.ServiceSecret('source', 'target', '100', '200', 0o777),
+            ],
+        }
+        denormalized_service = denormalize_service_dict(service_dict, V3_1)
+        assert secret_sort(denormalized_service['secrets']) == secret_sort([
+            {'source': 'one'},
+            {
+                'source': 'source',
+                'target': 'target',
+                'uid': '100',
+                'gid': '200',
+                'mode': 0o777,
+            },
+        ])

From 66f4a795a2ded1a26b6cf8474edb423727dd585d Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 15 Feb 2017 16:07:08 -0800
Subject: [PATCH 1263/1265] Don't import pip inside Compose

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/cli/__init__.py | 37 +++++++++++++++++++++++++++++++++++++
 compose/cli/main.py     | 24 ------------------------
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/compose/cli/__init__.py b/compose/cli/__init__.py
index e69de29b..c5db4455 100644
--- a/compose/cli/__init__.py
+++ b/compose/cli/__init__.py
@@ -0,0 +1,37 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import subprocess
+import sys
+
+# Attempt to detect https://github.com/docker/compose/issues/4344
+try:
+    # We don't try importing pip because it messes with package imports
+    # on some Linux distros (Ubuntu, Fedora)
+    # https://github.com/docker/compose/issues/4425
+    # https://github.com/docker/compose/issues/4481
+    # https://github.com/pypa/pip/blob/master/pip/_vendor/__init__.py
+    s_cmd = subprocess.Popen(
+        ['pip', 'freeze'], stderr=subprocess.PIPE, stdout=subprocess.PIPE
+    )
+    packages = s_cmd.communicate()[0].splitlines()
+    dockerpy_installed = len(
+        list(filter(lambda p: p.startswith(b'docker-py=='), packages))
+    ) > 0
+    if dockerpy_installed:
+        from .colors import red
+        print(
+            red('ERROR:'),
+            "Dependency conflict: an older version of the 'docker-py' package "
+            "is polluting the namespace. "
+            "Run the following command to remedy the issue:\n"
+            "pip uninstall docker docker-py; pip install docker",
+            file=sys.stderr
+        )
+        sys.exit(1)
+
+except OSError:
+    # pip command is not available, which indicates it's probably the binary
+    # distribution of Compose which is not affected
+    pass
diff --git a/compose/cli/main.py b/compose/cli/main.py
index e2ebce48..51ba36a0 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -14,30 +14,6 @@ from distutils.spawn import find_executable
 from inspect import getdoc
 from operator import attrgetter
 
-
-# Attempt to detect https://github.com/docker/compose/issues/4344
-try:
-    # A regular import statement causes PyInstaller to freak out while
-    # trying to load pip. This way it is simply ignored.
-    pip = __import__('pip')
-    pip_packages = pip.get_installed_distributions()
-    if 'docker-py' in [pkg.project_name for pkg in pip_packages]:
-        from .colors import red
-        print(
-            red('ERROR:'),
-            "Dependency conflict: an older version of the 'docker-py' package "
-            "is polluting the namespace. "
-            "Run the following command to remedy the issue:\n"
-            "pip uninstall docker docker-py; pip install docker",
-            file=sys.stderr
-        )
-        sys.exit(1)
-except ImportError:
-    # pip is not available, which indicates it's probably the binary
-    # distribution of Compose which is not affected
-    pass
-
-
 from . import errors
 from . import signals
 from .. import __version__

From 27297fd1af64aae4e48fce254bace122014977fd Mon Sep 17 00:00:00 2001
From: "Aaron.L.Xu" <likexu@harmonycloud.cn>
Date: Thu, 16 Feb 2017 11:14:25 +0800
Subject: [PATCH 1264/1265] fix a typo in script/release/utils.sh

Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
---
 script/release/utils.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/release/utils.sh b/script/release/utils.sh
index b4e5a2e6..321c1fb7 100644
--- a/script/release/utils.sh
+++ b/script/release/utils.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Util functions for release scritps
+# Util functions for release scripts
 #
 
 set -e

From d20e3f334215a55cbebc27d8dde82108a58a0bae Mon Sep 17 00:00:00 2001
From: "Aaron.L.Xu" <likexu@harmonycloud.cn>
Date: Thu, 16 Feb 2017 15:25:04 +0800
Subject: [PATCH 1265/1265] function-name-modification for tests/*

Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
---
 tests/acceptance/cli_test.py | 10 +++++-----
 tests/unit/cli_test.py       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 160e1913..8366ca75 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1234,7 +1234,7 @@ class CLITestCase(DockerClientTestCase):
         container = service.containers(stopped=True, one_off=OneOffFilter.only)[0]
         self.assertEqual(user, container.get('Config.User'))
 
-    def test_run_service_with_environement_overridden(self):
+    def test_run_service_with_environment_overridden(self):
         name = 'service'
         self.base_dir = 'tests/fixtures/environment-composefile'
         self.dispatch([
@@ -1246,9 +1246,9 @@ class CLITestCase(DockerClientTestCase):
         ])
         service = self.project.get_service(name)
         container = service.containers(stopped=True, one_off=OneOffFilter.only)[0]
-        # env overriden
+        # env overridden
         self.assertEqual('notbar', container.environment['foo'])
-        # keep environement from yaml
+        # keep environment from yaml
         self.assertEqual('world', container.environment['hello'])
         # added option from command line
         self.assertEqual('beta', container.environment['alpha'])
@@ -1293,7 +1293,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_range[0], "0.0.0.0:49153")
         self.assertEqual(port_range[1], "0.0.0.0:49154")
 
-    def test_run_service_with_explicitly_maped_ports(self):
+    def test_run_service_with_explicitly_mapped_ports(self):
         # create one off container
         self.base_dir = 'tests/fixtures/ports-composefile'
         self.dispatch(['run', '-d', '-p', '30000:3000', '--publish', '30001:3001', 'simple'])
@@ -1310,7 +1310,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(port_short, "0.0.0.0:30000")
         self.assertEqual(port_full, "0.0.0.0:30001")
 
-    def test_run_service_with_explicitly_maped_ip_ports(self):
+    def test_run_service_with_explicitly_mapped_ip_ports(self):
         # create one off container
         self.base_dir = 'tests/fixtures/ports-composefile'
         self.dispatch([
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index f9b60bff..317650cb 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -184,7 +184,7 @@ class CLITestCase(unittest.TestCase):
             mock_client.create_host_config.call_args[1].get('restart_policy')
         )
 
-    def test_command_manula_and_service_ports_together(self):
+    def test_command_manual_and_service_ports_together(self):
         project = Project.from_config(
             name='composetest',
             client=None,