base: fix ovn build failure (#2926)

kubeovn · Jun 12, 2023 · 3796d1e · 3796d1e
1 parent 98748f6
commit 3796d1e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base
@@ -42,6 +42,8 @@ RUN dpkg -i /usr/src/python3-openvswitch*.deb /usr/src/libopenvswitch*.deb
 
 RUN cd /usr/src/ && git clone -b branch-22.03 --depth=1 https://github.com/ovn-org/ovn.git && \
     cd ovn && \
+    # Revert "call ovsrcu_exit() before exit in ovn-northd and ovn-controller to make valgrind happy"
+    curl -s https://github.com/kubeovn/ovn/commit/7be7605993968c78853ce0072cc405f494a10ccd.patch | git apply && \
     # fix ssl listen address
     curl -s https://github.com/kubeovn/ovn/commit/7992d55af9ac356d3ad934764f473d1b6aa4cf64.patch | git apply && \
     # ovn-controller: Add a generic way to check if the daemon started recently.