From 55ca40693cd16d498ddeba1a54462436a1b206f0 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Mon, 24 Feb 2020 11:42:32 +0100 Subject: [PATCH 1/7] "Bump 1.26.0-rc1" Signed-off-by: Ulysses Souza --- compose/__init__.py | 2 +- script/run/run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/__init__.py b/compose/__init__.py index 69c4e0e49..6e5fcaae9 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.0dev' +__version__ = '1.26.0-rc1' diff --git a/script/run/run.sh b/script/run/run.sh index cd566f334..80307f11a 100755 --- a/script/run/run.sh +++ b/script/run/run.sh @@ -15,7 +15,7 @@ set -e -VERSION="1.25.5" +VERSION="1.26.0-rc1" IMAGE="docker/compose:$VERSION" From 9b8b8cb856ea9127ca82db0de6363e02ce002585 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Tue, 10 Mar 2020 16:25:59 +0100 Subject: [PATCH 2/7] "Bump 1.26.0-rc3" Signed-off-by: Ulysses Souza --- compose/__init__.py | 2 +- script/run/run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/__init__.py b/compose/__init__.py index 6e5fcaae9..6d98c8f5e 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-rc1' +__version__ = '1.26.0-rc3' diff --git a/script/run/run.sh b/script/run/run.sh index 80307f11a..f6dbe11dc 100755 --- a/script/run/run.sh +++ b/script/run/run.sh @@ -15,7 +15,7 @@ set -e -VERSION="1.26.0-rc1" +VERSION="1.26.0-rc3" IMAGE="docker/compose:$VERSION" From cad60dbc0037f4bf4e209fad6f27633c5829b095 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Wed, 29 Apr 2020 12:27:55 +0200 Subject: [PATCH 3/7] "Bump 1.26.0-rc4" Signed-off-by: Ulysses Souza --- CHANGELOG.md | 31 +++++++++++++++++++++++++++++++ compose/__init__.py | 2 +- script/run/run.sh | 2 +- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78f512272..9a264d4ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,37 @@ Change log ========== +1.26.0 (2020-04-29) +------------------- + +### Features + +- Add `docker context` support + +- Add missing test dependency `ddt` to `setup.py` + +- Add `--attach-dependencies` to command `up` for attaching to dependencies + +- Allow compatibility option with `COMPOSE_COMPATIBILITY` environment variable + +- Bump `Pytest` to 5.3.4 and add refactor compatibility with new version + +- Bump `OpenSSL` from 1.1.1f to 1.1.1g + +### Bugs + +- Properly escape values coming from env_files + +- Sync compose-schemas with upstream (docker/cli) + +- Remove `None` entries on exec command + +- Add `python-dotenv` to delegate `.env` file processing + +- Don't adjust output on terminal width when piped into another command + +- Show an error message when `version` attribute is malformed + 1.25.5 (2020-02-04) ------------------- diff --git a/compose/__init__.py b/compose/__init__.py index 6d98c8f5e..a279559fb 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-rc3' +__version__ = '1.26.0-rc4' diff --git a/script/run/run.sh b/script/run/run.sh index f6dbe11dc..2fd0b9d57 100755 --- a/script/run/run.sh +++ b/script/run/run.sh @@ -15,7 +15,7 @@ set -e -VERSION="1.26.0-rc3" +VERSION="1.26.0-rc4" IMAGE="docker/compose:$VERSION" From 3f0a7fe3ee91df5ab3068999ee56aa6cc10e920f Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Fri, 29 May 2020 10:11:45 +0200 Subject: [PATCH 4/7] Bump docker-py This should fix https problems when running on remote daemon Signed-off-by: Ulysses Souza --- compose/cli/docker_client.py | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py index d4cdc96e8..4553eee86 100644 --- a/compose/cli/docker_client.py +++ b/compose/cli/docker_client.py @@ -31,7 +31,7 @@ def default_cert_path(): def make_context(host, options, environment): tls = tls_config_from_options(options, environment) - ctx = Context("compose", host=host) + ctx = Context("compose", host=host, tls=tls.verify if tls else False) if tls: ctx.set_endpoint("docker", host, tls, skip_tls_verify=not tls.verify) return ctx @@ -138,7 +138,7 @@ def docker_client(environment, version=None, context=None, tls_version=None): tls = kwargs.get("tls", None) verify = False if not tls else tls.verify if host: - context = Context("compose", host=host) + context = Context("compose", host=host, tls=verify) else: context = ContextAPI.get_current_context() if tls: diff --git a/requirements.txt b/requirements.txt index f02e15eac..e64731272 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ certifi==2020.4.5.1 chardet==3.0.4 colorama==0.4.3; sys_platform == 'win32' distro==1.5.0 -docker==4.2.0 +docker==4.2.1 docker-pycreds==0.4.0 dockerpty==0.4.1 docopt==0.6.2 From f2bb6ff4730925af451333ad3405032fef0d0a6e Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Wed, 3 Jun 2020 10:32:47 +0200 Subject: [PATCH 5/7] "Bump 1.26.0-rc5" Signed-off-by: Ulysses Souza --- CHANGELOG.md | 6 +++++- compose/__init__.py | 2 +- script/run/run.sh | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) 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" From 3d2a82ca8326c79673c69beec20b94f1327bb64d Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Wed, 3 Jun 2020 16:10:04 +0200 Subject: [PATCH 6/7] "Bump 1.26.0" Signed-off-by: Ulysses Souza --- compose/__init__.py | 2 +- script/run/run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/__init__.py b/compose/__init__.py index 96193675a..4163aeb90 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-rc5' +__version__ = '1.26.0' diff --git a/script/run/run.sh b/script/run/run.sh index 8e8b0d4bd..65fb656ad 100755 --- a/script/run/run.sh +++ b/script/run/run.sh @@ -15,7 +15,7 @@ set -e -VERSION="1.26.0-rc5" +VERSION="1.26.0" IMAGE="docker/compose:$VERSION" From a691cd89cc3719a351f5d822cdcd24a0400572f9 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Wed, 3 Jun 2020 17:52:02 +0200 Subject: [PATCH 7/7] Set next version to a `dev` once again Signed-off-by: Ulysses Souza --- compose/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/__init__.py b/compose/__init__.py index 4163aeb90..37b5db09c 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' +__version__ = '1.27.0dev'