tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-25 22:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5330 from docker/bump-1.17.0

Browse Source 
Bump 1.17.0
This commit is contained in:
Joffrey F 2017-11-01 17:06:41 -07:00 committed by GitHub
commit b55a50a384
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,7 +1,7 @@
Change log Change log
========== ==========
1.17.0 (2017-11-03) 1.17.0 (2017-11-02)
------------------- -------------------
### New features ### New features

2
compose/__init__.py
View File

@ -1,4 +1,4 @@
from __future__ import absolute_import from __future__ import absolute_import
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '1.17.0-rc1' __version__ = '1.17.0'

2
compose/bundle.py
View File

@ -121,7 +121,7 @@ def get_image_digest(service, allow_push=False):
def push_image(service): def push_image(service):
try: try:
digest = service.push() digest = service.push()
except: except Exception:
log.error( log.error(
"Failed to push image for service '{s.name}'. Please use an " "Failed to push image for service '{s.name}'. Please use an "
"image tag that can be pushed to a Docker " "image tag that can be pushed to a Docker "

2
contrib/completion/bash/docker-compose
View File

@ -518,7 +518,7 @@ _docker_compose_up() {
case "$cur" in 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 __docker_compose_services_all

1
requirements-dev.txt
View File

@ -1,4 +1,5 @@
coverage==3.7.1 coverage==3.7.1
flake8==3.5.0
mock>=1.0.1 mock>=1.0.1
pytest==2.7.2 pytest==2.7.2
pytest-cov==2.1.0 pytest-cov==2.1.0

2
script/run/run.sh
View File

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

8
tests/acceptance/cli_test.py
View File

@ -851,7 +851,13 @@ class CLITestCase(DockerClientTestCase):
volumes = self.project.volumes.volumes volumes = self.project.volumes.volumes
assert 'data' in volumes assert 'data' in volumes
volume = volumes['data'] 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() @v2_only()
def test_up_no_ansi(self): def test_up_no_ansi(self):

2
tests/integration/service_test.py
View File

@ -788,7 +788,7 @@ class ServiceTest(DockerClientTestCase):
net_container = self.client.create_container( net_container = self.client.create_container(
'busybox', 'top', host_config=self.client.create_host_config( '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' ), name='composetest_build_network'
) )