Skip to content

Commit 76cb5bb

Browse files
authored
fix dpdk base update as master (#5118)
Signed-off-by: zbb88888 <[email protected]>
1 parent bef8067 commit 76cb5bb

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

dist/images/Dockerfile.base-dpdk

+18-16
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,25 @@ RUN cd /usr/src/ && \
1414
git clone -b branch-3.3 --depth=1 https://github.com/openvswitch/ovs.git && \
1515
cd ovs && \
1616
# fix memory leak by ofport_usage and trim memory periodically
17-
curl -s https://github.com/kubeovn/ovs/commit/8ff6820a3db1087a6ea4a28a1f743e079ea87315.patch | git apply && \
17+
curl -s https://github.com/kubeovn/ovs/commit/4228eab1d722087ba795e310eadc9e25c4513ec1.patch | git apply && \
1818
# increase election timer
19-
curl -s https://github.com/kubeovn/ovs/commit/98e1f9081f107205edc40478f61ae79a43c83061.patch | git apply && \
19+
curl -s https://github.com/kubeovn/ovs/commit/54056ea65dc28aa1c4c721a2a34d7913f79f8376.patch | git apply && \
2020
# add fdb update logging
21-
curl -s https://github.com/kubeovn/ovs/commit/f2ac94a5a1f382fc4b8e2d3d7725d98ebbef13e2.patch | git apply && \
21+
curl -s https://github.com/kubeovn/ovs/commit/6b4dcb311f171d81a5d40ea51a273fc356c123db.patch | git apply && \
2222
# fdb: fix mac learning in environments with hairpin enabled
23-
curl -s https://github.com/kubeovn/ovs/commit/321868c6897b9ebcaad9ce3c012e664f84c99ee9.patch | git apply && \
23+
curl -s https://github.com/kubeovn/ovs/commit/f627b7721ec282f2edaf798913b1559b939687f0.patch | git apply && \
2424
# ovsdb-tool: add optional server id parameter for "join-cluster" command
25-
curl -s https://github.com/kubeovn/ovs/commit/968b4eb4140b2944d75767aa9ae0625bdcc61596.patch | git apply && \
25+
curl -s https://github.com/kubeovn/ovs/commit/3f3e3a436ff5eb2eaafbeeae8ea9dc0c514fe8a3.patch | git apply && \
2626
# fix memory leak in qos
27-
curl -s https://github.com/kubeovn/ovs/commit/fd25c5273eed96e8bc9efab46eecbc815e0ce22b.patch | git apply && \
27+
curl -s https://github.com/kubeovn/ovs/commit/a6cb8215a80635129e4fada4c0d25c25fb746bf7.patch | git apply && \
2828
# ovsdb-tool: add command fix-cluster
29-
curl -s https://github.com/kubeovn/ovs/commit/32f907ae9a1f8efe58dfb58107f02b1442b18edc.patch | git apply && \
29+
curl -s https://github.com/kubeovn/ovs/commit/d4d76ddb2e12cdd9e73bb5e008ebb9fd1b4d6ca6.patch | git apply && \
3030
# netdev: reduce cpu utilization for getting device addresses
31-
curl -s https://github.com/kubeovn/ovs/commit/28d41977a26606f324eadd8d907a8fb2e18505d9.patch | git apply && \
31+
curl -s https://github.com/kubeovn/ovs/commit/ffd2328d4a55271569e2b89e54a2c18f4e186af8.patch | git apply && \
3232
# ovs-router: skip getting source address for kube-ipvs0
33-
curl -s https://github.com/kubeovn/ovs/commit/b7129150cb763d1fd081ee3c6f669da90d46b965.patch | git apply
33+
curl -s https://github.com/kubeovn/ovs/commit/d088c5d8c263552c5a31d87813991aee30ab74de.patch | git apply && \
34+
# increase the default probe interval for large cluster
35+
curl -s https://github.com/kubeovn/ovs/commit/1b31f07dc60c016153fa35d936cdda0e02e58492.patch | git apply
3436

3537
RUN cd /usr/src/ && git clone -b branch-24.03 --depth=1 https://github.com/ovn-org/ovn.git && \
3638
cd ovn && \
@@ -93,13 +95,13 @@ ARG DEBIAN_FRONTEND=noninteractive
9395
ENV PIP_BREAK_SYSTEM_PACKAGES=1
9496

9597
RUN apt update && apt upgrade -y && apt install ca-certificates python3 hostname libunwind8 netbase \
96-
ethtool iproute2 ncat libunbound8 procps libatomic1 kmod iptables python3-netifaces python3-sortedcontainers \
97-
tcpdump ipvsadm ipset curl uuid-runtime openssl inetutils-ping arping ndisc6 conntrack iputils-tracepath \
98-
logrotate dnsutils net-tools strongswan strongswan-pki libcharon-extra-plugins \
99-
libcharon-extauth-plugins libstrongswan-extra-plugins libstrongswan-standard-plugins \
100-
python3-pip build-essential libssl-dev libibverbs-dev libnuma-dev libpcap-dev -y --no-install-recommends && \
101-
rm -rf /var/lib/apt/lists/* && \
102-
rm -rf /etc/localtime
98+
ethtool iproute2 ncat libunbound8 procps libatomic1 kmod iptables python3-netifaces python3-sortedcontainers \
99+
tcpdump ipvsadm ipset curl uuid-runtime openssl inetutils-ping arping ndisc6 conntrack iputils-tracepath \
100+
logrotate dnsutils net-tools strongswan strongswan-pki libcharon-extra-plugins \
101+
libcharon-extauth-plugins libstrongswan-extra-plugins libstrongswan-standard-plugins \
102+
python3-pip build-essential libssl-dev libibverbs-dev libnuma-dev libpcap-dev -y --no-install-recommends && \
103+
rm -rf /var/lib/apt/lists/* && \
104+
rm -rf /etc/localtime
103105

104106
RUN pip3 install meson ninja pyelftools
105107

0 commit comments

Comments
 (0)