From 7c9b845f032874afe43cdaafd7ad0daa1a18d7a4 Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Sat, 25 May 2024 07:25:42 +0200 Subject: [PATCH] Bump agent, immucore and kcrypt - agent v2.8.16 - immucore v0.1.27 - kcrypt 0.11.1 Signed-off-by: Mauro Morales --- Dockerfile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index fb2b5e7..7c0af11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,17 +2,21 @@ ARG SECURITY_PROFILE=generic # Backport for kairos 3.0.x + # Bumps yip for user id reuse # Fixes hooks in uki install -FROM quay.io/kairos/packages:kairos-agent-system-2.8.15 AS kairos-agent -FROM quay.io/kairos/packages:kairos-agent-fips-2.8.15 AS kairos-agent-fips +FROM quay.io/kairos/packages:kairos-agent-system-2.8.16 AS kairos-agent +FROM quay.io/kairos/packages:kairos-agent-fips-2.8.16 AS kairos-agent-fips -# Bump fixes for kairos 3.0.x # Adds sync calls before and after mounting # Fixes mounting oem before running rootfs stage under uki # Bumps yip for user id reuse -FROM quay.io/kairos/packages:immucore-fips-0.1.26 AS immucore-fips -FROM quay.io/kairos/packages:immucore-system-0.1.26 AS immucore +FROM quay.io/kairos/packages:immucore-fips-0.1.27 AS immucore-fips +FROM quay.io/kairos/packages:immucore-system-0.1.27 AS immucore + +# Trigger udev to populate disk info +FROM quay.io/kairos/packages:kcrypt-fips-0.11.1 AS kcrypt-fips +FROM quay.io/kairos/packages:kcrypt-system-0.11.1 AS kcrypt FROM quay.io/luet/base:0.35.1 AS luet @@ -37,6 +41,7 @@ RUN luet install -y --config repositories.yaml --system-target /framework \ system/kairos-agent COPY --from=kairos-agent / /framework/ COPY --from=immucore / /framework/ +COPY --from=kcrypt / /framework/ FROM base AS fips RUN luet install -y --config repositories.yaml --system-target /framework \ @@ -46,6 +51,7 @@ RUN luet install -y --config repositories.yaml --system-target /framework \ fips/kairos-agent COPY --from=kairos-agent-fips / /framework/ COPY --from=immucore-fips / /framework/ +COPY --from=kcrypt-fips / /framework/ # Final images FROM ${SECURITY_PROFILE} AS post