From 9daf2b823237e24a76939e562632fa8d82783dd1 Mon Sep 17 00:00:00 2001
From: Michael Grote <michael.grote@posteo.de>
Date: Sat, 23 Jul 2022 10:53:54 +0200
Subject: [PATCH] hadolint: DL3009 + 3059 + 3020

---
 Dockerfile | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b5acb73..b566141 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,21 @@
 FROM ubuntu:20.04
 
 # install and configure munin
-RUN apt-get update -qq && RUNLEVEL=1 DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y -qq cron munin nginx apache2 wget libapache2-mod-fcgid libcgi-fast-perl ssmtp mailutils curl tzdata autoconf
-RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf)
-RUN (sed -i 's/^Alias.*/Alias \/ \/var\/cache\/munin\/www\//g' /etc/apache2/sites-available/000-default.conf)
-RUN (sed -i 's/Allow from .*/Satisfy Any/g' /etc/apache2/sites-available/000-default.conf)
-RUN (sed -i 's/Order allow,deny.*/Allow from all/g' /etc/apache2/sites-available/000-default.conf)
-RUN (mkdir -p /var/run/munin && chown -R munin:munin /var/run/munin)
+RUN apt-get update -qq \
+    && RUNLEVEL=1 \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install -y -qq cron munin nginx apache2 wget libapache2-mod-fcgid libcgi-fast-perl ssmtp mailutils curl tzdata autoconf \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN (chfn -f 'munin' root)
-RUN (/usr/sbin/a2enmod fcgid)
+RUN cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf \
+    && sed -i 's/^Alias.*/Alias \/ \/var\/cache\/munin\/www\//g' /etc/apache2/sites-available/000-default.conf \
+    && sed -i 's/Allow from .*/Satisfy Any/g' /etc/apache2/sites-available/000-default.conf \
+    && sed -i 's/Order allow,deny.*/Allow from all/g' /etc/apache2/sites-available/000-default.conf \
+    && mkdir -p /var/run/munin \
+    && chown -R munin:munin /var/run/munin \
+    && chfn -f 'munin' root \
+    && /usr/sbin/a2enmod fcgid
 
 COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
 COPY logrotate-munin /etc/logrotate.d/munin
@@ -23,7 +28,7 @@ RUN chmod +x /usr/local/bin/notify_slack_munin
 COPY munin_slack.conf /etc/munin/munin-conf.d/munin_slack.conf
 
 # copy launcher
-ADD run.sh /usr/local/bin/run
+COPY run.sh /usr/local/bin/run
 RUN chmod +x /usr/local/bin/run
 
 # persist