build: remove mkinitrd and fix docker create

- use `dracut -f --regenerate-all` to replace mkinitrd because mkinitrd is deprecated - docker create now need command to run Signed-off-by: Vicente Cheng <[email protected]>
harvester · Jun 19, 2024 · 1e7572e · 1e7572e
1 parent 4738955
commit 1e7572e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/package/harvester-os/Dockerfile b/package/harvester-os/Dockerfile
@@ -9,7 +9,7 @@ RUN chmod 0600 /system/oem/*
 
 COPY harvester-release.yaml /etc/
 
-RUN mkinitrd
+RUN dracut -f --regenerate-all
 
 ARG HARVESTER_PRETTY_NAME
 RUN sed -i "s/^PRETTY_NAME.*/PRETTY_NAME=\"$HARVESTER_PRETTY_NAME\"/g" /etc/os-release && \

diff --git a/scripts/package-harvester-os b/scripts/package-harvester-os
@@ -78,7 +78,8 @@ then
 fi
 
 INITRD=$(docker run --rm ${HARVESTER_OS_IMAGE} readlink /boot/initrd)
-docker create --cidfile=os-img-container ${HARVESTER_OS_IMAGE}
+# we need to add entrypoint or the docker create failed in newer version
+docker create --cidfile=os-img-container ${HARVESTER_OS_IMAGE} -- tail -f /dev/null
 docker cp $(<os-img-container):/boot/${KERNEL} ${ARTIFACTS_DIR}/${PROJECT_PREFIX}-vmlinuz-${ARCH}
 docker cp $(<os-img-container):/boot/${INITRD} ${ARTIFACTS_DIR}/${PROJECT_PREFIX}-initrd-${ARCH}
 docker cp $(<os-img-container):/usr/bin/elemental /usr/bin/elemental