Skip to content

Commit

Permalink
chore: move build dependency from alauda to kubeovn
Browse files Browse the repository at this point in the history
  • Loading branch information
oilbeater committed Feb 22, 2021
1 parent 798350a commit 0e9c717
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<img src="docs/logo-horizontal.svg" alt="kube_ovn_logo" width="500"/>

[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/alauda/kube-ovn/blob/master/LICENSE)
[![Build Tag](https://img.shields.io/github/tag/alauda/kube-ovn.svg)](https://github.com/alauda/kube-ovn/releases)
[![Go Report Card](https://goreportcard.com/badge/github.com/alauda/kube-ovn)](https://goreportcard.com/report/github.com/alauda/kube-ovn)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/kubeovn/kube-ovn/blob/master/LICENSE)
[![Build Tag](https://img.shields.io/github/tag/kubeovn/kube-ovn.svg)](https://github.com/kubeovn/kube-ovn/releases)
[![Go Report Card](https://goreportcard.com/badge/github.com/kubeovn/kube-ovn)](https://goreportcard.com/report/github.com/kubeovn/kube-ovn)
[![Slack Card](https://kube-ovn-slackin.herokuapp.com/badge.svg)](https://kube-ovn-slackin.herokuapp.com)
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Falauda%2Fkube-ovn.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Falauda%2Fkube-ovn?ref=badge_shield)

[中文教程](https://github.com/alauda/kube-ovn/wiki)
[中文教程](https://github.com/kubeovn/kube-ovn/wiki)

Kube-OVN integrates the OVN-based Network Virtualization with Kubernetes. It offers an advanced Container Network Fabric for Enterprises with the most functions and the easiest operation.

Expand Down
12 changes: 6 additions & 6 deletions dist/images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ RUN apt update && apt install build-essential git libnuma-dev autoconf curl \
RUN cd /usr/src/ && \
git clone -b branch-2.15 --depth=1 https://github.com/openvswitch/ovs.git && \
cd ovs && \
curl https://github.com/alauda/ovs/commit/df1c802f568be2af84aa81372fec46f5b09b4366.patch | git apply && \
curl https://github.com/alauda/ovs/commit/8dd4973bba021ce92eb9f42446d6c1c0e3474e25.patch | git apply && \
curl https://github.com/kubeovn/ovs/commit/df1c802f568be2af84aa81372fec46f5b09b4366.patch | git apply && \
curl https://github.com/kubeovn/ovs/commit/8dd4973bba021ce92eb9f42446d6c1c0e3474e25.patch | git apply && \

./boot.sh && \
rm -rf .git && \
DATAPATH_CONFIGURE_OPTS='--prefix=/usr --enable-shared' DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary

RUN cd /usr/src/ && git clone -b branch-20.12 --depth=1 https://github.com/ovn-org/ovn.git && \
cd ovn && \
curl https://github.com/alauda/ovn/commit/d8253981485e499979cc47c9453b6be8eebe5f0e.patch | git apply --exclude debian/changelog && \
curl https://github.com/alauda/ovn/commit/e19ff25f2464e67127c7eb1edef44803aa4a5462.patch | git apply && \
curl https://github.com/alauda/ovn/commit/289c62e3fcd05901dac4b727aa59f6cba058905f.patch | git apply && \
curl https://github.com/alauda/ovn/commit/e24734913d25c0bffdf1cfd79e14ef43d01e1019.patch | git apply && \
curl https://github.com/kubeovn/ovn/commit/d8253981485e499979cc47c9453b6be8eebe5f0e.patch | git apply --exclude debian/changelog && \
curl https://github.com/kubeovn/ovn/commit/e19ff25f2464e67127c7eb1edef44803aa4a5462.patch | git apply && \
curl https://github.com/kubeovn/ovn/commit/289c62e3fcd05901dac4b727aa59f6cba058905f.patch | git apply && \
curl https://github.com/kubeovn/ovn/commit/e24734913d25c0bffdf1cfd79e14ef43d01e1019.patch | git apply && \
sed -i 's/OVN/ovn/g' debian/changelog && \
rm -rf .git && \
./boot.sh && \
Expand Down
4 changes: 2 additions & 2 deletions dist/images/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cd ..
git clone -b branch-2.14 --depth=1 https://github.com/openvswitch/ovs.git
cd ovs
# change compact interval to reduce resource usage
curl https://github.com/alauda/ovs/commit/df1c802f568be2af84aa81372fec46f5b09b4366.patch | git apply
curl https://github.com/kubeovn/ovs/commit/df1c802f568be2af84aa81372fec46f5b09b4366.patch | git apply
sed -i 's/2.14.1/2.14.0/g' configure.ac
sed -i 's/sphinx-build-3/sphinx-build/g' rhel/openvswitch-fedora.spec.in
./boot.sh
Expand All @@ -30,7 +30,7 @@ git clone -b branch-20.06 --depth=1 https://github.com/ovn-org/ovn.git
cd ovn

# kube-ovn related patches
curl https://github.com/alauda/ovn/commit/f2db72af17f8ad1ea721b1d02e005ed84620fde2.patch | git apply
curl https://github.com/kubeovn/ovn/commit/f2db72af17f8ad1ea721b1d02e005ed84620fde2.patch | git apply

sed -i 's/20.06.3/20.06.2/g' configure.ac
./boot.sh
Expand Down
2 changes: 1 addition & 1 deletion hack/update-codegen-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# set GOPROXY you like
GOPROXY="https://goproxy.cn"

PROJECT_PACKAGE=github.com/alauda/kube-ovn
PROJECT_PACKAGE=github.com/kubeovn/kube-ovn
docker run -it --rm \
-v ${PWD}:/go/src/${PROJECT_PACKAGE}\
-e PROJECT_PACKAGE=${PROJECT_PACKAGE} \
Expand Down

0 comments on commit 0e9c717

Please sign in to comment.