Update images, fix some minor issues and improve qol

.gitignore

@@ -1,5 +1,6 @@
-/files/
-/output_files/
-/parsedmarc/GeoLite2-Country*
-/elastic_data/
-parsedmarc.ini
+/elastic_data/*
+!/elastic_data/.gitkeep
+/input_files/*
+!/input_files/.gitkeep
+/output_files/*
+!/output_files/.gitkeep

docker-compose.yml

@@ -1,27 +1,30 @@
-version: '3.5'
 services:
   parsedmarc:
-    build: ./parsedmarc/
+    build: ./parsedmarc
     volumes:
-      - ./files:/input:ro
+      - ./input_files:/input:ro
       - ./output_files:/output
-    command: parsedmarc -c /parsedmarc.ini /input/* --debug
+      - ./parsedmarc/parsedmarc.ini:/parsedmarc.ini
+    command: parsedmarc -c /parsedmarc.ini /input/*
     depends_on:
-      - elasticsearch
+      elasticsearch:
+        condition: service_healthy
     restart: on-failure
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.5
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.28
     environment:
       - discovery.type=single-node
     volumes:
       - ./elastic_data:/usr/share/elasticsearch/data
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:9200 || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    restart: on-failure
 
   grafana:
-    build: ./grafana/
+    build: ./grafana
     ports:
       - 3000:3000
-    user: root
-    environment:
-      GF_INSTALL_PLUGINS: grafana-piechart-panel,grafana-worldmap-panel
-      GF_AUTH_ANONYMOUS_ENABLED: 'true'

grafana/Dockerfile

@@ -1,6 +1,16 @@
-FROM grafana/grafana:8.5.4
+FROM grafana/grafana-oss
 
-ADD --chown=grafana:root https://raw.githubusercontent.com/domainaware/parsedmarc/master/grafana/Grafana-DMARC_Reports.json /var/lib/grafana/dashboards/
-RUN chmod 644 /etc/grafana/provisioning
+# Install dashboard and dependencies
+ARG DMARC_DASHBOARD=https://raw.githubusercontent.com/domainaware/parsedmarc/master/grafana/Grafana-DMARC_Reports.json
+ADD --chown=grafana:root ${DMARC_DASHBOARD} /var/lib/grafana/dashboards/
+RUN grafana-cli --pluginsDir "${GF_PATHS_PLUGINS}" plugins install grafana-piechart-panel
+RUN grafana-cli --pluginsDir "${GF_PATHS_PLUGINS}" plugins install grafana-worldmap-panel
 
-COPY grafana-provisioning/ /etc/grafana/provisioning/
+# Copy provisioning files and fix permissions
+COPY --chown=grafana:root provisioning/ /etc/grafana/provisioning/
+USER root
+RUN chmod -R +X /etc/grafana/provisioning
+USER grafana
+
+# Configure Grafana
+ENV GF_AUTH_ANONYMOUS_ENABLED=true

grafana/grafana-provisioning/datasources/all.yml → grafana/provisioning/datasources/all.yml

@@ -9,7 +9,7 @@ datasources:
   database: '[dmarc_aggregate-]YYYY-MM-DD'
   isDefault: true
   jsonData:
-    esVersion: 7.17.5
+    esVersion: 7.17.28
     timeField: 'date_range'
     interval: 'Daily'
   version: 1
@@ -22,7 +22,7 @@ datasources:
   database: '[dmarc_forensic-]YYYY-MM-DD'
   isDefault: false
   jsonData:
-    esVersion: 7.17.5
+    esVersion: 7.17.28
     timeField: 'arrival_date'
     interval: 'Daily'
   version: 1

parsedmarc/Dockerfile

@@ -1,9 +1,6 @@
-FROM python:3.9-alpine3.16
+FROM python:3.13-alpine
 
 RUN apk add --update --no-cache libxml2-dev libxslt-dev
 RUN apk add --update --no-cache --virtual .build_deps build-base libffi-dev \
     && pip install parsedmarc \
     && apk del .build_deps
-
-COPY parsedmarc.ini /
-#COPY GeoLite2-Country.mmdb /usr/share/GeoIP/GeoLite2-Country.mmdb

parsedmarc/parsedmarc.sample.ini → parsedmarc/parsedmarc.ini

@@ -1,7 +1,8 @@
 [general]
+offline = True
+output = /output/
 save_aggregate = True
 save_forensic = True
-output = /output/
 
 [elasticsearch]
 hosts = elasticsearch:9200