Skip to content

Commit 654dbf8

Browse files
authored
๐Ÿ„๐Ÿฐ Moopril 2022 - ClamAV, Rspamd, SOGo Update
Additions: Update SOGo to 5.5.1 Update Rspamd to 3.2.1 Update ClamAV Containers to use the official ones Added a specific ClamAV Volume for Docker Fixes: Autodiscover is now compatible with App Passwords. The Postmap Access List has been updated to a newer state. New French translations.
2 parents 880a68d + 53a5254 commit 654dbf8

24 files changed

+306
-377
lines changed
Lines changed: 7 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,15 @@
1-
FROM debian:bullseye-slim
1+
FROM clamav/clamav:0.104.2-2_base
22

33
LABEL maintainer "Andrรฉ Peters <[email protected]>"
44

5-
ARG CLAMAV=0.104.2
6-
ARG TINI_VERSION=v0.19.0
7-
8-
RUN apt-get update && apt-get install -y --no-install-recommends \
9-
ca-certificates \
10-
build-essential \
11-
pkg-config \
12-
python3 \
13-
python3-pip \
14-
valgrind \
15-
check \
16-
libbz2-dev \
17-
libcurl4-openssl-dev \
18-
libjson-c-dev \
19-
libmilter-dev \
20-
libncurses5-dev \
21-
libpcre2-dev \
22-
libssl-dev \
23-
libxml2-dev \
24-
zlib1g-dev \
25-
curl \
26-
bash \
27-
wget \
28-
tzdata \
29-
dnsutils \
5+
RUN apk upgrade --no-cache \
6+
&& apk add --update --no-cache \
307
rsync \
31-
dos2unix \
32-
netcat \
33-
&& python3 -m pip install cmake \
34-
&& rm -rf /var/lib/apt/lists/* \
35-
&& wget -O - https://www.clamav.net/downloads/production/clamav-${CLAMAV}.tar.gz | tar xfvz - \
36-
&& cd clamav-${CLAMAV} \
37-
&& cmake . \
38-
-D CMAKE_INSTALL_PREFIX=/usr \
39-
-D CMAKE_INSTALL_LIBDIR=/usr/lib \
40-
-D APP_CONFIG_DIRECTORY=/etc/clamav \
41-
-D CMAKE_INSTALL_MANDIR=/usr/share/man \
42-
-D CMAKE_INSTALL_INFODIR=/usr/share/info \
43-
-D CLAMAV_USER=clamav \
44-
-D CLAMAV_GROUP=clamav \
45-
-D DATABASE_DIRECTORY=/var/lib/clamav \
46-
-D ENABLE_APP=ON \
47-
-D ENABLE_JSON_SHARED=OFF \
48-
-D CMAKE_BUILD_TYPE=MinSizeRel \
49-
&& cmake --build . -j4 \
50-
&& cmake --build . --target install \
51-
&& cd .. && rm -rf clamav-${CLAMAV} \
52-
&& apt-get -y --auto-remove purge build-essential \
53-
&& apt-get -y purge pkg-config \
54-
python3 \
55-
python3-pip \
56-
valgrind \
57-
check \
58-
libbz2-dev \
59-
libcurl4-openssl-dev \
60-
libjson-c-dev \
61-
libmilter-dev \
62-
libncurses5-dev \
63-
libpcre2-dev \
64-
libssl-dev \
65-
libxml2-dev \
66-
zlib1g-dev \
67-
68-
&& addgroup --system --gid 700 clamav \
69-
&& adduser --system --no-create-home --home /var/lib/clamav --uid 700 --gid 700 --disabled-login clamav \
70-
&& rm -rf /tmp/* /var/tmp/*
8+
bind-tools \
9+
bash
7110

7211
COPY clamd.sh ./
73-
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
7412
RUN chmod +x /sbin/tini
7513

76-
CMD ["/sbin/tini", "-g", "--", "/clamd.sh"]
14+
ENTRYPOINT []
15+
CMD ["/sbin/tini", "-g", "--", "/clamd.sh"]

โ€Ždata/Dockerfiles/clamd/clamd.shโ€Ž

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ rm -rf /var/lib/clamav/clamav-*.tmp
1414

1515
mkdir -p /run/clamav /var/lib/clamav
1616

17-
if [[ -s /etc/clamav/whitelist.ign2 ]]; then
18-
echo "Copying non-empty whitelist.ign2 to /var/lib/clamav/whitelist.ign2"
19-
cp /etc/clamav/whitelist.ign2 /var/lib/clamav/whitelist.ign2
20-
fi
17+
#if [[ -s /etc/clamav/whitelist.ign2 ]]; then
18+
# echo "Copying non-empty whitelist.ign2 to /var/lib/clamav/whitelist.ign2"
19+
# cp /etc/clamav/whitelist.ign2 /var/lib/clamav/whitelist.ign2
20+
#fi
2121

2222
if [[ ! -f /var/lib/clamav/whitelist.ign2 ]]; then
2323
echo "Creating /var/lib/clamav/whitelist.ign2"

โ€Ždata/conf/nginx/includes/site-defaults.confโ€Ž

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
add_header X-Permitted-Cross-Domain-Policies none;
2323
add_header Referrer-Policy strict-origin;
2424

25+
proxy_buffer_size 128k;
26+
proxy_buffers 64 512k;
27+
proxy_busy_buffers_size 512k;
28+
2529
index index.php index.html;
2630

2731
client_max_body_size 0;
@@ -163,7 +167,7 @@
163167
proxy_connect_timeout 75;
164168
proxy_send_timeout 3600;
165169
proxy_read_timeout 3600;
166-
proxy_buffers 64 256k;
170+
#proxy_buffers 64 256k;
167171
proxy_set_header X-Real-IP $remote_addr;
168172
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
169173
proxy_set_header Host $http_host;

0 commit comments

Comments
ย (0)