From 3c3d679a71624e0bb85fd4f91eac6d5d01841ff3 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Tue, 19 Dec 2023 09:50:41 +0100 Subject: [PATCH] Use latest framework and drop manual immmucore/agent injection New versions are now in the latest framework so we should be able to use those directly Signed-off-by: Itxaka --- Earthfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Earthfile b/Earthfile index b910d9edb..c6651df7f 100644 --- a/Earthfile +++ b/Earthfile @@ -9,7 +9,7 @@ ARG LUET_VERSION=0.35.0 # renovate: datasource=docker depName=aquasec/trivy ARG TRIVY_VERSION=0.47.0 # renovate: datasource=github-releases depName=kairos-io/kairos-framework -ARG KAIROS_FRAMEWORK_VERSION="v2.4.4" +ARG KAIROS_FRAMEWORK_VERSION="main" ARG COSIGN_SKIP=".*quay.io/kairos/.*" # TODO: rename ISO_NAME to something like ARTIFACT_NAME because there are place where we use ISO_NAME to refer to the artifact name @@ -368,13 +368,6 @@ uki-base: # Build kernel,uname, etc artifacts FROM +base-image --BUILD_INITRD=false - # Get Kairos Agent from master branch - COPY github.com/kairos-io/kairos-agent:main+build-kairos-agent/kairos-agent /usr/bin/kairos-agent - # Get Immucore from master branch - COPY github.com/kairos-io/immucore:master+build-immucore/immucore /usr/bin/immucore - COPY github.com/kairos-io/immucore:master+dracut-artifacts/28immucore /usr/lib/dracut/modules.d/28immucore - COPY github.com/kairos-io/immucore:master+dracut-artifacts/10-immucore.conf /etc/dracut.conf.d/10-immucore.conf - RUN /usr/bin/immucore version RUN /usr/bin/kairos-agent version RUN ln -s /usr/bin/immucore /init