From 14e61848146c45c4892417833c8a7e98f48e864e Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 28 Jun 2017 13:26:04 -0700 Subject: [PATCH 1/2] Compose 1.14.0 hack Signed-off-by: Joffrey F --- docker/utils/ports.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/utils/ports.py b/docker/utils/ports.py index 8f713c720a..bf7d697271 100644 --- a/docker/utils/ports.py +++ b/docker/utils/ports.py @@ -54,6 +54,11 @@ def port_range(start, end, proto, randomly_available_port=False): def split_port(port): + if hasattr(port, 'legacy_repr'): + # This is the worst hack, but it prevents a bug in Compose 1.14.0 + # https://github.com/docker/docker-py/issues/1668 + # TODO: remove once fixed in Compose stable + port = port.legacy_repr() port = str(port) match = PORT_SPEC.match(port) if match is None: From 43f87e9f63a99c56f05afbf28e3a973151cacee5 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 28 Jun 2017 13:32:18 -0700 Subject: [PATCH 2/2] Bump 2.4.2 Signed-off-by: Joffrey F --- docker/version.py | 2 +- docs/change-log.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/version.py b/docker/version.py index 7953c904c9..af1bd5b580 100644 --- a/docker/version.py +++ b/docker/version.py @@ -1,2 +1,2 @@ -version = "2.4.1" +version = "2.4.2" version_info = tuple([int(d) for d in version.split("-")[0].split(".")]) diff --git a/docs/change-log.md b/docs/change-log.md index 4ccb617da4..7099d7942e 100644 --- a/docs/change-log.md +++ b/docs/change-log.md @@ -1,10 +1,10 @@ Change log ========== -2.4.1 +2.4.2 ----- -[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/35?closed=1) +[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/36?closed=1) ### Bugfixes