From 6997ec5adb65358f108ccbe81defc215a383b643 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 6 Oct 2020 10:25:03 -0400 Subject: [PATCH] pull script rather than git clone --- Dockerfile | 10 ++-------- .../cont-init.d/{69-geoip2influx => 98-geoip2influx} | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) rename root/etc/cont-init.d/{69-geoip2influx => 98-geoip2influx} (96%) diff --git a/Dockerfile b/Dockerfile index 4ad8796..e878919 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,6 @@ -FROM lsiobase/nginx:3.12 as buildstage - -RUN \ - apk add --no-cache \ - git && \ - mkdir -p /root-layer/geoip2influx && \ - git clone https://github.com/gilbN/geoip2influx.git /root-layer/geoip2influx - +FROM lsiobase/alpine:3.12 as buildstage +ADD https://raw.githubusercontent.com/gilbN/geoip2influx/master/geoip2influx.py /root-layer/geoip2influx/geoip2influx.py COPY root/ /root-layer/ # runtime stage diff --git a/root/etc/cont-init.d/69-geoip2influx b/root/etc/cont-init.d/98-geoip2influx similarity index 96% rename from root/etc/cont-init.d/69-geoip2influx rename to root/etc/cont-init.d/98-geoip2influx index 5e101d1..66f619b 100644 --- a/root/etc/cont-init.d/69-geoip2influx +++ b/root/etc/cont-init.d/98-geoip2influx @@ -14,7 +14,7 @@ fi # Create log folder mkdir -p \ - /config/log/geoip2influx + /config/log/geoip2influx # move old log if needed if [ -f /config/geoip2db/geoip2influx.log ]; then mv /config/geoip2db/geoip2influx.log /config/log/geoip2influx @@ -22,7 +22,7 @@ fi # permissions chown -R abc:abc \ - /geoip2influx \ + /geoip2influx \ /config/log/geoip2influx chmod +x /geoip2influx/geoip2influx.py