Replace docker dependency bgpdump with native one

This commit is contained in:
Yifan Gao 2019-12-19 16:27:08 +08:00
parent a497a9fc47
commit ed2292b4bd
3 changed files with 4 additions and 3 deletions

View File

@ -4,6 +4,7 @@ addons:
apt:
packages:
- lftp
- bgpdump
services:
- docker
language: rust
@ -14,7 +15,6 @@ before_script:
- cargo install --vers $BGPTOOLS_VERSION bgptools
- export PATH=$PATH:/home/travis/.cargo/bin
- docker pull yangzhaofengsteven/cidr-merge
- docker pull gaoyifan/bgpdump
script:
- ./generate.sh
- ./stat.sh

View File

@ -47,6 +47,7 @@ P.S. [stat文件](https://github.com/gaoyifan/china-operator-ip/blob/ip-lists/st
#### 安装依赖
* [bgptools](https://github.com/gaoyifan/bgptools) (`cargo install bgptools `)
* [bgpdump](https://bitbucket.org/ripencc/bgpdump-hg/wiki/Home) (`apt install bgpdump`)
* [docker](https://www.docker.com) (`curl -sSL https://get.docker.com | sh`)
#### 生成IP列表

View File

@ -22,7 +22,7 @@ get_asn(){
prepare_data_v4(){
curl -sSLo rib.bz2 http://archive.routeviews.org/dnszones/rib.bz2
log_info "runing bgpdump v4 ..."
docker run -it --rm -v `pwd`:/bgpdump -w /bgpdump gaoyifan/bgpdump bgpdump -m -O rib.txt rib.bz2
bgpdump -m -O rib.txt rib.bz2
log_info "finish bgpdump v4"
}
prepare_data_v6(){
@ -31,7 +31,7 @@ prepare_data_v6(){
LATEST6=$(lftp -e 'cls -1;exit' $IP6UPSTREAM/$MONTH6/RIBS/ 2>/dev/null | sort | tail -n 1)
curl -sSLo rib6.bz2 "$IP6UPSTREAM/$MONTH6/RIBS/$LATEST6"
log_info "runing bgpdump v6 ..."
docker run -it --rm -v `pwd`:/bgpdump -w /bgpdump gaoyifan/bgpdump bgpdump -m -O rib6.txt rib6.bz2
bgpdump -m -O rib6.txt rib6.bz2
log_info "finish bgpdump v6"
}
prepare_data(){