From 3929c0ebbda25c3871f2874a99b0501c4843e11c Mon Sep 17 00:00:00 2001 From: AnsibleGuy Date: Sat, 4 May 2024 16:19:16 +0200 Subject: [PATCH] updated molecule docker-image --- molecule/default/Dockerfile_debian12_systemd.j2 | 14 -------------- molecule/default/molecule.yml | 16 ++-------------- molecule/default/prepare.yml | 5 ----- 3 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 molecule/default/Dockerfile_debian12_systemd.j2 diff --git a/molecule/default/Dockerfile_debian12_systemd.j2 b/molecule/default/Dockerfile_debian12_systemd.j2 deleted file mode 100644 index 703498a..0000000 --- a/molecule/default/Dockerfile_debian12_systemd.j2 +++ /dev/null @@ -1,14 +0,0 @@ -# docker build -t mantest - < ./Dockerfile.j2 -# docker run -it --privileged --name mantest mantest:latest /sbin/init --tmpfs /tmp --tmpfs /run --tmpfs /run/lock - -FROM debian:12-slim - -ENV container docker -ENV LC_ALL C -ENV DEBIAN_FRONTEND noninteractive - -RUN apt-get update \ - && apt-get install -y systemd systemd-sysv python3 sudo \ - && apt-get clean - -CMD ["/sbin/init"] diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index e2080af..7faf74b 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -17,32 +17,20 @@ platforms: - name: 'test-ag-nftables' ipv4_address: '192.168.9.1' groups: [grp_targets] - - # docker config docker_host: 'tcp://molecule-docker.local:2375' - purge_networks: true - image: 'debian:12-slim' - dockerfile: 'Dockerfile_debian12_systemd.j2' - build_image: yes + image: 'ansible0guy/molecule:debian-latest' tmpfs: ['/tmp', '/run', '/run/lock'] privileged: true - command: '/sbin/init' - name: test-ag-nftables-1 networks: - name: 'test-ag-nftables' ipv4_address: '192.168.9.2' groups: [grp_targets] - - # docker config docker_host: 'tcp://molecule-docker.local:2375' - purge_networks: true - image: 'debian:12-slim' - dockerfile: 'Dockerfile_debian12_systemd.j2' - build_image: yes + image: 'ansible0guy/molecule:debian-latest' tmpfs: ['/tmp', '/run', '/run/lock'] privileged: true - command: '/sbin/init' provisioner: name: ansible diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index 237a0e1..f696c09 100644 --- a/molecule/default/prepare.yml +++ b/molecule/default/prepare.yml @@ -3,11 +3,6 @@ - name: Prepare hosts: all tasks: - - name: Installing troubleshooting utils - ansible.builtin.apt: - name: ['less', 'nano', 'net-tools', 'dnsutils', 'iproute2'] - state: present - - name: Installing Role dependencies ansible.builtin.apt: name: ['kmod']