From 82a4e874a4b0a09979b0966f5725bb5611ab5627 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 3 Mar 2025 09:22:33 -0500 Subject: [PATCH 1/2] finalize.d: Ensure var/tmp in container root There's a crazy history around this; what we really want is to have this reliably generated by tmpfiles.d, the handling for which I want to move to bootc. For now let's wedge this into finalize.d alongside the few others here. Signed-off-by: Colin Walters --- minimal/finalize.d/01-var.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/minimal/finalize.d/01-var.sh b/minimal/finalize.d/01-var.sh index e48c36a..35a8af1 100755 --- a/minimal/finalize.d/01-var.sh +++ b/minimal/finalize.d/01-var.sh @@ -4,3 +4,4 @@ set -xeuo pipefail ln -s ../run var/run # https://gitlab.com/fedora/bootc/tracker/-/issues/58 mkdir -p var/lib/rpm-state +test -d var/tmp || mkdir -m 1777 var/tmp From 1a5ba8905ae48e7336434d3a81fe68b90aa6a2ea Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 28 Feb 2025 16:04:04 -0500 Subject: [PATCH 2/2] container: Use copr rpm-ostree by default As we're now in a cycle of landing fixes there faster, then once we stabilize we can drop this. Signed-off-by: Colin Walters --- Containerfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 4f08153..3a99360 100644 --- a/Containerfile +++ b/Containerfile @@ -6,11 +6,19 @@ # to run the "rechunker" on the output of this build, see # https://coreos.github.io/rpm-ostree/experimental-build-chunked-oci/ +# Override this repos container to control the base image package versions. For +# example, podman build --from=quay.io/fedora/fedora:41 will get you a system +# that uses Fedora 41 packages. Or inject arbitrary yum repos (COPR, etc) here. FROM quay.io/fedora/fedora:rawhide as repos # BOOTSTRAPPING: This can be any image that has rpm-ostree and selinux-policy-targeted. -FROM quay.io/fedora/fedora:rawhide as builder -RUN dnf -y install rpm-ostree selinux-policy-targeted +FROM quay.io/fedora/fedora:41 as builder +# However we also pull rpm-ostree from git main to get some fixes for now +RUN <