fix: base dockerfile

Signed-off-by: bobz965 <[email protected]>

.gitignore

@@ -5,6 +5,8 @@ dist/images/test-server
 dist/images/kube-ovn
 dist/images/kube-ovn-cmd
 dist/images/kube-ovn-webhook
+dist/images/kube-ovn-daemon
+dist/images/kube-ovn-pinger
 dist/windows/kube-ovn.exe
 dist/windows/kube-ovn-daemon.exe
 ovnnb_db.*.backup

dist/images/Dockerfile.base

@@ -142,17 +142,13 @@ RUN curl -sSf -L --retry 3 -O https://launchpad.net/ubuntu/+archive/primary/+fil
 RUN --mount=type=bind,target=/packages,from=ovs-builder,source=/packages  \
     dpkg -i /packages/openvswitch-*.deb /packages/python3-openvswitch*.deb && \
     dpkg -i --ignore-depends=openvswitch-switch,openvswitch-common /packages/ovn-*.deb && \
-<<<<<<< HEAD
-    rm -rf /var/lib/openvswitch/pki/
-=======
     rm -rf /var/lib/openvswitch/pki/ && \
     chown -R nobody: /var/lib/logrotate && \
     setcap CAP_NET_ADMIN+eip $(readlink -f $(which ovs-dpctl)) && \
     if [ "${DEBUG}" != "true" ]; then \
         setcap CAP_NET_BIND_SERVICE+eip $(readlink -f $(which ovsdb-server)) && \
         setcap CAP_NET_ADMIN,CAP_NET_BIND_SERVICE,CAP_SYS_MODULE,CAP_SYS_ADMIN+eip $(readlink -f $(which ovs-vswitchd)); \
     fi
->>>>>>> fa429125 (reduce image size by merging layers (#4346))
 
 RUN --mount=type=bind,target=/packages,from=ovs-builder,source=/packages \
     if [ "${DEBUG}" = "true" ]; then \