Add libffi to all Postorius images. (#320)
* Add libffi to all Postorius images. * Use Django less than a certain version. * Fix the version constraint. * Fix uwsgi configuration by using only processes.
This commit is contained in:
@@ -12,10 +12,10 @@ COPY docker-entrypoint.sh /usr/local/bin/
|
||||
# rights for management script
|
||||
RUN set -ex \
|
||||
&& apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers \
|
||||
postgresql-dev mariadb-dev python3-dev \
|
||||
postgresql-dev mariadb-dev python3-dev libffi-dev \
|
||||
&& apk add --no-cache --virtual .mailman-rundeps bash sassc \
|
||||
postgresql-client mysql-client py-mysqldb curl mailcap \
|
||||
python3 py3-setuptools xapian-core xapian-bindings-python3 \
|
||||
python3 py3-setuptools xapian-core xapian-bindings-python3 libffi \
|
||||
&& python3 -m pip install -U django==2.1.5 pip \
|
||||
&& python3 -m pip install mailmanclient==3.2.1 \
|
||||
postorius==1.2.3 \
|
||||
|
||||
@@ -17,10 +17,10 @@ ARG CLIENT_REF
|
||||
# rights for management script
|
||||
RUN set -ex \
|
||||
&& apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers git \
|
||||
postgresql-dev mariadb-dev python3-dev \
|
||||
postgresql-dev mariadb-dev python3-dev libffi-dev \
|
||||
&& apk add --no-cache --virtual .mailman-rundeps bash sassc \
|
||||
python3 py3-setuptools postgresql-client mysql-client py-mysqldb\
|
||||
curl mailcap xapian-core xapian-bindings-python3 \
|
||||
python3 py3-setuptools postgresql-client mysql-client py-mysqldb\
|
||||
curl mailcap xapian-core xapian-bindings-python3 libffi \
|
||||
&& python3 -m pip install -U \
|
||||
git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \
|
||||
git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \
|
||||
@@ -29,11 +29,11 @@ RUN set -ex \
|
||||
uwsgi \
|
||||
psycopg2 \
|
||||
dj-database-url \
|
||||
mysqlclient \
|
||||
xapian-haystack \
|
||||
&& python3 -m pip install -U django>=1.11\
|
||||
&& python3 -m pip install -U \
|
||||
git+https://gitlab.com/mailman/django-mailman3@${DJ_MM3_REF} \
|
||||
mysqlclient \
|
||||
xapian-haystack \
|
||||
&& python3 -m pip install -U 'Django<2.2' \
|
||||
&& 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 \
|
||||
|
||||
@@ -14,8 +14,7 @@ wsgi-file = wsgi.py
|
||||
|
||||
# Setup default number of processes and threads per process.
|
||||
master = true
|
||||
process = 2
|
||||
threads = 2
|
||||
process = 4
|
||||
|
||||
# Drop privielges and don't run as root.
|
||||
uid = mailman
|
||||
|
||||
Reference in New Issue
Block a user