From 73fb980885a044b642a572b5321e4165f79b1493 Mon Sep 17 00:00:00 2001 From: Rishi Anand Date: Thu, 14 Sep 2023 02:10:31 -0700 Subject: [PATCH 1/4] PE-2605 Adding apparmor-parser as se_linux is disabled (#57) --- Earthfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Earthfile b/Earthfile index 1f7ee38..48f13ee 100644 --- a/Earthfile +++ b/Earthfile @@ -266,6 +266,13 @@ base-image: RUN zypper cc && \ zypper clean END + + IF [ "$OS_DISTRIBUTION" = "opensuse-leap" ] + RUN zypper install -y apparmor-parser apparmor-profiles + RUN zypper cc && \ + zypper clean + END + IF [ "$ARCH" = "arm64" ] RUN mkdir -p /etc/luet/repos.conf.d && luet repo add spectro --type docker --url gcr.io/spectro-dev-public/luet-repo-arm --priority 1 -y && luet repo update ELSE IF [ "$ARCH" = "amd64" ] From 80eaa2dbed4906c385e2b998f1dd8a3d7df4c175 Mon Sep 17 00:00:00 2001 From: Rishi Anand Date: Thu, 14 Sep 2023 02:12:52 -0700 Subject: [PATCH 2/4] Updating Earthfile with Luet version v1.1.4 (#55) * Updating Earthfile with Luet version v1.1.3 * Update Earthfile --------- Co-authored-by: Santhosh --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 48f13ee..ddf1e0d 100644 --- a/Earthfile +++ b/Earthfile @@ -10,7 +10,7 @@ ARG K8S_DISTRIBUTION ARG CUSTOM_TAG ARG ARCH ARG PE_VERSION=v4.0.3 -ARG SPECTRO_LUET_VERSION=v1.1.2 +ARG SPECTRO_LUET_VERSION=v1.1.4 ARG KAIROS_VERSION=v2.3.2 ARG K3S_FLAVOR_TAG=k3s1 ARG RKE2_FLAVOR_TAG=rke2r1 From 58ab429f66e6340b7b76d03a5aaed5000c8ebdf9 Mon Sep 17 00:00:00 2001 From: Santhosh Date: Fri, 15 Sep 2023 22:42:39 +0530 Subject: [PATCH 3/4] Update PE_VERSION --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index ddf1e0d..4784b96 100644 --- a/Earthfile +++ b/Earthfile @@ -9,7 +9,7 @@ ARG IMAGE_REPO=$OS_DISTRIBUTION ARG K8S_DISTRIBUTION ARG CUSTOM_TAG ARG ARCH -ARG PE_VERSION=v4.0.3 +ARG PE_VERSION=v4.0.4 ARG SPECTRO_LUET_VERSION=v1.1.4 ARG KAIROS_VERSION=v2.3.2 ARG K3S_FLAVOR_TAG=k3s1 From f67db2a4f457e23630f5a4d431d93a64a89da573 Mon Sep 17 00:00:00 2001 From: Santhosh Date: Thu, 21 Sep 2023 23:45:06 +0530 Subject: [PATCH 4/4] Update ubuntu-fips kernel for fips --- ubuntu-fips/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) 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