refact: Dockerfile structure

Author: simonwalz

system/Dockerfile

@@ -11,19 +11,21 @@ COPY seccomp-default.json /etc/docker/
 RUN apt-get update && apt-get install --no-install-recommends -y \
   initramfs-tools \
   zstd \
-  && echo "btrfs" >>/etc/initramfs-tools/modules \
-  && echo "ahci" >>/etc/initramfs-tools/modules \
-  && echo "nvme" >>/etc/initramfs-tools/modules \
-  && echo "sd_mod" >>/etc/initramfs-tools/modules \
-  && echo "sdhci" >>/etc/initramfs-tools/modules \
-  && echo "sdhci_pci" >>/etc/initramfs-tools/modules \
-  && echo "usb_storage" >>/etc/initramfs-tools/modules \
-  && echo "mmc_block" >>/etc/initramfs-tools/modules \
-  && echo "mmc_core" >>/etc/initramfs-tools/modules \
-  && echo "sr_mod" >>/etc/initramfs-tools/modules \
-  && echo "microcode" >>/etc/initramfs-tools/modules \
+  && apt-get clean && rm -rf /var/lib/apt/lists/* \
   && echo "RESUME=none" >>/etc/initramfs-tools/conf.d/resume \
-  && apt-get clean && rm -rf /var/lib/apt/lists/*
+  && cat >> "/etc/initramfs-tools/modules" <<'EOF'
+btrfs
+ahci
+nvme
+sd_mod
+sdhci
+sdhci_pci
+usb_storage
+mmc_block
+mmc_core
+sr_mod
+microcode
+EOF
 
 # Install required packages
 RUN apt-get update && apt-get install --no-install-recommends -y \

system/Dockerfile.rpi-arm64

@@ -42,17 +42,19 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/raspberrypi-archive.gpg] http://archi
 RUN apt-get update && apt-get install --no-install-recommends -y \
   initramfs-tools \
   zstd \
-  && echo "btrfs" >>/etc/initramfs-tools/modules \
-  && echo "nvme" >>/etc/initramfs-tools/modules \
-  && echo "sd_mod" >>/etc/initramfs-tools/modules \
-  && echo "sdhci" >>/etc/initramfs-tools/modules \
-  && echo "sdhci_pci" >>/etc/initramfs-tools/modules \
-  && echo "usb_storage" >>/etc/initramfs-tools/modules \
-  && echo "mmc_block" >>/etc/initramfs-tools/modules \
-  && echo "mmc_core" >>/etc/initramfs-tools/modules \
-  && echo "sr_mod" >>/etc/initramfs-tools/modules \
+  && apt-get clean && rm -rf /var/lib/apt/lists/* \
   && echo "RESUME=none" >>/etc/initramfs-tools/conf.d/resume \
-  && apt-get clean && rm -rf /var/lib/apt/lists/*
+  && cat >> "/etc/initramfs-tools/modules" <<'EOF'
+btrfs
+nvme
+sd_mod
+sdhci
+sdhci_pci
+usb_storage
+mmc_block
+mmc_core
+sr_mod
+EOF
 
 # Install required packages
 RUN apt-get update && apt-get install --no-install-recommends -y \