remove py27 testing, 1.26 and later drop python 2 support

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

CHANGELOG.md

@@ -1,41 +1,6 @@
 Change log
 ==========
 
-1.25.2 (2020-01-17)
--------------------
-
-### Features
-
-- Allow compatibility option with `COMPOSE_COMPATIBILITY` environment variable
-
-- Bump PyInstaller from 3.5 to 3.6
-
-- Bump pysocks from 1.6.7 to 1.7.1
-
-- Bump websocket-client from 0.32.0 to 0.57.0
-
-- Bump urllib3 from 1.24.2 to 1.25.7
-
-- Bump jsonschema from 3.0.1 to 3.2.0
-
-- Bump PyYAML from 4.2b1 to 5.3
-
-- Bump certifi from 2017.4.17 to 2019.11.28
-
-- Bump coverage from 4.5.4 to 5.0.3
-
-- Bump paramiko from 2.6.0 to 2.7.1
-
-- Bump cached-property from 1.3.0 to 1.5.1
-
-- Bump minor Linux and MacOSX dependencies
-
-### Bugfixes
-
-- Validate version format on formats 2+
-
-- Assume infinite terminal width when not running in a terminal
-
 1.25.1 (2020-01-06)
 -------------------
 

Dockerfile

@@ -1,9 +1,9 @@
-ARG DOCKER_VERSION=19.03.5
-ARG PYTHON_VERSION=3.7.5
+ARG DOCKER_VERSION=18.09.7
+ARG PYTHON_VERSION=3.7.4
 ARG BUILD_ALPINE_VERSION=3.10
 ARG BUILD_DEBIAN_VERSION=slim-stretch
-ARG RUNTIME_ALPINE_VERSION=3.10.3
-ARG RUNTIME_DEBIAN_VERSION=stretch-20191118-slim
+ARG RUNTIME_ALPINE_VERSION=3.10.1
+ARG RUNTIME_DEBIAN_VERSION=stretch-20190812-slim
 
 ARG BUILD_PLATFORM=alpine
 

Release.Jenkinsfile

@@ -2,7 +2,7 @@
 
 def dockerVersions = ['19.03.5', '18.09.9']
 def baseImages = ['alpine', 'debian']
-def pythonVersions = ['py27', 'py37']
+def pythonVersions = ['py37']
 
 pipeline {
     agent none
@@ -75,7 +75,7 @@ pipeline {
                     steps {
                         checkout scm
                         sh './script/setup/osx'
-                        sh 'tox -e py27,py37 -- tests/unit'
+                        sh 'tox -e py37 -- tests/unit'
                         sh './script/build/osx'
                         dir ('dist') {
                           checksum('docker-compose-Darwin-x86_64')
@@ -112,7 +112,7 @@ pipeline {
                     }
                     steps {
                         checkout scm
-                        bat 'tox.exe -e py27,py37 -- tests/unit'
+                        bat 'tox.exe -e py37 -- tests/unit'
                         powershell '.\\script\\build\\windows.ps1'
                         dir ('dist') {
                             checksum('docker-compose-Windows-x86_64.exe')
@@ -177,19 +177,14 @@ pipeline {
                     }
                     steps {
                         checkout scm
-                        withCredentials([[$class: "FileBinding", credentialsId: 'pypirc-docker-dsg-cibot', variable: 'PYPIRC']]) {
+                        withCredentials([file(credentialsId: 'pypirc-docker-dsg-cibot', variable: 'PYPIRC')]) {
                             sh """
-                                virtualenv venv-publish
-                                source venv-publish/bin/activate
+                                pip install --user twine wheel
                                 python setup.py sdist bdist_wheel
-                                pip install twine
                                 twine upload --config-file ${PYPIRC} ./dist/docker-compose-${env.TAG_NAME}.tar.gz ./dist/docker_compose-${env.TAG_NAME}-py2.py3-none-any.whl
                             """
                         }
                     }
-                    post {
-                        sh 'deactivate; rm -rf venv-publish'
-                    }
                 }
             }
         }
@@ -268,7 +263,6 @@ def buildRuntimeImage(baseImage) {
 
 def pushRuntimeImage(baseImage) {
     unstash "compose-${baseImage}"
-    sh 'echo -n "${DOCKERHUB_CREDS_PSW}" | docker login --username "${DOCKERHUB_CREDS_USR}" --password-stdin'
     sh "docker load -i dist/docker-compose-${baseImage}.tar"
     withDockerRegistry(credentialsId: 'dockerbuildbot-hub.docker.com') {
         sh "docker push docker/compose:${baseImage}-${env.TAG_NAME}"
@@ -283,18 +277,23 @@ def githubRelease() {
     withCredentials([string(credentialsId: 'github-compose-release-test-token', variable: 'GITHUB_TOKEN')]) {
         def prerelease = !( env.TAG_NAME ==~ /v[0-9\.]+/ )
         changelog = readFile "CHANGELOG.md"
-        def data = """{
-            \"tag_name\": \"${env.TAG_NAME}\",
-            \"name\": \"${env.TAG_NAME}\",
-            \"draft\": true,
-            \"prerelease\": ${prerelease},
-            \"body\" : \"${changelog}\"
-        """
-        echo $data
+
+        def info = [:]
+        info.tag_name = env.TAG_NAME
+        info.name = env.TAG_NAME
+        info.draft = true
+        info.prerelease = prerelease
+        info.body = changelog
+
+
+        writeFile file: 'release.json', text: groovy.json.JsonOutput.toJson(info)
+
+        // debug
+        sh("cat release.json")
 
         def url = "https://api.github.com/repos/docker/compose/releases"
         def upload_url = sh(returnStdout: true, script: """
-            curl -sSf -H 'Authorization: token ${GITHUB_TOKEN}' -H 'Accept: application/json' -H 'Content-type: application/json' -X POST -d '$data' $url") \\
+            curl -sSf -H 'Authorization: token ${GITHUB_TOKEN}' -H 'Accept: application/json' -H 'Content-type: application/json' -X POST --data-binary '@release.json' $url) \\
             | jq '.upload_url | .[:rindex("{")]'
         """)
         sh("""

compose/__init__.py

@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.25.2-rc1'
+__version__ = '1.26.0dev'

compose/bundle.py

@@ -0,0 +1,275 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+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
+
+
+log = logging.getLogger(__name__)
+
+
+SERVICE_KEYS = {
+    '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'
+
+
+class NeedsPush(Exception):
+    def __init__(self, image_name):
+        self.image_name = image_name
+
+
+class NeedsPull(Exception):
+    def __init__(self, image_name, service_name):
+        self.image_name = image_name
+        self.service_name = service_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):
+    return json.dumps(to_bundle(config, image_digests), indent=2, sort_keys=True)
+
+
+def get_image_digests(project, allow_push=False):
+    digests = {}
+    needs_push = set()
+    needs_pull = set()
+
+    for service in project.services:
+        try:
+            digests[service.name] = get_image_digest(
+                service,
+                allow_push=allow_push,
+            )
+        except NeedsPush as e:
+            needs_push.add(e.image_name)
+        except NeedsPull as e:
+            needs_pull.add(e.service_name)
+
+    if needs_push or needs_pull:
+        raise MissingDigests(needs_push, needs_pull)
+
+    return digests
+
+
+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 "
+            "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'])
+    # Compose file already uses a digest, no lookup required
+    if separator == '@':
+        return service.options['image']
+
+    digest = get_digest(service)
+
+    if digest:
+        return digest
+
+    if 'build' not in service.options:
+        raise NeedsPull(service.image_name, service.name)
+
+    if not allow_push:
+        raise NeedsPush(service.image_name)
+
+    return push_image(service)
+
+
+def get_digest(service):
+    digest = None
+    try:
+        image = service.image()
+        # TODO: pick a digest based on the image tag if there are multiple
+        # digests
+        if image['RepoDigests']:
+            digest = image['RepoDigests'][0]
+    except NoSuchImageError:
+        try:
+            # Fetch the image digest from the registry
+            distribution = service.get_image_registry_data()
+
+            if distribution['Descriptor']['digest']:
+                digest = '{image_name}@{digest}'.format(
+                    image_name=service.image_name,
+                    digest=distribution['Descriptor']['digest']
+                )
+        except NoSuchImageError:
+            raise UserError(
+                "Digest not found for service '{service}'. "
+                "Repository does not exist or may require 'docker login'"
+                .format(service=service.name))
+    return digest
+
+
+def push_image(service):
+    try:
+        digest = service.push()
+    except Exception:
+        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)
+
+    repo, _, _ = parse_repository_tag(service.options['image'])
+    identifier = '{repo}@{digest}'.format(repo=repo, digest=digest)
+
+    # 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
+        # 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.warning("Unsupported top level key 'networks' - ignoring")
+
+    if config.volumes:
+        log.warning("Unsupported top level key 'volumes' - ignoring")
+
+    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_digest):
+    container_config = {'Image': image_digest}
+
+    for key, value in service_dict.items():
+        if key in IGNORED_KEYS:
+            continue
+
+        if key not in SUPPORTED_KEYS:
+            log.warning("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
+            })
+            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)
+    if ports:
+        container_config['Ports'] = ports
+
+    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 = []
+
+    for network_name, network_def in get_network_defs_for_service(service_dict).items():
+        for key in network_def.keys():
+            log.warning(
+                "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]),
+    }

compose/cli/command.py

@@ -40,8 +40,7 @@ SILENT_COMMANDS = {
 }
 
 
-def project_from_options(project_dir, options, additional_options=None):
-    additional_options = additional_options or {}
+def project_from_options(project_dir, options, additional_options={}):
     override_dir = options.get('--project-directory')
     environment_file = options.get('--env-file')
     environment = Environment.from_env_file(override_dir or project_dir, environment_file)
@@ -60,7 +59,7 @@ def project_from_options(project_dir, options, additional_options=None):
         tls_config=tls_config_from_options(options, environment),
         environment=environment,
         override_dir=override_dir,
-        compatibility=compatibility_from_options(project_dir, options, environment),
+        compatibility=options.get('--compatibility'),
         interpolate=(not additional_options.get('--no-interpolate')),
         environment_file=environment_file
     )
@@ -82,8 +81,7 @@ def set_parallel_limit(environment):
         parallel.GlobalLimit.set_global_limit(parallel_limit)
 
 
-def get_config_from_options(base_dir, options, additional_options=None):
-    additional_options = additional_options or {}
+def get_config_from_options(base_dir, options, additional_options={}):
     override_dir = options.get('--project-directory')
     environment_file = options.get('--env-file')
     environment = Environment.from_env_file(override_dir or base_dir, environment_file)
@@ -92,7 +90,7 @@ def get_config_from_options(base_dir, options, additional_options=None):
     )
     return config.load(
         config.find(base_dir, config_path, environment, override_dir),
-        compatibility_from_options(config_path, options, environment),
+        options.get('--compatibility'),
         not additional_options.get('--no-interpolate')
     )
 
@@ -200,13 +198,3 @@ def get_project_name(working_dir, project_name=None, environment=None):
         return normalize_name(project)
 
     return 'default'
-
-
-def compatibility_from_options(working_dir, options=None, environment=None):
-    """Get compose v3 compatibility from --compatibility option
-       or from COMPOSE_COMPATIBILITY environment variable."""
-
-    compatibility_option = options.get('--compatibility')
-    compatibility_environment = environment.get_boolean('COMPOSE_COMPATIBILITY')
-
-    return compatibility_option or compatibility_environment

compose/cli/main.py

@@ -15,12 +15,14 @@ from distutils.spawn import find_executable
 from inspect import getdoc
 from operator import attrgetter
 
-import docker.errors
-import docker.utils
+import docker
 
 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
 from ..config import parse_labels
@@ -32,8 +34,6 @@ from ..const import COMPOSEFILE_V2_2 as V2_2
 from ..const import IS_WINDOWS_PLATFORM
 from ..errors import StreamParseError
 from ..progress_stream import StreamOutputError
-from ..project import get_image_digests
-from ..project import MissingDigests
 from ..project import NoSuchService
 from ..project import OneOffFilter
 from ..project import ProjectError
@@ -213,6 +213,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
@@ -303,6 +304,38 @@ class TopLevelCommand(object):
             progress=options.get('--progress'),
         )
 
+    def bundle(self, options):
+        """
+        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.
+
+        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".
+        """
+        compose_config = get_config_from_options('.', self.toplevel_options)
+
+        output = options["--output"]
+        if not output:
+            output = "{}.dab".format(self.project.name)
+
+        image_digests = image_digests_for_project(self.project, options['--push-images'])
+
+        with open(output, 'w') as f:
+            f.write(serialize_bundle(compose_config, image_digests))
+
+        log.info("Wrote bundle to {}".format(output))
+
     def config(self, options):
         """
         Validate and view the Compose file.
@@ -1012,7 +1045,6 @@ class TopLevelCommand(object):
             --build                    Build images before starting containers.
             --abort-on-container-exit  Stops all containers if any container was
                                        stopped. Incompatible with -d.
-            --attach-dependencies      Attach to dependent containers
             -t, --timeout TIMEOUT      Use this timeout in seconds for container
                                        shutdown when attached or when containers are
                                        already running. (default: 10)
@@ -1034,18 +1066,16 @@ class TopLevelCommand(object):
         remove_orphans = options['--remove-orphans']
         detached = options.get('--detach')
         no_start = options.get('--no-start')
-        attach_dependencies = options.get('--attach-dependencies')
 
-        if detached and (cascade_stop or exit_value_from or attach_dependencies):
-            raise UserError(
-                "-d cannot be combined with --abort-on-container-exit or --attach-dependencies.")
+        if detached and (cascade_stop or exit_value_from):
+            raise UserError("--abort-on-container-exit and -d cannot be combined.")
 
         ignore_orphans = self.toplevel_environment.get_boolean('COMPOSE_IGNORE_ORPHANS')
 
         if ignore_orphans and remove_orphans:
             raise UserError("COMPOSE_IGNORE_ORPHANS and --remove-orphans cannot be combined.")
 
-        opts = ['--detach', '--abort-on-container-exit', '--exit-code-from', '--attach-dependencies']
+        opts = ['--detach', '--abort-on-container-exit', '--exit-code-from']
         for excluded in [x for x in opts if options.get(x) and no_start]:
             raise UserError('--no-start and {} cannot be combined.'.format(excluded))
 
@@ -1090,10 +1120,7 @@ class TopLevelCommand(object):
             if detached or no_start:
                 return
 
-            attached_containers = filter_attached_containers(
-                to_attach,
-                service_names,
-                attach_dependencies)
+            attached_containers = filter_containers_to_service_names(to_attach, service_names)
 
             log_printer = log_printer_from_project(
                 self.project,
@@ -1189,10 +1216,12 @@ def timeout_from_opts(options):
     return None if timeout is None else int(timeout)
 
 
-def image_digests_for_project(project):
+def image_digests_for_project(project, allow_push=False):
     try:
-        return get_image_digests(project)
-
+        return get_image_digests(
+            project,
+            allow_push=allow_push
+        )
     except MissingDigests as e:
         def list_images(images):
             return "\n".join("    {}".format(name) for name in sorted(images))
@@ -1398,8 +1427,8 @@ def log_printer_from_project(
         log_args=log_args)
 
 
-def filter_attached_containers(containers, service_names, attach_dependencies=False):
-    if attach_dependencies or not service_names:
+def filter_containers_to_service_names(containers, service_names):
+    if not service_names:
         return containers
 
     return [

compose/project.py

@@ -16,7 +16,6 @@ from docker.errors import NotFound
 from docker.utils import version_lt
 
 from . import parallel
-from .cli.errors import UserError
 from .config import ConfigurationError
 from .config.config import V1
 from .config.sort_services import get_container_name_from_network_mode
@@ -34,7 +33,6 @@ from .service import ContainerNetworkMode
 from .service import ContainerPidMode
 from .service import ConvergenceStrategy
 from .service import NetworkMode
-from .service import NoSuchImageError
 from .service import parse_repository_tag
 from .service import PidMode
 from .service import Service
@@ -44,6 +42,7 @@ from .utils import microseconds_from_time_nano
 from .utils import truncate_string
 from .volume import ProjectVolumes
 
+
 log = logging.getLogger(__name__)
 
 
@@ -87,11 +86,10 @@ class Project(object):
         return labels
 
     @classmethod
-    def from_config(cls, name, config_data, client, default_platform=None, extra_labels=None):
+    def from_config(cls, name, config_data, client, default_platform=None, extra_labels=[]):
         """
         Construct a Project from a config.Config object.
         """
-        extra_labels = extra_labels or []
         use_networking = (config_data.version and config_data.version != V1)
         networks = build_networks(name, config_data, client)
         project_networks = ProjectNetworks.from_services(
@@ -383,7 +381,6 @@ class Project(object):
 
         def build_service(service):
             service.build(no_cache, pull, force_rm, memory, build_args, gzip, rm, silent, cli, progress)
-
         if parallel_build:
             _, errors = parallel.parallel_execute(
                 services,
@@ -847,91 +844,6 @@ def get_secrets(service, service_secrets, secret_defs):
     return secrets
 
 
-def get_image_digests(project):
-    digests = {}
-    needs_push = set()
-    needs_pull = set()
-
-    for service in project.services:
-        try:
-            digests[service.name] = get_image_digest(service)
-        except NeedsPush as e:
-            needs_push.add(e.image_name)
-        except NeedsPull as e:
-            needs_pull.add(e.service_name)
-
-    if needs_push or needs_pull:
-        raise MissingDigests(needs_push, needs_pull)
-
-    return digests
-
-
-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. Specify an image repo "
-            "and tag with the 'image' option.".format(s=service))
-
-    _, _, separator = parse_repository_tag(service.options['image'])
-    # Compose file already uses a digest, no lookup required
-    if separator == '@':
-        return service.options['image']
-
-    digest = get_digest(service)
-
-    if digest:
-        return digest
-
-    if 'build' not in service.options:
-        raise NeedsPull(service.image_name, service.name)
-
-    raise NeedsPush(service.image_name)
-
-
-def get_digest(service):
-    digest = None
-    try:
-        image = service.image()
-        # TODO: pick a digest based on the image tag if there are multiple
-        # digests
-        if image['RepoDigests']:
-            digest = image['RepoDigests'][0]
-    except NoSuchImageError:
-        try:
-            # Fetch the image digest from the registry
-            distribution = service.get_image_registry_data()
-
-            if distribution['Descriptor']['digest']:
-                digest = '{image_name}@{digest}'.format(
-                    image_name=service.image_name,
-                    digest=distribution['Descriptor']['digest']
-                )
-        except NoSuchImageError:
-            raise UserError(
-                "Digest not found for service '{service}'. "
-                "Repository does not exist or may require 'docker login'"
-                .format(service=service.name))
-    return digest
-
-
-class MissingDigests(Exception):
-    def __init__(self, needs_push, needs_pull):
-        self.needs_push = needs_push
-        self.needs_pull = needs_pull
-
-
-class NeedsPush(Exception):
-    def __init__(self, image_name):
-        self.image_name = image_name
-
-
-class NeedsPull(Exception):
-    def __init__(self, image_name, service_name):
-        self.image_name = image_name
-        self.service_name = service_name
-
-
 class NoSuchService(Exception):
     def __init__(self, name):
         if isinstance(name, six.binary_type):

compose/service.py

@@ -185,7 +185,7 @@ class Service(object):
             scale=1,
             pid_mode=None,
             default_platform=None,
-            extra_labels=None,
+            extra_labels=[],
             **options
     ):
         self.name = name
@@ -201,7 +201,7 @@ class Service(object):
         self.scale_num = scale
         self.default_platform = default_platform
         self.options = options
-        self.extra_labels = extra_labels or []
+        self.extra_labels = extra_labels
 
     def __repr__(self):
         return '<Service: {}>'.format(self.name)

contrib/completion/bash/docker-compose

@@ -126,6 +126,18 @@ _docker_compose_build() {
 }
 
 
+_docker_compose_bundle() {
+	case "$prev" in
+		--output|-o)
+			_filedir
+			return
+			;;
+	esac
+
+	COMPREPLY=( $( compgen -W "--push-images --help --output -o" -- "$cur" ) )
+}
+
+
 _docker_compose_config() {
 	case "$prev" in
 		--hash)
@@ -545,7 +557,7 @@ _docker_compose_up() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--abort-on-container-exit --always-recreate-deps --attach-dependencies --build -d --detach --exit-code-from --force-recreate --help --no-build --no-color --no-deps --no-recreate --no-start --renew-anon-volumes -V --remove-orphans --scale --timeout -t" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--abort-on-container-exit --always-recreate-deps --build -d --detach --exit-code-from --force-recreate --help --no-build --no-color --no-deps --no-recreate --no-start --renew-anon-volumes -V --remove-orphans --scale --timeout -t" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_complete_services
@@ -569,6 +581,7 @@ _docker_compose() {
 
 	local commands=(
 		build
+		bundle
 		config
 		create
 		down

contrib/completion/zsh/_docker-compose

@@ -121,6 +121,12 @@ __docker-compose_subcommand() {
                 '--parallel[Build images in parallel.]' \
                 '*:services:__docker-compose_services_from_build' && ret=0
             ;;
+        (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)
             _arguments \
                 $opts_help \
@@ -284,7 +290,7 @@ __docker-compose_subcommand() {
         (up)
             _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 and --attach-dependencies.]' \
+                '(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names. Incompatible with --abort-on-container-exit.]' \
                 $opts_no_color \
                 $opts_no_deps \
                 $opts_force_recreate \
@@ -292,7 +298,6 @@ __docker-compose_subcommand() {
                 $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.]" \
-                "(-d)--attach-dependencies[Attach to dependent containers. 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: " \
                 '--scale[SERVICE=NUM Scale SERVICE to NUM instances. Overrides the `scale` setting in the Compose file if present.]:service scale SERVICE=NUM: ' \
                 '--exit-code-from=[Return the exit code of the selected service container. Implies --abort-on-container-exit]:service:__docker-compose_services' \

requirements-build.txt

@@ -1 +1 @@
-pyinstaller==3.6
+pyinstaller==3.5

requirements-dev.txt

@@ -1,7 +1,6 @@
-coverage==5.0.3
-ddt==1.2.2
+coverage==4.5.4
+ddt==1.2.0
 flake8==3.7.9
 mock==3.0.5
-pytest==5.3.2; python_version >= '3.5'
-pytest==4.6.5; python_version < '3.5'
+pytest==3.6.3
 pytest-cov==2.8.1

requirements.txt

@@ -1,26 +1,26 @@
 backports.shutil_get_terminal_size==1.0.0
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
-cached-property==1.5.1
-certifi==2019.11.28
+cached-property==1.3.0
+certifi==2017.4.17
 chardet==3.0.4
-colorama==0.4.3; sys_platform == 'win32'
+colorama==0.4.0; sys_platform == 'win32'
 docker==4.1.0
 docker-pycreds==0.4.0
 dockerpty==0.4.1
 docopt==0.6.2
 enum34==1.1.6; python_version < '3.4'
 functools32==3.2.3.post2; python_version < '3.2'
-idna==2.8
-ipaddress==1.0.23
-jsonschema==3.2.0
-paramiko==2.7.1
+idna==2.5
+ipaddress==1.0.18
+jsonschema==3.0.1
+paramiko==2.6.0
 pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
 pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6'
-PySocks==1.7.1
-PyYAML==5.3
+PySocks==1.6.7
+PyYAML==4.2b1
 requests==2.22.0
 six==1.12.0
 subprocess32==3.5.4; python_version < '3.2'
 texttable==1.6.2
-urllib3==1.25.7; python_version == '3.3'
-websocket-client==0.57.0
+urllib3==1.24.2; python_version == '3.3'
+websocket-client==0.32.0

script/build/linux-entrypoint

@@ -24,7 +24,7 @@ if [ ! -z "${BUILD_BOOTLOADER}" ]; then
     git clone --single-branch --branch develop https://github.com/pyinstaller/pyinstaller.git /tmp/pyinstaller
     cd /tmp/pyinstaller/bootloader
     # Checkout commit corresponding to version in requirements-build
-    git checkout v3.6
+    git checkout v3.5
     "${VENV}"/bin/python3 ./waf configure --no-lsb all
     "${VENV}"/bin/pip3 install ..
     cd "${CODE_PATH}"

script/run/run.sh

@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.25.2-rc1"
+VERSION="1.25.1"
 IMAGE="docker/compose:$VERSION"
 
 

script/setup/osx

@@ -13,13 +13,13 @@ if ! [ ${DEPLOYMENT_TARGET} == "$(macos_version)" ]; then
   SDK_SHA1=dd228a335194e3392f1904ce49aff1b1da26ca62
 fi
 
-OPENSSL_VERSION=1.1.1d
+OPENSSL_VERSION=1.1.1c
 OPENSSL_URL=https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
-OPENSSL_SHA1=056057782325134b76d1931c48f2c7e6595d7ef4
+OPENSSL_SHA1=71b830a077276cbeccc994369538617a21bee808
 
-PYTHON_VERSION=3.7.5
+PYTHON_VERSION=3.7.4
 PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
-PYTHON_SHA1=8b0311d4cca19f0ea9181731189fa33c9f5aedf9
+PYTHON_SHA1=fb1d764be8a9dcd40f2f152a610a0ab04e0d0ed3
 
 #
 # Install prerequisites.

setup.py

@@ -32,7 +32,7 @@ def find_version(*file_paths):
 install_requires = [
     'cached-property >= 1.2.0, < 2',
     'docopt >= 0.6.1, < 1',
-    'PyYAML >= 3.10, < 6',
+    'PyYAML >= 3.10, < 5',
     'requests >= 2.20.0, < 3',
     'texttable >= 0.9.0, < 2',
     'websocket-client >= 0.32.0, < 1',

tests/acceptance/cli_test.py

@@ -43,24 +43,6 @@ ProcessResult = namedtuple('ProcessResult', 'stdout stderr')
 
 BUILD_CACHE_TEXT = 'Using cache'
 BUILD_PULL_TEXT = 'Status: Image is up to date for busybox:1.27.2'
-COMPOSE_COMPATIBILITY_DICT = {
-    'version': '2.3',
-    'volumes': {'foo': {'driver': 'default'}},
-    'networks': {'bar': {}},
-    'services': {
-        'foo': {
-            'command': '/bin/true',
-            'image': 'alpine:3.10.1',
-            'scale': 3,
-            'restart': 'always:7',
-            'mem_limit': '300M',
-            'mem_reservation': '100M',
-            'cpus': 0.7,
-            'volumes': ['foo:/bar:rw'],
-            'networks': {'bar': None},
-        }
-    },
-}
 
 
 def start_process(base_dir, options):
@@ -287,7 +269,7 @@ services:
         # assert there are no python objects encoded in the output
         assert '!!' not in result.stdout
 
-        output = yaml.safe_load(result.stdout)
+        output = yaml.load(result.stdout)
         expected = {
             'version': '2.0',
             'volumes': {'data': {'driver': 'local'}},
@@ -312,7 +294,7 @@ services:
     def test_config_restart(self):
         self.base_dir = 'tests/fixtures/restart'
         result = self.dispatch(['config'])
-        assert yaml.safe_load(result.stdout) == {
+        assert yaml.load(result.stdout) == {
             'version': '2.0',
             'services': {
                 'never': {
@@ -341,7 +323,7 @@ services:
     def test_config_external_network(self):
         self.base_dir = 'tests/fixtures/networks'
         result = self.dispatch(['-f', 'external-networks.yml', 'config'])
-        json_result = yaml.safe_load(result.stdout)
+        json_result = yaml.load(result.stdout)
         assert 'networks' in json_result
         assert json_result['networks'] == {
             'networks_foo': {
@@ -355,7 +337,7 @@ services:
     def test_config_with_dot_env(self):
         self.base_dir = 'tests/fixtures/default-env-file'
         result = self.dispatch(['config'])
-        json_result = yaml.safe_load(result.stdout)
+        json_result = yaml.load(result.stdout)
         assert json_result == {
             'services': {
                 'web': {
@@ -370,7 +352,7 @@ services:
     def test_config_with_env_file(self):
         self.base_dir = 'tests/fixtures/default-env-file'
         result = self.dispatch(['--env-file', '.env2', 'config'])
-        json_result = yaml.safe_load(result.stdout)
+        json_result = yaml.load(result.stdout)
         assert json_result == {
             'services': {
                 'web': {
@@ -385,7 +367,7 @@ services:
     def test_config_with_dot_env_and_override_dir(self):
         self.base_dir = 'tests/fixtures/default-env-file'
         result = self.dispatch(['--project-directory', 'alt/', 'config'])
-        json_result = yaml.safe_load(result.stdout)
+        json_result = yaml.load(result.stdout)
         assert json_result == {
             'services': {
                 'web': {
@@ -400,7 +382,7 @@ services:
     def test_config_external_volume_v2(self):
         self.base_dir = 'tests/fixtures/volumes'
         result = self.dispatch(['-f', 'external-volumes-v2.yml', 'config'])
-        json_result = yaml.safe_load(result.stdout)
+        json_result = yaml.load(result.stdout)
         assert 'volumes' in json_result
         assert json_result['volumes'] == {
             'foo': {
@@ -416,7 +398,7 @@ services:
     def test_config_external_volume_v2_x(self):
         self.base_dir = 'tests/fixtures/volumes'
         result = self.dispatch(['-f', 'external-volumes-v2-x.yml', 'config'])
-        json_result = yaml.safe_load(result.stdout)
+        json_result = yaml.load(result.stdout)
         assert 'volumes' in json_result
         assert json_result['volumes'] == {
             'foo': {
@@ -432,7 +414,7 @@ services:
     def test_config_external_volume_v3_x(self):
         self.base_dir = 'tests/fixtures/volumes'
         result = self.dispatch(['-f', 'external-volumes-v3-x.yml', 'config'])
-        json_result = yaml.safe_load(result.stdout)
+        json_result = yaml.load(result.stdout)
         assert 'volumes' in json_result
         assert json_result['volumes'] == {
             'foo': {
@@ -448,7 +430,7 @@ services:
     def test_config_external_volume_v3_4(self):
         self.base_dir = 'tests/fixtures/volumes'
         result = self.dispatch(['-f', 'external-volumes-v3-4.yml', 'config'])
-        json_result = yaml.safe_load(result.stdout)
+        json_result = yaml.load(result.stdout)
         assert 'volumes' in json_result
         assert json_result['volumes'] == {
             'foo': {
@@ -464,7 +446,7 @@ services:
     def test_config_external_network_v3_5(self):
         self.base_dir = 'tests/fixtures/networks'
         result = self.dispatch(['-f', 'external-networks-v3-5.yml', 'config'])
-        json_result = yaml.safe_load(result.stdout)
+        json_result = yaml.load(result.stdout)
         assert 'networks' in json_result
         assert json_result['networks'] == {
             'foo': {
@@ -480,7 +462,7 @@ services:
     def test_config_v1(self):
         self.base_dir = 'tests/fixtures/v1-config'
         result = self.dispatch(['config'])
-        assert yaml.safe_load(result.stdout) == {
+        assert yaml.load(result.stdout) == {
             'version': '2.1',
             'services': {
                 'net': {
@@ -505,7 +487,7 @@ services:
         self.base_dir = 'tests/fixtures/v3-full'
         result = self.dispatch(['config'])
 
-        assert yaml.safe_load(result.stdout) == {
+        assert yaml.load(result.stdout) == {
             'version': '3.5',
             'volumes': {
                 'foobar': {
@@ -582,23 +564,24 @@ services:
         self.base_dir = 'tests/fixtures/compatibility-mode'
         result = self.dispatch(['--compatibility', 'config'])
 
-        assert yaml.load(result.stdout) == COMPOSE_COMPATIBILITY_DICT
-
-    @mock.patch.dict(os.environ)
-    def test_config_compatibility_mode_from_env(self):
-        self.base_dir = 'tests/fixtures/compatibility-mode'
-        os.environ['COMPOSE_COMPATIBILITY'] = 'true'
-        result = self.dispatch(['config'])
-
-        assert yaml.load(result.stdout) == COMPOSE_COMPATIBILITY_DICT
-
-    @mock.patch.dict(os.environ)
-    def test_config_compatibility_mode_from_env_and_option_precedence(self):
-        self.base_dir = 'tests/fixtures/compatibility-mode'
-        os.environ['COMPOSE_COMPATIBILITY'] = 'false'
-        result = self.dispatch(['--compatibility', 'config'])
-
-        assert yaml.load(result.stdout) == COMPOSE_COMPATIBILITY_DICT
+        assert yaml.load(result.stdout) == {
+            'version': '2.3',
+            'volumes': {'foo': {'driver': 'default'}},
+            'networks': {'bar': {}},
+            'services': {
+                'foo': {
+                    'command': '/bin/true',
+                    'image': 'alpine:3.10.1',
+                    'scale': 3,
+                    'restart': 'always:7',
+                    'mem_limit': '300M',
+                    'mem_reservation': '100M',
+                    'cpus': 0.7,
+                    'volumes': ['foo:/bar:rw'],
+                    'networks': {'bar': None},
+                }
+            },
+        }
 
     def test_ps(self):
         self.project.get_service('simple').create_container()
@@ -872,6 +855,32 @@ services:
         )
         assert 'Favorite Touhou Character: hong.meiling' in result.stdout
 
+    def test_bundle_with_digests(self):
+        self.base_dir = 'tests/fixtures/bundle-with-digests/'
+        tmpdir = pytest.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_build_override_dir(self):
         self.base_dir = 'tests/fixtures/build-path-override-dir'
         self.override_dir = os.path.abspath('tests/fixtures')
@@ -1571,26 +1580,6 @@ services:
         assert len(db.containers()) == 0
         assert len(console.containers()) == 0
 
-    def test_up_with_attach_dependencies(self):
-        self.base_dir = 'tests/fixtures/echo-services-dependencies'
-        result = self.dispatch(['up', '--attach-dependencies', '--no-color', 'simple'], None)
-        simple_name = self.project.get_service('simple').containers(stopped=True)[0].name_without_project
-        another_name = self.project.get_service('another').containers(
-            stopped=True
-        )[0].name_without_project
-
-        assert '{}   | simple'.format(simple_name) in result.stdout
-        assert '{}  | another'.format(another_name) in result.stdout
-
-    def test_up_handles_aborted_dependencies(self):
-        self.base_dir = 'tests/fixtures/abort-on-container-exit-dependencies'
-        proc = start_process(
-            self.base_dir,
-            ['up', 'simple', '--attach-dependencies', '--abort-on-container-exit'])
-        wait_on_condition(ContainerCountCondition(self.project, 0))
-        proc.wait()
-        assert proc.returncode == 1
-
     def test_up_with_force_recreate(self):
         self.dispatch(['up', '-d'], None)
         service = self.project.get_service('simple')

tests/fixtures/abort-on-container-exit-dependencies/docker-compose.yml

@@ -1,10 +0,0 @@
-version: "2.0"
-services:
-  simple:
-    image: busybox:1.31.0-uclibc
-    command: top
-    depends_on:
-      - another
-  another:
-    image: busybox:1.31.0-uclibc
-    command: ls /thecakeisalie

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

tests/fixtures/echo-services-dependencies/docker-compose.yml

@@ -1,10 +0,0 @@
-version: "2.0"
-services:
-  simple:
-    image: busybox:1.31.0-uclibc
-    command: echo simple
-    depends_on:
-      - another
-  another:
-    image: busybox:1.31.0-uclibc
-    command: echo another

tests/helpers.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import contextlib
 import os
 
 from compose.config.config import ConfigDetails
@@ -56,17 +55,3 @@ def create_host_file(client, filename):
         content = fh.read()
 
     return create_custom_host_file(client, filename, content)
-
-
-@contextlib.contextmanager
-def cd(path):
-    """
-    A context manager which changes the working directory to the given
-    path, and then changes it back to its previous value on exit.
-    """
-    prev_cwd = os.getcwd()
-    os.chdir(path)
-    try:
-        yield
-    finally:
-        os.chdir(prev_cwd)

tests/integration/project_test.py

@@ -8,6 +8,7 @@ import random
 import shutil
 import tempfile
 
+import py
 import pytest
 from docker.errors import APIError
 from docker.errors import NotFound
@@ -15,7 +16,6 @@ from docker.errors import NotFound
 from .. import mock
 from ..helpers import build_config as load_config
 from ..helpers import BUSYBOX_IMAGE_WITH_TAG
-from ..helpers import cd
 from ..helpers import create_host_file
 from .testcases import DockerClientTestCase
 from .testcases import SWARM_SKIP_CONTAINERS_ALL
@@ -1329,9 +1329,9 @@ class ProjectTest(DockerClientTestCase):
             })
         details = config.ConfigDetails('.', [base_file, override_file])
 
-        tmpdir = tempfile.mkdtemp('logging_test')
-        self.addCleanup(shutil.rmtree, tmpdir)
-        with cd(tmpdir):
+        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

tests/integration/state_test.py

@@ -6,10 +6,8 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import copy
-import os
-import shutil
-import tempfile
 
+import py
 from docker.errors import ImageNotFound
 
 from ..helpers import BUSYBOX_IMAGE_WITH_TAG
@@ -428,32 +426,29 @@ class ServiceStateTest(DockerClientTestCase):
 
     @no_cluster('Can not guarantee the build will be run on the same node the service is deployed')
     def test_trigger_recreate_with_build(self):
-        context = tempfile.mkdtemp('test_trigger_recreate_with_build')
-        self.addCleanup(shutil.rmtree, context)
+        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 = os.path.join(context, 'Dockerfile')
-        with open(dockerfile, mode="w") as dockerfile_fh:
-            dockerfile_fh.write(base_image)
+        dockerfile = context.join('Dockerfile')
+        dockerfile.write(base_image)
 
         web = self.create_service('web', build={'context': str(context)})
         container = web.create_container()
 
-        with open(dockerfile, mode="w") as dockerfile_fh:
-            dockerfile_fh.write(base_image + 'CMD echo hello world\n')
+        dockerfile.write(base_image + 'CMD echo hello world\n')
         web.build()
 
         web = self.create_service('web', build={'context': str(context)})
         assert ('recreate', [container]) == web.convergence_plan()
 
     def test_image_changed_to_build(self):
-        context = tempfile.mkdtemp('test_image_changed_to_build')
-        self.addCleanup(shutil.rmtree, context)
-        with open(os.path.join(context, 'Dockerfile'), mode="w") as dockerfile:
-            dockerfile.write("""
-                FROM busybox
-                LABEL com.docker.compose.test_image=true
-            """)
+        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', image='busybox')
         container = web.create_container()

tests/unit/bundle_test.py

@@ -0,0 +1,233 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import docker
+import pytest
+
+from .. import mock
+from compose import bundle
+from compose import service
+from compose.cli.errors import UserError
+from compose.config.config import Config
+from compose.const import COMPOSEFILE_V2_0 as V2_0
+from compose.service import NoSuchImageError
+
+
+@pytest.fixture
+def mock_service():
+    return mock.create_autospec(
+        service.Service,
+        client=mock.create_autospec(docker.APIClient),
+        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_from_repository(mock_service):
+    mock_service.options['image'] = 'abcd'
+    mock_service.image_name = 'abcd'
+    mock_service.image.side_effect = NoSuchImageError(None)
+    mock_service.get_image_registry_data.return_value = {'Descriptor': {'digest': 'digest'}}
+
+    digest = bundle.get_image_digest(mock_service)
+    assert digest == 'abcd@digest'
+
+
+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_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.push_image(mock_service)
+    assert digest == image_id + '@' + expected
+
+    mock_service.push.assert_called_once_with()
+    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():
+    image_digests = {'a': 'aaaa', 'b': 'bbbb'}
+    services = [
+        {'name': 'a', 'build': '.', },
+        {'name': 'b', 'build': './b'},
+    ]
+    config = Config(
+        version=V2_0,
+        services=services,
+        volumes={'special': {}},
+        networks={'extra': {}},
+        secrets={},
+        configs={}
+    )
+
+    with mock.patch('compose.bundle.log.warning', 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.warning', 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.warning', 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.warning', 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}

tests/unit/cli/main_test.py

@@ -12,7 +12,7 @@ from compose.cli.formatter import ConsoleWarningFormatter
 from compose.cli.main import build_one_off_container_options
 from compose.cli.main import call_docker
 from compose.cli.main import convergence_strategy_from_opts
-from compose.cli.main import filter_attached_containers
+from compose.cli.main import filter_containers_to_service_names
 from compose.cli.main import get_docker_start_call
 from compose.cli.main import setup_console_handler
 from compose.cli.main import warn_for_swarm_mode
@@ -37,7 +37,7 @@ def logging_handler():
 
 class TestCLIMainTestCase(object):
 
-    def test_filter_attached_containers(self):
+    def test_filter_containers_to_service_names(self):
         containers = [
             mock_container('web', 1),
             mock_container('web', 2),
@@ -46,29 +46,17 @@ class TestCLIMainTestCase(object):
             mock_container('another', 1),
         ]
         service_names = ['web', 'db']
-        actual = filter_attached_containers(containers, service_names)
+        actual = filter_containers_to_service_names(containers, service_names)
         assert actual == containers[:3]
 
-    def test_filter_attached_containers_with_dependencies(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']
-        actual = filter_attached_containers(containers, service_names, attach_dependencies=True)
-        assert actual == containers
-
-    def test_filter_attached_containers_all(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 = []
-        actual = filter_attached_containers(containers, service_names)
+        actual = filter_containers_to_service_names(containers, service_names)
         assert actual == containers
 
     def test_warning_in_swarm_mode(self):

tests/unit/config/config_test.py

@@ -10,6 +10,7 @@ import tempfile
 from operator import itemgetter
 from random import shuffle
 
+import py
 import pytest
 import yaml
 from ddt import data
@@ -17,7 +18,6 @@ from ddt import ddt
 
 from ...helpers import build_config_details
 from ...helpers import BUSYBOX_IMAGE_WITH_TAG
-from ...helpers import cd
 from compose.config import config
 from compose.config import types
 from compose.config.config import ConfigFile
@@ -780,14 +780,13 @@ class ConfigTest(unittest.TestCase):
             })
         details = config.ConfigDetails('.', [base_file, override_file])
 
-        tmpdir = tempfile.mkdtemp('config_test')
-        self.addCleanup(shutil.rmtree, tmpdir)
-        with open(os.path.join(tmpdir, 'common.yml'), mode="w") as common_fh:
-            common_fh.write("""
-                base:
-                  labels: ['label=one']
-            """)
-        with cd(tmpdir):
+        tmpdir = py.test.ensuretemp('config_test')
+        self.addCleanup(tmpdir.remove)
+        tmpdir.join('common.yml').write("""
+            base:
+              labels: ['label=one']
+        """)
+        with tmpdir.as_cwd():
             service_dicts = config.load(details).services
 
         expected = [
@@ -816,20 +815,19 @@ class ConfigTest(unittest.TestCase):
             }
         )
 
-        tmpdir = tempfile.mkdtemp('config_test')
-        self.addCleanup(shutil.rmtree, tmpdir)
-        with open(os.path.join(tmpdir, 'base.yml'), mode="w") as base_fh:
-            base_fh.write("""
-                version: '2.2'
-                services:
-                  base:
-                    image: base
-                  web:
-                    extends: base
-            """)
+        tmpdir = pytest.ensuretemp('config_test')
+        self.addCleanup(tmpdir.remove)
+        tmpdir.join('base.yml').write("""
+            version: '2.2'
+            services:
+              base:
+                image: base
+              web:
+                extends: base
+        """)
 
         details = config.ConfigDetails('.', [main_file])
-        with cd(tmpdir):
+        with tmpdir.as_cwd():
             service_dicts = config.load(details).services
             assert service_dicts[0] == {
                 'name': 'prodweb',
@@ -1767,23 +1765,22 @@ class ConfigTest(unittest.TestCase):
         assert services[0]['environment']['SPRING_JPA_HIBERNATE_DDL-AUTO'] == 'none'
 
     def test_load_yaml_with_yaml_error(self):
-        tmpdir = tempfile.mkdtemp('invalid_yaml_test')
-        self.addCleanup(shutil.rmtree, tmpdir)
-        invalid_yaml_file = os.path.join(tmpdir, 'docker-compose.yml')
-        with open(invalid_yaml_file, mode="w") as invalid_yaml_file_fh:
-            invalid_yaml_file_fh.write("""
-web:
-    this is bogus: ok: what
-            """)
+        tmpdir = py.test.ensuretemp('invalid_yaml_test')
+        self.addCleanup(tmpdir.remove)
+        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 22' in exc.exconly()
+        assert 'line 3, column 32' in exc.exconly()
 
     def test_load_yaml_with_bom(self):
-        tmpdir = tempfile.mkdtemp('bom_yaml')
-        self.addCleanup(shutil.rmtree, tmpdir)
-        bom_yaml = os.path.join(tmpdir, 'docker-compose.yml')
+        tmpdir = py.test.ensuretemp('bom_yaml')
+        self.addCleanup(tmpdir.remove)
+        bom_yaml = tmpdir.join('docker-compose.yml')
         with codecs.open(str(bom_yaml), 'w', encoding='utf-8') as f:
             f.write('''\ufeff
                 version: '2.3'
@@ -4727,48 +4724,43 @@ class ExtendsTest(unittest.TestCase):
 
     @mock.patch.dict(os.environ)
     def test_extends_with_environment_and_env_files(self):
-        tmpdir = tempfile.mkdtemp('test_extends_with_environment')
-        self.addCleanup(shutil.rmtree, tmpdir)
-        commondir = os.path.join(tmpdir, 'common')
-        os.mkdir(commondir)
-        with open(os.path.join(commondir, 'base.yml'), mode="w") as base_fh:
-            base_fh.write("""
-                app:
-                    image: 'example/app'
-                    env_file:
-                        - 'envs'
-                    environment:
-                        - SECRET
-                        - TEST_ONE=common
-                        - TEST_TWO=common
-            """)
-        with open(os.path.join(tmpdir, 'docker-compose.yml'), mode="w") as docker_compose_fh:
-            docker_compose_fh.write("""
-                ext:
-                    extends:
-                        file: common/base.yml
-                        service: app
-                    env_file:
-                        - 'envs'
-                    environment:
-                        - THING
-                        - TEST_ONE=top
-            """)
-        with open(os.path.join(commondir, 'envs'), mode="w") as envs_fh:
-            envs_fh.write("""
-                COMMON_ENV_FILE
-                TEST_ONE=common-env-file
-                TEST_TWO=common-env-file
-                TEST_THREE=common-env-file
-                TEST_FOUR=common-env-file
-            """)
-        with open(os.path.join(tmpdir, 'envs'), mode="w") as envs_fh:
-            envs_fh.write("""
-                TOP_ENV_FILE
-                TEST_ONE=top-env-file
-                TEST_TWO=top-env-file
-                TEST_THREE=top-env-file
-            """)
+        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
+                    - TEST_ONE=common
+                    - TEST_TWO=common
+        """)
+        tmpdir.join('docker-compose.yml').write("""
+            ext:
+                extends:
+                    file: common/base.yml
+                    service: app
+                env_file:
+                    - 'envs'
+                environment:
+                    - THING
+                    - TEST_ONE=top
+        """)
+        commondir.join('envs').write("""
+            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("""
+            TOP_ENV_FILE
+            TEST_ONE=top-env-file
+            TEST_TWO=top-env-file
+            TEST_THREE=top-env-file
+        """)
 
         expected = [
             {
@@ -4791,77 +4783,72 @@ class ExtendsTest(unittest.TestCase):
         os.environ['THING'] = 'thing'
         os.environ['COMMON_ENV_FILE'] = 'secret'
         os.environ['TOP_ENV_FILE'] = 'secret'
-        config = load_from_filename(str(os.path.join(tmpdir, 'docker-compose.yml')))
+        config = load_from_filename(str(tmpdir.join('docker-compose.yml')))
 
         assert config == expected
 
     def test_extends_with_mixed_versions_is_error(self):
-        tmpdir = tempfile.mkdtemp('test_extends_with_mixed_version')
-        self.addCleanup(shutil.rmtree, tmpdir)
-        with open(os.path.join(tmpdir, 'docker-compose.yml'), mode="w") as docker_compose_fh:
-            docker_compose_fh.write("""
-                version: "2"
-                services:
-                  web:
-                    extends:
-                      file: base.yml
-                      service: base
-                    image: busybox
-            """)
-        with open(os.path.join(tmpdir, 'base.yml'), mode="w") as base_fh:
-            base_fh.write("""
-                base:
-                  volumes: ['/foo']
-                  ports: ['3000:3000']
-            """)
+        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(os.path.join(tmpdir, 'docker-compose.yml')))
+            load_from_filename(str(tmpdir.join('docker-compose.yml')))
         assert 'Version mismatch' in exc.exconly()
 
     def test_extends_with_defined_version_passes(self):
-        tmpdir = tempfile.mkdtemp('test_extends_with_defined_version')
-        self.addCleanup(shutil.rmtree, tmpdir)
-        with open(os.path.join(tmpdir, 'docker-compose.yml'), mode="w") as docker_compose_fh:
-            docker_compose_fh.write("""
-                version: "2"
-                services:
-                  web:
-                    extends:
-                      file: base.yml
-                      service: base
-                    image: busybox
-            """)
-        with open(os.path.join(tmpdir, 'base.yml'), mode="w") as base_fh:
-            base_fh.write("""
-                version: "2"
-                services:
-                  base:
-                    volumes: ['/foo']
-                    ports: ['3000:3000']
-                    command: top
-            """)
+        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(os.path.join(tmpdir, 'docker-compose.yml')))
+        service = load_from_filename(str(tmpdir.join('docker-compose.yml')))
         assert service[0]['command'] == "top"
 
     def test_extends_with_depends_on(self):
-        tmpdir = tempfile.mkdtemp('test_extends_with_depends_on')
-        self.addCleanup(shutil.rmtree, tmpdir)
-        with open(os.path.join(tmpdir, 'docker-compose.yml'), mode="w") as docker_compose_fh:
-            docker_compose_fh.write("""
-                version: "2"
-                services:
-                  base:
-                    image: example
-                  web:
-                    extends: base
-                    image: busybox
-                    depends_on: ['other']
-                  other:
-                    image: example
-            """)
-        services = load_from_filename(str(os.path.join(tmpdir, 'docker-compose.yml')))
+        tmpdir = py.test.ensuretemp('test_extends_with_depends_on')
+        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': {'condition': 'service_started'}
         }
@@ -4880,47 +4867,45 @@ class ExtendsTest(unittest.TestCase):
         }]
 
     def test_extends_with_ports(self):
-        tmpdir = tempfile.mkdtemp('test_extends_with_ports')
-        self.addCleanup(shutil.rmtree, tmpdir)
-        with open(os.path.join(tmpdir, 'docker-compose.yml'), mode="w") as docker_compose_fh:
-            docker_compose_fh.write("""
-                version: '2'
+        tmpdir = py.test.ensuretemp('test_extends_with_ports')
+        self.addCleanup(tmpdir.remove)
+        tmpdir.join('docker-compose.yml').write("""
+            version: '2'
 
-                services:
-                  a:
-                    image: nginx
-                    ports:
-                      - 80
+            services:
+              a:
+                image: nginx
+                ports:
+                  - 80
 
-                  b:
-                    extends:
-                      service: a
-            """)
-        services = load_from_filename(str(os.path.join(tmpdir, 'docker-compose.yml')))
+              b:
+                extends:
+                  service: a
+        """)
+        services = load_from_filename(str(tmpdir.join('docker-compose.yml')))
 
         assert len(services) == 2
         for svc in services:
             assert svc['ports'] == [types.ServicePort('80', None, None, None, None)]
 
     def test_extends_with_security_opt(self):
-        tmpdir = tempfile.mkdtemp('test_extends_with_ports')
-        self.addCleanup(shutil.rmtree, tmpdir)
-        with open(os.path.join(tmpdir, 'docker-compose.yml'), mode="w") as docker_compose_fh:
-            docker_compose_fh.write("""
-                version: '2'
+        tmpdir = py.test.ensuretemp('test_extends_with_ports')
+        self.addCleanup(tmpdir.remove)
+        tmpdir.join('docker-compose.yml').write("""
+            version: '2'
 
-                services:
-                  a:
-                    image: nginx
-                    security_opt:
-                    - apparmor:unconfined
-                    - seccomp:unconfined
+            services:
+              a:
+                image: nginx
+                security_opt:
+                  - apparmor:unconfined
+                  - seccomp:unconfined
 
-                  b:
-                    extends:
-                      service: a
-            """)
-        services = load_from_filename(str(os.path.join(tmpdir, 'docker-compose.yml')))
+              b:
+                extends:
+                  service: a
+        """)
+        services = load_from_filename(str(tmpdir.join('docker-compose.yml')))
         assert len(services) == 2
         for svc in services:
             assert types.SecurityOpt.parse('apparmor:unconfined') in svc['security_opt']
@@ -5075,7 +5060,7 @@ class HealthcheckTest(unittest.TestCase):
             })
         )
 
-        serialized_config = yaml.safe_load(serialize_config(config_dict))
+        serialized_config = yaml.load(serialize_config(config_dict))
         serialized_service = serialized_config['services']['test']
 
         assert serialized_service['healthcheck'] == {
@@ -5102,7 +5087,7 @@ class HealthcheckTest(unittest.TestCase):
             })
         )
 
-        serialized_config = yaml.safe_load(serialize_config(config_dict))
+        serialized_config = yaml.load(serialize_config(config_dict))
         serialized_service = serialized_config['services']['test']
 
         assert serialized_service['healthcheck'] == {
@@ -5309,7 +5294,7 @@ class SerializeTest(unittest.TestCase):
             'secrets': secrets_dict
         }))
 
-        serialized_config = yaml.safe_load(serialize_config(config_dict))
+        serialized_config = yaml.load(serialize_config(config_dict))
         serialized_service = serialized_config['services']['web']
         assert secret_sort(serialized_service['secrets']) == secret_sort(service_dict['secrets'])
         assert 'secrets' in serialized_config
@@ -5324,7 +5309,7 @@ class SerializeTest(unittest.TestCase):
             }
         ], volumes={}, networks={}, secrets={}, configs={})
 
-        serialized_config = yaml.safe_load(serialize_config(config_dict))
+        serialized_config = yaml.load(serialize_config(config_dict))
         assert '8080:80/tcp' in serialized_config['services']['web']['ports']
 
     def test_serialize_ports_with_ext_ip(self):
@@ -5336,7 +5321,7 @@ class SerializeTest(unittest.TestCase):
             }
         ], volumes={}, networks={}, secrets={}, configs={})
 
-        serialized_config = yaml.safe_load(serialize_config(config_dict))
+        serialized_config = yaml.load(serialize_config(config_dict))
         assert '127.0.0.1:8080:80/tcp' in serialized_config['services']['web']['ports']
 
     def test_serialize_configs(self):
@@ -5364,7 +5349,7 @@ class SerializeTest(unittest.TestCase):
             'configs': configs_dict
         }))
 
-        serialized_config = yaml.safe_load(serialize_config(config_dict))
+        serialized_config = yaml.load(serialize_config(config_dict))
         serialized_service = serialized_config['services']['web']
         assert secret_sort(serialized_service['configs']) == secret_sort(service_dict['configs'])
         assert 'configs' in serialized_config
@@ -5404,7 +5389,7 @@ class SerializeTest(unittest.TestCase):
         }
         config_dict = config.load(build_config_details(cfg))
 
-        serialized_config = yaml.safe_load(serialize_config(config_dict))
+        serialized_config = yaml.load(serialize_config(config_dict))
         serialized_service = serialized_config['services']['web']
         assert serialized_service['environment']['CURRENCY'] == '$$'
         assert serialized_service['command'] == 'echo $$FOO'
@@ -5426,7 +5411,7 @@ class SerializeTest(unittest.TestCase):
         }
         config_dict = config.load(build_config_details(cfg), interpolate=False)
 
-        serialized_config = yaml.safe_load(serialize_config(config_dict, escape_dollar=False))
+        serialized_config = yaml.load(serialize_config(config_dict, escape_dollar=False))
         serialized_service = serialized_config['services']['web']
         assert serialized_service['environment']['CURRENCY'] == '$'
         assert serialized_service['command'] == 'echo $FOO'
@@ -5445,7 +5430,7 @@ class SerializeTest(unittest.TestCase):
 
         config_dict = config.load(build_config_details(cfg))
 
-        serialized_config = yaml.safe_load(serialize_config(config_dict))
+        serialized_config = yaml.load(serialize_config(config_dict))
         serialized_service = serialized_config['services']['web']
         assert serialized_service['command'] == 'echo 十六夜　咲夜'
 
@@ -5461,6 +5446,6 @@ class SerializeTest(unittest.TestCase):
         }
 
         config_dict = config.load(build_config_details(cfg))
-        serialized_config = yaml.safe_load(serialize_config(config_dict))
+        serialized_config = yaml.load(serialize_config(config_dict))
         serialized_volume = serialized_config['volumes']['test']
         assert serialized_volume['external'] is False

tests/unit/config/environment_test.py

@@ -4,9 +4,6 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 import codecs
-import os
-import shutil
-import tempfile
 
 import pytest
 
@@ -49,19 +46,19 @@ class EnvironmentTest(unittest.TestCase):
         assert env.get_boolean('UNDEFINED') is False
 
     def test_env_vars_from_file_bom(self):
-        tmpdir = tempfile.mkdtemp('env_file')
-        self.addCleanup(shutil.rmtree, tmpdir)
+        tmpdir = pytest.ensuretemp('env_file')
+        self.addCleanup(tmpdir.remove)
         with codecs.open('{}/bom.env'.format(str(tmpdir)), 'w', encoding='utf-8') as f:
             f.write('\ufeffPARK_BOM=박봄\n')
-        assert env_vars_from_file(str(os.path.join(tmpdir, 'bom.env'))) == {
+        assert env_vars_from_file(str(tmpdir.join('bom.env'))) == {
             'PARK_BOM': '박봄'
         }
 
     def test_env_vars_from_file_whitespace(self):
-        tmpdir = tempfile.mkdtemp('env_file')
-        self.addCleanup(shutil.rmtree, tmpdir)
+        tmpdir = pytest.ensuretemp('env_file')
+        self.addCleanup(tmpdir.remove)
         with codecs.open('{}/whitespace.env'.format(str(tmpdir)), 'w', encoding='utf-8') as f:
             f.write('WHITESPACE =yes\n')
         with pytest.raises(ConfigurationError) as exc:
-            env_vars_from_file(str(os.path.join(tmpdir, 'whitespace.env')))
+            env_vars_from_file(str(tmpdir.join('whitespace.env')))
         assert 'environment variable' in exc.exconly()