From 31665095a32f984cb31591c52693c6e44aa4e6a3 Mon Sep 17 00:00:00 2001 From: Jo Zzsi Date: Thu, 19 Sep 2024 21:56:03 -0400 Subject: [PATCH] ci: remove unused interactive debugging tools Remove vi(m), strace, tcpdump, wget, less. --- test/container/Dockerfile-arch | 3 --- test/container/Dockerfile-debian | 5 ----- test/container/Dockerfile-fedora | 3 --- test/container/Dockerfile-opensuse | 3 --- test/container/Dockerfile-ubuntu | 5 ----- test/container/Dockerfile-void | 2 -- 6 files changed, 21 deletions(-) diff --git a/test/container/Dockerfile-arch b/test/container/Dockerfile-arch index 6dd139f8a..2ed839d8d 100644 --- a/test/container/Dockerfile-arch +++ b/test/container/Dockerfile-arch @@ -49,12 +49,9 @@ RUN pacman --noconfirm -Syu \ shellcheck \ shfmt \ squashfs-tools \ - strace \ swtpm \ systemd-ukify \ - tcpdump \ tgt \ tpm2-tools \ - vi \ xfsprogs \ && yes | pacman -Scc diff --git a/test/container/Dockerfile-debian b/test/container/Dockerfile-debian index 7346cb268..f122c2170 100644 --- a/test/container/Dockerfile-debian +++ b/test/container/Dockerfile-debian @@ -40,7 +40,6 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq -- jfsutils \ jq \ kmod \ - less \ libkmod-dev \ linux-image-generic \ lvm2 \ @@ -67,19 +66,15 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq -- sbsigntool \ shellcheck \ squashfs-tools \ - strace \ swtpm \ systemd-boot-efi \ systemd-container \ systemd-coredump \ systemd-resolved \ systemd-timesyncd \ - tcpdump \ tgt \ thin-provisioning-tools \ tpm2-tools \ - vim \ - wget \ xfsprogs \ zstd \ && apt-get clean diff --git a/test/container/Dockerfile-fedora b/test/container/Dockerfile-fedora index 9977a51e9..2739f8984 100644 --- a/test/container/Dockerfile-fedora +++ b/test/container/Dockerfile-fedora @@ -61,16 +61,13 @@ RUN dnf -y install --setopt=install_weak_deps=False \ ShellCheck \ shfmt \ squashfs-tools \ - strace \ swtpm \ systemd-boot-unsigned \ systemd-networkd \ systemd-resolved \ systemd-ukify \ tar \ - tcpdump \ tpm2-tools \ - wget \ xfsprogs \ xz \ && dnf -y update && dnf clean all diff --git a/test/container/Dockerfile-opensuse b/test/container/Dockerfile-opensuse index 3ba823a54..de33f61bc 100644 --- a/test/container/Dockerfile-opensuse +++ b/test/container/Dockerfile-opensuse @@ -46,17 +46,14 @@ RUN dnf -y install --setopt=install_weak_deps=False \ ShellCheck \ shfmt \ squashfs \ - strace \ swtpm \ systemd-boot \ systemd-experimental \ tar \ - tcpdump \ tgt \ tpm2.0-tools \ /usr/bin/qemu-system-$(uname -m) \ util-linux-systemd \ - wget \ xz \ && dnf -y update && dnf clean all diff --git a/test/container/Dockerfile-ubuntu b/test/container/Dockerfile-ubuntu index d8796a08a..bb1cbb859 100644 --- a/test/container/Dockerfile-ubuntu +++ b/test/container/Dockerfile-ubuntu @@ -41,7 +41,6 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && \ jfsutils \ jq \ kmod \ - less \ libdmraid-dev \ libkmod-dev \ linux-image-generic \ @@ -69,7 +68,6 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && \ sbsigntool \ shellcheck \ squashfs-tools \ - strace \ swtpm \ systemd-boot-efi \ systemd-container \ @@ -77,12 +75,9 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && \ systemd-resolved \ systemd-timesyncd \ systemd-ukify \ - tcpdump \ tgt \ thin-provisioning-tools \ tpm2-tools \ - vim \ - wget \ xfsprogs \ zstd \ && apt-get clean \ diff --git a/test/container/Dockerfile-void b/test/container/Dockerfile-void index 17104a264..dc1152355 100644 --- a/test/container/Dockerfile-void +++ b/test/container/Dockerfile-void @@ -56,10 +56,8 @@ RUN xbps-install -Syu xbps && xbps-install -yu \ shellcheck \ shfmt \ squashfs-tools \ - strace \ swtpm \ systemd-boot-efistub \ - tcpdump \ tgt \ tpm2-tools \ ukify \