Fixes to make it work

keramblock · keramblock · commit 718ff95aad51 · 2022-08-22T16:09:49.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 /files/
 /output_files/
 /parsedmarc/GeoLite2-Country*
+/elastic_data/
+parsedmarc.ini
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,15 +5,17 @@ services:
     volumes:
       - ./files:/input:ro
       - ./output_files:/output
-    command: parsedmarc -c /parsedmarc.ini /input/*
+    command: parsedmarc -c /parsedmarc.ini /input/* --debug
     depends_on:
       - elasticsearch
     restart: on-failure
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.9.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.5
     environment:
       - discovery.type=single-node
+    volumes:
+      - ./elastic_data:/usr/share/elasticsearch/data
 
   grafana:
     build: ./grafana/
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
@@ -1,4 +1,4 @@
-FROM grafana/grafana
+FROM grafana/grafana:8.5.4
 
 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
diff --git a/parsedmarc/Dockerfile b/parsedmarc/Dockerfile
@@ -1,6 +1,6 @@
-FROM python:alpine
+FROM python:3.9-alpine3.16
 
-RUN apk add build-base libxml2-dev libxslt-dev \
+RUN apk add build-base libxml2-dev libxslt-dev libffi-dev \
     && pip install parsedmarc
 
 COPY parsedmarc.ini /
diff --git a/parsedmarc/parsedmarc.sample.ini b/parsedmarc/parsedmarc.sample.ini

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM grafana/grafana`
	`1`	`+FROM grafana/grafana:8.5.4`
`2`	`2`
`3`	`3`	`ADD --chown=grafana:root https://raw.githubusercontent.com/domainaware/parsedmarc/master/grafana/Grafana-DMARC_Reports.json /var/lib/grafana/dashboards/`
`4`	`4`	`RUN chmod 644 /etc/grafana/provisioning`