"Bump 1.28.4"

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

CHANGELOG.md

@@ -1,6 +1,19 @@
 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)
 -------------------
 
@@ -8,7 +21,7 @@ Change log
 
 ### Bugs
 
-- Fix SSH hostname parsing when it contains leading s/h, and removes the quiet option that was hiding the error (via docker-py bump to 4.4.2)
+- 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
 

Dockerfile

@@ -1,5 +1,5 @@
 ARG DOCKER_VERSION=19.03
-ARG PYTHON_VERSION=3.7.9
+ARG PYTHON_VERSION=3.7.10
 
 ARG BUILD_ALPINE_VERSION=3.12
 ARG BUILD_CENTOS_VERSION=7

Jenkinsfile

@@ -23,7 +23,7 @@ pipeline {
             parallel {
                 stage('alpine') {
                     agent {
-                        label 'ubuntu && amd64 && !zfs'
+                        label 'ubuntu-2004 && amd64 && !zfs && cgroup1'
                     }
                     steps {
                         buildImage('alpine')
@@ -31,7 +31,7 @@ pipeline {
                 }
                 stage('debian') {
                     agent {
-                        label 'ubuntu && amd64 && !zfs'
+                        label 'ubuntu-2004 && amd64 && !zfs && cgroup1'
                     }
                     steps {
                         buildImage('debian')
@@ -99,7 +99,7 @@ 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:/code/.docker/config.json" \\
+                      --volume="\${DOCKER_CONFIG}/config.json:/root/.docker/config.json" \\
                       -e "DOCKER_TLS_CERTDIR=" \\
                       -e "TAG=${imageName}" \\
                       -e "STORAGE_DRIVER=${storageDriver}" \\

Release.Jenkinsfile

@@ -23,7 +23,7 @@ pipeline {
             parallel {
                 stage('alpine') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && cgroup1'
+                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
                     }
                     steps {
                         buildImage('alpine')
@@ -31,7 +31,7 @@ pipeline {
                 }
                 stage('debian') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && cgroup1'
+                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
                     }
                     steps {
                         buildImage('debian')
@@ -41,7 +41,7 @@ pipeline {
         }
         stage('Test') {
             agent {
-                label 'linux && docker && ubuntu-2004 && cgroup1'
+                label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
             }
             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 && cgroup1'
+                label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
             }
             steps {
                 checkout scm
@@ -98,7 +98,7 @@ pipeline {
                 }
                 stage('linux binary') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && cgroup1'
+                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
                     }
                     steps {
                         checkout scm
@@ -134,7 +134,7 @@ pipeline {
                 }
                 stage('alpine image') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && cgroup1'
+                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
                     }
                     steps {
                         buildRuntimeImage('alpine')
@@ -142,7 +142,7 @@ pipeline {
                 }
                 stage('debian image') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && cgroup1'
+                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
                     }
                     steps {
                         buildRuntimeImage('debian')
@@ -157,7 +157,7 @@ pipeline {
             parallel {
                 stage('Pushing images') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && cgroup1'
+                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
                     }
                     steps {
                         pushRuntimeImage('alpine')
@@ -166,7 +166,7 @@ pipeline {
                 }
                 stage('Creating Github Release') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && cgroup1'
+                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
                     }
                     environment {
                         GITHUB_TOKEN = credentials('github-release-token')
@@ -198,7 +198,7 @@ pipeline {
                 }
                 stage('Publishing Python packages') {
                     agent {
-                        label 'linux && docker && ubuntu-2004 && cgroup1'
+                        label 'linux && docker && ubuntu-2004 && amd64 && cgroup1'
                     }
                     environment {
                         PYPIRC = credentials('pypirc-docker-dsg-cibot')
@@ -247,7 +247,7 @@ def buildImage(baseImage) {
 def runTests(dockerVersion, pythonVersion, baseImage) {
     return {
         stage("python=${pythonVersion} docker=${dockerVersion} ${baseImage}") {
-            node("linux && docker && ubuntu-2004 && cgroup1") {
+            node("linux && docker && ubuntu-2004 && amd64 && cgroup1") {
                 def scmvar = checkout(scm)
                 def imageName = "dockerpinata/compose:${baseImage}-${scmvar.GIT_COMMIT}"
                 def storageDriver = sh(script: "docker info -f \'{{.Driver}}\'", returnStdout: true).trim()
@@ -259,7 +259,7 @@ 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:/code/.docker/config.json" \\
+                      --volume="\${DOCKER_CONFIG}/config.json:/root/.docker/config.json" \\
                       -e "DOCKER_TLS_CERTDIR=" \\
                       -e "TAG=${imageName}" \\
                       -e "STORAGE_DRIVER=${storageDriver}" \\

compose/__init__.py

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

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.2
+docker==4.4.3
 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.28.3"
+VERSION="1.28.4"
 IMAGE="docker/compose:$VERSION"
 
 

script/test/all

@@ -43,7 +43,7 @@ for version in $DOCKER_VERSIONS; do
     --name "$daemon_container" \
     --privileged \
     --volume="/var/lib/docker" \
-    -v $DOCKER_CONFIG/config.json:/code/.docker/config.json \
+    -v $DOCKER_CONFIG/config.json:/root/.docker/config.json \
     -e "DOCKER_TLS_CERTDIR=" \
     "docker:$version-dind" \
     dockerd -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \

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.0, < 5',
+    'docker[ssh] >= 4.4.3, < 5',
     'dockerpty >= 0.4.1, < 1',
     'jsonschema >= 2.5.1, < 4',
     'python-dotenv >= 0.13.0, < 1',