mirror/echoip
1
0
Fork 1
mirror of https://github.com/thecodingrobot/echoip.git synced 2026-05-09 00:04:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6 from leafcloudhq/fix-geoip-download

Browse source 
added geoip-download to docker-pushx and made GEOIP_LICENSE_KEY option
This commit is contained in:
Jegor van Opdorp 2024-09-12 11:33:56 +02:00 • committed by GitHub
commit 435f0c1657
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Makefile
View file

@ -27,14 +27,17 @@ install:
databases := GeoLite2-City GeoLite2-Country GeoLite2-ASN
$(databases):
ifndef GEOIP_LICENSE_KEY
$(error GEOIP_LICENSE_KEY must be set. Please see https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/)
endif
mkdir -p data
ifdef GEOIP_LICENSE_KEY
@curl -fsSL -m 30 "https://download.maxmind.com/app/geoip_download?edition_id=$@&license_key=$(GEOIP_LICENSE_KEY)&suffix=tar.gz" | tar $(TAR_OPTS) --strip-components=1 -C $(CURDIR)/data -xzf - '*.mmdb'
test ! -f data/GeoLite2-City.mmdb || mv data/GeoLite2-City.mmdb data/city.mmdb
test ! -f data/GeoLite2-Country.mmdb || mv data/GeoLite2-Country.mmdb data/country.mmdb
test ! -f data/GeoLite2-ASN.mmdb || mv data/GeoLite2-ASN.mmdb data/asn.mmdb
test ! -f data/city.mmdb || $(error Failed to download GEOIP databases, GEOIP_LICENSE_KEY is probably wrong. Please see https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/)
else
cp GeoLite2-City.mmdb data/city.mmdb
cp GeoLite2-Country.mmdb data/country.mmdb
cp GeoLite2-ASN.mmdb data/asn.mmdb
endif
geoip-download: $(databases)
@ -60,7 +63,7 @@ docker-test:
docker-push: docker-test docker-login
$(DOCKER) push $(DOCKER_IMAGE)
docker-pushx: docker-multiarch-builder docker-test docker-login
docker-pushx: geoip-download docker-multiarch-builder docker-test docker-login
$(DOCKER) buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t $(DOCKER_IMAGE) --push .
xinstall: