Migration: change geoip address

This commit is contained in:
gVisor bot 2019-12-31 12:30:42 +08:00
parent 027ffcb67d
commit 2a5840b15c
2 changed files with 7 additions and 35 deletions

View file

@ -1,9 +1,7 @@
FROM golang:alpine as builder FROM golang:alpine as builder
RUN apk add --no-cache make git && \ RUN apk add --no-cache make git && \
wget http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz -O /tmp/GeoLite2-Country.tar.gz && \ wget -O /Country.mmdb https://github.com/Dreamacro/maxmind-geoip/releases/latest/download/Country.mmdb
tar zxvf /tmp/GeoLite2-Country.tar.gz -C /tmp && \
mv /tmp/GeoLite2-Country_*/GeoLite2-Country.mmdb /Country.mmdb
WORKDIR /clash-src WORKDIR /clash-src
COPY . /clash-src COPY . /clash-src
RUN go mod download && \ RUN go mod download && \

View file

@ -1,56 +1,30 @@
package config package config
import ( import (
"archive/tar"
"compress/gzip"
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
"os" "os"
"strings"
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/log" "github.com/Dreamacro/clash/log"
) )
func downloadMMDB(path string) (err error) { func downloadMMDB(path string) (err error) {
resp, err := http.Get("http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz") resp, err := http.Get("https://github.com/Dreamacro/maxmind-geoip/releases/latest/download/Country.mmdb")
if err != nil { if err != nil {
return return
} }
defer resp.Body.Close() defer resp.Body.Close()
gr, err := gzip.NewReader(resp.Body) f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0644)
if err != nil { if err != nil {
return return err
} }
defer gr.Close() defer f.Close()
_, err = io.Copy(f, resp.Body)
tr := tar.NewReader(gr) return err
for {
h, err := tr.Next()
if err == io.EOF {
break
} else if err != nil {
return err
}
if !strings.HasSuffix(h.Name, "GeoLite2-Country.mmdb") {
continue
}
f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0644)
if err != nil {
return err
}
defer f.Close()
_, err = io.Copy(f, tr)
if err != nil {
return err
}
}
return nil
} }
// Init prepare necessary files // Init prepare necessary files