Skip to content

Commit cd910d9

Browse files
committed
Fix auroaraboot version
1 parent 02748d6 commit cd910d9

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

Earthfile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,9 +1013,12 @@ maas-iso-image:
10131013
# Build raw dd image from maas-iso-image using auroraboot
10141014
# This creates a raw disk image that contains the full Kairos OS with A/B partitions
10151015
# Uses Docker-in-Docker approach similar to the existing kairos-raw-image target
1016+
# ARG AURORABOOT_VERSION: use v0.6.4 for known-good; v0.15.0+ may use different output paths
10161017
build-kairos-dd-image:
10171018
FROM --platform=linux/${ARCH} --allow-privileged earthly/dind:alpine-3.19-docker-25.0.5-r0
10181019

1020+
ARG AURORABOOT_VERSION=v0.6.4
1021+
10191022
# Install required tools
10201023
RUN apk add --no-cache bash findutils
10211024

@@ -1039,9 +1042,9 @@ build-kairos-dd-image:
10391042
echo "Contents of /etc/kairos-release:" && \
10401043
docker run --rm index.docker.io/library/palette-installer-image:maas cat /etc/kairos-release 2>/dev/null || echo "File not found" && \
10411044
exit 1) && \
1042-
echo "=== Running auroraboot to convert image to raw disk ===" && \
1045+
echo "=== Running auroraboot (version: ${AURORABOOT_VERSION}) to convert image to raw disk ===" && \
10431046
docker run --privileged -v /var/run/docker.sock:/var/run/docker.sock \
1044-
-v /workdir:/aurora --net host --rm quay.io/kairos/auroraboot:v0.6.4 \
1047+
-v /workdir:/aurora --net host --rm quay.io/kairos/auroraboot:${AURORABOOT_VERSION} \
10451048
--debug \
10461049
--set "disable_http_server=true" \
10471050
--set "disable_netboot=true" \
@@ -1050,18 +1053,18 @@ build-kairos-dd-image:
10501053
--set "state_dir=/aurora" > /workdir/auroraboot.log 2>&1; \
10511054
AURORABOOT_EXIT=$?; \
10521055
echo "=== Auroraboot finished with exit code: $AURORABOOT_EXIT ===" && \
1053-
if [ $AURORABOOT_EXIT -ne 0 ]; then \
1056+
echo "=== Auroraboot log (always shown for debugging) ===" && \
1057+
cat /workdir/auroraboot.log || true && \
1058+
echo "=== Workdir contents after auroraboot ===" && \
1059+
ls -laR /workdir/ || true && \
1060+
if [ "$AURORABOOT_EXIT" -ne 0 ]; then \
10541061
echo "ERROR: Auroraboot failed with exit code $AURORABOOT_EXIT"; \
1055-
echo "=== Full Auroraboot log ==="; \
1056-
cat /workdir/auroraboot.log || true; \
10571062
exit 1; \
10581063
fi && \
10591064
echo "=== Finding raw image ===" && \
1060-
RAW_IMG=$(find /workdir -type f \( -name "*.raw" -o -name "*.img" \) -not -name "*.iso" | head -n1) && \
1065+
RAW_IMG=$(find /workdir -type f \( -name "*.raw" -o -name "*.img" -o -name "disk.raw" \) ! -name "*.iso" 2>/dev/null | head -n1) && \
10611066
if [ -z "$RAW_IMG" ]; then \
1062-
echo "ERROR: No raw image found in /workdir"; \
1063-
echo "Contents of /workdir:"; \
1064-
ls -laR /workdir/ || true; \
1067+
echo "ERROR: No raw image found in /workdir (searched for *.raw, *.img, disk.raw)"; \
10651068
echo "=== Auroraboot log ==="; \
10661069
cat /workdir/auroraboot.log || true; \
10671070
exit 1; \

0 commit comments

Comments
 (0)