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

dpdk-v2 ，--with-hybrid-dpdk 修改 Dockerfile.base-dpdk 解决 编译安装 ovs-dpdk 正常运行 #1754

Merged
merged 8 commits into from
Jul 28, 2022
Merged

dpdk-v2 ，--with-hybrid-dpdk 修改 Dockerfile.base-dpdk 解决 编译安装 ovs-dpdk 正常运行 #1754

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8de8b43
add webhook vaildate the vpc resource whether can be deleted.
wlooppy Apr 3, 2022
0912b3a
Merge branch 'kubeovn:master' into master
wlooppy Jul 16, 2022
3ddde70
add note for dpdk-v2 install
wlooppy Jul 16, 2022
bd97e7b
Merge branch 'kubeovn:master' into master
wlooppy Jul 24, 2022
9458b95
set vhostuser dir 777 for qemu has the permission to create sock
wlooppy Jul 24, 2022
d24a9d9
Change gosec args to make it happy
oilbeater Jul 25, 2022
187d0b5
Merge branch 'kubeovn:master' into master
wlooppy Jul 28, 2022
fcbc5a1
edit ovs ovn source patch for compile ovs-dpdk
wlooppy Jul 28, 2022
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
12 changes: 4 additions & 8 deletions dist/images/Dockerfile.base-dpdk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ RUN cd /usr/src/ && \


RUN cd /usr/src/ && \
git clone -b branch-2.16 --depth=1 https://github.com/openvswitch/ovs.git && \
git clone https://github.com/openvswitch/ovs.git && \
cd ovs && \
git checkout c50a0f080d95e9027b7ba3a70150b02c2377c721 && \
curl -s https://github.com/kubeovn/ovs/commit/22ea22c40b46ee5adeae977ff6cfca81b3ff25d7.patch | git apply && \
./boot.sh && \
rm -rf .git && \
Expand All @@ -37,14 +38,9 @@ RUN cd /usr/src/ && \

RUN dpkg -i /usr/src/python3-openvswitch*.deb /usr/src/libopenvswitch*.deb

RUN cd /usr/src/ && git clone -b branch-21.06 --depth=1 https://github.com/ovn-org/ovn.git && \
RUN cd /usr/src/ && git clone -b branch-21.06 --depth=1 https://github.com/kubeovn/ovn.git && \
cd ovn && \
curl -s https://github.com/kubeovn/ovn/commit/e24734913d25c0bffdf1cfd79e14ef43d01e1019.patch | git apply && \
curl -s https://github.com/kubeovn/ovn/commit/8f4e4868377afb5e980856755b9f6394f8b649e2.patch | git apply && \
curl -s https://github.com/kubeovn/ovn/commit/23a87cabb76fbdce5092a6b3d3b56f3fa8dd61f5.patch | git apply && \
curl -s https://github.com/kubeovn/ovn/commit/89ca60989df4af9a96cc6024e04f99b9b77bad22.patch | git apply && \
curl -s https://github.com/kubeovn/ovn/commit/aeafa43fc51be8ea1c7abfbe779c69205c1c5aa4.patch | git apply && \
curl -s https://github.com/kubeovn/ovn/commit/71f831b9cc5a6dc923af4ca90286857e2cf8b1d3.patch | git apply && \

sed -i 's/OVN/ovn/g' debian/changelog && \
rm -rf .git && \
./boot.sh && \
Expand Down