[stable-2] Fix docker_image tests with Docker SDK for Python 7.1.0; restrict requests in EE dependencies to < 2.32.0 (#872)

* Docker SDK for Python 7.1.0 also dropped support for API versions < 1.24.

* EE: restrict requests to < 2.32.0.
This commit is contained in:
Felix Fontein 2024-05-26 19:43:47 +02:00 committed by GitHub
parent 0a54f8097a
commit b4e0ba9e5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 2 deletions

View File

@ -0,0 +1,7 @@
bugfixes:
- "EE requirements - restrict ``requests`` dependency to ``< 2.32.0`` since later versions are incompatible with
Docker SDK for Python < 7.1.0, which we depend on (https://github.com/ansible-collections/community.docker/pull/872)."
known_issues:
- "EE requirements - ``requests < 2.32.0`` is vulnerable to `CVE-2024-35195 <https://github.com/advisories/GHSA-9wx4-h78v-vm56>`__.
This does not affect Docker SDK for Python, but might affect other users of ``requests``
(https://github.com/ansible-collections/community.docker/pull/872)."

View File

@ -1,2 +1,3 @@
docker<7.0.0
requests<2.32.0
docker-compose

View File

@ -299,7 +299,8 @@
api_version: "1.22"
register: load_image_4
# Moby 25.0.0 (API version 1.44) dropped support for older API versions
when: docker_api_version is version('1.44', '<')
# Docker SDK for Python 7.1.0 also dropped support for older API versions
when: docker_api_version is version('1.44', '<') and docker_py_version is version('7.1.0', '<')
- name: load image (ID, idempotency)
docker_image:
@ -320,7 +321,7 @@
- '"Detected no loaded images. Archive potentially corrupt?" == load_image_3.msg'
- load_image_5 is not changed
- when: docker_api_version is version('1.44', '<')
- when: docker_api_version is version('1.44', '<') and docker_py_version is version('7.1.0', '<')
assert:
that:
- load_image_4 is changed