Skip to content

Commit 9bd3db4

Browse files
committed
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 <[email protected]>
1 parent f153ae6 commit 9bd3db4

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

requirements.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
collections:
22
- name: ansible.posix # docker
3-
version: ">=1.4.0"
3+
version: ">=1.4.0" # keep in synch with src/molecule_plugins/docker/driver.py and src/molecule_plugins/containers/driver.py
44
- name: google.cloud
55
- name: amazon.aws
66
- name: community.docker
7-
version: ">=3.10.2"
7+
version: ">=3.10.2" # keep in synch with src/molecule_plugins/docker/driver.py and src/molecule_plugins/containers/driver.py
88
- name: containers.podman
99
- name: azure.azcollection
1010
version: ">=1,<2"

src/molecule_plugins/containers/driver.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def __init__(self, config=None) -> None:
4646
def required_collections(self) -> dict[str, str]:
4747
"""Return collections dict containing names and versions required."""
4848
return {
49-
"ansible.posix": "1.3.0",
50-
"community.docker": "1.9.1",
49+
"ansible.posix": "1.4.0", # keep in synch with src/molecule_plugins/docker/driver.py and requirements.yml
50+
"community.docker": "3.10.2", # keep in synch with src/molecule_plugins/docker/driver.py and requirements.yml
5151
"containers.podman": "1.8.1",
5252
}

src/molecule_plugins/docker/driver.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,4 +275,5 @@ def reset(self):
275275
def required_collections(self) -> dict[str, str]:
276276
"""Return collections dict containing names and versions required."""
277277
# https://galaxy.ansible.com/community/docker
278+
# keep in synch with src/molecule_plugins/containers/driver.py and requirements.yml
278279
return {"community.docker": "3.10.2", "ansible.posix": "1.4.0"}

0 commit comments

Comments
 (0)