ci: install newly created systemd-cryptsetup into Debian/Ubuntu containers

diff --git a/test/container/Dockerfile-debian b/test/container/Dockerfile-debian
index 2ab8ae8a18ccaaa9a32df7cadf339b09e3e9f2b0..0f65c5c0125fc65e234b41d80c71f86c4c100f1d 100644 (file)
--- a/test/container/Dockerfile-debian
+++ b/test/container/Dockerfile-debian
@@ -1,12 +1,23 @@
 ARG DISTRIBUTION=debian
 FROM docker.io/${DISTRIBUTION}
 
+# export ARG
+ARG DISTRIBUTION
+
 # dmraid is no longer installed
 # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1056944
 
 # Install needed packages for the dracut CI container
 # Install dracut as a linux-initramfs-tool provider so that the default initramfs-tool package does not get installed
-RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq --no-install-recommends dracut && \
+RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq --no-install-recommends dracut
+
+# extra packages for sid
+RUN if [ "$DISTRIBUTION" = "debian:sid" ] ; then \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \
+    systemd-cryptsetup \
+    ; fi
+
+RUN \
     DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \
     asciidoc \
     asciidoctor \

diff --git a/test/container/Dockerfile-ubuntu b/test/container/Dockerfile-ubuntu
index 223aad439d19b89a6ababce27c073e2ff994d3f4..ed0215c816fdf8c233060caddf731c6eafd733e5 100644 (file)
--- a/test/container/Dockerfile-ubuntu
+++ b/test/container/Dockerfile-ubuntu
@@ -1,12 +1,23 @@
 ARG DISTRIBUTION=ubuntu
 FROM docker.io/${DISTRIBUTION}
 
+# export ARG
+ARG DISTRIBUTION
+
 # prefer running tests in verbose mode
 ENV V=2
 
 # Install needed packages for the dracut CI container
 # The Linux kernel is only readable by root. See https://launchpad.net/bugs/759725
-RUN apt-get update -y -qq && apt-get upgrade -y -qq && \
+RUN apt-get update -y -qq && apt-get upgrade -y -qq
+
+# extra packages for rolling
+RUN if [ "${DISTRIBUTION}" = "ubuntu:rolling" ] ; then \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \
+    systemd-cryptsetup \
+    ; fi
+
+RUN \
     DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \
     asciidoc \
     asciidoctor \