Scott.Idem/OSIT-Mailman3
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update max supported Django versions (#699)

Browse Source 
* Update max supported Django versions

* Add dependency on python-openid

* Use the right dependency

* Also bump django version

* Add python-openid specifically to deps

* Add dependency on openid too
This commit is contained in:
Abhilash Raj
2024-06-07 13:27:10 +05:30
committed by GitHub
parent cee738a9df
commit 21684ce838
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
postorius/Dockerfile
View File

@@ -11,7 +11,7 @@ RUN --mount=type=cache,target=/root/.cache \
&& apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \
postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \
python3 py3-pip libffi libuuid pcre-dev py-cryptography \ 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 \ && python3 -m pip install --break-system-packages postorius==1.3.10 \
uwsgi \ uwsgi \
psycopg2 \ psycopg2 \

4
postorius/Dockerfile.dev
View File

@@ -20,12 +20,12 @@ RUN --mount=type=cache,target=/root/.cache \
git+https://gitlab.com/mailman/mailmanclient \ git+https://gitlab.com/mailman/mailmanclient \
git+https://gitlab.com/mailman/postorius \ git+https://gitlab.com/mailman/postorius \
uwsgi \ uwsgi \
'psycopg2<2.9' \ psycopg2 \
dj-database-url \ dj-database-url \
mysqlclient \ mysqlclient \
typing \ typing \
django-utils-six \ 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 \ && python3 -m pip install --break-system-packages -U \
git+https://gitlab.com/mailman/django-mailman3 \ git+https://gitlab.com/mailman/django-mailman3 \
&& apk del .build-deps \ && apk del .build-deps \

3
web/Dockerfile
View File

@@ -14,7 +14,7 @@ RUN --mount=type=cache,target=/root/.cache \
&& apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \
postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \
python3 py3-pip xapian-core xapian-bindings-python3 libffi pcre-dev py-cryptography \ 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 \ && pip install --break-system-packages -r /tmp/requirements.txt \
whoosh \ whoosh \
uwsgi \ uwsgi \
@@ -28,6 +28,7 @@ RUN --mount=type=cache,target=/root/.cache \
diskcache \ diskcache \
django-utils-six \ django-utils-six \
tzdata \ tzdata \
'django-allauth[socialaccount,openid]' \
&& apk del .build-deps \ && apk del .build-deps \
&& addgroup -S mailman \ && addgroup -S mailman \
&& adduser -S -G mailman mailman && adduser -S -G mailman mailman

3
web/Dockerfile.dev
View File

@@ -32,7 +32,8 @@ RUN --mount=type=cache,target=/root/.cache \
tzdata \ tzdata \
diskcache \ diskcache \
django-utils-six \ 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 \ && python3 -m pip install --break-system-packages -U \
git+https://gitlab.com/mailman/django-mailman3 \ git+https://gitlab.com/mailman/django-mailman3 \
&& apk del .build-deps \ && apk del .build-deps \