Merge pull request #26 from cgwalters/cleanups

Misc cleanups + regenerate initramfs (to pick up ostree changes)
CentOS · Feb 12, 2024 · cb6aaec · cb6aaec
2 parents 2733e24 + fb4b003
commit cb6aaec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/eln-dev/Containerfile b/eln-dev/Containerfile
@@ -1,5 +1,6 @@
 FROM quay.io/centos-bootc/fedora-bootc:eln
 COPY *.repo /etc/yum.repos.d/
 RUN dnf --disablerepo='*' --enablerepo=copr-coreos-continuous --enablerepo=copr-rhcontainerbot-bootc -y distro-sync && \
-    dnf clean all && rm -rf /var/* && \
-    ostree container commit
+    dnf clean all
+# Note we need to regenerate the initramfs because ostree is included in it
+RUN set -x; kver=$(cd /usr/lib/modules && echo *); dracut -vf /usr/lib/modules/$kver/initramfs.img $kver
diff --git a/stream9-dev/Containerfile b/stream9-dev/Containerfile
@@ -1,6 +1,6 @@
 FROM quay.io/centos-bootc/centos-bootc:stream9
 COPY *.repo /etc/yum.repos.d/
 RUN dnf --disablerepo='*' --enablerepo=copr-coreos-continuous --enablerepo=copr-rhcontainerbot-bootc -y distro-sync && \
-    rpm -q bootc || dnf -y install bootc && \
-    dnf clean all && rm -rf /var/* && \
-    ostree container commit
+    dnf clean all
+# Note we need to regenerate the initramfs because ostree is included in it
+RUN set -x; kver=$(cd /usr/lib/modules && echo *); dracut -vf /usr/lib/modules/$kver/initramfs.img $kver