From 16130748e53f607f6463aaac1b07c9969a065285 Mon Sep 17 00:00:00 2001
From: Marius <gilberg@gmail.com>
Date: Sun, 4 Oct 2020 23:48:49 +0200
Subject: [PATCH] move files inside mod

---
 Dockerfile                           | 18 ++++++++++++--
 root/etc/cont-init.d/69-geoip2influx | 37 +++++++++-------------------
 root/etc/logrotate.d/geoip2influx    |  2 +-
 root/etc/services.d/geoip2influx/run |  2 +-
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2f24b20..4ad8796 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,18 @@
+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
+
+
+COPY root/ /root-layer/
+
+# runtime stage
 FROM scratch
 
-# copy local files
-COPY root/ /
+LABEL maintainer="GilbN"
+
+# Add files from buildstage
+COPY --from=buildstage /root-layer/ /
\ No newline at end of file
diff --git a/root/etc/cont-init.d/69-geoip2influx b/root/etc/cont-init.d/69-geoip2influx
index 24f87d6..5e101d1 100644
--- a/root/etc/cont-init.d/69-geoip2influx
+++ b/root/etc/cont-init.d/69-geoip2influx
@@ -12,33 +12,20 @@ if [ ! -d /usr/lib/python3.8/site-packages/influxdb ]; then
     IPy==1.0
 fi
 
-if [ ! -d /config/geoip2db ]; then
-    echo '-------------------------------------'
-    echo '| Creating /config/geoip2db/ folder |'
-    echo '-------------------------------------'
-    mkdir  /config/geoip2db
+# Create log folder
+mkdir -p \
+	/config/log/geoip2influx
+# move old log if needed
+if [ -f /config/geoip2db/geoip2influx.log ]; then
+  mv /config/geoip2db/geoip2influx.log /config/log/geoip2influx
 fi
 
-# Fetch latest or update existing
-if [[ ! -d geoip2influx/.git ]]; then
-  echo '---------------------------'
-  echo '| Installing Geoip2Influx |'
-  echo '---------------------------'
-  git clone --progress --verbose https://github.com/gilbN/geoip2influx.git
-  cp geoip2influx/geoip2influx.py /config/geoip2db/
-  chown -R abc:abc /config/geoip2db
-  chmod +x /config/geoip2db/geoip2influx.py
-  
-elif [[ -d geoip2influx/.git ]]; then
-  echo '-------------------------'
-  echo '| Updating Geoip2Influx |'
-  echo '-------------------------'
-  cd geoip2influx/
-  git pull
-  cp geoip2influx.py /config/geoip2db/
-  chown -R abc:abc /config/geoip2db
-  chmod +x /config/geoip2db/geoip2influx.py
-fi
+# permissions
+chown -R abc:abc \
+	/geoip2influx \
+  /config/log/geoip2influx
+
+chmod +x /geoip2influx/geoip2influx.py
 
 # Display variables for troubleshooting
 echo -e "Variables set:\\n\
diff --git a/root/etc/logrotate.d/geoip2influx b/root/etc/logrotate.d/geoip2influx
index 66ada84..53c3d34 100644
--- a/root/etc/logrotate.d/geoip2influx
+++ b/root/etc/logrotate.d/geoip2influx
@@ -1,4 +1,4 @@
-/config/geoip2db/geoip2influx.log {
+/config/log/geoip2influx/geoip2influx.log {
  daily
  rotate 7
  size 25M
diff --git a/root/etc/services.d/geoip2influx/run b/root/etc/services.d/geoip2influx/run
index 9d829a9..27484b8 100644
--- a/root/etc/services.d/geoip2influx/run
+++ b/root/etc/services.d/geoip2influx/run
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bash
 
   exec \
-        python3 /config/geoip2db/geoip2influx.py
\ No newline at end of file
+        python3 /geoip2influx/geoip2influx.py
\ No newline at end of file