From b22d3422f45418e7d463dcea0297d6f8d802f1b9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 3 Oct 2024 16:28:49 -0400 Subject: [PATCH] containerfile: Drop use of bootc-image-builder This just adds confusion in the end. Switch to bootstrapping from the app image. --- Containerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 87a31ed..4a3f20c 100644 --- a/Containerfile +++ b/Containerfile @@ -20,12 +20,14 @@ # # # Why does this build process require additional privileges? # -# Because it's generating a base image and uses containerbuildcontextization features itself. +# Because it's generating a base image and uses containerization features itself. # In the future some of this can be lifted. FROM quay.io/fedora/fedora:rawhide as repos -FROM quay.io/centos-bootc/bootc-image-builder:latest as builder +# BOOTSTRAPPING: This can be any image that has rpm-ostree and selinux-policy-targeted. +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