diff --git a/Containerfile b/Containerfile index d5af966..9421a6b 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}" FROM registry.fedoraproject.org/fedora:${FEDORA_MAJOR_VERSION} AS builder @@ -22,16 +22,6 @@ RUN dnf install \ dnf builddep -y output/ublue-update.spec && \ make build-rpm -# Dump a file list for each RPM for easier consumption -RUN \ - for RPM in ${UBLUE_ROOT}/noarch/*.rpm; do \ - NAME="$(rpm -q $RPM --queryformat='%{NAME}')"; \ - mkdir -p "${UBLUE_ROOT}/ublue-os/files/${NAME}"; \ - rpm2cpio "${RPM}" | cpio -idmv --directory "${UBLUE_ROOT}/ublue-os/files/${NAME}"; \ - mkdir -p ${UBLUE_ROOT}/ublue-os/rpms/; \ - cp "${RPM}" "${UBLUE_ROOT}/ublue-os/rpms/$(rpm -q "${RPM}" --queryformat='%{NAME}.%{ARCH}.rpm')"; \ - done - FROM scratch ENV UBLUE_ROOT=/app/output