diff --git a/0001-fix-docker-update-function-call-to-support-python-do.patch b/0001-fix-docker-update-function-call-to-support-python-do.patch new file mode 100644 index 0000000000000000000000000000000000000000..6178de8d95d5cbd56c8ac99e5a308dd2153c0955 --- /dev/null +++ b/0001-fix-docker-update-function-call-to-support-python-do.patch @@ -0,0 +1,26 @@ +From 50bccb3a1abbfe21a1a840e4f71fdd29dbea495e Mon Sep 17 00:00:00 2001 +From: Jianmin +Date: Wed, 23 Apr 2025 12:02:41 +0800 +Subject: [PATCH] fix(docker): update function call to support python-docker + 7.0.0 version + +--- + compose/cli/docker_client.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py +index e4a0fea..f550e20 100644 +--- a/compose/cli/docker_client.py ++++ b/compose/cli/docker_client.py +@@ -121,7 +121,7 @@ def docker_client(environment, version=None, context=None, tls_version=None): + according to the same logic as the official Docker client. + """ + try: +- kwargs = kwargs_from_env(environment=environment, ssl_version=tls_version) ++ kwargs = kwargs_from_env(environment=environment) + except TLSParameterError: + raise UserError( + "TLS configuration is invalid - make sure your DOCKER_TLS_VERIFY " +-- +2.39.5 (Apple Git-154) + diff --git a/docker-compose.spec b/docker-compose.spec index ce587f127fdbe763034e72adbc19553114d533b6..01816512c67c1f7ee7ad46e3c09ab5b1a851011b 100644 --- a/docker-compose.spec +++ b/docker-compose.spec @@ -1,11 +1,12 @@ Name: docker-compose Version: 1.29.2 -Release: 1 +Release: 2 Summary: Multi-container orchestration for Docker License: ASL-2.0 URL: https://github.com/docker/compose Source0: %pypi_source BuildArch: noarch +Patch0001: 0001-fix-docker-update-function-call-to-support-python-do.patch BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools @@ -15,7 +16,7 @@ BuildRequires: python%{python3_pkgversion}-ddt BuildRequires: python%{python3_pkgversion}-cached_property >= 1.5.1 BuildRequires: python%{python3_pkgversion}-chardet >= 3.0.4 BuildRequires: python%{python3_pkgversion}-distro >= 1.5.0 -BuildRequires: python%{python3_pkgversion}-docker >= 5.0.0 +BuildRequires: python%{python3_pkgversion}-docker >= 7.0.0 BuildRequires: python%{python3_pkgversion}-docker-pycreds >= 0.4.0 BuildRequires: python%{python3_pkgversion}-dockerpty >= 0.4.1 BuildRequires: python%{python3_pkgversion}-docopt >= 0.6.2 @@ -31,7 +32,7 @@ Requires: python%{python3_pkgversion}-setuptools Requires: python%{python3_pkgversion}-cached_property >= 1.5.1 Requires: python%{python3_pkgversion}-chardet >= 3.0.4 Requires: python%{python3_pkgversion}-distro >= 1.5.0 -Requires: python%{python3_pkgversion}-docker >= 5.0.0 +Requires: python%{python3_pkgversion}-docker >= 7.0.0 Requires: python%{python3_pkgversion}-docker-pycreds >= 0.4.0 Requires: python%{python3_pkgversion}-dockerpty >= 0.4.1 Requires: python%{python3_pkgversion}-docopt >= 0.6.2 @@ -92,6 +93,9 @@ install -D -p -m 644 contrib/completion/fish/docker-compose.fish %{buildroot}%{_ %{_datadir}/fish %changelog +* Tue May 20 2025 Jianmin - 1.29.2-2 +- fix: unsupported ssl_version from kwargs_from_env in python-docker 7.0.0 + * Wed Nov 22 2023 konglidong - 1.29.2-1 - update version to 1.29.2