albert/ipinfo
1
0
Fork 0
mirror of https://github.com/skidoodle/ipinfo.git synced 2025-02-15 08:29:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

test updates

Browse source
This commit is contained in:
skidoodle 2024-09-07 18:59:47 +02:00
parent 7e14ec4d76
commit d4ac1c0dd8
5 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile
View file

@ -8,7 +8,8 @@ RUN go install github.com/maxmind/geoipupdate/v7/cmd/geoipupdate@latest
RUN mkdir -p /build/data RUN mkdir -p /build/data
FROM alpine:latest FROM alpine:latest
RUN apk add --no-cache curl RUN apk add --no-cache curl tzdata busybox-suid
WORKDIR /app WORKDIR /app
COPY --from=builder /build/ipinfo . COPY --from=builder /build/ipinfo .
COPY --from=builder /go/bin/geoipupdate /usr/local/bin/geoipupdate COPY --from=builder /go/bin/geoipupdate /usr/local/bin/geoipupdate
@ -23,6 +24,9 @@ RUN echo "AccountID ${GEOIPUPDATE_ACCOUNT_ID}" > /etc/GeoIP.conf && \
echo "EditionIDs ${GEOIPUPDATE_EDITION_IDS}" >> /etc/GeoIP.conf && \ echo "EditionIDs ${GEOIPUPDATE_EDITION_IDS}" >> /etc/GeoIP.conf && \
echo "DatabaseDirectory ${GEOIPUPDATE_DB_DIR}" >> /etc/GeoIP.conf echo "DatabaseDirectory ${GEOIPUPDATE_DB_DIR}" >> /etc/GeoIP.conf
RUN echo "0 0 * * * geoipupdate >> /var/log/geoipupdate.log 2>&1" > /etc/crontabs/root
RUN cat /etc/crontabs/root
HEALTHCHECK --interval=30s --timeout=5s --start-period=5s CMD curl --fail http://localhost:3000/ || exit 1 HEALTHCHECK --interval=30s --timeout=5s --start-period=5s CMD curl --fail http://localhost:3000/ || exit 1
EXPOSE 3000 EXPOSE 3000

2
docker-compose.dev.yml
View file

@ -1,5 +1,3 @@
version: '3.9'
services: services:
ipinfo: ipinfo:
build: . build: .

2
docker-compose.yml
View file

@ -1,5 +1,3 @@
version: '3.9'
services: services:
ipinfo: ipinfo:
image: ghcr.io/skidoodle/ipinfo:main image: ghcr.io/skidoodle/ipinfo:main

2
iputils.go
View file

@ -114,6 +114,7 @@ func lookupIPData(ip net.IP) *dataStruct {
Location struct { Location struct {
Latitude float64 `maxminddb:"latitude"` Latitude float64 `maxminddb:"latitude"`
Longitude float64 `maxminddb:"longitude"` Longitude float64 `maxminddb:"longitude"`
Timezone string `maxminddb:"time_zone"`
} `maxminddb:"location"` } `maxminddb:"location"`
} }
err := cityDB.Lookup(ip, &cityRecord) err := cityDB.Lookup(ip, &cityRecord)
@ -152,6 +153,7 @@ func lookupIPData(ip net.IP) *dataStruct {
Region: sd, Region: sd,
Country: toPtr(cityRecord.Country.Names["en"]), Country: toPtr(cityRecord.Country.Names["en"]),
Continent: toPtr(cityRecord.Continent.Names["en"]), Continent: toPtr(cityRecord.Continent.Names["en"]),
Timezone: toPtr(cityRecord.Location.Timezone),
Loc: toPtr(fmt.Sprintf("%.4f,%.4f", cityRecord.Location.Latitude, cityRecord.Location.Longitude)), Loc: toPtr(fmt.Sprintf("%.4f,%.4f", cityRecord.Location.Latitude, cityRecord.Location.Longitude)),
} }
} }

3
server.go
View file

@ -21,6 +21,7 @@ type dataStruct struct {
Region *string `json:"region"` Region *string `json:"region"`
Country *string `json:"country"` Country *string `json:"country"`
Continent *string `json:"continent"` Continent *string `json:"continent"`
Timezone *string `json:"timezone"`
Loc *string `json:"loc"` Loc *string `json:"loc"`
} }
@ -124,6 +125,8 @@ func getField(data *dataStruct, field string) *string {
return data.Country return data.Country
case "continent": case "continent":
return data.Continent return data.Continent
case "timezone":
return data.Timezone
case "loc": case "loc":
return data.Loc return data.Loc
default: default: