"Bump 1.26.2"

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>

CHANGELOG.md

@@ -1,6 +1,61 @@
 Change log
 ==========
 
+1.26.2 (2020-07-02)
+-------------------
+
+### Bugs
+
+- Enforce `docker-py` 4.2.2 as minimum version when installing with pip
+
+1.26.1 (2020-06-30)
+-------------------
+
+### Features
+
+- Bump `docker-py` from 4.2.1 to 4.2.2
+
+### Bugs
+
+- Enforce `docker-py` 4.2.1 as minimum version when installing with pip
+
+- Fix context load for non-docker endpoints
+
+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)
 -------------------
 

Release.Jenkinsfile

@@ -20,7 +20,7 @@ pipeline {
             parallel {
                 stage('alpine') {
                     agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     steps {
                         buildImage('alpine')
@@ -28,7 +28,7 @@ pipeline {
                 }
                 stage('debian') {
                     agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     steps {
                         buildImage('debian')
@@ -55,7 +55,7 @@ pipeline {
         }
         stage('Generate Changelog') {
             agent {
-                label 'linux'
+                label 'linux && docker && ubuntu-2004'
             }
             steps {
                 checkout scm
@@ -92,7 +92,7 @@ pipeline {
                 }
                 stage('linux binary') {
                     agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     steps {
                         checkout scm
@@ -128,7 +128,7 @@ pipeline {
                 }
                 stage('alpine image') {
                     agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     steps {
                         buildRuntimeImage('alpine')
@@ -136,7 +136,7 @@ pipeline {
                 }
                 stage('debian image') {
                     agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     steps {
                         buildRuntimeImage('debian')
@@ -151,7 +151,7 @@ pipeline {
             parallel {
                 stage('Pushing images') {
                     agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     steps {
                         pushRuntimeImage('alpine')
@@ -160,7 +160,7 @@ pipeline {
                 }
                 stage('Creating Github Release') {
                     agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     environment {
                         GITHUB_TOKEN = credentials('github-release-token')
@@ -192,7 +192,7 @@ pipeline {
                 }
                 stage('Publishing Python packages') {
                     agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     environment {
                         PYPIRC = credentials('pypirc-docker-dsg-cibot')
@@ -201,9 +201,9 @@ pipeline {
                         checkout scm
                         sh """
                             rm -rf build/ dist/
-                            pip install wheel
-                            python setup.py sdist bdist_wheel
-                            pip install twine
+                            pip3 install wheel
+                            python3 setup.py sdist bdist_wheel
+                            pip3 install twine
                             ~/.local/bin/twine upload --config-file ${PYPIRC} ./dist/docker-compose-*.tar.gz ./dist/docker_compose-*-py2.py3-none-any.whl
                         """
                     }

compose/__init__.py

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

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,12 +138,17 @@ 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:
             context.set_endpoint("docker", host=host, tls_cfg=tls, skip_tls_verify=not verify)
 
+    if not context.is_docker_host():
+        raise UserError(
+            "The platform targeted with the current context is not supported.\n"
+            "Make sure the context in use targets a Docker Engine.\n")
+
     kwargs['base_url'] = context.Host
     if context.TLSConfig:
         kwargs['tls'] = context.TLSConfig

compose/cli/main.py

@@ -1080,7 +1080,7 @@ class TopLevelCommand(object):
                 log.error(
                     "The image for the service you're trying to recreate has been removed. "
                     "If you continue, volume data could be lost. Consider backing up your data "
-                    "before continuing.\n".format(e.explanation)
+                    "before continuing.\n"
                 )
                 res = yesno("Continue with the new image? [yN]", False)
                 if res is None or not res:

compose/service.py

@@ -1157,7 +1157,7 @@ class Service(object):
         container_name = build_container_name(
             self.project, service_name, number, slug,
         )
-        ext_links_origins = [l.split(':')[0] for l in self.options.get('external_links', [])]
+        ext_links_origins = [link.split(':')[0] for link in self.options.get('external_links', [])]
         if container_name in ext_links_origins:
             raise DependencyError(
                 'Service {0} has a self-referential external link: {1}'.format(

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.2
 docker-pycreds==0.4.0
 dockerpty==0.4.1
 docopt==0.6.2
@@ -25,4 +25,5 @@ six==1.12.0
 subprocess32==3.5.4; python_version < '3.2'
 texttable==1.6.2
 urllib3==1.25.7; python_version == '3.3'
+wcwidth==0.1.9
 websocket-client==0.57.0

script/run/run.sh

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

setup.py

@@ -37,7 +37,7 @@ install_requires = [
     'texttable >= 0.9.0, < 2',
     'websocket-client >= 0.32.0, < 1',
     'distro >= 1.5.0, < 2',
-    'docker[ssh] >= 3.7.0, < 5',
+    'docker[ssh] >= 4.2.2, < 5',
     'dockerpty >= 0.4.1, < 1',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 4',

tests/integration/service_test.py

@@ -223,6 +223,9 @@ class ServiceTest(DockerClientTestCase):
         service.start_container(container)
         assert container.get('HostConfig.ReadonlyRootfs') == read_only
 
+    @pytest.mark.xfail(True, reason='Getting "Your kernel does not support '
+                                    'cgroup blkio weight and weight_device" on daemon start '
+                                    'on Linux kernel 5.3.x')
     def test_create_container_with_blkio_config(self):
         blkio_config = {
             'weight': 300,