From 312833c8ab9386598c64a8e5eda986f647e3f69a Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Wed, 26 Oct 2022 13:05:17 +0530 Subject: [PATCH 1/3] Bump to new releases --- core/Dockerfile | 2 +- postorius/Dockerfile | 4 ++-- web/Dockerfile | 10 +++++----- web/Dockerfile.dev | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index c916a7c..ce97fee 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -14,7 +14,7 @@ RUN --mount=type=cache,target=/root/.cache \ && python3 -m pip install -U pip setuptools wheel \ && python3 -m pip install psycopg2 \ gunicorn==19.9.0 \ - mailman==3.3.5 \ + mailman==3.3.6 \ mailman-hyperkitty==1.2.0 \ pymysql \ 'sqlalchemy<1.4.0' \ diff --git a/postorius/Dockerfile b/postorius/Dockerfile index fbf2d81..c678763 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -16,8 +16,8 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip libffi libuuid pcre-dev py-cryptography \ - && python3 -m pip install -U 'Django<3.2' pip setuptools wheel \ - && python3 -m pip install postorius==1.3.6 \ + && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \ + && python3 -m pip install postorius==1.3.7 \ uwsgi \ 'psycopg2<2.9' \ dj-database-url \ diff --git a/web/Dockerfile b/web/Dockerfile index cd0c94e..d98e8a9 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -16,11 +16,11 @@ RUN --mount=type=cache,target=/root/.cache \ && 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 pcre-dev py-cryptography \ - && python3 -m pip install -U 'Django<3.2' pip setuptools wheel \ - && pip install mailmanclient==3.3.3 \ - postorius==1.3.6 \ - hyperkitty==1.3.5 \ - django-mailman3==1.3.7 \ + && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \ + && pip install mailmanclient==3.3.4 \ + postorius==1.3.7 \ + hyperkitty==1.3.6 \ + django-mailman3==1.3.8 \ mistune==2.0.0rc1 \ whoosh \ uwsgi \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 9049528..8a1f466 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -37,7 +37,7 @@ RUN --mount=type=cache,target=/root/.cache \ tzdata \ diskcache \ django-utils-six \ - && python3 -m pip install -U 'Django<4.3' \ + && python3 -m pip install -U 'Django<4.2' \ && python3 -m pip install -U \ git+https://gitlab.com/mailman/django-mailman3 \ && apk del .build-deps \ From 5fe9f30fd5dda3c70a48d218acf904f70abccb01 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Wed, 26 Oct 2022 13:17:23 +0530 Subject: [PATCH 2/3] Remove constraint on mistune --- web/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/web/Dockerfile b/web/Dockerfile index d98e8a9..07be720 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -21,7 +21,6 @@ RUN --mount=type=cache,target=/root/.cache \ postorius==1.3.7 \ hyperkitty==1.3.6 \ django-mailman3==1.3.8 \ - mistune==2.0.0rc1 \ whoosh \ uwsgi \ 'psycopg2<2.9' \ From 21155c1498281e6511cde15be2882bfbb9fc5f15 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Wed, 26 Oct 2022 13:41:52 +0530 Subject: [PATCH 3/3] Add dependency on tzdata --- web/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/web/Dockerfile b/web/Dockerfile index 07be720..49d6acb 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -32,6 +32,7 @@ RUN --mount=type=cache,target=/root/.cache \ python-memcached \ diskcache \ django-utils-six \ + tzdata \ && apk del .build-deps \ && addgroup -S mailman \ && adduser -S -G mailman mailman \