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

Merge pull request #623 from maxking/bump-django

Browse Source 
Bump Alpine and Django version
This commit is contained in:
Abhilash Raj
2023-06-18 20:23:23 -07:00
committed by GitHub
parent 9a10a00f3a 85a060015c
commit a09b1812d8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/Dockerfile
View File

@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.3 # syntax = docker/dockerfile:1.3
FROM alpine:3.17.3 FROM alpine:3.18.0
# Add needed files for uwsgi server + settings for django # Add needed files for uwsgi server + settings for django
COPY mailman-web /opt/mailman-web COPY mailman-web /opt/mailman-web
@@ -18,11 +18,11 @@ RUN --mount=type=cache,target=/root/.cache \
&& apk add --no-cache --virtual .mailman-rundeps bash sassc \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \
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 -U 'Django<4.1' pip setuptools wheel \ && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \
&& pip install -r /tmp/requirements.txt \ && pip install -r /tmp/requirements.txt \
whoosh \ whoosh \
uwsgi \ uwsgi \
'psycopg2<2.9' \ psycopg2 \
dj-database-url \ dj-database-url \
mysqlclient \ mysqlclient \
typing \ typing \

6
web/Dockerfile.dev
View File

@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.3 # syntax = docker/dockerfile:1.3
FROM alpine:3.17.3 FROM alpine:3.18.0
# Add needed files for uwsgi server + settings for django # Add needed files for uwsgi server + settings for django
COPY mailman-web /opt/mailman-web COPY mailman-web /opt/mailman-web
@@ -28,7 +28,7 @@ RUN --mount=type=cache,target=/root/.cache \
git+https://gitlab.com/mailman/hyperkitty \ git+https://gitlab.com/mailman/hyperkitty \
whoosh \ whoosh \
uwsgi \ uwsgi \
'psycopg2<2.9' \ psycopg2 \
dj-database-url \ dj-database-url \
mysqlclient \ mysqlclient \
xapian-haystack \ xapian-haystack \
@@ -37,7 +37,7 @@ RUN --mount=type=cache,target=/root/.cache \
tzdata \ tzdata \
diskcache \ diskcache \
django-utils-six \ django-utils-six \
&& python3 -m pip install -U 'Django<4.1' \ && python3 -m pip install -U 'Django<4.2' \
&& python3 -m pip install -U \ && python3 -m pip install -U \
git+https://gitlab.com/mailman/django-mailman3 \ git+https://gitlab.com/mailman/django-mailman3 \
&& apk del .build-deps \ && apk del .build-deps \