From 1c17cd6bbcc467b1c98f0dd82c432b338492204c Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Fri, 11 Oct 2024 12:38:51 +0300 Subject: [PATCH] Don't break docker build when /lib/modules etc are not found because "[ -z ... ]` returns "1" and fails the build Signed-off-by: Dimitris Karakasilis --- images/Dockerfile.ubuntu | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu index 43ae4aa21..d625b77eb 100644 --- a/images/Dockerfile.ubuntu +++ b/images/Dockerfile.ubuntu @@ -116,11 +116,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # for UKI, install the linux-modules pkg if no modules are found RUN [ -z "$(ls -A /lib/modules/)" ] && apt-get update && apt-get install -y --no-install-recommends \ "$(apt-cache search linux-modules | grep -oP 'linux-modules-\d+.\d+.\d+-\d+-generic' | sort -V | tail -1)" \ - && apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* + && apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* || true # for UKI, install the linux-image pkg if no kernel is found RUN [ -z "$(ls -A /boot/vmlinuz*)" ] && apt-get update && apt-get install -y --no-install-recommends \ "$(apt-cache search linux-image | grep -oP 'linux-image-\d+.\d+.\d+-\d+-generic' | sort -V | tail -1)" \ - && apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* + && apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* || true # This target is aimed at non-UKI images where size is not a concern FROM common AS grub @@ -141,18 +141,14 @@ RUN apt-get update \ && apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* FROM systemd-boot AS systemd-boot-amd64 -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - shared-mime-info \ - && apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y --no-install-recommends shared-mime-info || true +RUN apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* || true RUN [ -z "$(ls -A /lib/firmware/amd/)" ] && apt-get update && apt-get install -y --no-install-recommends \ - && apt-get install -y --no-install-recommends \ - amd64-microcode \ - && apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* + && apt-get install -y --no-install-recommends amd64-microcode || true +RUN apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* || true RUN [ -z "$(ls -A /lib/firmware/intel-ucode/)" ] && apt-get update && apt-get install -y --no-install-recommends \ - && apt-get install -y --no-install-recommends \ - intel-microcode \ - && apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* + && apt-get install -y --no-install-recommends intel-microcode || true +RUN apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* || true FROM systemd-boot AS systemd-boot-arm64