From 1a5ba8905ae48e7336434d3a81fe68b90aa6a2ea Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 28 Feb 2025 16:04:04 -0500
Subject: [PATCH] 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 <walters@verbum.org>
---
 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 <<EORUN
+set -xeuo pipefail
+curl -L --fail -o /etc/yum.repos.d/continuous.repo https://copr.fedorainfracloud.org/coprs/g/CoreOS/continuous/repo/fedora-41/group_CoreOS-continuous-fedora-41.repo
+dnf -y install rpm-ostree selinux-policy-targeted
+EORUN
 ARG MANIFEST=fedora-standard
 # The input git repository has .repo files committed to git rpm-ostree has historically
 # emphasized that.  But here, we are fetching the repos from the container base image.