"Bump 1.28.0"

Signed-off-by: aiordache <anca.iordache@docker.com>

.pre-commit-config.yaml

@@ -17,7 +17,7 @@
   sha: v1.3.4
   hooks:
     - id: reorder-python-imports
-      language_version: 'python3.7'
+      language_version: 'python3.9'
       args:
          - --py3-plus
 -   repo: https://github.com/asottile/pyupgrade

CHANGELOG.md

@@ -1,57 +1,7 @@
 Change log
 ==========
 
-1.28.4 (2021-02-18)
--------------------
-
-[List of PRs / issues for this release](https://github.com/docker/compose/milestone/54?closed=1)
-
-### Bugs
-
-- Fix SSH port parsing by bumping docker-py to 4.4.3
-
-### Miscellaneous
-
-- Bump Python to 3.7.10
-
-1.28.3 (2021-02-17)
--------------------
-
-[List of PRs / issues for this release](https://github.com/docker/compose/milestone/53?closed=1)
-
-### Bugs
-
-- Fix SSH hostname parsing when it contains leading s/h, and remove the quiet option that was hiding the error (via docker-py bump to 4.4.2)
-
-- Fix key error for '--no-log-prefix' option
-
-- Fix incorrect CLI environment variable name for service profiles: `COMPOSE_PROFILES` instead of `COMPOSE_PROFILE`
-
-- Fix fish completion
-
-### Miscellaneous
-
-- Bump cryptography to 3.3.2
-
-- Remove log driver filter
-
-1.28.2 (2021-01-26)
--------------------
-
-### Miscellaneous
-
-- CI setup update
-
-1.28.1 (2021-01-25)
--------------------
-
-### Bugs
-
-- Revert to Python 3.7 bump for Linux static builds
-
-- Add bash completion for `docker-compose logs|up --no-log-prefix`
-
-1.28.0 (2021-01-20)
+1.28.0 (2020-12-03)
 -------------------
 
 ### Features
@@ -114,10 +64,6 @@ Change log
 
 - Updates of READMEs
 
-<<<<<<< HEAD
-=======
-
->>>>>>> master
 1.27.4 (2020-09-24)
 -------------------
 

Dockerfile

@@ -1,13 +1,13 @@
 ARG DOCKER_VERSION=19.03
-ARG PYTHON_VERSION=3.7.10
+ARG PYTHON_VERSION=3.9.0
 
 ARG BUILD_ALPINE_VERSION=3.12
 ARG BUILD_CENTOS_VERSION=7
-ARG BUILD_DEBIAN_VERSION=slim-stretch
+ARG BUILD_DEBIAN_VERSION=slim-buster
 
 ARG RUNTIME_ALPINE_VERSION=3.12
 ARG RUNTIME_CENTOS_VERSION=7
-ARG RUNTIME_DEBIAN_VERSION=stretch-slim
+ARG RUNTIME_DEBIAN_VERSION=buster-slim
 
 ARG DISTRO=alpine
 
@@ -38,7 +38,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     git \
     libc-dev \
     libffi-dev \
-    libgcc-6-dev \
+    libgcc-8-dev \
     libssl-dev \
     make \
     openssl \
@@ -68,8 +68,8 @@ WORKDIR /code/
 COPY docker-compose-entrypoint.sh /usr/local/bin/
 COPY --from=docker-cli /usr/local/bin/docker /usr/local/bin/docker
 RUN pip install \
-    virtualenv==20.4.0 \
-    tox==3.21.2
+    virtualenv==20.2.2 \
+    tox==3.20.1
 COPY requirements-dev.txt .
 COPY requirements-indirect.txt .
 COPY requirements.txt .
@@ -79,7 +79,7 @@ COPY tox.ini .
 COPY setup.py .
 COPY README.md .
 COPY compose compose/
-RUN tox -e py37 --notest
+RUN tox --notest
 COPY . .
 ARG GIT_COMMIT=unknown
 ENV DOCKER_COMPOSE_GITSHA=$GIT_COMMIT

Jenkinsfile

@@ -2,7 +2,7 @@
 
 def dockerVersions = ['19.03.13']
 def baseImages = ['alpine', 'debian']
-def pythonVersions = ['py37']
+def pythonVersions = ['py39']
 
 pipeline {
     agent none
@@ -23,7 +23,7 @@ pipeline {
             parallel {
                 stage('alpine') {
                     agent {
-                        label 'ubuntu-2004 && amd64 && !zfs && cgroup1'
+                        label 'ubuntu && amd64 && !zfs'
                     }
                     steps {
                         buildImage('alpine')
@@ -31,7 +31,7 @@ pipeline {
                 }
                 stage('debian') {
                     agent {
-                        label 'ubuntu-2004 && amd64 && !zfs && cgroup1'
+                        label 'ubuntu && amd64 && !zfs'
                     }
                     steps {
                         buildImage('debian')
@@ -62,7 +62,7 @@ pipeline {
 
 def buildImage(baseImage) {
     def scmvar = checkout(scm)
-    def imageName = "dockerpinata/compose:${baseImage}-${scmvar.GIT_COMMIT}"
+    def imageName = "dockerbuildbot/compose:${baseImage}-${scmvar.GIT_COMMIT}"
     image = docker.image(imageName)
 
     withDockerRegistry(credentialsId:'dockerbuildbot-index.docker.io') {
@@ -89,7 +89,7 @@ def runTests(dockerVersion, pythonVersion, baseImage) {
         stage("python=${pythonVersion} docker=${dockerVersion} ${baseImage}") {
             node("ubuntu && amd64 && !zfs") {
                 def scmvar = checkout(scm)
-                def imageName = "dockerpinata/compose:${baseImage}-${scmvar.GIT_COMMIT}"
+                def imageName = "dockerbuildbot/compose:${baseImage}-${scmvar.GIT_COMMIT}"
                 def storageDriver = sh(script: "docker info -f \'{{.Driver}}\'", returnStdout: true).trim()
                 echo "Using local system's storage driver: ${storageDriver}"
                 withDockerRegistry(credentialsId:'dockerbuildbot-index.docker.io') {
@@ -99,8 +99,6 @@ def runTests(dockerVersion, pythonVersion, baseImage) {
                       --privileged \\
                       --volume="\$(pwd)/.git:/code/.git" \\
                       --volume="/var/run/docker.sock:/var/run/docker.sock" \\
-                      --volume="\${DOCKER_CONFIG}/config.json:/root/.docker/config.json" \\
-                      -e "DOCKER_TLS_CERTDIR=" \\
                       -e "TAG=${imageName}" \\
                       -e "STORAGE_DRIVER=${storageDriver}" \\
                       -e "DOCKER_VERSIONS=${dockerVersion}" \\

Release.Jenkinsfile

@@ -2,7 +2,7 @@
 
 def dockerVersions = ['19.03.13', '18.09.9']
 def baseImages = ['alpine', 'debian']
-def pythonVersions = ['py37']
+def pythonVersions = ['py39']
 
 pipeline {
     agent none
@@ -23,7 +23,7 @@ pipeline {
             parallel {
                 stage('alpine') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     steps {
                         buildImage('alpine')
@@ -31,7 +31,7 @@ pipeline {
                 }
                 stage('debian') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     steps {
                         buildImage('debian')
@@ -41,7 +41,7 @@ pipeline {
         }
         stage('Test') {
             agent {
-                label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
+                label 'linux && docker && ubuntu-2004'
             }
             steps {
                 // TODO use declarative 1.5.0 `matrix` once available on CI
@@ -61,7 +61,7 @@ pipeline {
         }
         stage('Generate Changelog') {
             agent {
-                label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
+                label 'linux && docker && ubuntu-2004'
             }
             steps {
                 checkout scm
@@ -98,7 +98,7 @@ pipeline {
                 }
                 stage('linux binary') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     steps {
                         checkout scm
@@ -134,7 +134,7 @@ pipeline {
                 }
                 stage('alpine image') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     steps {
                         buildRuntimeImage('alpine')
@@ -142,7 +142,7 @@ pipeline {
                 }
                 stage('debian image') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     steps {
                         buildRuntimeImage('debian')
@@ -157,7 +157,7 @@ pipeline {
             parallel {
                 stage('Pushing images') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     steps {
                         pushRuntimeImage('alpine')
@@ -166,7 +166,7 @@ pipeline {
                 }
                 stage('Creating Github Release') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     environment {
                         GITHUB_TOKEN = credentials('github-release-token')
@@ -198,7 +198,7 @@ pipeline {
                 }
                 stage('Publishing Python packages') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
+                        label 'linux && docker && ubuntu-2004'
                     }
                     environment {
                         PYPIRC = credentials('pypirc-docker-dsg-cibot')
@@ -222,7 +222,7 @@ pipeline {
 
 def buildImage(baseImage) {
     def scmvar = checkout(scm)
-    def imageName = "dockerpinata/compose:${baseImage}-${scmvar.GIT_COMMIT}"
+    def imageName = "dockerbuildbot/compose:${baseImage}-${scmvar.GIT_COMMIT}"
     image = docker.image(imageName)
 
     withDockerRegistry(credentialsId:'dockerbuildbot-index.docker.io') {
@@ -247,9 +247,9 @@ def buildImage(baseImage) {
 def runTests(dockerVersion, pythonVersion, baseImage) {
     return {
         stage("python=${pythonVersion} docker=${dockerVersion} ${baseImage}") {
-            node("linux && docker && ubuntu-2004 && amd64 && cgroup1") {
+            node("linux && docker && ubuntu-2004") {
                 def scmvar = checkout(scm)
-                def imageName = "dockerpinata/compose:${baseImage}-${scmvar.GIT_COMMIT}"
+                def imageName = "dockerbuildbot/compose:${baseImage}-${scmvar.GIT_COMMIT}"
                 def storageDriver = sh(script: "docker info -f \'{{.Driver}}\'", returnStdout: true).trim()
                 echo "Using local system's storage driver: ${storageDriver}"
                 withDockerRegistry(credentialsId:'dockerbuildbot-index.docker.io') {
@@ -259,8 +259,6 @@ def runTests(dockerVersion, pythonVersion, baseImage) {
                       --privileged \\
                       --volume="\$(pwd)/.git:/code/.git" \\
                       --volume="/var/run/docker.sock:/var/run/docker.sock" \\
-                      --volume="\${DOCKER_CONFIG}/config.json:/root/.docker/config.json" \\
-                      -e "DOCKER_TLS_CERTDIR=" \\
                       -e "TAG=${imageName}" \\
                       -e "STORAGE_DRIVER=${storageDriver}" \\
                       -e "DOCKER_VERSIONS=${dockerVersion}" \\

compose/__init__.py

@@ -1 +1 @@
-__version__ = '1.28.4'
+__version__ = '1.28.0'

compose/cli/command.py

@@ -129,7 +129,7 @@ def get_profiles_from_options(options, environment):
     if profile_option:
         return profile_option
 
-    profiles = environment.get('COMPOSE_PROFILES')
+    profiles = environment.get('COMPOSE_PROFILE')
     if profiles:
         return profiles.split(',')
 

compose/cli/log_printer.py

@@ -158,8 +158,10 @@ class QueueItem(namedtuple('_QueueItem', 'item is_stop exc')):
 
 
 def tail_container_logs(container, presenter, queue, log_args):
+    generator = get_log_generator(container)
+
     try:
-        for item in build_log_generator(container, log_args):
+        for item in generator(container, log_args):
             queue.put(QueueItem.new(presenter.present(container, item)))
     except Exception as e:
         queue.put(QueueItem.exception(e))
@@ -169,6 +171,20 @@ def tail_container_logs(container, presenter, queue, log_args):
     queue.put(QueueItem.stop(container.name))
 
 
+def get_log_generator(container):
+    if container.has_api_logs:
+        return build_log_generator
+    return build_no_log_generator
+
+
+def build_no_log_generator(container, log_args):
+    """Return a generator that prints a warning about logs and waits for
+    container to exit.
+    """
+    yield "WARNING: no logs are available with the '{}' log driver\n".format(
+        container.log_driver)
+
+
 def build_log_generator(container, log_args):
     # if the container doesn't have a log_stream we need to attach to container
     # before log printer starts running

compose/cli/main.py

@@ -691,7 +691,7 @@ class TopLevelCommand:
             -t, --timestamps        Show timestamps.
             --tail="all"            Number of lines to show from the end of the logs
                                     for each container.
-            --no-log-prefix         Don't print prefix in logs.
+            --no-log-prefix    Don't print prefix in logs.
         """
         containers = self.project.containers(service_names=options['SERVICE'], stopped=True)
 
@@ -1109,7 +1109,7 @@ class TopLevelCommand:
                                        container. Implies --abort-on-container-exit.
             --scale SERVICE=NUM        Scale SERVICE to NUM instances. Overrides the
                                        `scale` setting in the Compose file if present.
-            --no-log-prefix            Don't print prefix in logs.
+            --no-log-prefix       Don't print prefix in logs.
         """
         start_deps = not options['--no-deps']
         always_recreate_deps = options['--always-recreate-deps']
@@ -1121,7 +1121,7 @@ class TopLevelCommand:
         detached = options.get('--detach')
         no_start = options.get('--no-start')
         attach_dependencies = options.get('--attach-dependencies')
-        keep_prefix = not options.get('--no-log-prefix')
+        keep_prefix = not options['--no-log-prefix']
 
         if detached and (cascade_stop or exit_value_from or attach_dependencies):
             raise UserError(

compose/container.py

@@ -186,6 +186,11 @@ class Container:
     def log_driver(self):
         return self.get('HostConfig.LogConfig.Type')
 
+    @property
+    def has_api_logs(self):
+        log_type = self.log_driver
+        return not log_type or log_type in ('json-file', 'journald', 'local')
+
     @property
     def human_readable_health_status(self):
         """ Generate UP status string with up time and health
@@ -199,7 +204,11 @@ class Container:
         return status_string
 
     def attach_log_stream(self):
-        self.log_stream = self.attach(stdout=True, stderr=True, stream=True)
+        """A log stream can only be attached if the container uses a
+        json-file, journald or local log driver.
+        """
+        if self.has_api_logs:
+            self.log_stream = self.attach(stdout=True, stderr=True, stream=True)
 
     def get(self, key):
         """Return a value from the container or None if the value is not set.

contrib/completion/bash/docker-compose

@@ -294,7 +294,7 @@ _docker_compose_logs() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--follow -f --help --no-color --no-log-prefix --tail --timestamps -t" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--follow -f --help --no-color --tail --timestamps -t" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_complete_services
@@ -549,7 +549,7 @@ _docker_compose_up() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--abort-on-container-exit --always-recreate-deps --attach-dependencies --build -d --detach --exit-code-from --force-recreate --help --no-build --no-color --no-deps --no-log-prefix --no-recreate --no-start --renew-anon-volumes -V --remove-orphans --scale --timeout -t" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--abort-on-container-exit --always-recreate-deps --attach-dependencies --build -d --detach --exit-code-from --force-recreate --help --no-build --no-color --no-deps --no-recreate --no-start --renew-anon-volumes -V --remove-orphans --scale --timeout -t" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_complete_services

contrib/completion/fish/docker-compose.fish

@@ -22,6 +22,6 @@ complete -c docker-compose -l tlskey -r                   -d 'Path to TLS key fi
 complete -c docker-compose -l tlsverify                   -d 'Use TLS and verify the remote'
 complete -c docker-compose -l skip-hostname-check         -d "Don't check the daemon's hostname against the name specified in the client certificate (for example if your docker host is an IP address)"
 complete -c docker-compose -l no-ansi                     -d 'Do not print ANSI control characters'
-complete -c docker-compose -l ansi -a 'never always auto' -d 'Control when to print ANSI control characters'
+complete -c docker-compose -l ansi -a never always auto   -d 'Control when to print ANSI control characters'
 complete -c docker-compose -s h -l help                   -d 'Print usage'
 complete -c docker-compose -s v -l version                -d 'Print version and exit'

requirements-indirect.txt

@@ -3,7 +3,7 @@ appdirs==1.4.4
 attrs==20.3.0
 bcrypt==3.2.0
 cffi==1.14.4
-cryptography==3.3.2
+cryptography==3.2.1
 distlib==0.3.1
 entrypoints==0.3
 filelock==3.0.12
@@ -23,6 +23,6 @@ pyrsistent==0.16.0
 smmap==3.0.4
 smmap2==3.0.1
 toml==0.10.1
-tox==3.21.2
-virtualenv==20.4.0
+tox==3.20.1
+virtualenv==20.2.2
 wcwidth==0.2.5

requirements.txt

@@ -4,7 +4,7 @@ certifi==2020.6.20
 chardet==3.0.4
 colorama==0.4.3; sys_platform == 'win32'
 distro==1.5.0
-docker==4.4.3
+docker==4.4.1
 docker-pycreds==0.4.0
 dockerpty==0.4.1
 docopt==0.6.2

script/build/linux-entrypoint

@@ -3,7 +3,7 @@
 set -ex
 
 CODE_PATH=/code
-VENV="${CODE_PATH}"/.tox/py37
+VENV="${CODE_PATH}"/.tox/py39
 
 cd "${CODE_PATH}"
 mkdir -p dist

script/run/run.sh

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

script/test/all

@@ -11,7 +11,7 @@ docker run --rm \
   "$TAG" tox -e pre-commit
 
 get_versions="docker run --rm
-    --entrypoint=/code/.tox/py37/bin/python
+    --entrypoint=/code/.tox/py39/bin/python
     $TAG
     /code/script/test/versions.py docker/docker-ce,moby/moby"
 
@@ -22,7 +22,7 @@ elif [ "$DOCKER_VERSIONS" == "all" ]; then
 fi
 
 BUILD_NUMBER=${BUILD_NUMBER-$USER}
-PY_TEST_VERSIONS=${PY_TEST_VERSIONS:-py37}
+PY_TEST_VERSIONS=${PY_TEST_VERSIONS:-py39}
 
 for version in $DOCKER_VERSIONS; do
   >&2 echo "Running tests against Docker $version"
@@ -38,19 +38,17 @@ for version in $DOCKER_VERSIONS; do
 
   trap "on_exit" EXIT
 
+  repo="dockerswarm/dind"
+
   docker run \
     -d \
     --name "$daemon_container" \
     --privileged \
     --volume="/var/lib/docker" \
-    -v $DOCKER_CONFIG/config.json:/root/.docker/config.json \
-    -e "DOCKER_TLS_CERTDIR=" \
-    "docker:$version-dind" \
+    "$repo:$version" \
     dockerd -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
     2>&1 | tail -n 10
 
-  docker exec "$daemon_container" sh -c "apk add --no-cache git"
-
   docker run \
     --rm \
     --tty \

setup.py

@@ -32,7 +32,7 @@ install_requires = [
     'texttable >= 0.9.0, < 2',
     'websocket-client >= 0.32.0, < 1',
     'distro >= 1.5.0, < 2',
-    'docker[ssh] >= 4.4.3, < 5',
+    'docker[ssh] >= 4.4.0, < 5',
     'dockerpty >= 0.4.1, < 1',
     'jsonschema >= 2.5.1, < 4',
     'python-dotenv >= 0.13.0, < 1',

tests/unit/cli/log_printer_test.py

@@ -8,6 +8,7 @@ from docker.errors import APIError
 
 from compose.cli.log_printer import build_log_generator
 from compose.cli.log_printer import build_log_presenters
+from compose.cli.log_printer import build_no_log_generator
 from compose.cli.log_printer import consume_queue
 from compose.cli.log_printer import QueueItem
 from compose.cli.log_printer import wait_on_exit
@@ -74,6 +75,14 @@ def test_wait_on_exit_raises():
     assert expected in wait_on_exit(mock_container)
 
 
+def test_build_no_log_generator(mock_container):
+    mock_container.has_api_logs = False
+    mock_container.log_driver = 'none'
+    output, = build_no_log_generator(mock_container, None)
+    assert "WARNING: no logs are available with the 'none' log driver\n" in output
+    assert "exited with code" not in output
+
+
 class TestBuildLogGenerator:
 
     def test_no_log_stream(self, mock_container):

tests/unit/container_test.py

@@ -221,6 +221,34 @@ class ContainerTest(unittest.TestCase):
         container = Container(None, self.container_dict, has_been_inspected=True)
         assert container.short_id == self.container_id[:12]
 
+    def test_has_api_logs(self):
+        container_dict = {
+            'HostConfig': {
+                'LogConfig': {
+                    'Type': 'json-file'
+                }
+            }
+        }
+
+        container = Container(None, container_dict, has_been_inspected=True)
+        assert container.has_api_logs is True
+
+        container_dict['HostConfig']['LogConfig']['Type'] = 'none'
+        container = Container(None, container_dict, has_been_inspected=True)
+        assert container.has_api_logs is False
+
+        container_dict['HostConfig']['LogConfig']['Type'] = 'syslog'
+        container = Container(None, container_dict, has_been_inspected=True)
+        assert container.has_api_logs is False
+
+        container_dict['HostConfig']['LogConfig']['Type'] = 'journald'
+        container = Container(None, container_dict, has_been_inspected=True)
+        assert container.has_api_logs is True
+
+        container_dict['HostConfig']['LogConfig']['Type'] = 'foobar'
+        container = Container(None, container_dict, has_been_inspected=True)
+        assert container.has_api_logs is False
+
 
 class GetContainerNameTestCase(unittest.TestCase):
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,py39,pre-commit
+envlist = py39,pre-commit
 
 [testenv]
 usedevelop=True