summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authormicah <micah@riseup.net>2020-03-30 08:46:12 -0700
committermicah <micah@riseup.net>2020-03-30 08:46:12 -0700
commit4591ca4ba79f429f5ffcd29d884a189917321857 (patch)
treea9366608697e1f16766f55917e15179f89b6ef09 /Dockerfile
parent9cad6ad4aebb3f41918ba6738fe0c85c1bf818b3 (diff)
parent06934a8462cf932d89844601ec3c213313c14f82 (diff)
Merge branch 'remove-geoipdb-update' into 'master'
Remove geoipupdate from container See merge request leap/getmyip!5
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile8
1 files changed, 1 insertions, 7 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