From ea5f1a1b3d6998db709c072a8cfe04e035d3aad5 Mon Sep 17 00:00:00 2001 From: Santhosh Date: Thu, 21 Sep 2023 23:48:14 +0530 Subject: [PATCH] sync release-4.0 to main (#58) --- Earthfile | 4 ++-- ubuntu-fips/Dockerfile | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Earthfile b/Earthfile index 48f13ee..4784b96 100644 --- a/Earthfile +++ b/Earthfile @@ -9,8 +9,8 @@ ARG IMAGE_REPO=$OS_DISTRIBUTION ARG K8S_DISTRIBUTION ARG CUSTOM_TAG ARG ARCH -ARG PE_VERSION=v4.0.3 -ARG SPECTRO_LUET_VERSION=v1.1.2 +ARG PE_VERSION=v4.0.4 +ARG SPECTRO_LUET_VERSION=v1.1.4 ARG KAIROS_VERSION=v2.3.2 ARG K3S_FLAVOR_TAG=k3s1 ARG RKE2_FLAVOR_TAG=rke2r1 diff --git a/ubuntu-fips/Dockerfile b/ubuntu-fips/Dockerfile index 74efc8d..7d4a879 100644 --- a/ubuntu-fips/Dockerfile +++ b/ubuntu-fips/Dockerfile @@ -155,6 +155,9 @@ RUN rm -rf /boot/initramfs-* # Fixup sudo perms RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo +# Symlink kernel HMAC +RUN kernel=$(ls /boot/vmlinuz-* | head -n1) && ln -sf ."${kernel#/boot/}".hmac /boot/.vmlinuz.hmac + RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install RUN ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv