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

Add libffi to all Postorius images. (#320)

Browse Source 
* 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:
Abhilash Raj
2019-04-13 21:04:42 -07:00
committed by GitHub
parent a7832b00f1
commit 423d9cbf03
7 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
postorius/Dockerfile
View File

@@ -12,8 +12,8 @@ COPY docker-entrypoint.sh /usr/local/bin/
# rights for management script # rights for management script
RUN set -ex \ RUN set -ex \
&& apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers \ && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers \
postgresql-dev mariadb-dev \ postgresql-dev mariadb-dev libffi-dev \
&& apk add --no-cache --virtual .mailman-rundeps bash \ && apk add --no-cache --virtual .mailman-rundeps bash libffi \
postgresql-client mysql-client py-mysqldb curl mailcap \ postgresql-client mysql-client py-mysqldb curl mailcap \
&& pip install -U Django==2.1.5 pip \ && pip install -U Django==2.1.5 pip \
&& pip install postorius==1.2.3 \ && pip install postorius==1.2.3 \

6
postorius/Dockerfile.dev
View File

@@ -16,8 +16,8 @@ ARG CLIENT_REF
# rights for management script # rights for management script
RUN set -ex \ RUN set -ex \
&& apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers git \ && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers git \
postgresql-dev mariadb-dev \ postgresql-dev mariadb-dev libffi-dev \
&& apk add --no-cache --virtual .mailman-rundeps bash \ && apk add --no-cache --virtual .mailman-rundeps bash libffi \
postgresql-client mysql-client py-mysqldb curl mailcap \ postgresql-client mysql-client py-mysqldb curl mailcap \
&& pip install -U git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \ && pip install -U git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \
git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \ git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \
@@ -26,7 +26,7 @@ RUN set -ex \
psycopg2 \ psycopg2 \
dj-database-url \ dj-database-url \
mysqlclient \ 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} \ && pip install -U git+https://gitlab.com/mailman/django-mailman3@${DJ_MM3_REF} \
&& apk del .build-deps \ && apk del .build-deps \
&& addgroup -S mailman \ && addgroup -S mailman \

6
postorius/mailman-web/uwsgi.ini
View File

@@ -3,9 +3,6 @@
uwsgi-socket = 0.0.0.0:8080 uwsgi-socket = 0.0.0.0:8080
http-socket = 0.0.0.0:8000 http-socket = 0.0.0.0:8000
#Enable threading for python
enable-threads = true
# Move to the directory wher the django files are. # Move to the directory wher the django files are.
chdir = /opt/mailman-web chdir = /opt/mailman-web
@@ -14,8 +11,7 @@ wsgi-file = wsgi.py
# Setup default number of processes and threads per process. # Setup default number of processes and threads per process.
master = true master = true
process = 2 process = 4
threads = 2
# Drop privielges and don't run as root. # Drop privielges and don't run as root.
uid = mailman uid = mailman

2
tests/test.sh
View File

@@ -18,7 +18,7 @@ docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mai
docker-compose ps docker-compose ps
# Sleep for a while and check again if the containers are up. # Sleep for a while and check again if the containers are up.
sleep 30 sleep 60
docker ps docker ps
# Check if there is anything interesting in the logs. # Check if there is anything interesting in the logs.

4
web/Dockerfile
View File

@@ -12,10 +12,10 @@ COPY docker-entrypoint.sh /usr/local/bin/
# rights for management script # rights for management script
RUN set -ex \ RUN set -ex \
&& apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers \ && 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 \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \
postgresql-client mysql-client py-mysqldb curl mailcap \ 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 -U django==2.1.5 pip \
&& python3 -m pip install mailmanclient==3.2.1 \ && python3 -m pip install mailmanclient==3.2.1 \
postorius==1.2.3 \ postorius==1.2.3 \

6
web/Dockerfile.dev
View File

@@ -17,10 +17,10 @@ ARG CLIENT_REF
# rights for management script # rights for management script
RUN set -ex \ RUN set -ex \
&& apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers git \ && 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 \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \
python3 py3-setuptools postgresql-client mysql-client py-mysqldb\ python3 py3-setuptools postgresql-client mysql-client py-mysqldb\
curl mailcap xapian-core xapian-bindings-python3 \ curl mailcap xapian-core xapian-bindings-python3 libffi \
&& python3 -m pip install -U \ && python3 -m pip install -U \
git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \ git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \
git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \ git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \
@@ -31,7 +31,7 @@ RUN set -ex \
dj-database-url \ dj-database-url \
mysqlclient \ mysqlclient \
xapian-haystack \ xapian-haystack \
&& python3 -m pip install -U django>=1.11\ && python3 -m pip install -U 'Django<2.2' \
&& python3 -m pip install -U \ && python3 -m pip install -U \
git+https://gitlab.com/mailman/django-mailman3@${DJ_MM3_REF} \ git+https://gitlab.com/mailman/django-mailman3@${DJ_MM3_REF} \
&& apk del .build-deps \ && apk del .build-deps \

3
web/mailman-web/uwsgi.ini
View File

@@ -14,8 +14,7 @@ wsgi-file = wsgi.py
# Setup default number of processes and threads per process. # Setup default number of processes and threads per process.
master = true master = true
process = 2 process = 4
threads = 2
# Drop privielges and don't run as root. # Drop privielges and don't run as root.
uid = mailman uid = mailman