Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor Dockerfile fixes #3446

Merged
merged 2 commits into from
Nov 15, 2024
Merged

Minor Dockerfile fixes #3446

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57a0c9d
Drop support for F39 in Dockerfile
dmnks Nov 14, 2024
ba57d1a
Remove rpm-plugin-ima in Dockerfile on F41
dmnks Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions tests/Dockerfile.fedora
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Supported Fedora releases: 39 40 41
# Supported Fedora releases: 40 41
FROM registry.fedoraproject.org/fedora:40 AS base
MAINTAINER [email protected]

Expand Down Expand Up @@ -47,12 +47,14 @@ RUN dnf -y install \
tar unzip gzip bzip2 cpio xz p7zip \
pkgconfig \
/usr/bin/systemd-sysusers \
gdb-headless \
dwz \
fsverity-utils fsverity-utils-devel \
pandoc \
sequoia-sq \
libasan \
libubsan
libubsan \
&& dnf clean all

RUN echo "%_dbpath $(rpm --eval '%_dbpath')" > /root/.rpmmacros

Expand All @@ -61,17 +63,18 @@ RUN echo "%_dbpath $(rpm --eval '%_dbpath')" > /root/.rpmmacros
RUN ln -sf $(rpm --eval '%{_target_platform}%{?_gnu}')-pkg-config \
/usr/bin/pkg-config

# F40 and older (no dnf5) require special handling
# Self-destruct stock rpm
RUN if which dnf5; then \
dnf -y install gdb-headless; \
dnf clean all; \
# Fedora 41+ \
rpm -e --nodeps --nodb \
rpm-plugin-ima; \
else \
dnf -y install "gdb-headless < 15"; \
dnf clean all; \
rpm -e --nodeps --nodb rpm-sign-libs python3-rpm; \
fi

RUN rpm -e --nodeps --nodb \
# Fedora 40 \
rpm -e --nodeps --nodb \
rpm-sign-libs \
python3-rpm; \
fi; \
rpm -e --nodeps --nodb \
rpm \
rpm-libs \
rpm-build-libs
Expand Down
Loading