Merge branch 'remove-geoipdb-update' into 'master'

Remove geoipupdate from container

See merge request leap/getmyip!5

2 files changed, 1 insertions, 12 deletions

diff --git a/Dockerfile b/Dockerfile
index 7395e9e..e3aa34b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch AS build
+FROM debian:buster AS build
 RUN apt-get -q update && env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     build-essential pkg-config golang-go git ca-certificates \
 && rm -rf /var/lib/apt/lists/*
@@ -10,12 +10,6 @@ RUN go get 0xacab.org/leap/getmyip
 RUN strip $GOPATH/bin/getmyip
 
 FROM registry.git.autistici.org/ai3/docker/chaperone-base
-RUN echo 'deb http://deb.debian.org/debian stretch contrib' > /etc/apt/sources.list.d/contrib.list
-RUN apt-get -q update && env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    geoipupdate ca-certificates \
-&& rm -rf /var/lib/apt/lists/*
-RUN cp /usr/share/doc/geoipupdate/examples/GeoIP.conf.default /etc/GeoIP.conf
-RUN /usr/bin/geoipupdate
 COPY --from=build /go/bin/getmyip /usr/local/bin/getmyip
 COPY chaperone.d/ /etc/chaperone.d
 
diff --git a/chaperone.d/download-geoipdb.conf b/chaperone.d/download-geoipdb.conf
deleted file mode 100644
index 4c4df07..0000000
--- a/chaperone.d/download-geoipdb.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-download-geoipdb-cron.service: {
-     type: cron,
-     interval: "59 23 * * *",
-     command: "/usr/bin/geoipupdate"
-}