Merge pull request #5330 from docker/bump-1.17.0

Bump 1.17.0

8 files changed, 14 insertions, 7 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cff19d87..f531783e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Change log
 ==========
 
-1.17.0 (2017-11-03)
+1.17.0 (2017-11-02)
 -------------------
 
 ### New features
diff --git a/compose/__init__.py b/compose/__init__.py
index 86542ec4..7b0c7d1e 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.17.0-rc1'
+__version__ = '1.17.0'
diff --git a/compose/bundle.py b/compose/bundle.py
index 505ce91f..937a3708 100644
--- a/compose/bundle.py
+++ b/compose/bundle.py
@@ -121,7 +121,7 @@ def get_image_digest(service, allow_push=False):
 def push_image(service):
     try:
         digest = service.push()
-    except:
+    except Exception:
         log.error(
             "Failed to push image for service '{s.name}'. Please use an "
             "image tag that can be pushed to a Docker "
diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose
index 9de15640..1fdb2770 100644
--- a/contrib/completion/bash/docker-compose
+++ b/contrib/completion/bash/docker-compose
@@ -518,7 +518,7 @@ _docker_compose_up() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--abort-on-container-exit --build -d --exit-code-from --force-recreate --help --no-build --no-color --no-deps --no-recreate --remove-orphans --scale --timeout -t" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--abort-on-container-exit --build -d --exit-code-from --force-recreate --help --no-build --no-color --no-deps --no-recreate --no-start --remove-orphans --scale --timeout -t" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_all
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 73b80783..e06cad45 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,5 @@
 coverage==3.7.1
+flake8==3.5.0
 mock>=1.0.1
 pytest==2.7.2
 pytest-cov==2.1.0
diff --git a/script/run/run.sh b/script/run/run.sh
index 49822628..38ce8787 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.17.0-rc1"
+VERSION="1.17.0"
 IMAGE="docker/compose:$VERSION"
 
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 8ba43b00..bba2238e 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -851,7 +851,13 @@ class CLITestCase(DockerClientTestCase):
         volumes = self.project.volumes.volumes
         assert 'data' in volumes
         volume = volumes['data']
-        assert volume.exists()
+
+        # The code below is a Swarm-compatible equivalent to volume.exists()
+        remote_volumes = [
+            v for v in self.client.volumes().get('Volumes', [])
+            if v['Name'].split('/')[-1] == volume.full_name
+        ]
+        assert len(remote_volumes) > 0
 
     @v2_only()
     def test_up_no_ansi(self):
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 84b54fe4..3ddf991b 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -788,7 +788,7 @@ class ServiceTest(DockerClientTestCase):
 
         net_container = self.client.create_container(
             'busybox', 'top', host_config=self.client.create_host_config(
-                extra_hosts={'google.local': '8.8.8.8'}
+                extra_hosts={'google.local': '127.0.0.1'}
             ), name='composetest_build_network'
         )