[All] Tweak molecule docker config

manala · Apr 12, 2024 · 094bcc4 · 094bcc4
1 parent 5d5d28e
commit 094bcc4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/.config/molecule/config.yml b/.config/molecule/config.yml
@@ -9,8 +9,12 @@ platforms:
     image: jrei/systemd-debian:buster
     platform: linux/amd64
     dockerfile: ../Dockerfile.debian.buster.j2
-    privileged: true
     cgroupns_mode: host
+    capabilities:
+      - NET_ADMIN
+    tmpfs:
+      - /run
+      - /run/lock
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     override_command: false
@@ -19,8 +23,12 @@ platforms:
     image: jrei/systemd-debian:bullseye
     platform: linux/amd64
     dockerfile: ../Dockerfile.debian.bullseye.j2
-    privileged: true
     cgroupns_mode: host
+    capabilities:
+      - NET_ADMIN
+    tmpfs:
+      - /run
+      - /run/lock
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     override_command: false
@@ -29,8 +37,12 @@ platforms:
     image: jrei/systemd-debian:bookworm
     platform: linux/amd64
     dockerfile: ../Dockerfile.debian.bookworm.j2
-    privileged: true
     cgroupns_mode: host
+    capabilities:
+      - NET_ADMIN
+    tmpfs:
+      - /run
+      - /run/lock
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     override_command: false

diff --git a/molecule/Dockerfile.debian.bookworm.j2 b/molecule/Dockerfile.debian.bookworm.j2
@@ -20,6 +20,4 @@ RUN \
     # Goss
     && curl -sSL "https://github.com/aelsabbahy/goss/releases/download/v${GOSS_VERSION}/goss-linux-$(dpkg --print-architecture)" \
         --output /usr/local/bin/goss \
-    && chmod +x /usr/local/bin/goss \
-    # Clean
-    && rm -rf /var/lib/apt/lists/*
+    && chmod +x /usr/local/bin/goss
diff --git a/molecule/Dockerfile.debian.bullseye.j2 b/molecule/Dockerfile.debian.bullseye.j2
@@ -20,6 +20,4 @@ RUN \
     # Goss
     && curl -sSL "https://github.com/aelsabbahy/goss/releases/download/v${GOSS_VERSION}/goss-linux-$(dpkg --print-architecture)" \
         --output /usr/local/bin/goss \
-    && chmod +x /usr/local/bin/goss \
-    # Clean
-    && rm -rf /var/lib/apt/lists/*
+    && chmod +x /usr/local/bin/goss
diff --git a/molecule/Dockerfile.debian.buster.j2 b/molecule/Dockerfile.debian.buster.j2
@@ -20,6 +20,4 @@ RUN \
     # Goss
     && curl -sSL "https://github.com/aelsabbahy/goss/releases/download/v${GOSS_VERSION}/goss-linux-$(dpkg --print-architecture)" \
         --output /usr/local/bin/goss \
-    && chmod +x /usr/local/bin/goss \
-    # Clean
-    && rm -rf /var/lib/apt/lists/*
+    && chmod +x /usr/local/bin/goss