Skip to content

Commit

Permalink
move build dependency from alauda to kubeovn
Browse files Browse the repository at this point in the history
  • Loading branch information
hongzhen-ma committed Feb 25, 2021
1 parent 9184aa9 commit 8559014
Show file tree
Hide file tree
Showing 5 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
10 changes: 5 additions & 5 deletions dist/images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ RUN apt update && apt install build-essential git libnuma-dev autoconf curl \
RUN cd /usr/src/ && \
git clone -b branch-2.14 --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/kubeovn/ovs/commit/df1c802f568be2af84aa81372fec46f5b09b4366.patch | git apply && \
sed -i 's/2.14.1/2.14.0/g' configure.ac && \
./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.09 --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/34d7031d999418a79f1f79e2a7d5ecd17fa6f84c.patch | git apply && \
curl https://github.com/alauda/ovn/commit/11ec3f14cebe08ce556d5a8c0ee1cc14686f953d.patch | git apply && \
curl https://github.com/alauda/ovn/commit/113cf2e3c10b210a410b9ef41f981d321785d8df.patch | git apply && \
curl https://github.com/kubeovn/ovn/commit/d8253981485e499979cc47c9453b6be8eebe5f0e.patch | git apply --exclude debian/changelog && \
curl https://github.com/kubeovn/ovn/commit/34d7031d999418a79f1f79e2a7d5ecd17fa6f84c.patch | git apply && \
curl https://github.com/kubeovn/ovn/commit/11ec3f14cebe08ce556d5a8c0ee1cc14686f953d.patch | git apply && \
curl https://github.com/kubeovn/ovn/commit/113cf2e3c10b210a410b9ef41f981d321785d8df.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
2 changes: 1 addition & 1 deletion hack/update-codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ CODEGEN_PKG=$GOPATH/src/k8s.io/code-generator
# k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
# instead of the $GOPATH directly. For normal projects this can be dropped.
${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
github.com/alauda/kube-ovn/pkg/client github.com/alauda/kube-ovn/pkg/apis \
github.com/kubeovn/kube-ovn/pkg/client github.com/kubeovn/kube-ovn/pkg/apis \
kubeovn:v1

0 comments on commit 8559014

Please sign in to comment.