From ccabfde353b20b4c706059cdcc0157b5567f5881 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Thu, 18 Feb 2021 11:04:25 -0300 Subject: [PATCH 1/7] Bump python to 3.7.10 Signed-off-by: Ulysses Souza --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f2ec3812f..d934a8878 100644 --- a/Dockerfile +++ b/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 From a92c6d7e17047f368354ee98a3dc325e683cfb7b Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Thu, 18 Feb 2021 11:34:03 -0300 Subject: [PATCH 2/7] Add label amd64 to filter the agents Signed-off-by: Ulysses Souza --- Release.Jenkinsfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Release.Jenkinsfile b/Release.Jenkinsfile index 354f5e2d4..4d4a1fa0f 100644 --- a/Release.Jenkinsfile +++ b/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() From 49d0ee2de52979d5aec3b36197d4678ad6afcba8 Mon Sep 17 00:00:00 2001 From: aiordache Date: Thu, 18 Feb 2021 09:56:14 +0100 Subject: [PATCH 3/7] Update changelog for release 1.28.3 Signed-off-by: aiordache --- CHANGELOG.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 683abf36b..a00b5f4b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,27 @@ Change log ========== +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) ------------------- From 5b983ac6536d273e309df6fd80e0c697d25c1b7a Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Thu, 18 Feb 2021 12:24:04 -0300 Subject: [PATCH 4/7] Add cgroup1 as filter label Signed-off-by: Ulysses Souza --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f3c336965..8e41f88ef 100644 --- a/Jenkinsfile +++ b/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') From d28d717884920f9bb5d9c3896a3791fc2dae270a Mon Sep 17 00:00:00 2001 From: aiordache Date: Thu, 18 Feb 2021 15:49:56 +0100 Subject: [PATCH 5/7] Fix SSH port parsing via docker-py bump Signed-off-by: aiordache --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d70e2fade..fd3705041 100644 --- a/requirements.txt +++ b/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 From 36e470d640ec4f29c61f5338a3710190b02cb44a Mon Sep 17 00:00:00 2001 From: aiordache Date: Thu, 18 Feb 2021 17:18:08 +0100 Subject: [PATCH 6/7] Bump docker-py to 4.4.3 in setup.py Signed-off-by: aiordache --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 57e131335..74012bf14 100644 --- a/setup.py +++ b/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', From c760600a65de987ff2535c50784bde4be26e8647 Mon Sep 17 00:00:00 2001 From: aiordache Date: Thu, 18 Feb 2021 18:44:21 +0100 Subject: [PATCH 7/7] fix config path for authentication Signed-off-by: aiordache --- Jenkinsfile | 2 +- Release.Jenkinsfile | 2 +- script/test/all | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8e41f88ef..e26a85b3c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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}" \\ diff --git a/Release.Jenkinsfile b/Release.Jenkinsfile index 4d4a1fa0f..4779c25a3 100644 --- a/Release.Jenkinsfile +++ b/Release.Jenkinsfile @@ -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}" \\ diff --git a/script/test/all b/script/test/all index 21c6fff6a..fba670eb3 100755 --- a/script/test/all +++ b/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 \