diff --git a/Dockerfile b/Dockerfile index 86b95bc..277f16e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.17 MAINTAINER Andrey Arapov RUN apk update && \ diff --git a/service/spamassassin/run b/service/spamassassin/run index db6e01b..8a13e9c 100755 --- a/service/spamassassin/run +++ b/service/spamassassin/run @@ -4,7 +4,7 @@ echo "${PWD##*/}: started." set -x # first run init -if [ ! -d "/var/lib/spamassassin/3.004001" ]; then +if [ ! -d "/var/lib/spamassassin/3.004006" ]; then /usr/bin/sa-update fi @@ -12,4 +12,4 @@ fi # seq 17 31 | xargs -I@ echo 172.@.0.0/16 | xargs | tr ' ' ',' chown -Rh spamd:spamd -- /var/lib/spamassassin -exec /usr/sbin/spamd -r /run/spamd.pid -m 5 -c -i 0.0.0.0:783 -u spamd -H /var/lib/spamassassin -x -A 172.17.0.0/16,172.18.0.0/16,172.19.0.0/16,172.20.0.0/16,172.21.0.0/16,172.22.0.0/16,172.23.0.0/16,172.24.0.0/16,172.25.0.0/16,172.26.0.0/16,172.27.0.0/16,172.28.0.0/16,172.29.0.0/16,172.30.0.0/16,172.31.0.0/16 2>&1 +exec /usr/sbin/spamd -r /run/spamd.pid --min-children 1 --max-children 2 --max-conn-per-child 50 -c -i 0.0.0.0:783 -u spamd -H /var/lib/spamassassin -x -A 172.17.0.0/16,172.18.0.0/16,172.19.0.0/16,172.20.0.0/16,172.21.0.0/16,172.22.0.0/16,172.23.0.0/16,172.24.0.0/16,172.25.0.0/16,172.26.0.0/16,172.27.0.0/16,172.28.0.0/16,172.29.0.0/16,172.30.0.0/16,172.31.0.0/16 2>&1