Skip to content

Commit

Permalink
Simplify +iso target
Browse files Browse the repository at this point in the history
Signed-off-by: Dimitris Karakasilis <[email protected]>
  • Loading branch information
jimmykarily committed Dec 18, 2023
1 parent 9c514cd commit 23a0b83
Showing 1 changed file with 2 additions and 22 deletions.
24 changes: 2 additions & 22 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 23a0b83

Please sign in to comment.