From 329ccd7444f54d1392f096836ff8a395574e4636 Mon Sep 17 00:00:00 2001 From: Alex Kirhenshtein Date: Tue, 5 Jul 2022 01:59:44 +0300 Subject: [PATCH 1/3] Grafana fixed to version 8.5.4 --- grafana/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana/Dockerfile b/grafana/Dockerfile index b790317..6d7d2fd 100644 --- 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 From a7157014c9690d4ce3e9320f9a2ea98306b12aa4 Mon Sep 17 00:00:00 2001 From: Alex Kirhenshtein Date: Tue, 5 Jul 2022 02:00:06 +0300 Subject: [PATCH 2/3] libffi-dev added to deps --- parsedmarc/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parsedmarc/Dockerfile b/parsedmarc/Dockerfile index cca9af5..d22eff7 100644 --- a/parsedmarc/Dockerfile +++ b/parsedmarc/Dockerfile @@ -1,6 +1,6 @@ FROM python:alpine -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 / From 702cf88d6cd66fdce6926c7525842a4892628c62 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Sat, 25 Sep 2021 01:35:44 +0100 Subject: [PATCH 3/3] minify Docker image --- parsedmarc/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/parsedmarc/Dockerfile b/parsedmarc/Dockerfile index d22eff7..83f5ef6 100644 --- a/parsedmarc/Dockerfile +++ b/parsedmarc/Dockerfile @@ -1,7 +1,9 @@ FROM python:alpine -RUN apk add build-base libxml2-dev libxslt-dev libffi-dev \ - && pip install parsedmarc +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