Skip to content

Fix ldap and email #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jtilander wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix ldap and email #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a269e53
Added installation of the LDAP module.
Jun 7, 2016
a04158a
Moved some files around to reflect that we've moved to 1.26
Jun 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 0 additions & 84 deletions 1.23/docker-entrypoint.sh
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions 1.24/Dockerfile
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions 1.24/README.md
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions 1.24/apache/mediawiki.conf
View file
Open in desktop

This file was deleted.

32 changes: 26 additions & 6 deletions 1.23/Dockerfile → Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
FROM php:5.6-apache
MAINTAINER Synctree App Force <appforce+docker@synctree.com>

ENV MEDIAWIKI_VERSION 1.23
ENV MEDIAWIKI_FULL_VERSION 1.23.9
ENV MEDIAWIKI_VERSION 1.26
ENV MEDIAWIKI_FULL_VERSION 1.26.3
ENV LDAP_VERSION REL1_26


ENV DEBIAN_FRONTEND=noninteractive

RUN set -x; \
apt-get update \
&& apt-get install -y --no-install-recommends \
g++ \
libicu52 \
libicu-dev \
libldap2-dev \
imagemagick \
git \
&& pecl install intl \
&& echo extension=intl.so >> /usr/local/etc/php/conf.d/ext-intl.ini \
&& apt-get purge -y --auto-remove g++ libicu-dev \
&& rm -rf /var/lib/apt/lists/*

RUN docker-php-ext-install mysqli opcache

RUN set -x; \
apt-get update \
&& apt-get install -y --no-install-recommends imagemagick \
&& rm -rf /var/lib/apt/lists/*
RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/
RUN docker-php-ext-install ldap

RUN a2enmod rewrite

Expand All @@ -45,6 +50,21 @@ RUN MEDIAWIKI_DOWNLOAD_URL="https://releases.wikimedia.org/mediawiki/$MEDIAWIKI_
COPY apache/mediawiki.conf /etc/apache2/
RUN echo Include /etc/apache2/mediawiki.conf >> /etc/apache2/apache2.conf

RUN mkdir /var/tmp/stage && cd /var/tmp/stage && git clone -b $LDAP_VERSION https://github.com/wikimedia/mediawiki-extensions-LdapAuthentication.git
RUN mkdir /var/log/mediawiki

# Install support for emailing.
RUN pear install Auth_SASL
RUN pear install net_smtp
RUN pear install mail

# Read about the LDAP setup here: https://www.mediawiki.org/wiki/Extension:LDAP_Authentication/Requirements
# You basically need to stick your own .crt file in /usr/local/share/ca-certificates and restart the container.
# You can get the certificate by issuing "openssl s_client -showcerts -connect <yourserver>:636"
RUN echo "TLS_CACERTDIR /etc/ssl/certs" >> /etc/ldap/ldap.conf

VOLUME ["/usr/local/share/ca-certificates"]

COPY docker-entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"]
0 1.23/README.md → README.md
View file
Open in desktop
File renamed without changes.
0 1.23/apache/mediawiki.conf → apache/mediawiki.conf
View file
Open in desktop
File renamed without changes.
10 changes: 10 additions & 0 deletions 1.24/docker-entrypoint.sh → docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

set -e

# Always update the certificate store.
/usr/sbin/update-ca-certificates


: ${MEDIAWIKI_SITE_NAME:=MediaWiki}

if [ -z "$MEDIAWIKI_DB_HOST" -a -z "$MYSQL_PORT_3306_TCP" ]; then
Expand Down Expand Up @@ -37,6 +41,12 @@ if ! [ -e index.php -a -e includes/DefaultSettings.php ]; then
echo >&2 "Complete! MediaWiki has been successfully copied to $(pwd)"
fi

if ! [ -d /var/www/html/extensions/LdapAuthentication ]; then
echo >&2 "Ldap extension not found, copying version $LDAP_VERSION to extensions..."
mkdir /var/www/html/extensions/LdapAuthentication
cp -r /var/tmp/stage/mediawiki-extensions-LdapAuthentication/* /var/www/html/extensions/LdapAuthentication
fi

: ${MEDIAWIKI_SHARED:=/var/www-shared/html}
if [ -d "$MEDIAWIKI_SHARED" ]; then
# If there is no LocalSettings.php but we have one under the shared
Expand Down