From 07a7c1ce689a8a729ddebf4e0c238bb0cde246d7 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Sun, 2 Aug 2020 12:42:36 -0700 Subject: [PATCH] Bump Mailmanclient and upgrade setuptools and wheel in images. (#389) * Bump Mailmanclient. * Add linux-headers package for psutils. * Update setuptools and wheel everywhere. * Use Postorius 1.3.3 in Postorius image. --- core/Dockerfile | 5 +++-- core/Dockerfile.dev | 5 +++-- postorius/Dockerfile | 4 ++-- postorius/Dockerfile.dev | 2 +- web/Dockerfile | 4 ++-- web/Dockerfile.dev | 1 + 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index 6d0b4f9..aaadfa2 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -9,8 +9,9 @@ COPY docker-entrypoint.sh /usr/local/bin/ RUN apk update \ && apk add --virtual build-deps gcc python3-dev musl-dev postgresql-dev \ libffi-dev \ - && apk add --no-cache bash su-exec postgresql-client mysql-client curl python py3-setuptools \ - && python3 -m pip install -U pip \ + # psutil needs linux-headers to compile on musl c library. + && 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 \ gunicorn==19.9.0 \ mailman==3.3.1 \ diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev index f450187..6e2ff35 100644 --- a/core/Dockerfile.dev +++ b/core/Dockerfile.dev @@ -15,8 +15,9 @@ ARG MM3_HK_REF RUN apk update \ && apk add --no-cache --virtual build-deps gcc python3-dev musl-dev \ postgresql-dev git libffi-dev \ - && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-setuptools \ - && python3 -m pip install -U psycopg2 pymysql \ + && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-setuptools linux-headers \ + && 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-hyperkitty@${MM3_HK_REF} \ gunicorn==19.9.0 \ diff --git a/postorius/Dockerfile b/postorius/Dockerfile index 510ecd7..ed63ef1 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -16,8 +16,8 @@ RUN set -ex \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py-mysqldb curl mailcap \ python3 py3-setuptools libffi \ - && python3 -m pip install -U 'Django<3.0' pip \ - && python3 -m pip install postorius==1.3.1 \ + && python3 -m pip install -U 'Django<3.0' pip wheel setuptools \ + && python3 -m pip install postorius==1.3.3 \ uwsgi \ psycopg2 \ dj-database-url \ diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 9cc1d5b..4e89cd1 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -18,7 +18,7 @@ RUN set -ex \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py-mysqldb curl mailcap \ 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} \ uwsgi \ psycopg2 \ diff --git a/web/Dockerfile b/web/Dockerfile index 192e4d2..6298cb1 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -16,8 +16,8 @@ RUN set -ex \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py-mysqldb curl mailcap gettext \ python3 py3-setuptools xapian-core xapian-bindings-python3 libffi \ - && python3 -m pip install -U 'Django<3.0' pip \ - && python3 -m pip install mailmanclient==3.3.0 \ + && python3 -m pip install -U 'Django<3.0' pip setuptools wheel \ + && pip install mailmanclient==3.3.1 \ postorius==1.3.3 \ hyperkitty==1.3.3 \ django-mailman3==1.3.4 \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 99c4925..4839f40 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -21,6 +21,7 @@ RUN set -ex \ && 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 libffi gettext \ + && python3 -m pip install -U pip setuptools wheel \ && python3 -m pip install -U \ git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \ git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \