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

[CORE-10546] Change rpm install order to fix 'undefined symbol: xtables_strdup' #9022

Merged
merged 3 commits into from
Jul 19, 2024
Merged

[CORE-10546] Change rpm install order to fix 'undefined symbol: xtables_strdup' #9022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4537b5b
[CORE-10546] Change rpm install order to fix 'undefined symbol: xtabl…
coutinhop Jul 18, 2024
020182d
Update comment
coutinhop Jul 18, 2024
27ea8ab
Merge branch 'master' into pedro-CORE-10546
coutinhop Jul 18, 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
21 changes: 11 additions & 10 deletions node/Dockerfile.amd64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,26 +119,27 @@ RUN microdnf install \
# Needed for runit startup script
which \
# Needed for the cleanup script
findutils \
# nftables
nftables
findutils

# Since the ubi repos do not contain all the packages we need (they're missing conntrack-tools),
# we're using AlmaLinux repos for missing packages.
COPY almalinux.repo /etc/yum.repos.d/almalinux.repo

RUN microdnf --enablerepo=baseos install \
iproute-tc \
# Needed for conntrack
libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_queue \
conntrack-tools

# Install iptables via rpms. The libs must be force installed because the iptables source RPM has the release
# version '1.8.8-6.el8' conflicts with iptables-libs (pulled in by the iputils package) '1.8.5-11.el8_9'.
RUN rpm --force -i /tmp/rpms/iptables-libs-${IPTABLES_VER}.el8.x86_64.rpm && \
rpm --force -i /tmp/rpms/iptables-legacy-libs-${IPTABLES_VER}.el8.2.x86_64.rpm && \
# Install compatible libnftnl version with selected iptables version
rpm -i /tmp/rpms/iptables-legacy-${IPTABLES_VER}.el8.2.x86_64.rpm && \
# Install iptables-libs via rpm. The libs must installed before installing iproute-tc and nftables via 'microdnf install'
# otherwise they will pull a different version of iptables-libs as a dependency.
RUN rpm -i /tmp/rpms/iptables-libs-${IPTABLES_VER}.el8.x86_64.rpm && \
rpm -i /tmp/rpms/iptables-legacy-libs-${IPTABLES_VER}.el8.2.x86_64.rpm

# iproute-tc and nftables depend on iptables-libs and should be installed after it.
RUN microdnf --enablerepo=baseos install iproute-tc nftables

# Install iptables via rpm. Install compatible libnftnl version with the selected iptables version
RUN rpm -i /tmp/rpms/iptables-legacy-${IPTABLES_VER}.el8.2.x86_64.rpm && \
rpm -i /tmp/rpms/iptables-nft-${IPTABLES_VER}.el8.x86_64.rpm && \
# Install ipset version
rpm --force -i /tmp/rpms/ipset-libs-${IPSET_VER}.el8.x86_64.rpm && \
Expand Down
22 changes: 11 additions & 11 deletions node/Dockerfile.arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,27 +129,27 @@ RUN microdnf install \
# Needed for runit startup script
which \
# Needed for the cleanup script
findutils \
# nftables
nftables

findutils

# Since the ubi repos do not contain all the packages we need (they're missing conntrack-tools),
# we're using AlmaLinux repos for missing packages.
COPY almalinux.repo /etc/yum.repos.d/almalinux.repo

RUN microdnf --enablerepo=baseos install \
iproute-tc \
# Needed for conntrack
libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_queue \
conntrack-tools

# Install iptables via rpms. The libs must be force installed because the iptables source RPM has the release
# version '1.8.8-6.el8' conflicts with iptables-libs (pulled in by the iputils package) '1.8.5-11.el8_9'.
RUN rpm --force -i /tmp/rpms/iptables-libs-${IPTABLES_VER}.el8.aarch64.rpm && \
rpm --force -i /tmp/rpms/iptables-legacy-libs-${IPTABLES_VER}.el8.2.aarch64.rpm && \
# Install compatible libnftnl version with selected iptables version
rpm --force -i /tmp/rpms/libnftnl-${LIBNFTNL_VER}.el8.aarch64.rpm && \
# Install iptables-libs via rpm. The libs must installed before installing iproute-tc and nftables via 'microdnf install'
# otherwise they will pull a different version of iptables-libs as a dependency.
RUN rpm -i /tmp/rpms/iptables-libs-${IPTABLES_VER}.el8.aarch64.rpm && \
rpm -i /tmp/rpms/iptables-legacy-libs-${IPTABLES_VER}.el8.2.aarch64.rpm

# iproute-tc and nftables depend on iptables-libs and should be installed after it.
RUN microdnf --enablerepo=baseos install iproute-tc nftables

# Install iptables via rpm. Install compatible libnftnl version with the selected iptables version
RUN rpm --force -i /tmp/rpms/libnftnl-${LIBNFTNL_VER}.el8.aarch64.rpm && \
Copy link
Contributor

Choose a reason for hiding this comment

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

remove --force ?

# Install both and select at runtime.
rpm -i /tmp/rpms/iptables-legacy-${IPTABLES_VER}.el8.2.aarch64.rpm && \
rpm -i /tmp/rpms/iptables-nft-${IPTABLES_VER}.el8.aarch64.rpm && \
Expand Down