diff --git a/images/Dockerfile.kairos-ubuntu b/images/Dockerfile.kairos-ubuntu index 4cddc50c6..6d5f21a44 100644 --- a/images/Dockerfile.kairos-ubuntu +++ b/images/Dockerfile.kairos-ubuntu @@ -332,9 +332,6 @@ RUN apt-get update \ systemd-hwe-hwdb \ systemd-resolved \ && apt-get clean && rm -rf /var/lib/apt/lists/* -# compress firmware (from 23.10, fw files come compressed) -# for some reason \+ is breaking. Using \; instead despite being slower -RUN find /usr/lib/firmware -type f ! -name "*.zst" -execdir zstd --rm -9 {} \; FROM ubuntu-latest AS ubuntu-latest-selinux RUN apt-get update \ @@ -350,7 +347,6 @@ FROM ubuntu-latest-selinux AS ubuntu-24.10 FROM ubuntu-latest-selinux AS ubuntu-24.04 FROM ${TARGETARCH}-${FLAVOR}-${FLAVOR_RELEASE}-${MODEL} AS ubuntu-legacy -RUN find /usr/lib/firmware -type f ! -name "*.zst" -execdir zstd --rm -9 {} \+ FROM ubuntu-legacy AS ubuntu-22.04 RUN apt-get update @@ -367,9 +363,6 @@ FROM ubuntu-legacy AS ubuntu-20.04 ############################################################### FROM ${FLAVOR}-${FLAVOR_RELEASE} AS all -# compress modules -RUN find /usr/lib/modules -type f -name "*.ko" -execdir zstd --rm -9 {} \+ - RUN systemctl enable systemd-networkd RUN systemctl enable ssh diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu index eb0988529..f309d6779 100644 --- a/images/Dockerfile.ubuntu +++ b/images/Dockerfile.ubuntu @@ -333,9 +333,6 @@ RUN apt-get update \ systemd-hwe-hwdb \ systemd-resolved \ && apt-get clean && rm -rf /var/lib/apt/lists/* -# compress firmware (from 23.10, fw files come compressed) -# for some reason \+ is breaking. Using \; instead despite being slower -RUN find /usr/lib/firmware -type f ! -name "*.zst" -execdir zstd --rm -9 {} \; FROM ubuntu-latest AS ubuntu-latest-selinux RUN apt-get update \ @@ -351,7 +348,6 @@ FROM ubuntu-latest-selinux AS ubuntu-24.10 FROM ubuntu-latest-selinux AS ubuntu-24.04 FROM ${TARGETARCH}-${FLAVOR}-${FLAVOR_RELEASE}-${MODEL} AS ubuntu-legacy -RUN find /usr/lib/firmware -type f ! -name "*.zst" -execdir zstd --rm -9 {} \+ FROM ubuntu-legacy AS ubuntu-22.04 RUN apt-get update @@ -368,9 +364,6 @@ FROM ubuntu-legacy AS ubuntu-20.04 ############################################################### FROM ${FLAVOR}-${FLAVOR_RELEASE} AS all -# compress modules -RUN find /usr/lib/modules -type f -name "*.ko" -execdir zstd --rm -9 {} \+ - RUN systemctl enable systemd-networkd RUN systemctl enable ssh