From fbc4b9cabb04a3510b530cc676a35b0c1acfc423 Mon Sep 17 00:00:00 2001 From: Zoey Date: Wed, 3 May 2023 16:27:52 +0200 Subject: [PATCH 1/3] optimize clamav Dockerfile Signed-off-by: Zoey --- Containers/clamav/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Containers/clamav/Dockerfile b/Containers/clamav/Dockerfile index f024c124..23e61b66 100644 --- a/Containers/clamav/Dockerfile +++ b/Containers/clamav/Dockerfile @@ -1,7 +1,8 @@ -# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/0.105/alpine/Dockerfile +# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.0/alpine/Dockerfile FROM clamav/clamav:1.1.0-1 -RUN apk add --no-cache tzdata -COPY clamav.conf /tmp/ -RUN cat /tmp/clamav.conf >> /etc/clamav/clamd.conf +COPY clamav.conf /tmp/clamav.conf + +RUN apk add --no-cache tzdata; \ + tee -a /etc/clamav/clamd.conf < /tmp/clamav.conf LABEL com.centurylinklabs.watchtower.monitor-only="true" From c9e406f76c47c09155cda082b327690d1228f462 Mon Sep 17 00:00:00 2001 From: Zoey Date: Wed, 3 May 2023 17:02:43 +0200 Subject: [PATCH 2/3] add set -ex and remove tmp conf Co-authored-by: Simon L. Signed-off-by: Zoey --- Containers/clamav/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Containers/clamav/Dockerfile b/Containers/clamav/Dockerfile index 23e61b66..680ba4ca 100644 --- a/Containers/clamav/Dockerfile +++ b/Containers/clamav/Dockerfile @@ -3,6 +3,8 @@ FROM clamav/clamav:1.1.0-1 COPY clamav.conf /tmp/clamav.conf -RUN apk add --no-cache tzdata; \ - tee -a /etc/clamav/clamd.conf < /tmp/clamav.conf +RUN set -ex; \ + apk add --no-cache tzdata; \ + cat /tmp/clamav.conf | tee -a /etc/clamav/clamd.conf; \ + rm /tmp/clamav.conf LABEL com.centurylinklabs.watchtower.monitor-only="true" From 3fc1487cd971707bb0c7a3c72eaf78d3cca8e078 Mon Sep 17 00:00:00 2001 From: Zoey Date: Wed, 3 May 2023 17:03:04 +0200 Subject: [PATCH 3/3] update version in of source file Co-authored-by: Simon L. Signed-off-by: Zoey --- Containers/clamav/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containers/clamav/Dockerfile b/Containers/clamav/Dockerfile index 680ba4ca..5816a498 100644 --- a/Containers/clamav/Dockerfile +++ b/Containers/clamav/Dockerfile @@ -1,4 +1,4 @@ -# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.0/alpine/Dockerfile +# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.1/alpine/Dockerfile FROM clamav/clamav:1.1.0-1 COPY clamav.conf /tmp/clamav.conf