From 793ee37f2eec9d52dbd0ca88c7d04bcb7e0f1001 Mon Sep 17 00:00:00 2001
From: Danil Smirnov <danil@smirnov.la>
Date: Mon, 9 Aug 2021 09:03:05 +0000
Subject: [PATCH] Postorius rolling image fix

---
 postorius/Dockerfile.dev | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev
index 5105d0a..61e4734 100644
--- a/postorius/Dockerfile.dev
+++ b/postorius/Dockerfile.dev
@@ -8,6 +8,8 @@ COPY mailman-web /opt/mailman-web
 COPY docker-entrypoint.sh /usr/local/bin/
 
 ARG POSTORIUS_REF
+ARG DJ_MM3_REF
+ARG CLIENT_REF
 
 # Install packages and dependencies for postorius and hyperkitty Add user for
 # executing apps, change ownership for uwsgi+django files and set execution
@@ -18,13 +20,19 @@ RUN set -ex \
 	&& apk add --no-cache --virtual .mailman-rundeps bash sassc \
 		postgresql-client mysql-client py3-mysqlclient curl mailcap \
 		python3 py3-pip libffi gettext \
-	&& python3 -m pip install -U 'Django<3.0' pip setuptools wheel \
-	&& python3 -m pip install git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \
+    && python3 -m pip install -U pip setuptools wheel \
+    && python3 -m pip install -U \
+        git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \
+        git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \
 		uwsgi \
 		psycopg2 \
 		dj-database-url \
 		mysqlclient \
 		typing \
+		django-utils-six \
+    && python3 -m pip install -U 'Django<3.1' \
+    && python3 -m pip install -U \
+       git+https://gitlab.com/mailman/django-mailman3@${DJ_MM3_REF} \
 	&& apk del .build-deps \
 	&& addgroup -S mailman \
 	&& adduser -S -G mailman mailman \