ci: test dash only on Debian/Ubuntu CI

dash is default on Debian/Ubuntu and no testcase requires dash anymore.

Removed astyle as well as it is was never needed to run the CI.

diff --git a/test/container/Dockerfile-arch b/test/container/Dockerfile-arch
index fb30621d53f847a2cf6d3c25f0949e5627fa1595..4e3a20a9ba9b02d56c9d807042617b110f1f4d6e 100644 (file)
--- a/test/container/Dockerfile-arch
+++ b/test/container/Dockerfile-arch
@@ -6,7 +6,6 @@ ENV TEST_FSTYPE=xfs
 RUN pacman --noconfirm -Syu \
     asciidoc \
     asciidoctor \
-    astyle \
     base-devel \
     bluez \
     btrfs-progs \
@@ -15,7 +14,6 @@ RUN pacman --noconfirm -Syu \
     cifs-utils \
     connman \
     cpio \
-    dash \
     dhclient \
     dhcp \
     dmraid \

diff --git a/test/container/Dockerfile-debian b/test/container/Dockerfile-debian
index 06f530dacea53c960036a361cf4cb9425d6d4a11..3e82e1036e18d352278121889d325782fd6ee041 100644 (file)
--- a/test/container/Dockerfile-debian
+++ b/test/container/Dockerfile-debian
@@ -22,7 +22,6 @@ RUN \
     DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \
     asciidoc \
     asciidoctor \
-    astyle \
     bluez \
     btrfs-progs \
     busybox-static \

diff --git a/test/container/Dockerfile-fedora b/test/container/Dockerfile-fedora
index cf76bf352fdcbca3ed41a7adf1bf72f49f8e5761..964235b2dbaa33965f1dbe479b7c875f18edf258 100644 (file)
--- a/test/container/Dockerfile-fedora
+++ b/test/container/Dockerfile-fedora
@@ -12,10 +12,8 @@ if [ "${DISTRIBUTION}" = "centos:stream9" ]; then \
 else \
     dnf -y install --setopt=install_weak_deps=False \
     asciidoctor \
-    astyle \
     btrfs-progs \
     busybox \
-    dash \
     dmraid \
     erofs-utils \
     f2fs-tools \

diff --git a/test/container/Dockerfile-gentoo b/test/container/Dockerfile-gentoo
index a735e501ca97bdf3be3bc1cb9ba2d5c53d5ed761..2881517a99270b1c7c83b8c5282707390c8dbd9c 100644 (file)
--- a/test/container/Dockerfile-gentoo
+++ b/test/container/Dockerfile-gentoo
@@ -34,7 +34,6 @@ RUN emerge --quiet --deep --autounmask-continue=y --with-bdeps=n --noreplace \
     app-emulation/qemu \
     app-misc/jq \
     app-portage/gentoolkit \
-    app-shells/dash \
     app-text/asciidoc \
     app-text/docbook-xml-dtd \
     app-text/docbook-xsl-stylesheets \

diff --git a/test/container/Dockerfile-opensuse b/test/container/Dockerfile-opensuse
index a66317f435852488f2ee9bab505bceb96c57154d..f59dd59cac00a146903cfd487b7ed411cf92af6a 100644 (file)
--- a/test/container/Dockerfile-opensuse
+++ b/test/container/Dockerfile-opensuse
@@ -11,7 +11,6 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     bzip2 \
     cargo \
     cryptsetup \
-    dash \
     dbus-broker \
     dhcp-client \
     dhcp-server \

diff --git a/test/container/Dockerfile-ubuntu b/test/container/Dockerfile-ubuntu
index 3bcf367f1a6d7772efb3671271daf506e51b22ee..3de6bfdad045904804a5458556e840b85c8c8f7b 100644 (file)
--- a/test/container/Dockerfile-ubuntu
+++ b/test/container/Dockerfile-ubuntu
@@ -22,7 +22,6 @@ RUN \
     DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \
     asciidoc \
     asciidoctor \
-    astyle \
     bluez \
     btrfs-progs \
     busybox-static \

diff --git a/test/container/Dockerfile-void b/test/container/Dockerfile-void
index 52ded016d335b52e506ff510b44269c3ad7ccdb5..5ed7ae07e8c8a7d5ede8dd3784f38f80204a03c4 100644 (file)
--- a/test/container/Dockerfile-void
+++ b/test/container/Dockerfile-void
@@ -2,7 +2,6 @@ FROM ghcr.io/void-linux/void-glibc-full
 
 RUN xbps-install -Syu xbps && xbps-install -yu \
     asciidoc \
-    astyle \
     base-devel \
     bash \
     binutils \
@@ -15,7 +14,6 @@ RUN xbps-install -Syu xbps && xbps-install -yu \
     cpio \
     cryptsetup \
     curl \
-    dash \
     dhclient \
     dhcp \
     dmraid \