ntp/geoipapi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update base image, minor tweaks

Browse Source
This commit is contained in:
Ask Bjørn Hansen
2020-07-10 22:07:56 -07:00
parent ea8dd3fd77
commit 0ade0b9817
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -1,10 +1,10 @@
FROM golang:1.12.6-alpine3.9 AS build FROM golang:1.14.7-alpine3.12 AS build
WORKDIR /go/src/github.com/abh/geoipapi WORKDIR /go/src/github.com/abh/geoipapi
ADD . /go/src/github.com/abh/geoipapi ADD . /go/src/github.com/abh/geoipapi
RUN go install -v ./... RUN go install -v ./...
FROM quay.io/ntppool/dnsmapper:geoip-data-201906 FROM quay.io/ntppool/dnsmapper:geoip-data-202007
USER root USER root
RUN apk --no-cache add ca-certificates RUN apk --no-cache add ca-certificates

2
geoipapi.go
View File

@@ -84,7 +84,7 @@ func getCity(req *http.Request) (*geoip2.City, error) {
ipStr := req.FormValue("ip") ipStr := req.FormValue("ip")
ip := net.ParseIP(ipStr) ip := net.ParseIP(ipStr)
if ip == nil { if ip == nil {
return nil, fmt.Errorf("Missing IP") return nil, fmt.Errorf("missing IP address")
} }
return getCityIP(ip) return getCityIP(ip)
} }