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

Postorius fix for Dockerfile.dev (#361)

Browse Source 
* Updating Dockerfiles

* Whitespaces fix
This commit is contained in:
Danil Smirnov
2020-01-10 19:14:41 +02:00
committed by Abhilash Raj
parent 5ec6bd054f
commit 81f3eeb578
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
postorius/Dockerfile
View File

@@ -17,7 +17,7 @@ RUN set -ex \
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 \
&& python3 -mpip install postorius==1.3.1 \ && python3 -m pip install postorius==1.3.1 \
uwsgi \ uwsgi \
psycopg2 \ psycopg2 \
dj-database-url \ dj-database-url \

29
postorius/Dockerfile.dev
View File

@@ -1,4 +1,4 @@
FROM python:3.6-alpine3.6 FROM alpine:3.8
MAINTAINER Abhilash Raj MAINTAINER Abhilash Raj
@@ -8,26 +8,23 @@ COPY mailman-web /opt/mailman-web
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
ARG POSTORIUS_REF ARG POSTORIUS_REF
ARG DJ_MM3_REF
ARG CLIENT_REF
# Install packages and dependencies for postorius and hyperkitty Add user for # Install packages and dependencies for postorius and hyperkitty Add user for
# executing apps, change ownership for uwsgi+django files and set execution # executing apps, change ownership for uwsgi+django files and set execution
# 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 \
postgresql-dev mariadb-dev libffi-dev \ postgresql-dev mariadb-dev python3-dev libffi-dev \
&& apk add --no-cache --virtual .mailman-rundeps bash libffi \ && 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 \
&& pip install -U git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \ python3 py3-setuptools libffi \
git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \ && python3 -m pip install -U 'Django<3.0' pip \
whoosh \ && python3 -m pip install git+https://gitlab.com/mailman/postorius@${POSTORIUS_REF} \
uwsgi \ uwsgi \
psycopg2 \ psycopg2 \
dj-database-url \ dj-database-url \
mysqlclient \ mysqlclient \
&& pip install -U 'Django<3.0' \ typing \
&& 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 \
&& adduser -S -G mailman mailman \ && adduser -S -G mailman mailman \