From eb9b8e816772b6f1f0136ec1fd912e8a47f6f2b0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 9 Jan 2025 17:19:24 -0500 Subject: [PATCH] build-sys: Drop compat with pungi It's too hard to keep things working both ways. --- Containerfile | 19 +++++---- fedora-40.yaml | 7 --- fedora-41.yaml | 7 --- fedora-rawhide.yaml | 6 --- fedora.repo | 102 -------------------------------------------- 5 files changed, 11 insertions(+), 130 deletions(-) delete mode 100644 fedora-40.yaml delete mode 100644 fedora-41.yaml delete mode 100644 fedora-rawhide.yaml delete mode 100644 fedora.repo diff --git a/Containerfile b/Containerfile index 049389a..cd14401 100644 --- a/Containerfile +++ b/Containerfile @@ -29,21 +29,24 @@ FROM quay.io/fedora/fedora:rawhide as repos FROM quay.io/fedora/fedora:41 as builder RUN dnf -y install rpm-ostree selinux-policy-targeted ARG MANIFEST=fedora-bootc.yaml -COPY --from=repos /etc/dnf/vars /etc/dnf/vars -COPY --from=repos /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-* /etc/pki/rpm-gpg -# 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. -# So copy the source, and delete the hardcoded ones in git, and use the container base -# image ones. We can drop the ones commited to git when we hard switch to Containerfile. + +# Copy in the source code COPY . /src WORKDIR /src -RUN rm -vf /src/*.repo -COPY --from=repos /etc/yum.repos.d/*.repo /src # Construct the base rootfs RUN --mount=type=cache,target=/workdir \ --mount=type=bind,from=repos,src=/,dst=/repos <