"Bump 1.28.6"

Signed-off-by: Anca Iordache <anca.iordache@docker.com>

CHANGELOG.md

@@ -1,44 +1,6 @@
 Change log
 ==========
 
-1.29.1 (2021-04-13)
--------------------
-
-[List of PRs / issues for this release](https://github.com/docker/compose/milestone/58?closed=1)
-
-### Bugs
-
-- Fix for invalid handler warning on Windows builds
-
-- Fix config hash to trigger container recreation on IPC mode updates
-
-- Fix conversion map for `placement.max_replicas_per_node`
-
-- Remove extra scan suggestion on build
-
-1.29.0 (2021-04-06)
--------------------
-
-[List of PRs / issues for this release](https://github.com/docker/compose/milestone/56?closed=1)
-
-### Features
-
-- Add profile filter to `docker-compose config`
-
-- Add a `depends_on` condition to wait for successful service completion
-
-### Miscellaneous
-
-- Add image scan message on build
-
-- Update warning message for `--no-ansi` to mention `--ansi never` as alternative
-
-- Bump docker-py to 5.0.0
-
-- Bump PyYAML to 5.4.1
-
-- Bump python-dotenv to 0.17.0
-
 1.28.6 (2021-03-23)
 -------------------
 
@@ -46,7 +8,9 @@ Change log
 
 ### Bugs
 
-- Make `--env-file` relative to the current working directory and error out for invalid paths. Environment file paths set with `--env-file` are relative to the current working directory while the default `.env` file is located in the project directory which by default is the base directory of the Compose file.
+- Make `--env-file` relative to the current working directory and error out for invalid paths. Environment file paths set
+with `--env-file` are relative to the current working directory while the default `.env` file is located in the project
+directory which by default is the base directory of the Compose file.
 
 - Fix missing service property `storage_opt` by updating the compose schema
 
@@ -186,7 +150,10 @@ Change log
 
 - Updates of READMEs
 
+<<<<<<< HEAD
+=======
 
+>>>>>>> master
 1.27.4 (2020-09-24)
 -------------------
 

compose/__init__.py

@@ -1 +1 @@
-__version__ = '1.29.1'
+__version__ = '1.28.6'

compose/cli/main.py

@@ -82,7 +82,7 @@ def main():  # noqa: C901
         if not IS_LINUX_PLATFORM and command == 'help':
             print("\nDocker Compose is now in the Docker CLI, try `docker compose` help")
     except (KeyboardInterrupt, signals.ShutdownException):
-        exit_with_metrics(command, "Aborting.", status=Status.CANCELED)
+        exit_with_metrics(command, "Aborting.", status=Status.FAILURE)
     except (UserError, NoSuchService, ConfigurationError,
             ProjectError, OperationFailedError) as e:
         exit_with_metrics(command, e.msg, status=Status.FAILURE)
@@ -103,8 +103,7 @@ def main():  # noqa: C901
         commands = "\n".join(parse_doc_section("commands:", getdoc(e.supercommand)))
         if not IS_LINUX_PLATFORM:
             commands += "\n\nDocker Compose is now in the Docker CLI, try `docker compose`"
-        exit_with_metrics("", log_msg="No such command: {}\n\n{}".format(
-            e.command, commands), status=Status.FAILURE)
+        exit_with_metrics(e.command, "No such command: {}\n\n{}".format(e.command, commands))
     except (errors.ConnectionError, StreamParseError):
         exit_with_metrics(command, status=Status.FAILURE)
     except SystemExit as e:
@@ -172,8 +171,7 @@ def dispatch():
     if options.get("--no-ansi"):
         if options.get("--ansi"):
             raise UserError("--no-ansi and --ansi cannot be combined.")
-        log.warning('--no-ansi option is deprecated and will be removed in future versions. '
-                    'Use `--ansi never` instead.')
+        log.warning('--no-ansi option is deprecated and will be removed in future versions.')
         ansi_mode = AnsiMode.NEVER
 
     setup_console_handler(console_handler,
@@ -392,7 +390,6 @@ class TopLevelCommand:
             --no-interpolate         Don't interpolate environment variables.
             -q, --quiet              Only validate the configuration, don't print
                                      anything.
-            --profiles               Print the profile names, one per line.
             --services               Print the service names, one per line.
             --volumes                Print the volume names, one per line.
             --hash="*"               Print the service config hash, one per line.
@@ -412,15 +409,6 @@ class TopLevelCommand:
         if options['--quiet']:
             return
 
-        if options['--profiles']:
-            profiles = set()
-            for service in compose_config.services:
-                if 'profiles' in service:
-                    for profile in service['profiles']:
-                        profiles.add(profile)
-            print('\n'.join(sorted(profiles)))
-            return
-
         if options['--services']:
             print('\n'.join(service['name'] for service in compose_config.services))
             return

compose/config/compose_spec.json

@@ -188,7 +188,7 @@
                   "properties": {
                     "condition": {
                       "type": "string",
-                      "enum": ["service_started", "service_healthy", "service_completed_successfully"]
+                      "enum": ["service_started", "service_healthy"]
                     }
                   },
                   "required": ["condition"]

compose/config/interpolation.py

@@ -243,7 +243,6 @@ class ConversionMap:
         service_path('healthcheck', 'disable'): to_boolean,
         service_path('deploy', 'labels', PATH_JOKER): to_str,
         service_path('deploy', 'replicas'): to_int,
-        service_path('deploy', 'placement', 'max_replicas_per_node'): to_int,
         service_path('deploy', 'resources', 'limits', "cpus"): to_float,
         service_path('deploy', 'update_config', 'parallelism'): to_int,
         service_path('deploy', 'update_config', 'max_failure_ratio'): to_float,

compose/errors.py

@@ -27,8 +27,3 @@ class NoHealthCheckConfigured(HealthCheckException):
                 service_name
             )
         )
-
-
-class CompletedUnsuccessfully(Exception):
-    def __init__(self, container_id, exit_code):
-        self.msg = 'Container "{}" exited with code {}.'.format(container_id, exit_code)

compose/metrics/client.py

@@ -36,7 +36,7 @@ class MetricsCommand(requests.Session):
                  context_type=None, status=Status.SUCCESS,
                  source=MetricsSource.CLI, uri=None):
         super().__init__()
-        self.command = ("compose " + command).strip() if command else "compose --help"
+        self.command = "compose " + command if command else "compose --help"
         self.context = context_type or ContextAPI.get_current_context().context_type or 'moby'
         self.source = source
         self.status = status.value

compose/parallel.py

@@ -16,7 +16,6 @@ from compose.cli.colors import green
 from compose.cli.colors import red
 from compose.cli.signals import ShutdownException
 from compose.const import PARALLEL_LIMIT
-from compose.errors import CompletedUnsuccessfully
 from compose.errors import HealthCheckFailed
 from compose.errors import NoHealthCheckConfigured
 from compose.errors import OperationFailedError
@@ -62,8 +61,7 @@ def parallel_execute_watch(events, writer, errors, results, msg, get_name, fail_
         elif isinstance(exception, APIError):
             errors[get_name(obj)] = exception.explanation
             writer.write(msg, get_name(obj), 'error', red)
-        elif isinstance(exception, (OperationFailedError, HealthCheckFailed, NoHealthCheckConfigured,
-                                    CompletedUnsuccessfully)):
+        elif isinstance(exception, (OperationFailedError, HealthCheckFailed, NoHealthCheckConfigured)):
             errors[get_name(obj)] = exception.msg
             writer.write(msg, get_name(obj), 'error', red)
         elif isinstance(exception, UpstreamError):
@@ -243,12 +241,6 @@ def feed_queue(objects, func, get_deps, results, state, limiter):
                 'not processing'.format(obj)
             )
             results.put((obj, None, e))
-        except CompletedUnsuccessfully as e:
-            log.debug(
-                'Service(s) upstream of {} did not completed successfully - '
-                'not processing'.format(obj)
-            )
-            results.put((obj, None, e))
 
     if state.is_done():
         results.put(STOP)

compose/service.py

@@ -1,5 +1,6 @@
 import enum
 import itertools
+import json
 import logging
 import os
 import re
@@ -44,7 +45,6 @@ from .const import LABEL_VERSION
 from .const import NANOCPUS_SCALE
 from .const import WINDOWS_LONGPATH_PREFIX
 from .container import Container
-from .errors import CompletedUnsuccessfully
 from .errors import HealthCheckFailed
 from .errors import NoHealthCheckConfigured
 from .errors import OperationFailedError
@@ -112,7 +112,6 @@ HOST_CONFIG_KEYS = [
 
 CONDITION_STARTED = 'service_started'
 CONDITION_HEALTHY = 'service_healthy'
-CONDITION_COMPLETED_SUCCESSFULLY = 'service_completed_successfully'
 
 
 class BuildError(Exception):
@@ -713,7 +712,6 @@ class Service:
             'image_id': image_id(),
             'links': self.get_link_names(),
             'net': self.network_mode.id,
-            'ipc_mode': self.ipc_mode.mode,
             'networks': self.networks,
             'secrets': self.secrets,
             'volumes_from': [
@@ -755,8 +753,6 @@ class Service:
                 configs[svc] = lambda s: True
             elif config['condition'] == CONDITION_HEALTHY:
                 configs[svc] = lambda s: s.is_healthy()
-            elif config['condition'] == CONDITION_COMPLETED_SUCCESSFULLY:
-                configs[svc] = lambda s: s.is_completed_successfully()
             else:
                 # The config schema already prevents this, but it might be
                 # bypassed if Compose is called programmatically.
@@ -1107,9 +1103,8 @@ class Service:
                 'Impossible to perform platform-targeted builds for API version < 1.35'
             )
 
-        builder = _ClientBuilder(self.client) if not cli else _CLIBuilder(progress)
-        return builder.build(
-            service=self,
+        builder = self.client if not cli else _CLIBuilder(progress)
+        build_output = builder.build(
             path=path,
             tag=self.image_name,
             rm=rm,
@@ -1130,7 +1125,30 @@ class Service:
             gzip=gzip,
             isolation=build_opts.get('isolation', self.options.get('isolation', None)),
             platform=self.platform,
-            output_stream=output_stream)
+        )
+
+        try:
+            all_events = list(stream_output(build_output, output_stream))
+        except StreamOutputError as e:
+            raise BuildError(self, str(e))
+
+        # Ensure the HTTP connection is not reused for another
+        # streaming command, as the Docker daemon can sometimes
+        # complain about it
+        self.client.close()
+
+        image_id = None
+
+        for event in all_events:
+            if 'stream' in event:
+                match = re.search(r'Successfully built ([0-9a-f]+)', event.get('stream', ''))
+                if match:
+                    image_id = match.group(1)
+
+        if image_id is None:
+            raise BuildError(self, event if all_events else 'Unknown')
+
+        return image_id
 
     def get_cache_from(self, build_opts):
         cache_from = build_opts.get('cache_from', None)
@@ -1286,21 +1304,6 @@ class Service:
                 raise HealthCheckFailed(ctnr.short_id)
         return result
 
-    def is_completed_successfully(self):
-        """ Check that all containers for this service has completed successfully
-            Returns false if at least one container does not exited and
-            raises CompletedUnsuccessfully exception if at least one container
-            exited with non-zero exit code.
-        """
-        result = True
-        for ctnr in self.containers(stopped=True):
-            ctnr.inspect()
-            if ctnr.get('State.Status') != 'exited':
-                result = False
-            elif ctnr.exit_code != 0:
-                raise CompletedUnsuccessfully(ctnr.short_id, ctnr.exit_code)
-        return result
-
     def _parse_proxy_config(self):
         client = self.client
         if 'proxies' not in client._general_configs:
@@ -1787,77 +1790,20 @@ def rewrite_build_path(path):
     return path
 
 
-class _ClientBuilder:
-    def __init__(self, client):
-        self.client = client
-
-    def build(self, service, path, tag=None, quiet=False, fileobj=None,
-              nocache=False, rm=False, timeout=None,
-              custom_context=False, encoding=None, pull=False,
-              forcerm=False, dockerfile=None, container_limits=None,
-              decode=False, buildargs=None, gzip=False, shmsize=None,
-              labels=None, cache_from=None, target=None, network_mode=None,
-              squash=None, extra_hosts=None, platform=None, isolation=None,
-              use_config_proxy=True, output_stream=sys.stdout):
-        build_output = self.client.build(
-            path=path,
-            tag=tag,
-            nocache=nocache,
-            rm=rm,
-            pull=pull,
-            forcerm=forcerm,
-            dockerfile=dockerfile,
-            labels=labels,
-            cache_from=cache_from,
-            buildargs=buildargs,
-            network_mode=network_mode,
-            target=target,
-            shmsize=shmsize,
-            extra_hosts=extra_hosts,
-            container_limits=container_limits,
-            gzip=gzip,
-            isolation=isolation,
-            platform=platform)
-
-        try:
-            all_events = list(stream_output(build_output, output_stream))
-        except StreamOutputError as e:
-            raise BuildError(service, str(e))
-
-        # Ensure the HTTP connection is not reused for another
-        # streaming command, as the Docker daemon can sometimes
-        # complain about it
-        self.client.close()
-
-        image_id = None
-
-        for event in all_events:
-            if 'stream' in event:
-                match = re.search(r'Successfully built ([0-9a-f]+)', event.get('stream', ''))
-                if match:
-                    image_id = match.group(1)
-
-        if image_id is None:
-            raise BuildError(service, event if all_events else 'Unknown')
-
-        return image_id
-
-
 class _CLIBuilder:
     def __init__(self, progress):
         self._progress = progress
 
-    def build(self, service, path, tag=None, quiet=False, fileobj=None,
+    def build(self, path, tag=None, quiet=False, fileobj=None,
               nocache=False, rm=False, timeout=None,
               custom_context=False, encoding=None, pull=False,
               forcerm=False, dockerfile=None, container_limits=None,
               decode=False, buildargs=None, gzip=False, shmsize=None,
               labels=None, cache_from=None, target=None, network_mode=None,
               squash=None, extra_hosts=None, platform=None, isolation=None,
-              use_config_proxy=True, output_stream=sys.stdout):
+              use_config_proxy=True):
         """
         Args:
-            service (str): Service to be built
             path (str): Path to the directory containing the Dockerfile
             buildargs (dict): A dictionary of build arguments
             cache_from (:py:class:`list`): A list of images used for build
@@ -1906,7 +1852,6 @@ class _CLIBuilder:
                 configuration file (``~/.docker/config.json`` by default)
                 contains a proxy configuration, the corresponding environment
                 variables will be set in the container being built.
-            output_stream (writer): stream to use for build logs
         Returns:
             A generator for the build output.
         """
@@ -1939,18 +1884,33 @@ class _CLIBuilder:
 
         args = command_builder.build([path])
 
-        with subprocess.Popen(args, stdout=output_stream, stderr=sys.stderr,
+        magic_word = "Successfully built "
+        appear = False
+        with subprocess.Popen(args, stdout=subprocess.PIPE,
                               universal_newlines=True) as p:
+            while True:
+                line = p.stdout.readline()
+                if not line:
+                    break
+                if line.startswith(magic_word):
+                    appear = True
+                yield json.dumps({"stream": line})
+
             p.communicate()
             if p.returncode != 0:
-                raise BuildError(service, "Build failed")
+                raise StreamOutputError()
 
         with open(iidfile) as f:
             line = f.readline()
             image_id = line.split(":")[1].strip()
         os.remove(iidfile)
 
-        return image_id
+        # In case of `DOCKER_BUILDKIT=1`
+        # there is no success message already present in the output.
+        # Since that's the way `Service::build` gets the `image_id`
+        # it has to be added `manually`
+        if not appear:
+            yield json.dumps({"stream": "{}{}\n".format(magic_word, image_id)})
 
 
 class _CommandBuilder:

contrib/completion/bash/docker-compose

@@ -138,7 +138,7 @@ _docker_compose_config() {
 			;;
 	esac
 
-	COMPREPLY=( $( compgen -W "--hash --help --no-interpolate --profiles --quiet -q --resolve-image-digests --services --volumes" -- "$cur" ) )
+	COMPREPLY=( $( compgen -W "--hash --help --no-interpolate --quiet -q --resolve-image-digests --services --volumes" -- "$cur" ) )
 }
 
 
@@ -172,10 +172,6 @@ _docker_compose_docker_compose() {
 			COMPREPLY=( $( compgen -W "debug info warning error critical" -- "$cur" ) )
 			return
 			;;
-		--profile)
-			COMPREPLY=( $( compgen -W "$(__docker_compose_q config --profiles)" -- "$cur" ) )
-			return
-			;;
 		--project-directory)
 			_filedir -d
 			return
@@ -622,11 +618,10 @@ _docker_compose() {
 		--tlskey
 	"
 
-	# These options require special treatment when searching the command.
+	# These options are require special treatment when searching the command.
 	local top_level_options_with_args="
 		--ansi
 		--log-level
-		--profile
 	"
 
 	COMPREPLY=()

requirements-dev.txt

@@ -1,5 +1,5 @@
 Click==7.1.2
-coverage==5.5
+coverage==5.2.1
 ddt==1.4.1
 flake8==3.8.3
 gitpython==3.1.11
@@ -7,3 +7,4 @@ mock==3.0.5
 pytest==6.0.1; python_version >= '3.5'
 pytest==4.6.5; python_version < '3.5'
 pytest-cov==2.10.1
+PyYAML==5.3.1

requirements-indirect.txt

@@ -11,7 +11,7 @@ gitdb2==4.0.2
 mccabe==0.6.1
 more-itertools==8.6.0; python_version >= '3.5'
 more-itertools==5.0.0; python_version < '3.5'
-packaging==20.9
+packaging==20.4
 pluggy==0.13.1
 py==1.9.0
 pycodestyle==2.6.0

requirements.txt

@@ -4,7 +4,7 @@ certifi==2020.6.20
 chardet==3.0.4
 colorama==0.4.3; sys_platform == 'win32'
 distro==1.5.0
-docker==5.0.0
+docker==4.4.4
 docker-pycreds==0.4.0
 dockerpty==0.4.1
 docopt==0.6.2
@@ -13,9 +13,9 @@ ipaddress==1.0.23
 jsonschema==3.2.0
 paramiko==2.7.1
 PySocks==1.7.1
-python-dotenv==0.17.0
+python-dotenv==0.14.0
 pywin32==227; sys_platform == 'win32'
-PyYAML==5.4.1
+PyYAML==5.3.1
 requests==2.24.0
 texttable==1.6.2
 urllib3==1.25.10; python_version == '3.3'

script/run/run.sh

@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.29.1"
+VERSION="1.28.6"
 IMAGE="docker/compose:$VERSION"
 
 

setup.py

@@ -31,7 +31,7 @@ install_requires = [
     'texttable >= 0.9.0, < 2',
     'websocket-client >= 0.32.0, < 1',
     'distro >= 1.5.0, < 2',
-    'docker[ssh] >= 5',
+    'docker[ssh] >= 4.4.4, < 5',
     'dockerpty >= 0.4.1, < 1',
     'jsonschema >= 2.5.1, < 4',
     'python-dotenv >= 0.13.0, < 1',

tests/acceptance/cli_test.py

@@ -237,11 +237,6 @@ class CLITestCase(DockerClientTestCase):
         result = self.dispatch(['-H=tcp://doesnotexist:8000', 'ps'], returncode=1)
         assert "Couldn't connect to Docker daemon" in result.stderr
 
-    def test_config_list_profiles(self):
-        self.base_dir = 'tests/fixtures/config-profiles'
-        result = self.dispatch(['config', '--profiles'])
-        assert set(result.stdout.rstrip().split('\n')) == {'debug', 'frontend', 'gui'}
-
     def test_config_list_services(self):
         self.base_dir = 'tests/fixtures/v2-full'
         result = self.dispatch(['config', '--services'])

tests/fixtures/config-profiles/docker-compose.yml

@@ -1,15 +0,0 @@
-version: '3.8'
-services:
-  frontend:
-    image: frontend
-    profiles: ["frontend", "gui"]
-  phpmyadmin:
-    image: phpmyadmin
-    depends_on:
-      - db
-    profiles:
-      - debug
-  backend:
-    image: backend
-  db:
-    image: mysql

tests/integration/project_test.py

@@ -25,7 +25,6 @@ from compose.const import COMPOSE_SPEC as VERSION
 from compose.const import LABEL_PROJECT
 from compose.const import LABEL_SERVICE
 from compose.container import Container
-from compose.errors import CompletedUnsuccessfully
 from compose.errors import HealthCheckFailed
 from compose.errors import NoHealthCheckConfigured
 from compose.project import Project
@@ -1900,110 +1899,6 @@ class ProjectTest(DockerClientTestCase):
         with pytest.raises(NoHealthCheckConfigured):
             svc1.is_healthy()
 
-    def test_project_up_completed_successfully_dependency(self):
-        config_dict = {
-            'version': '2.1',
-            'services': {
-                'svc1': {
-                    'image': BUSYBOX_IMAGE_WITH_TAG,
-                    'command': 'true'
-                },
-                'svc2': {
-                    'image': BUSYBOX_IMAGE_WITH_TAG,
-                    'command': 'top',
-                    'depends_on': {
-                        'svc1': {'condition': 'service_completed_successfully'},
-                    }
-                }
-            }
-        }
-        config_data = load_config(config_dict)
-        project = Project.from_config(
-            name='composetest', config_data=config_data, client=self.client
-        )
-        project.up()
-
-        svc1 = project.get_service('svc1')
-        svc2 = project.get_service('svc2')
-
-        assert 'svc1' in svc2.get_dependency_names()
-        assert svc2.containers()[0].is_running
-        assert len(svc1.containers()) == 0
-        assert svc1.is_completed_successfully()
-
-    def test_project_up_completed_unsuccessfully_dependency(self):
-        config_dict = {
-            'version': '2.1',
-            'services': {
-                'svc1': {
-                    'image': BUSYBOX_IMAGE_WITH_TAG,
-                    'command': 'false'
-                },
-                'svc2': {
-                    'image': BUSYBOX_IMAGE_WITH_TAG,
-                    'command': 'top',
-                    'depends_on': {
-                        'svc1': {'condition': 'service_completed_successfully'},
-                    }
-                }
-            }
-        }
-        config_data = load_config(config_dict)
-        project = Project.from_config(
-            name='composetest', config_data=config_data, client=self.client
-        )
-        with pytest.raises(ProjectError):
-            project.up()
-
-        containers = project.containers()
-        assert len(containers) == 0
-
-        svc1 = project.get_service('svc1')
-        svc2 = project.get_service('svc2')
-        assert 'svc1' in svc2.get_dependency_names()
-        with pytest.raises(CompletedUnsuccessfully):
-            svc1.is_completed_successfully()
-
-    def test_project_up_completed_differently_dependencies(self):
-        config_dict = {
-            'version': '2.1',
-            'services': {
-                'svc1': {
-                    'image': BUSYBOX_IMAGE_WITH_TAG,
-                    'command': 'true'
-                },
-                'svc2': {
-                    'image': BUSYBOX_IMAGE_WITH_TAG,
-                    'command': 'false'
-                },
-                'svc3': {
-                    'image': BUSYBOX_IMAGE_WITH_TAG,
-                    'command': 'top',
-                    'depends_on': {
-                        'svc1': {'condition': 'service_completed_successfully'},
-                        'svc2': {'condition': 'service_completed_successfully'},
-                    }
-                }
-            }
-        }
-        config_data = load_config(config_dict)
-        project = Project.from_config(
-            name='composetest', config_data=config_data, client=self.client
-        )
-        with pytest.raises(ProjectError):
-            project.up()
-
-        containers = project.containers()
-        assert len(containers) == 0
-
-        svc1 = project.get_service('svc1')
-        svc2 = project.get_service('svc2')
-        svc3 = project.get_service('svc3')
-        assert ['svc1', 'svc2'] == svc3.get_dependency_names()
-        assert svc1.is_completed_successfully()
-        with pytest.raises(CompletedUnsuccessfully):
-            svc2.is_completed_successfully()
-
     def test_project_up_seccomp_profile(self):
         seccomp_data = {
             'defaultAction': 'SCMP_ACT_ALLOW',

tests/unit/config/config_test.py

@@ -2397,8 +2397,7 @@ web:
             'image': 'busybox',
             'depends_on': {
                 'app1': {'condition': 'service_started'},
-                'app2': {'condition': 'service_healthy'},
-                'app3': {'condition': 'service_completed_successfully'}
+                'app2': {'condition': 'service_healthy'}
             }
         }
         override = {}
@@ -2410,12 +2409,11 @@ web:
             'image': 'busybox',
             'depends_on': {
                 'app1': {'condition': 'service_started'},
-                'app2': {'condition': 'service_healthy'},
-                'app3': {'condition': 'service_completed_successfully'}
+                'app2': {'condition': 'service_healthy'}
             }
         }
         override = {
-            'depends_on': ['app4']
+            'depends_on': ['app3']
         }
 
         actual = config.merge_service_dicts(base, override, VERSION)
@@ -2424,8 +2422,7 @@ web:
             'depends_on': {
                 'app1': {'condition': 'service_started'},
                 'app2': {'condition': 'service_healthy'},
-                'app3': {'condition': 'service_completed_successfully'},
-                'app4': {'condition': 'service_started'},
+                'app3': {'condition': 'service_started'}
             }
         }
 

tests/unit/service_test.py

@@ -330,7 +330,7 @@ class ServiceTest(unittest.TestCase):
         assert service.options['environment'] == environment
 
         assert opts['labels'][LABEL_CONFIG_HASH] == \
-            '6da0f3ec0d5adf901de304bdc7e0ee44ec5dd7adb08aebc20fe0dd791d4ee5a8'
+            '689149e6041a85f6fb4945a2146a497ed43c8a5cbd8991753d875b165f1b4de4'
         assert opts['environment'] == ['also=real']
 
     def test_get_container_create_options_sets_affinity_with_binds(self):
@@ -700,7 +700,6 @@ class ServiceTest(unittest.TestCase):
         config_dict = service.config_dict()
         expected = {
             'image_id': 'abcd',
-            'ipc_mode': None,
             'options': {'image': 'example.com/foo'},
             'links': [('one', 'one')],
             'net': 'other',
@@ -724,7 +723,6 @@ class ServiceTest(unittest.TestCase):
         config_dict = service.config_dict()
         expected = {
             'image_id': 'abcd',
-            'ipc_mode': None,
             'options': {'image': 'example.com/foo'},
             'links': [],
             'networks': {},