diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a264d4ec..432f1745e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Change log ========== -1.26.0 (2020-04-29) +1.26.0 (2020-06-03) ------------------- ### Features @@ -18,6 +18,8 @@ Change log - Bump `OpenSSL` from 1.1.1f to 1.1.1g +- Bump `docker-py` from 4.2.0 to 4.2.1 + ### Bugs - Properly escape values coming from env_files @@ -32,6 +34,8 @@ Change log - Show an error message when `version` attribute is malformed +- Fix HTTPS connection when DOCKER_HOST is remote + 1.25.5 (2020-02-04) ------------------- diff --git a/compose/__init__.py b/compose/__init__.py index a279559fb..96193675a 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.26.0-rc4' +__version__ = '1.26.0-rc5' diff --git a/script/run/run.sh b/script/run/run.sh index 2fd0b9d57..8e8b0d4bd 100755 --- a/script/run/run.sh +++ b/script/run/run.sh @@ -15,7 +15,7 @@ set -e -VERSION="1.26.0-rc4" +VERSION="1.26.0-rc5" IMAGE="docker/compose:$VERSION"