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

Include django-auth-ldap in mailman-web (#374) (#375)

Browse Source
This commit is contained in:
Christian Dietrich
2020-04-20 02:13:48 +02:00
committed by GitHub
parent 637c353dfc
commit 794d17ebd1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/Dockerfile
View File

@@ -12,7 +12,7 @@ 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 libffi-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 py-mysqldb curl mailcap gettext \
python3 py3-setuptools xapian-core xapian-bindings-python3 libffi \ python3 py3-setuptools xapian-core xapian-bindings-python3 libffi \
@@ -28,6 +28,7 @@ RUN set -ex \
mysqlclient \ mysqlclient \
typing \ typing \
xapian-haystack \ xapian-haystack \
django-auth-ldap \
&& apk del .build-deps \ && apk del .build-deps \
&& addgroup -S mailman \ && addgroup -S mailman \
&& adduser -S -G mailman mailman \ && adduser -S -G mailman mailman \

3
web/Dockerfile.dev
View File

@@ -17,7 +17,7 @@ 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 libffi-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-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 \
@@ -31,6 +31,7 @@ RUN set -ex \
dj-database-url \ dj-database-url \
mysqlclient \ mysqlclient \
xapian-haystack \ xapian-haystack \
django-auth-ldap \
&& python3 -m pip install -U 'Django<3.0' \ && python3 -m pip install -U 'Django<3.0' \
&& 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} \