Merge pull request #27 from cgwalters/composefs-transient

cgwalters · web-flow · commit be1753ba8651 · 2024-02-16T11:34:53.000-05:00
Enable composefs + transient root
diff --git a/eln-dev/Containerfile b/eln-dev/Containerfile
@@ -1,4 +1,5 @@
 FROM quay.io/centos-bootc/fedora-bootc:eln
+COPY usr usr
 COPY *.repo /etc/yum.repos.d/
 RUN dnf --disablerepo='*' --enablerepo=copr-coreos-continuous --enablerepo=copr-rhcontainerbot-bootc -y distro-sync && \
     dnf clean all
diff --git a/eln-dev/usr/lib/ostree/prepare-root.conf b/eln-dev/usr/lib/ostree/prepare-root.conf
@@ -0,0 +1,4 @@
+[root]
+transient = true
+[composefs]
+enabled = true
diff --git a/stream9-dev/Containerfile b/stream9-dev/Containerfile
@@ -1,4 +1,5 @@
 FROM quay.io/centos-bootc/centos-bootc:stream9
+COPY usr usr
 COPY *.repo /etc/yum.repos.d/
 RUN dnf --disablerepo='*' --enablerepo=copr-coreos-continuous --enablerepo=copr-rhcontainerbot-bootc -y distro-sync && \
     dnf clean all
diff --git a/stream9-dev/usr/lib/ostree/prepare-root.conf b/stream9-dev/usr/lib/ostree/prepare-root.conf
@@ -0,0 +1,4 @@
+[root]
+transient = true
+[composefs]
+enabled = true

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`FROM quay.io/centos-bootc/fedora-bootc:eln`
	`2`	`+COPY usr usr`
`2`	`3`	`COPY *.repo /etc/yum.repos.d/`
`3`	`4`	`RUN dnf --disablerepo='*' --enablerepo=copr-coreos-continuous --enablerepo=copr-rhcontainerbot-bootc -y distro-sync && \`
`4`	`5`	`dnf clean all`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`FROM quay.io/centos-bootc/centos-bootc:stream9`
	`2`	`+COPY usr usr`
`2`	`3`	`COPY *.repo /etc/yum.repos.d/`
`3`	`4`	`RUN dnf --disablerepo='*' --enablerepo=copr-coreos-continuous --enablerepo=copr-rhcontainerbot-bootc -y distro-sync && \`
`4`	`5`	`dnf clean all`