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

[Backport 3.49] Fix base image build having a selinux dependency collision #663

Merged
merged 1 commit into from
Sep 18, 2024
Merged

[Backport 3.49] Fix base image build having a selinux dependency collision #663

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions images/Containerfile.core.base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN dnf -y module enable nginx:1.22
# of dependencies below. For example, drpm-devel.
RUN dnf -y install python${PYTHON_VERSION} python3-cryptography python${PYTHON_VERSION}-devel && \
dnf -y install openssl openssl-devel && \
dnf -y install openldap-devel && \
dnf -y install openldap-devel --exclude selinux* && \
dnf -y install wget git && \
dnf -y install python3-psycopg2 && \
dnf -y install redhat-rpm-config gcc cargo libffi-devel && \
Expand All @@ -54,7 +54,7 @@ RUN dnf -y install python${PYTHON_VERSION} python3-cryptography python${PYTHON_V
dnf -y install libpq-devel && \
dnf -y install python3-setuptools && \
dnf -y install swig && \
dnf -y install buildah --exclude container-selinux && \
dnf -y install podman fuse-overlayfs buildah --exclude container-selinux && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good to me.
Is this selinux stuff a weak dependency? Should we think about https://discussion.fedoraproject.org/t/which-kind-of-dependencies-suggested-recommended-does-dnf-install/74111 in general?

dnf -y install xz && \
dnf -y install libmodulemd-devel && \
dnf -y install libcomps-devel && \
Expand All @@ -64,7 +64,6 @@ RUN dnf -y install python${PYTHON_VERSION} python3-cryptography python${PYTHON_V
dnf -y install libcurl-devel libxml2-devel sqlite-devel file-devel && \
dnf -y install ostree-libs ostree && \
dnf -y install skopeo && \
dnf -y install podman && \
dnf -y install sudo && \
dnf -y install zstd && \
dnf -y install jq && \
Expand Down
Loading