[Dovecot] Dovecot 2.3.1, Pigeonhole 0.5.1

[ClamAV] 0.100.0, new log method without pipes
[Compose] New images for Dovecot and ClamAV, add persistent tty to clamd-mailcow
This commit is contained in:
André
2018-04-26 12:36:13 +02:00
parent f036de706e
commit f53006f6ab
7 changed files with 32 additions and 29 deletions

View File

@@ -6,7 +6,7 @@ LABEL maintainer "André Peters <andre.peters@servercow.de>"
COPY dl_files.sh bootstrap.sh ./
# Installation
ENV CLAMAV 0.99.3
ENV CLAMAV 0.100.0
RUN apk add --no-cache --virtual build-dependencies alpine-sdk ncurses-dev zlib-dev bzip2-dev pcre-dev linux-headers fts-dev libxml2-dev libressl-dev \
&& apk add --no-cache curl bash tini libxml2 libbz2 pcre fts libressl \
@@ -33,11 +33,12 @@ RUN apk add --no-cache --virtual build-dependencies alpine-sdk ncurses-dev zlib-
&& apk del build-dependencies \
&& addgroup -S clamav \
&& adduser -S -D -h /var/lib/clamav -s /sbin/nologin -G clamav -g clamav clamav \
&& adduser clamav tty \
&& mkdir -p /run/clamav \
&& chown clamav:clamav /run/clamav \
&& chmod +x /dl_files.sh \
&& set -ex; /bin/bash /dl_files.sh \
&& chmod 750 /run/clamav
&& chmod +x /dl_files.sh \
&& set -ex; /bin/bash /dl_files.sh \
&& chmod 750 /run/clamav
# Port provision
EXPOSE 3310

View File

@@ -7,18 +7,20 @@ if [[ "${SKIP_CLAMD}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
fi
# Create log pipes
mkdir /var/log/clamav
mkdir -p /var/log/clamav
touch /var/log/clamav/clamd.log /var/log/clamav/freshclam.log
mkfifo -m 600 /tmp/logpipe_clamd
mkfifo -m 600 /tmp/logpipe_freshclam
chown -R clamav:clamav /var/log/clamav/ /tmp/logpipe_*
cat <> /tmp/logpipe_clamd 1>&2 &
cat <> /tmp/logpipe_freshclam 1>&2 &
chown -R clamav:clamav /var/log/clamav/
# Prepare
BACKGROUND_TASKS=()
freshclam -d &
(
while true; do
sleep 1m
freshclam
sleep 1h
done
) &
BACKGROUND_TASKS+=($!)
clamd &