diff options
| -rw-r--r-- | molecule/debian/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | molecule/raspberrypi/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | molecule/ubuntu/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | roles/network/tasks/install-debian.yml | 8 |
4 files changed, 3 insertions, 11 deletions
diff --git a/molecule/debian/Dockerfile.j2 b/molecule/debian/Dockerfile.j2 index 26e0dc9e..126602e4 100644 --- a/molecule/debian/Dockerfile.j2 +++ b/molecule/debian/Dockerfile.j2 @@ -1,6 +1,6 @@ # Based on the amazing work of geerlingguy <3 # FROM docker.io/geerlingguy/docker-debian12-ansible -FROM docker.io/library/debian:bookworm +FROM docker.io/library/debian:12.11 ARG DEBIAN_FRONTEND=noninteractive diff --git a/molecule/raspberrypi/Dockerfile.j2 b/molecule/raspberrypi/Dockerfile.j2 index 26e0dc9e..126602e4 100644 --- a/molecule/raspberrypi/Dockerfile.j2 +++ b/molecule/raspberrypi/Dockerfile.j2 @@ -1,6 +1,6 @@ # Based on the amazing work of geerlingguy <3 # FROM docker.io/geerlingguy/docker-debian12-ansible -FROM docker.io/library/debian:bookworm +FROM docker.io/library/debian:12.11 ARG DEBIAN_FRONTEND=noninteractive diff --git a/molecule/ubuntu/Dockerfile.j2 b/molecule/ubuntu/Dockerfile.j2 index a8e90a48..5d9a96cc 100644 --- a/molecule/ubuntu/Dockerfile.j2 +++ b/molecule/ubuntu/Dockerfile.j2 @@ -1,6 +1,6 @@ # Based on the amazing work of geerlingguy <3 # FROM docker.io/geerlingguy/docker-ubuntu2404-ansible -FROM docker.io/library/ubuntu:noble +FROM docker.io/library/ubuntu:noble-20250805 ARG DEBIAN_FRONTEND=noninteractive diff --git a/roles/network/tasks/install-debian.yml b/roles/network/tasks/install-debian.yml index 92912ea0..c5793bd1 100644 --- a/roles/network/tasks/install-debian.yml +++ b/roles/network/tasks/install-debian.yml @@ -5,10 +5,6 @@ pkg: "{{ network_packages }}" state: "present" -- name: "Collect facts about installed packages" - ansible.builtin.package_facts: - manager: "apt" - - name: "Ensure avahi/dhcpcd packages are removed" become: true ansible.builtin.apt: @@ -19,7 +15,3 @@ state: "absent" autoremove: true purge: true - when: > - 'avahi-daemon' in ansible_facts.packages or - 'avahi-utils' in ansible_facts.packages or - 'dhcpcd' in ansible_facts.packages |