From 23a0b83a733438b247976ecf3dbfc5ba780a5a77 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Mon, 18 Dec 2023 16:27:07 +0200 Subject: [PATCH] Simplify +iso target Signed-off-by: Dimitris Karakasilis --- Earthfile | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/Earthfile b/Earthfile index 8219a91b3..fcc0e39ae 100644 --- a/Earthfile +++ b/Earthfile @@ -435,28 +435,6 @@ uki-local-artifacts: ### iso: - FROM ubuntu - - COPY +version/VERSION ./ - ARG RELEASE=$(cat VERSION) - ARG TARGETARCH - - # args for base-image target - ARG --required FAMILY - ARG --required FLAVOR - ARG --required FLAVOR_RELEASE - ARG --required BASE_IMAGE - ARG --required MODEL - ARG --required VARIANT - - # Not needed after bumping kairos-agent. remove - ARG ARCH=$TARGETARCH - ARG RELEASE=$KAIROS_VERSION - COPY +extract-kairos-agent-from-framework/kairos-agent kairos-agent - RUN ./kairos-agent versioneer bootable-artifact-name # To see the error if one occurs - ARG ISO_NAME=$(./kairos-agent versioneer bootable-artifact-name) - RUN rm kairos-agent - ARG OSBUILDER_IMAGE FROM $OSBUILDER_IMAGE WORKDIR /build @@ -466,6 +444,8 @@ iso: COPY --keep-own +image-rootfs/rootfs /build/image COPY --keep-own +image-rootfs/IMAGE IMAGE + ARG ISO_NAME=$(source /build/image/etc/os-release; echo '$KAIROS_ARTIFACT') + RUN /entrypoint.sh --name $ISO_NAME --debug build-iso --squash-no-compression --date=false dir:/build/image --output /build/ SAVE ARTIFACT IMAGE AS LOCAL build/IMAGE SAVE ARTIFACT /build/$ISO_NAME.iso kairos.iso AS LOCAL build/$ISO_NAME.iso