Merge pull request #7499 from ulyssessouza/post-1.26.0

Post 1.26.0 merge into master

CHANGELOG.md

@@ -1,6 +1,41 @@
 Change log
 ==========
 
+1.26.0 (2020-06-03)
+-------------------
+
+### 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
+
+- Bump `docker-py` from 4.2.0 to 4.2.1
+
+### 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
+
+- Fix HTTPS connection when DOCKER_HOST is remote
+
 1.25.5 (2020-02-04)
 -------------------
 

compose/__init__.py

@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.26.0dev'
+__version__ = '1.27.0dev'

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:

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

script/run/run.sh

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