diff --git a/Dockerfile b/Dockerfile index 10b804a..d0c3cc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,14 +9,14 @@ RUN apk add --no-cache curl git && \ FROM docker.io/alpine:3.24 LABEL maintainer="Said Sef (saidsef.co.uk/)" -ENV PORT=${PORT:-8080} USER nobody COPY --from=builder /app/faas-reverse-geocoding /usr/bin/ -HEALTHCHECK --interval=60s --timeout=10s CMD curl --fail 'http://localhost:${PORT}/' || exit 1 +# The final image has busybox wget but no curl. +HEALTHCHECK --interval=60s --timeout=10s CMD wget -q -O /dev/null http://localhost:8080/ || exit 1 -EXPOSE ${PORT} +EXPOSE 8080 CMD ["/usr/bin/faas-reverse-geocoding"] diff --git a/deployment/base/deployment.yml b/deployment/base/deployment.yml index ebe0d71..2b37592 100644 --- a/deployment/base/deployment.yml +++ b/deployment/base/deployment.yml @@ -29,9 +29,6 @@ spec: - name: geocode image: ghcr.io/saidsef/faas-reverse-geocoding:latest imagePullPolicy: Always - env: - - name: "PORT" - value: "8080" securityContext: runAsNonRoot: true runAsGroup: 65534 @@ -59,7 +56,7 @@ spec: exec: command: - pgrep - - geocode + - faas-reverse-geocoding initialDelaySeconds: 5 periodSeconds: 30 failureThreshold: 2 diff --git a/deployment/ingress-nginx/kustomization.yml b/deployment/ingress-nginx/kustomization.yml index 22e9ec2..05150d7 100644 --- a/deployment/ingress-nginx/kustomization.yml +++ b/deployment/ingress-nginx/kustomization.yml @@ -5,17 +5,3 @@ kind: Kustomization resources: - ../base - ingress.yml - -replacements: -- source: - fieldPath: spec.rules[0].host - group: networking.k8s.io - kind: Ingress - name: geocode - version: v1 - targets: - - select: - kind: Ingress - name: geocode - version: v1 - group: networking.k8s.io diff --git a/deployment/kustomization.yml b/deployment/kustomization.yml index 7c001d5..1bd9a8f 100644 --- a/deployment/kustomization.yml +++ b/deployment/kustomization.yml @@ -4,10 +4,5 @@ kind: Kustomization resources: - ./base -images: -- name: geocode - newName: ghcr.io/saidsef/faas-reverse-geocoding - newTag: "2023.12" - commonAnnotations: app.kubernetes.io/part-of: geocode diff --git a/geocode.go b/geocode.go index 564c504..c573875 100644 --- a/geocode.go +++ b/geocode.go @@ -41,7 +41,7 @@ func loggingMiddleware(next http.HandlerFunc) http.HandlerFunc { func main() { flag.IntVar(&port, "port", 8080, "HTTP listening PORT") flag.BoolVar(&verbose, "verbose", false, "Enable verbose logging") - flag.IntVar(&cache, "cache", 60, "Cache duration minutes (default 30)") + flag.IntVar(&cache, "cache", 60, "Cache duration in minutes") flag.Parse() // Set the verbosity level in the utils package