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

Bump Mailmanclient and upgrade setuptools and wheel in images. (#389)

Browse Source 
* Bump Mailmanclient.
* Add linux-headers package for psutils.
* Update setuptools and wheel everywhere.
* Use Postorius 1.3.3 in Postorius image.
This commit is contained in:
Abhilash Raj
2020-08-02 12:42:36 -07:00
committed by GitHub
parent 1ae02c70ee
commit 07a7c1ce68
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/Dockerfile
View File

@@ -9,8 +9,9 @@ COPY docker-entrypoint.sh /usr/local/bin/
RUN apk update \ RUN apk update \
&& apk add --virtual build-deps gcc python3-dev musl-dev postgresql-dev \ && apk add --virtual build-deps gcc python3-dev musl-dev postgresql-dev \
libffi-dev \ libffi-dev \
&& apk add --no-cache bash su-exec postgresql-client mysql-client curl python py3-setuptools \ # psutil needs linux-headers to compile on musl c library.
&& python3 -m pip install -U pip \ && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-setuptools linux-headers \
&& python3 -m pip install -U pip setuptools wheel \
&& python3 -m pip install psycopg2 \ && python3 -m pip install psycopg2 \
gunicorn==19.9.0 \ gunicorn==19.9.0 \
mailman==3.3.1 \ mailman==3.3.1 \

5
core/Dockerfile.dev
View File

@@ -15,8 +15,9 @@ ARG MM3_HK_REF
RUN apk update \ RUN apk update \
&& apk add --no-cache --virtual build-deps gcc python3-dev musl-dev \ && apk add --no-cache --virtual build-deps gcc python3-dev musl-dev \
postgresql-dev git libffi-dev \ postgresql-dev git libffi-dev \
&& apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-setuptools \ && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-setuptools linux-headers \
&& python3 -m pip install -U psycopg2 pymysql \ && python3 -m pip install -U psycopg2 pymysql setuptools wheel \
&& python3 -m pip install \
git+https://gitlab.com/mailman/mailman@${CORE_REF} \ git+https://gitlab.com/mailman/mailman@${CORE_REF} \
git+https://gitlab.com/mailman/mailman-hyperkitty@${MM3_HK_REF} \ git+https://gitlab.com/mailman/mailman-hyperkitty@${MM3_HK_REF} \
gunicorn==19.9.0 \ gunicorn==19.9.0 \

4
postorius/Dockerfile
View File

@@ -16,8 +16,8 @@ RUN set -ex \
&& 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 libffi \ python3 py3-setuptools libffi \
&& python3 -m pip install -U 'Django<3.0' pip \ && python3 -m pip install -U 'Django<3.0' pip wheel setuptools \
&& python3 -m pip install postorius==1.3.1 \ && python3 -m pip install postorius==1.3.3 \
uwsgi \ uwsgi \
psycopg2 \ psycopg2 \
dj-database-url \ dj-database-url \

2
postorius/Dockerfile.dev
View File

@@ -18,7 +18,7 @@ RUN set -ex \
&& 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 libffi gettext \ python3 py3-setuptools libffi gettext \
&& python3 -m pip install -U 'Django<3.0' pip \ && python3 -m pip install -U 'Django<3.0' pip setuptools wheel \
&& python3 -m pip install git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \ && python3 -m pip install git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \
uwsgi \ uwsgi \
psycopg2 \ psycopg2 \

4
web/Dockerfile
View File

@@ -16,8 +16,8 @@ RUN set -ex \
&& 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 gettext \ postgresql-client mysql-client py-mysqldb curl mailcap gettext \
python3 py3-setuptools xapian-core xapian-bindings-python3 libffi \ python3 py3-setuptools xapian-core xapian-bindings-python3 libffi \
&& python3 -m pip install -U 'Django<3.0' pip \ && python3 -m pip install -U 'Django<3.0' pip setuptools wheel \
&& python3 -m pip install mailmanclient==3.3.0 \ && pip install mailmanclient==3.3.1 \
postorius==1.3.3 \ postorius==1.3.3 \
hyperkitty==1.3.3 \ hyperkitty==1.3.3 \
django-mailman3==1.3.4 \ django-mailman3==1.3.4 \

1
web/Dockerfile.dev
View File

@@ -21,6 +21,7 @@ RUN set -ex \
&& 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 libffi gettext \ curl mailcap xapian-core xapian-bindings-python3 libffi gettext \
&& python3 -m pip install -U pip setuptools wheel \
&& 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} \