From 85ab9459611dd8667ed85e67c208f12bb3846495 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 18 Aug 2022 20:36:16 -0400 Subject: [PATCH] switch to hybrid --- Dockerfile | 2 +- .../dependencies.d/init-mods | 0 .../run | 43 +++++++++++++++++++ .../type | 1 + .../init-mod-swag-geoip2influx-add-package/up | 1 + .../init-mod-swag-geoip2influx-add-package | 0 .../dependencies.d/init-services | 0 .../s6-rc.d/svc-mod-swag-geoip2influx/run | 4 ++ .../s6-rc.d/svc-mod-swag-geoip2influx/type | 1 + .../init-mod-swag-geoip2influx-add-package | 0 .../user/contents.d/svc-mod-swag-geoip2influx | 0 root/etc/services.d/geoip2influx/run | 0 12 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-swag-geoip2influx-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-swag-geoip2influx/dependencies.d/init-services create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-mod-swag-geoip2influx/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-swag-geoip2influx/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-geoip2influx-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-swag-geoip2influx mode change 100644 => 100755 root/etc/services.d/geoip2influx/run diff --git a/Dockerfile b/Dockerfile index e878919..915ed83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:3.12 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage ADD https://raw.githubusercontent.com/gilbN/geoip2influx/master/geoip2influx.py /root-layer/geoip2influx/geoip2influx.py COPY root/ /root-layer/ diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/dependencies.d/init-mods new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/run new file mode 100755 index 0000000..1afefff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/run @@ -0,0 +1,43 @@ +#!/usr/bin/with-contenv bash + +if ! pip list 2>&1 | grep -q "influxdb"; then + echo '-------------------------------------------------------------' + echo '| Mod by Gilbn |' + echo '| Adding required modules for Geoip2Influx to install list |' + echo '-------------------------------------------------------------' + echo "\ + geoip2==3.0.0 \ + geohash2==1.1 \ + influxdb==5.3.0 \ + IPy==1.0" >> /mod-pip-packages-to-install.list +fi + +# 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 + +# permissions +chown -R abc:abc \ + /geoip2influx \ + /config/log/geoip2influx + +chmod +x /geoip2influx/geoip2influx.py + +# Display variables for troubleshooting +echo -e "Variables set:\\n\ +NGINX_LOG_PATH=${NGINX_LOG_PATH}\\n\ +INFLUX_HOST=${INFLUX_HOST}\\n\ +INFLUX_HOST_PORT=${INFLUX_HOST_PORT}\\n\ +INFLUX_DATABASE=${INFLUX_DATABASE}\\n\ +INFLUX_USER=${INFLUX_USER}\\n\ +INFLUX_PASS=${INFLUX_PASS}\\n\ +INFLUX_RETENTION=${INFLUX_RETENTION}\\n\ +INFLUX_SHARD=${INFLUX_SHARD}\\n\ +GEO_MEASUREMENT=${GEO_MEASUREMENT}\\n\ +LOG_MEASUREMENT=${LOG_MEASUREMENT}\\n\ +SEND_NGINX_LOGS=${SEND_NGINX_LOGS}\\n\ +GEOIP2INFLUX_LOG_LEVEL=${GEOIP2INFLUX_LOG_LEVEL}\\n" diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/up new file mode 100644 index 0000000..a3ac39f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-swag-geoip2influx-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-swag-geoip2influx-add-package new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-swag-geoip2influx/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-mod-swag-geoip2influx/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-swag-geoip2influx/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-swag-geoip2influx/run new file mode 100755 index 0000000..9dc871a --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-swag-geoip2influx/run @@ -0,0 +1,4 @@ +#!/usr/bin/with-contenv bash + +exec \ + python3 /geoip2influx/geoip2influx.py \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-swag-geoip2influx/type b/root/etc/s6-overlay/s6-rc.d/svc-mod-swag-geoip2influx/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-swag-geoip2influx/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-geoip2influx-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-geoip2influx-add-package new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-swag-geoip2influx b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-swag-geoip2influx new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/geoip2influx/run b/root/etc/services.d/geoip2influx/run old mode 100644 new mode 100755