rebuild images with rockylinux 8 and update rspamd to v3.0

This commit is contained in:
ace 2021-10-22 00:42:06 +03:00
parent af2c98090f
commit 58f905d2da
No known key found for this signature in database
GPG Key ID: 2E47CC17BA7F8CF0
7 changed files with 24 additions and 29 deletions

View File

@ -1,4 +1,4 @@
FROM centos:8 FROM rockylinux/rockylinux:8
RUN useradd -m -s /bin/false vmail RUN useradd -m -s /bin/false vmail
@ -6,10 +6,9 @@ RUN dnf install -y epel-release && dnf update -y \
&& dnf clean all \ && dnf clean all \
&& rm -rf /var/cache/yum && rm -rf /var/cache/yum
RUN dnf --nogpg install -y https://mirror.ghettoforge.org/distributions/gf/el/8/gf/x86_64/gf-release-8-11.gf.el8.noarch.rpm \ RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
&& dnf install -y --enablerepo=gf-plus postfix3-3.5.8 postfix3-ldap-3.5.8 postfix3-mysql-3.5.8 postfix3-pgsql-3.5.8 \ dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.4.1.1 \
&& dnf install -y dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.3.2 \ cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
&& dnf install -y cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
&& dnf clean all \ && dnf clean all \
&& rm -rf /var/cache/yum && rm -rf /var/cache/yum

View File

@ -1,4 +1,4 @@
FROM centos:8 FROM rockylinux/rockylinux:8
RUN useradd -m -s /bin/false vmail RUN useradd -m -s /bin/false vmail
@ -6,10 +6,9 @@ RUN dnf install -y epel-release && dnf update -y \
&& dnf clean all \ && dnf clean all \
&& rm -rf /var/cache/yum && rm -rf /var/cache/yum
RUN dnf --nogpg install -y https://mirror.ghettoforge.org/distributions/gf/el/8/gf/x86_64/gf-release-8-11.gf.el8.noarch.rpm \ RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
&& dnf install -y --enablerepo=gf-plus postfix3-3.5.8 postfix3-ldap-3.5.8 postfix3-mysql-3.5.8 postfix3-pgsql-3.5.8 \ dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.4.1.1 \
&& dnf install -y dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.3.2 \ cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
&& dnf install -y cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
&& dnf clean all \ && dnf clean all \
&& rm -rf /var/cache/yum && rm -rf /var/cache/yum

View File

@ -1,4 +1,4 @@
FROM centos:8 FROM rockylinux/rockylinux:8
RUN useradd -m -s /bin/false vmail RUN useradd -m -s /bin/false vmail
@ -6,10 +6,9 @@ RUN dnf install -y epel-release && dnf update -y \
&& dnf clean all \ && dnf clean all \
&& rm -rf /var/cache/yum && rm -rf /var/cache/yum
RUN dnf --nogpg install -y https://mirror.ghettoforge.org/distributions/gf/el/8/gf/x86_64/gf-release-8-11.gf.el8.noarch.rpm \ RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
&& dnf install -y --enablerepo=gf-plus postfix3-3.5.8 postfix3-ldap-3.5.8 postfix3-mysql-3.5.8 postfix3-pgsql-3.5.8 \ dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.4.1.1 \
&& dnf install -y dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.3.2 \ cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
&& dnf install -y cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
&& dnf clean all \ && dnf clean all \
&& rm -rf /var/cache/yum && rm -rf /var/cache/yum

View File

@ -1,4 +1,4 @@
FROM python:3-buster FROM python:3.9-buster
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y git \ apt-get install -y git \

View File

@ -1,4 +1,4 @@
FROM centos:8 FROM rockylinux/rockylinux:8
RUN useradd -m -s /bin/false vmail RUN useradd -m -s /bin/false vmail
@ -6,10 +6,9 @@ RUN dnf install -y epel-release && dnf update -y \
&& dnf clean all \ && dnf clean all \
&& rm -rf /var/cache/yum && rm -rf /var/cache/yum
RUN dnf --nogpg install -y https://mirror.ghettoforge.org/distributions/gf/el/8/gf/x86_64/gf-release-8-11.gf.el8.noarch.rpm \ RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
&& dnf install -y --enablerepo=gf-plus postfix3-3.5.8 postfix3-ldap-3.5.8 postfix3-mysql-3.5.8 postfix3-pgsql-3.5.8 \ dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.4.1.1 \
&& dnf install -y dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.3.2 \ cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
&& dnf install -y cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
&& dnf clean all \ && dnf clean all \
&& rm -rf /var/cache/yum && rm -rf /var/cache/yum

View File

@ -1,4 +1,4 @@
FROM centos:8 FROM rockylinux/rockylinux:8
RUN useradd -m -s /bin/false vmail RUN useradd -m -s /bin/false vmail
@ -6,16 +6,15 @@ RUN dnf install -y epel-release && dnf update -y \
&& dnf clean all \ && dnf clean all \
&& rm -rf /var/cache/yum && rm -rf /var/cache/yum
RUN dnf --nogpg install -y https://mirror.ghettoforge.org/distributions/gf/el/8/gf/x86_64/gf-release-8-11.gf.el8.noarch.rpm \ RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
&& dnf install -y --enablerepo=gf-plus postfix3-3.5.8 postfix3-ldap-3.5.8 postfix3-mysql-3.5.8 postfix3-pgsql-3.5.8 \ dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.4.1.1 \
&& dnf install -y dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.3.2 \ cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
&& dnf install -y cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
&& dnf clean all \ && dnf clean all \
&& rm -rf /var/cache/yum && rm -rf /var/cache/yum
RUN curl https://rspamd.com/rpm-stable/centos-8/rspamd.repo > /etc/yum.repos.d/rspamd.repo \ RUN curl https://rspamd.com/rpm-stable/centos-8/rspamd.repo > /etc/yum.repos.d/rspamd.repo \
&& rpm --import https://rspamd.com/rpm/gpg.key \ && rpm --import https://rspamd.com/rpm/gpg.key \
&& dnf install -y rspamd-2.7 \ && dnf install -y rspamd-3.0 \
&& dnf clean all \ && dnf clean all \
&& rm -rf /var/cache/yum && rm -rf /var/cache/yum

View File

@ -1,4 +1,4 @@
VERSION=2.7 VERSION=3.0
IMAGE=rspamd IMAGE=rspamd
REGISTRY=registry.0xace.cc/ghp REGISTRY=registry.0xace.cc/ghp