From 9bd3db461d77bd5e43f9e896a291c6a9d1c17591 Mon Sep 17 00:00:00 2001 From: Daniel Ziegenberg Date: Tue, 23 Sep 2025 18:23:33 +0200 Subject: [PATCH] bug: align required collections between drivers docker and containers The `containers` driver might use the `docker` driver as a backend and should therefore report the same required collection version of `community.docker`. Signed-off-by: Daniel Ziegenberg --- requirements.yml | 4 ++-- src/molecule_plugins/containers/driver.py | 4 ++-- src/molecule_plugins/docker/driver.py | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/requirements.yml b/requirements.yml index b8eaacfa..2292acb4 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,10 +1,10 @@ collections: - name: ansible.posix # docker - version: ">=1.4.0" + version: ">=1.4.0" # keep in synch with src/molecule_plugins/docker/driver.py and src/molecule_plugins/containers/driver.py - name: google.cloud - name: amazon.aws - name: community.docker - version: ">=3.10.2" + version: ">=3.10.2" # keep in synch with src/molecule_plugins/docker/driver.py and src/molecule_plugins/containers/driver.py - name: containers.podman - name: azure.azcollection version: ">=1,<2" diff --git a/src/molecule_plugins/containers/driver.py b/src/molecule_plugins/containers/driver.py index e59a997c..1e30504b 100644 --- a/src/molecule_plugins/containers/driver.py +++ b/src/molecule_plugins/containers/driver.py @@ -46,7 +46,7 @@ def __init__(self, config=None) -> None: def required_collections(self) -> dict[str, str]: """Return collections dict containing names and versions required.""" return { - "ansible.posix": "1.3.0", - "community.docker": "1.9.1", + "ansible.posix": "1.4.0", # keep in synch with src/molecule_plugins/docker/driver.py and requirements.yml + "community.docker": "3.10.2", # keep in synch with src/molecule_plugins/docker/driver.py and requirements.yml "containers.podman": "1.8.1", } diff --git a/src/molecule_plugins/docker/driver.py b/src/molecule_plugins/docker/driver.py index dd6ac931..8e9d3213 100644 --- a/src/molecule_plugins/docker/driver.py +++ b/src/molecule_plugins/docker/driver.py @@ -275,4 +275,5 @@ def reset(self): def required_collections(self) -> dict[str, str]: """Return collections dict containing names and versions required.""" # https://galaxy.ansible.com/community/docker + # keep in synch with src/molecule_plugins/containers/driver.py and requirements.yml return {"community.docker": "3.10.2", "ansible.posix": "1.4.0"}