Fix issues building arm

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
kairos-io · Dec 21, 2023 · 5c699ba · 5c699ba
1 parent 6dfdbca
commit 5c699ba
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/Earthfile b/Earthfile
@@ -1,5 +1,5 @@
 VERSION 0.6
-FROM alpine
+FROM alpine:3.18
 ARG REGISTRY_AND_ORG=quay.io/kairos
 ARG IMAGE
 ARG SUPPORT=official # not using until this is defined in https://github.com/kairos-io/kairos/issues/1527
@@ -283,6 +283,7 @@ base-image:
     COPY +git-version/GIT_VERSION VERSION
 
     SAVE IMAGE $_CIMG
+    SAVE ARTIFACT /etc/os-release osrelease
     SAVE ARTIFACT /IMAGE AS LOCAL build/IMAGE
     SAVE ARTIFACT VERSION AS LOCAL build/VERSION
     SAVE ARTIFACT /etc/kairos/versions.yaml versions.yaml AS LOCAL build/versions.yaml
@@ -526,15 +527,23 @@ netboot:
     SAVE ARTIFACT /build/$ISO_NAME-initrd initrd AS LOCAL build/$ISO_NAME-initrd
     SAVE ARTIFACT /build/$ISO_NAME.ipxe ipxe AS LOCAL build/$ISO_NAME.ipxe
 
+foo:
+    FROM alpine
+    COPY +base-image/osrelease osrelease
+    RUN source osrelease && echo $KAIROS_ARTIFACT > foo
+    SAVE ARTIFACT foo foo AS LOCAL build/foo
+
 arm-image:
   ARG OSBUILDER_IMAGE
   ARG COMPRESS_IMG=true
   ARG IMG_COMPRESSION=xz
 
-  FROM +base-image
-  ARG IMAGE_NAME=$(source /etc/os-release; echo '$KAIROS_ARTIFACT').img
+  COPY --platform=linux/arm64 +base-image/osrelease osrelease
+  ARG IMAGE_NAME=$(source osrelease && echo $KAIROS_ARTIFACT).img
+  RUN rm osrelease
 
   FROM $OSBUILDER_IMAGE
+  ARG --required MODEL
 
   WORKDIR /build
   # These sizes are in MB

diff --git a/images/Dockerfile.kairos-opensuse b/images/Dockerfile.kairos-opensuse
@@ -81,6 +81,7 @@ RUN zypper in --force-resolution -y \
     tmux \
     vim \
     which \
+    tpm2* \
     && zypper cc
 
 FROM common as amd64

diff --git a/images/Dockerfile.kairos-rhel b/images/Dockerfile.kairos-rhel
@@ -26,7 +26,7 @@ FROM epel AS almalinux
 FROM epel AS rockylinux
 
 FROM base AS fedora
-RUN dnf install -y "https://zfsonlinux.org/fedora/zfs-release-2-3$(rpm --eval "%{dist}").noarch.rpm" && dnf clean all
+RUN dnf install -y "https://zfsonlinux.org/fedora/zfs-release-2-4$(rpm --eval "%{dist}").noarch.rpm" && dnf clean all
 
 # install common packages
 FROM ${FLAVOR} AS common

diff --git a/images/Dockerfile.kairos-ubuntu b/images/Dockerfile.kairos-ubuntu
@@ -89,6 +89,7 @@ RUN apt-get update \
     ubuntu-advantage-tools \
     xz-utils \
     zstd \
+    tpm2-* \
     && apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 ###############################################################