ci: remove git from CI containers

git is not required to build dracut or run the tests.
remove some other packages that are not used during the CI run anyways.

diff --git a/test/container/Dockerfile-alpine b/test/container/Dockerfile-alpine
index c66b779adce24865d3193221e8e196e7112967d1..af07d97ad2ce5fb1cfd3f437ef68fc0ea18ce282 100644 (file)
--- a/test/container/Dockerfile-alpine
+++ b/test/container/Dockerfile-alpine
@@ -1,7 +1,7 @@
 ARG DISTRIBUTION=alpine
 FROM docker.io/${DISTRIBUTION}
 
-# prefer running tests with clang
+# run tests with clang
 ENV CC=clang
 
 # ovmf is not installed as systemd-boot-efistub is not available
@@ -22,7 +22,6 @@ RUN apk add --no-cache \
     bash \
     binutils \
     blkid \
-    bluez \
     btrfs-progs \
     busybox \
     bzip2 \
@@ -42,7 +41,6 @@ RUN apk add --no-cache \
     file \
     findmnt \
     f2fs-tools \
-    git \
     gpg \
     grep \
     iputils \

diff --git a/test/container/Dockerfile-arch b/test/container/Dockerfile-arch
index aba35f24ef3971a8f80afa40d9be10d2311f891e..536b1237b329bfd8f34421adb46c9f2618b234c1 100644 (file)
--- a/test/container/Dockerfile-arch
+++ b/test/container/Dockerfile-arch
@@ -19,7 +19,6 @@ RUN pacman --noconfirm -Syu \
     elfutils \
     erofs-utils \
     f2fs-tools \
-    git \
     glibc \
     jfsutils \
     jq \

diff --git a/test/container/Dockerfile-debian b/test/container/Dockerfile-debian
index af373ae59e9858b34509c24fcfb17bd54c61359b..fa9dfc24a8bb51a8da65f0df3000e7c357f44b40 100644 (file)
--- a/test/container/Dockerfile-debian
+++ b/test/container/Dockerfile-debian
@@ -40,8 +40,7 @@ RUN \
     fcoe-utils \
     fdisk \
     file \
-    g++ \
-    git \
+    gcc \
     gpg \
     iputils-arping \
     iputils-ping \

diff --git a/test/container/Dockerfile-fedora b/test/container/Dockerfile-fedora
index ab592a252f9e8d779791a19316c28d54a399f0cd..c9e75d246f7f38b8817826586102fc57a6224113 100644 (file)
--- a/test/container/Dockerfile-fedora
+++ b/test/container/Dockerfile-fedora
@@ -40,7 +40,6 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     fcoe-utils \
     fuse3 \
     gcc \
-    git \
     iproute \
     iputils \
     iscsi-initiator-utils \

diff --git a/test/container/Dockerfile-opensuse b/test/container/Dockerfile-opensuse
index a12d33d4cd8dd65056b66052a2412ea3e35c1e5b..5dc37701a584d836068f9b2327d2a19bc8b7c1aa 100644 (file)
--- a/test/container/Dockerfile-opensuse
+++ b/test/container/Dockerfile-opensuse
@@ -18,7 +18,6 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     e2fsprogs \
     erofs-utils \
     gcc \
-    git \
     hmaccalc \
     iproute \
     iputils \

diff --git a/test/container/Dockerfile-ubuntu b/test/container/Dockerfile-ubuntu
index 3582d7ef17fc5db94b8640175cd7a3530124374b..d6af05a9056a0e6b5e48f6893e6896e0242bbe67 100644 (file)
--- a/test/container/Dockerfile-ubuntu
+++ b/test/container/Dockerfile-ubuntu
@@ -40,8 +40,7 @@ RUN \
     fcoe-utils \
     fdisk \
     file \
-    g++ \
-    git \
+    gcc \
     gpg \
     iputils-arping \
     iputils-ping \

diff --git a/test/container/Dockerfile-void b/test/container/Dockerfile-void
index 0276c445ee5cc5c847ce83eefdd786bebd4ec449..d0145975526f70ffadec8e99c3c59a007766b061 100644 (file)
--- a/test/container/Dockerfile-void
+++ b/test/container/Dockerfile-void
@@ -2,15 +2,11 @@ FROM ghcr.io/void-linux/void-glibc-full
 
 RUN xbps-install -Syu xbps && xbps-install -yu \
     asciidoc \
-    base-devel \
     bash \
     binutils \
-    bluez \
     btrfs-progs \
-    busybox \
     cargo \
     cifs-utils \
-    connman \
     cpio \
     cryptsetup \
     curl \
@@ -25,9 +21,10 @@ RUN xbps-install -Syu xbps && xbps-install -yu \
     erofs-utils \
     eudev \
     f2fs-tools \
-    git \
+    gcc \
     glibc \
     gnupg \
+    iproute2 \
     iputils \
     jfsutils \
     jq \
@@ -40,7 +37,6 @@ RUN xbps-install -Syu xbps && xbps-install -yu \
     mdadm \
     mtools \
     nbd \
-    NetworkManager \
     nfs-utils \
     ntfs-3g \
     nvme-cli \
@@ -48,9 +44,9 @@ RUN xbps-install -Syu xbps && xbps-install -yu \
     openssh \
     parted \
     pigz \
+    pkg-config \
     plymouth \
     qemu-system-amd64 \
-    rng-tools \
     sbsigntool \
     squashfs-tools \
     swtpm \