Skip to content

Commit

Permalink
fix: fedora version 40, remove rpm file extractor
Browse files Browse the repository at this point in the history
  • Loading branch information
gerblesh committed Jul 9, 2024
1 parent f4acbf1 commit e328071
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down

0 comments on commit e328071

Please sign in to comment.