From 297bf35b1b149baba61fc975e7d59bcef82fd25d Mon Sep 17 00:00:00 2001
From: Danil Smirnov <27999539+danil-smirnov@users.noreply.github.com>
Date: Thu, 25 Feb 2021 07:36:59 +0200
Subject: [PATCH] Upgrade Mailman 3 versions (#433)

* Upgrading Mailman 3 versions

* Fixing dependencies
---
 core/Dockerfile      |  2 +-
 postorius/Dockerfile |  4 ++--
 web/Dockerfile       | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/Dockerfile b/core/Dockerfile
index b5bac6b..7900be0 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -14,7 +14,7 @@ RUN apk update \
     && python3 -m pip install -U pip setuptools wheel \
         && python3 -m pip install psycopg2 \
                    gunicorn==19.9.0 \
-                   mailman==3.3.2 \
+                   mailman==3.3.3 \
                    mailman-hyperkitty==1.1.0 \
                    pymysql \
     && apk del build-deps \
diff --git a/postorius/Dockerfile b/postorius/Dockerfile
index 551a972..e41ea87 100644
--- a/postorius/Dockerfile
+++ b/postorius/Dockerfile
@@ -12,12 +12,12 @@ COPY docker-entrypoint.sh /usr/local/bin/
 # rights for management script
 RUN set -ex \
 	&& apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers \
-		postgresql-dev mariadb-dev python3-dev libffi-dev openldap-dev \
+		postgresql-dev mariadb-dev python3-dev libffi-dev openldap-dev cargo rust \
 	&& apk add --no-cache --virtual .mailman-rundeps bash sassc \
 		postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \
 		python3 py3-pip libffi libuuid \
 	&& python3 -m pip install -U 'Django<3.0' pip setuptools wheel \
-	&& python3 -m pip install postorius==1.3.3 \
+	&& python3 -m pip install postorius==1.3.4 \
 		uwsgi \
 		psycopg2 \
 		dj-database-url \
diff --git a/web/Dockerfile b/web/Dockerfile
index 6a0a5b0..4d661f7 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -12,15 +12,15 @@ COPY docker-entrypoint.sh /usr/local/bin/
 # rights for management script
 RUN set -ex \
 	&& apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers \
-		postgresql-dev mariadb-dev python3-dev libffi-dev openldap-dev \
+		postgresql-dev mariadb-dev python3-dev libffi-dev openldap-dev cargo rust \
 	&& apk add --no-cache --virtual .mailman-rundeps bash sassc \
 	   postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \
 	   python3 py3-pip xapian-core xapian-bindings-python3 libffi \
 	&& python3 -m pip install -U 'Django<3.0' pip setuptools wheel \
-	&& pip install mailmanclient==3.3.1 \
-		postorius==1.3.3 \
-		hyperkitty==1.3.3 \
-		django-mailman3==1.3.4 \
+	&& pip install mailmanclient==3.3.2 \
+		postorius==1.3.4 \
+		hyperkitty==1.3.4 \
+		django-mailman3==1.3.5 \
 		whoosh \
 		uwsgi \
 		psycopg2 \