From 58f905d2da723340869a29da1467c4ef72b208fa Mon Sep 17 00:00:00 2001 From: ace Date: Fri, 22 Oct 2021 00:42:06 +0300 Subject: [PATCH] rebuild images with rockylinux 8 and update rspamd to v3.0 --- dovecot/Dockerfile | 9 ++++----- opendkim/Dockerfile | 9 ++++----- opendmarc/Dockerfile | 9 ++++----- playmaker/Dockerfile | 2 +- postfix/Dockerfile | 9 ++++----- rspamd/Dockerfile | 13 ++++++------- rspamd/Makefile | 2 +- 7 files changed, 24 insertions(+), 29 deletions(-) diff --git a/dovecot/Dockerfile b/dovecot/Dockerfile index ff3d454..723b36d 100644 --- a/dovecot/Dockerfile +++ b/dovecot/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:8 +FROM rockylinux/rockylinux:8 RUN useradd -m -s /bin/false vmail @@ -6,10 +6,9 @@ RUN dnf install -y epel-release && dnf update -y \ && dnf clean all \ && 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 \ - && 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 \ - && dnf install -y dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.3.2 \ - && dnf install -y cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \ +RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \ + dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.4.1.1 \ + cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \ && dnf clean all \ && rm -rf /var/cache/yum diff --git a/opendkim/Dockerfile b/opendkim/Dockerfile index 12ce7aa..819de3f 100644 --- a/opendkim/Dockerfile +++ b/opendkim/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:8 +FROM rockylinux/rockylinux:8 RUN useradd -m -s /bin/false vmail @@ -6,10 +6,9 @@ RUN dnf install -y epel-release && dnf update -y \ && dnf clean all \ && 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 \ - && 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 \ - && dnf install -y dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.3.2 \ - && dnf install -y cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \ +RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \ + dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.4.1.1 \ + cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \ && dnf clean all \ && rm -rf /var/cache/yum diff --git a/opendmarc/Dockerfile b/opendmarc/Dockerfile index dd718af..cfeaef2 100644 --- a/opendmarc/Dockerfile +++ b/opendmarc/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:8 +FROM rockylinux/rockylinux:8 RUN useradd -m -s /bin/false vmail @@ -6,10 +6,9 @@ RUN dnf install -y epel-release && dnf update -y \ && dnf clean all \ && 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 \ - && 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 \ - && dnf install -y dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.3.2 \ - && dnf install -y cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \ +RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \ + dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.4.1.1 \ + cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \ && dnf clean all \ && rm -rf /var/cache/yum diff --git a/playmaker/Dockerfile b/playmaker/Dockerfile index 4f43e99..3025cd0 100644 --- a/playmaker/Dockerfile +++ b/playmaker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-buster +FROM python:3.9-buster RUN apt-get update && \ apt-get install -y git \ diff --git a/postfix/Dockerfile b/postfix/Dockerfile index 99b1c9c..3485975 100644 --- a/postfix/Dockerfile +++ b/postfix/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:8 +FROM rockylinux/rockylinux:8 RUN useradd -m -s /bin/false vmail @@ -6,10 +6,9 @@ RUN dnf install -y epel-release && dnf update -y \ && dnf clean all \ && 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 \ - && 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 \ - && dnf install -y dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.3.2 \ - && dnf install -y cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \ +RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \ + dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.4.1.1 \ + cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \ && dnf clean all \ && rm -rf /var/cache/yum diff --git a/rspamd/Dockerfile b/rspamd/Dockerfile index 78d8da7..bec5c56 100644 --- a/rspamd/Dockerfile +++ b/rspamd/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:8 +FROM rockylinux/rockylinux:8 RUN useradd -m -s /bin/false vmail @@ -6,16 +6,15 @@ RUN dnf install -y epel-release && dnf update -y \ && dnf clean all \ && 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 \ - && 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 \ - && dnf install -y dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.3.2 \ - && dnf install -y cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \ +RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \ + dovecot-2.3.8 dovecot-pigeonhole-2.3.8 opendkim-2.11.0 opendmarc-1.4.1.1 \ + cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \ && dnf clean all \ && 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 \ - && dnf install -y rspamd-2.7 \ + && dnf install -y rspamd-3.0 \ && dnf clean all \ && rm -rf /var/cache/yum diff --git a/rspamd/Makefile b/rspamd/Makefile index e59f5fc..512af7f 100644 --- a/rspamd/Makefile +++ b/rspamd/Makefile @@ -1,4 +1,4 @@ -VERSION=2.7 +VERSION=3.0 IMAGE=rspamd REGISTRY=registry.0xace.cc/ghp