diff --git a/postorius/Dockerfile b/postorius/Dockerfile index 207ed11..c157df9 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -11,7 +11,7 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip libffi libuuid pcre-dev py-cryptography \ - && python3 -m pip install --break-system-packages -U 'Django<4.2' pip setuptools wheel \ + && python3 -m pip install --break-system-packages -U 'Django<4.3' pip setuptools wheel \ && python3 -m pip install --break-system-packages postorius==1.3.10 \ uwsgi \ psycopg2 \ diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 4cc7c82..fe02d3f 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -20,12 +20,12 @@ RUN --mount=type=cache,target=/root/.cache \ git+https://gitlab.com/mailman/mailmanclient \ git+https://gitlab.com/mailman/postorius \ uwsgi \ - 'psycopg2<2.9' \ + psycopg2 \ dj-database-url \ mysqlclient \ typing \ django-utils-six \ - && python3 -m pip install --break-system-packages -U 'Django<3.2' \ + && python3 -m pip install --break-system-packages -U 'Django<4.3' \ && python3 -m pip install --break-system-packages -U \ git+https://gitlab.com/mailman/django-mailman3 \ && apk del .build-deps \ diff --git a/web/Dockerfile b/web/Dockerfile index b01125d..1c502e0 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -14,7 +14,7 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ 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 --break-system-packages -U 'Django<4.2' pip setuptools wheel \ + && python3 -m pip install --break-system-packages -U 'Django<4.3' pip setuptools wheel \ && pip install --break-system-packages -r /tmp/requirements.txt \ whoosh \ uwsgi \ @@ -28,6 +28,7 @@ RUN --mount=type=cache,target=/root/.cache \ diskcache \ django-utils-six \ tzdata \ + 'django-allauth[socialaccount,openid]' \ && apk del .build-deps \ && addgroup -S mailman \ && adduser -S -G mailman mailman diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index ece0282..f3ecd5e 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -32,7 +32,8 @@ RUN --mount=type=cache,target=/root/.cache \ tzdata \ diskcache \ django-utils-six \ - && python3 -m pip install --break-system-packages -U 'Django<4.2' \ + 'django-allauth[socialaccount,openid]' \ + && python3 -m pip install --break-system-packages -U 'Django<4.3' \ && python3 -m pip install --break-system-packages -U \ git+https://gitlab.com/mailman/django-mailman3 \ && apk del .build-deps \