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,8 +12,8 @@ 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 \
|
||||
&& apk add --no-cache --virtual .mailman-rundeps bash \
|
||||
postgresql-dev mariadb-dev libffi-dev \
|
||||
&& apk add --no-cache --virtual .mailman-rundeps bash libffi \
|
||||
postgresql-client mysql-client py-mysqldb curl mailcap \
|
||||
&& pip install -U Django==2.1.5 pip \
|
||||
&& pip install postorius==1.2.3 \
|
||||
|
||||
@@ -16,8 +16,8 @@ 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 \
|
||||
&& apk add --no-cache --virtual .mailman-rundeps bash \
|
||||
postgresql-dev mariadb-dev libffi-dev \
|
||||
&& apk add --no-cache --virtual .mailman-rundeps bash libffi \
|
||||
postgresql-client mysql-client py-mysqldb curl mailcap \
|
||||
&& pip install -U git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \
|
||||
git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \
|
||||
@@ -26,7 +26,7 @@ RUN set -ex \
|
||||
psycopg2 \
|
||||
dj-database-url \
|
||||
mysqlclient \
|
||||
&& pip install -U django==2.1.5\
|
||||
&& pip install -U 'Django<2.2' \
|
||||
&& pip install -U git+https://gitlab.com/mailman/django-mailman3@${DJ_MM3_REF} \
|
||||
&& apk del .build-deps \
|
||||
&& addgroup -S mailman \
|
||||
|
||||
@@ -3,9 +3,6 @@
|
||||
uwsgi-socket = 0.0.0.0:8080
|
||||
http-socket = 0.0.0.0:8000
|
||||
|
||||
#Enable threading for python
|
||||
enable-threads = true
|
||||
|
||||
# Move to the directory wher the django files are.
|
||||
chdir = /opt/mailman-web
|
||||
|
||||
@@ -14,8 +11,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