Skip to content

Commit 60deab8

Browse files
authored
fix dpdk base image (#5595)
* fix dpdk base image Signed-off-by: clyi <clyi@alauda.io> * fix Signed-off-by: clyi <clyi@alauda.io> * fix Signed-off-by: clyi <clyi@alauda.io> --------- Signed-off-by: clyi <clyi@alauda.io>
1 parent 8a7ef6e commit 60deab8

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

dist/images/Dockerfile.base-dpdk

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,15 @@ ADD patches/d4d76ddb2e12cdd9e73bb5e008ebb9fd1b4d6ca6.patch $SRC_DIR
1717
ADD patches/ffd2328d4a55271569e2b89e54a2c18f4e186af8.patch $SRC_DIR
1818
ADD patches/d088c5d8c263552c5a31d87813991aee30ab74de.patch $SRC_DIR
1919
ADD patches/1b31f07dc60c016153fa35d936cdda0e02e58492.patch $SRC_DIR
20-
ADD patches/e490f5ac0b644101913c2a3db8e03d85e859deff.patch $SRC_DIR
21-
ADD patches/b973ec477b43df1c3ef3cdb69f8646948fcf94ae.patch $SRC_DIR
22-
ADD patches/5593e614e51a5dce28941e5bf760f9ee5397cede.patch $SRC_DIR
20+
ADD patches/9ee66bd91be65605cffb9a490b4dba3bc13358e9.patch $SRC_DIR
21+
ADD patches/e889d46924085ca0fe38a2847da973dfe6ea100e.patch $SRC_DIR
2322
ADD patches/f9e97031b56ab5747b5d73629198331a6daacdfd.patch $SRC_DIR
2423

2524
RUN apt update && apt install -y git curl
2625

2726
# The support for AVX-512 depends on your build machine's CPU. judge it support the avx512 use the command 'cat /proc/cpuinfo | grep avx512'
2827
RUN cd /usr/src/ && \
29-
git clone -b branch-3.3 --depth=1 https://github.com/openvswitch/ovs.git && \
28+
git clone -b branch-3.5 --depth=1 https://github.com/openvswitch/ovs.git && \
3029
cd ovs && \
3130
# fix memory leak by ofport_usage and trim memory periodically
3231
git apply $SRC_DIR/4228eab1d722087ba795e310eadc9e25c4513ec1.patch && \
@@ -49,14 +48,12 @@ RUN cd /usr/src/ && \
4948
# increase the default probe interval for large cluster
5049
git apply $SRC_DIR/1b31f07dc60c016153fa35d936cdda0e02e58492.patch
5150

52-
RUN cd /usr/src/ && git clone -b branch-24.03 --depth=1 https://github.com/ovn-org/ovn.git && \
51+
RUN cd /usr/src/ && git clone -b branch-25.03 --depth=1 https://github.com/ovn-org/ovn.git && \
5352
cd ovn && \
54-
# change hash type from dp_hash to hash with field src_ip
55-
git apply $SRC_DIR/e490f5ac0b644101913c2a3db8e03d85e859deff.patch && \
5653
# modify src route priority
57-
git apply $SRC_DIR/b973ec477b43df1c3ef3cdb69f8646948fcf94ae.patch && \
54+
git apply $SRC_DIR/9ee66bd91be65605cffb9a490b4dba3bc13358e9.patch && \
5855
# fix reaching resubmit limit in underlay
59-
git apply $SRC_DIR/5593e614e51a5dce28941e5bf760f9ee5397cede.patch && \
56+
git apply $SRC_DIR/e889d46924085ca0fe38a2847da973dfe6ea100e.patch && \
6057
# ovn-controller: do not send GARP on localnet for Kube-OVN ports
6158
git apply $SRC_DIR/f9e97031b56ab5747b5d73629198331a6daacdfd.patch
6259

0 commit comments

Comments
 (0)