Merge pull request #18 from kairos-io/rework_dracut

kairos-io · May 4, 2023 · f5dc23f · f5dc23f
2 parents 18eab48 + 2889a52
commit f5dc23f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Earthfile b/Earthfile
@@ -16,13 +16,20 @@ build-kcrypt:
     RUN CGO_ENABLED=0 go build -o kcrypt -ldflags "-X main.Version=$VERSION"
     SAVE ARTIFACT /work/kcrypt kcrypt AS LOCAL kcrypt
 
+dracut-artifacts:
+    FROM $BASE_IMAGE
+    WORKDIR /build
+    COPY --dir dracut/29kcrypt .
+    COPY dracut/10-kcrypt.conf .
+    SAVE ARTIFACT 29kcrypt 29kcrypt
+    SAVE ARTIFACT 10-kcrypt.conf 10-kcrypt.conf
+
 build-dracut:
     FROM $BASE_IMAGE
-    COPY . /work
-    COPY +build-kcrypt/kcrypt /usr/bin/kcrypt
     WORKDIR /work
-    RUN cp -r dracut/* /usr/lib/dracut/modules.d
-    RUN cp dracut.conf /etc/dracut.conf.d/10-kcrypt.conf
+    COPY +build-kcrypt/kcrypt /usr/bin/kcrypt
+    COPY +dracut-artifacts/29kcrypt /usr/lib/dracut/modules.d/29kcrypt
+    COPY +dracut-artifacts/10-kcrypt.conf /etc/dracut.conf.d/10-kcrypt.conf
     RUN kernel=$(ls /lib/modules | head -n1) && \
         dracut -f "/boot/initrd-${kernel}" "${kernel}" && \
         ln -sf "initrd-${kernel}" /boot/initrd

diff --git a/dracut.conf → dracut/10-kcrypt.conf b/dracut.conf → dracut/10-kcrypt.conf