fix: use systemd as container command for rootless molecule tests
Rootless Docker requires loginctl enable-linger and systemctl --user, which need systemd as PID 1 inside the container. Updated all platform entries to use /lib/systemd/systemd (or /usr/lib/systemd/systemd for Arch) as the container command instead of sleep infinity. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
co-authored by
Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
parent
d4ea2eef61
commit
43b2a01361
@@ -31,10 +31,11 @@ MOLECULE_ROOT = Path("ansible/roles/gitea-runner/molecule")
|
|||||||
|
|
||||||
#: Supported OS platform matrix.
|
#: Supported OS platform matrix.
|
||||||
#: Each entry maps a short name to (image, command).
|
#: Each entry maps a short name to (image, command).
|
||||||
|
#: The command must be systemd since rootless Docker requires loginctl/systemctl --user.
|
||||||
PLATFORMS: list[dict[str, str]] = [
|
PLATFORMS: list[dict[str, str]] = [
|
||||||
{"name": "ubuntu-2204", "image": "geerlingguy/docker-ubuntu2204-ansible:latest", "command": ""},
|
{"name": "ubuntu-2204", "image": "geerlingguy/docker-ubuntu2204-ansible:latest", "command": "/lib/systemd/systemd"},
|
||||||
{"name": "ubuntu-2404", "image": "geerlingguy/docker-ubuntu2404-ansible:latest", "command": ""},
|
{"name": "ubuntu-2404", "image": "geerlingguy/docker-ubuntu2404-ansible:latest", "command": "/lib/systemd/systemd"},
|
||||||
{"name": "debian-12", "image": "geerlingguy/docker-debian12-ansible:latest", "command": ""},
|
{"name": "debian-12", "image": "geerlingguy/docker-debian12-ansible:latest", "command": "/lib/systemd/systemd"},
|
||||||
{"name": "archlinux", "image": "marcstraube/archlinux-ansible:latest", "command": "/usr/lib/systemd/systemd"},
|
{"name": "archlinux", "image": "marcstraube/archlinux-ansible:latest", "command": "/usr/lib/systemd/systemd"},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ MOLECULE_BIN="$(realpath "${BIN:-.venv/bin}/molecule")"
|
|||||||
ROLE_DIR="$(cd "$(dirname "$0")/.." && pwd)/ansible/roles/gitea-runner"
|
ROLE_DIR="$(cd "$(dirname "$0")/.." && pwd)/ansible/roles/gitea-runner"
|
||||||
|
|
||||||
for p in \
|
for p in \
|
||||||
ubuntu-2204:geerlingguy/docker-ubuntu2204-ansible:latest: \
|
ubuntu-2204:geerlingguy/docker-ubuntu2204-ansible:latest:/lib/systemd/systemd \
|
||||||
ubuntu-2404:geerlingguy/docker-ubuntu2404-ansible:latest: \
|
ubuntu-2404:geerlingguy/docker-ubuntu2404-ansible:latest:/lib/systemd/systemd \
|
||||||
debian-12:geerlingguy/docker-debian12-ansible:latest: \
|
debian-12:geerlingguy/docker-debian12-ansible:latest:/lib/systemd/systemd \
|
||||||
archlinux:marcstraube/archlinux-ansible:latest:/usr/lib/systemd/systemd
|
archlinux:marcstraube/archlinux-ansible:latest:/usr/lib/systemd/systemd
|
||||||
do
|
do
|
||||||
IFS=":" read -r name image command <<< "$p"
|
IFS=":" read -r name image command <<< "$p"
|
||||||
|
|||||||
Reference in New Issue
Block a user