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

Bump to use Alpine 3.12 since 3.8 is now EOL. (#390)

Browse Source 
* Bump to use Alpine 3.12 since 3.8 is now EOL.

* Manually install pip in all images.

* Rename all py- modules to py3- modules.

* Replace mysqldb with mysqlclient library for Mysql support in web.
This commit is contained in:
Abhilash Raj
2020-08-04 00:16:42 -07:00
committed by GitHub
parent 07a7c1ce68
commit e76bb3a1ff
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:3.8 FROM alpine:3.12
MAINTAINER Abhilash Raj MAINTAINER Abhilash Raj
@@ -10,7 +10,7 @@ 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 \
# psutil needs linux-headers to compile on musl c library. # 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 \ && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers \
&& python3 -m pip install -U pip setuptools wheel \ && 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 \

4
core/Dockerfile.dev
View File

@@ -1,4 +1,4 @@
FROM alpine:3.8 FROM alpine:3.12
MAINTAINER Abhilash Raj MAINTAINER Abhilash Raj
@@ -15,7 +15,7 @@ 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 linux-headers \ && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers \
&& python3 -m pip install -U psycopg2 pymysql setuptools wheel \ && python3 -m pip install -U psycopg2 pymysql setuptools wheel \
&& python3 -m pip install \ && python3 -m pip install \
git+https://gitlab.com/mailman/mailman@${CORE_REF} \ git+https://gitlab.com/mailman/mailman@${CORE_REF} \

6
postorius/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:3.8 FROM alpine:3.12
MAINTAINER Abhilash Raj MAINTAINER Abhilash Raj
@@ -14,8 +14,8 @@ 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 libffi-dev gettext \ postgresql-dev mariadb-dev python3-dev libffi-dev gettext \
&& 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 py3-mysqlclient curl mailcap \
python3 py3-setuptools libffi \ python3 py3-pip libffi \
&& python3 -m pip install -U 'Django<3.0' pip wheel setuptools \ && python3 -m pip install -U 'Django<3.0' pip wheel setuptools \
&& python3 -m pip install postorius==1.3.3 \ && python3 -m pip install postorius==1.3.3 \
uwsgi \ uwsgi \

6
postorius/Dockerfile.dev
View File

@@ -1,4 +1,4 @@
FROM alpine:3.8 FROM alpine:3.12
MAINTAINER Abhilash Raj MAINTAINER Abhilash Raj
@@ -16,8 +16,8 @@ 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 libffi-dev git \ postgresql-dev mariadb-dev python3-dev libffi-dev git \
&& 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 py3-mysqlclient curl mailcap \
python3 py3-setuptools libffi gettext \ python3 py3-pip libffi gettext \
&& python3 -m pip install -U 'Django<3.0' pip setuptools wheel \ && 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 \

6
web/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:3.8 FROM alpine:3.12
MAINTAINER Abhilash Raj MAINTAINER Abhilash Raj
@@ -14,8 +14,8 @@ 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 libffi-dev openldap-dev \ postgresql-dev mariadb-dev python3-dev libffi-dev openldap-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 gettext \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \
python3 py3-setuptools xapian-core xapian-bindings-python3 libffi \ python3 py3-pip xapian-core xapian-bindings-python3 libffi \
&& python3 -m pip install -U 'Django<3.0' pip setuptools wheel \ && python3 -m pip install -U 'Django<3.0' pip setuptools wheel \
&& pip install mailmanclient==3.3.1 \ && pip install mailmanclient==3.3.1 \
postorius==1.3.3 \ postorius==1.3.3 \

4
web/Dockerfile.dev
View File

@@ -1,4 +1,4 @@
FROM alpine:3.8 FROM alpine:3.12
MAINTAINER Abhilash Raj MAINTAINER Abhilash Raj
@@ -19,7 +19,7 @@ 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 libffi-dev openldap-dev \ postgresql-dev mariadb-dev python3-dev libffi-dev openldap-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-pip postgresql-client mysql-client py3-mysqlclient \
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 pip setuptools wheel \
&& python3 -m pip install -U \ && python3 -m pip install -U \