friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-03-04 05:54:38 +01:00
Code Issues Releases Wiki Activity

Add ldap support for ldapauth addon

Browse source
This commit is contained in:
Philipp Holzer 2019-11-16 12:05:28 +01:00
parent d910f614a5
commit 687136d26b
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
8 changed files with 58 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
2019.09/apache/Dockerfile
View file

@ -34,6 +34,7 @@ RUN set -ex; \
libfreetype6-dev \ libfreetype6-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \
libldap2-dev \
; \ ; \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
@ -41,6 +42,9 @@ RUN set -ex; \
--with-png-dir=/usr/include/ \ --with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \
; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
@ -48,12 +52,13 @@ RUN set -ex; \
opcache \ opcache \
ctype \ ctype \
pcntl \ pcntl \
ldap \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install apcu-5.1.17; \ pecl install apcu-5.1.18; \
pecl install memcached-3.1.3; \ pecl install memcached-3.1.4; \
pecl install redis-5.0.2; \ pecl install redis-5.1.1; \
pecl install imagick-3.4.4; \ pecl install imagick-3.4.4; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

11
2019.09/fpm-alpine/Dockerfile
View file

@ -28,6 +28,7 @@ RUN set -ex; \
librsvg \ librsvg \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
libldap2-dev \
; \ ; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
@ -37,18 +38,22 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
\ \
docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \
; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
zip \ zip \
opcache \ opcache \
pcntl \ pcntl \
ldap \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.17; \ pecl install APCu-5.1.18; \
pecl install memcached-3.1.3; \ pecl install memcached-3.1.4; \
pecl install redis-5.0.2; \ pecl install redis-5.1.1; \
pecl install imagick-3.4.4; \ pecl install imagick-3.4.4; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

11
2019.09/fpm/Dockerfile
View file

@ -34,6 +34,7 @@ RUN set -ex; \
libfreetype6-dev \ libfreetype6-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \
libldap2-dev \
; \ ; \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
@ -41,6 +42,9 @@ RUN set -ex; \
--with-png-dir=/usr/include/ \ --with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \
; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
@ -48,12 +52,13 @@ RUN set -ex; \
opcache \ opcache \
ctype \ ctype \
pcntl \ pcntl \
ldap \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install apcu-5.1.17; \ pecl install apcu-5.1.18; \
pecl install memcached-3.1.3; \ pecl install memcached-3.1.4; \
pecl install redis-5.0.2; \ pecl install redis-5.1.1; \
pecl install imagick-3.4.4; \ pecl install imagick-3.4.4; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

11
2019.12-dev/apache/Dockerfile
View file

@ -34,6 +34,7 @@ RUN set -ex; \
libfreetype6-dev \ libfreetype6-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \
libldap2-dev \
; \ ; \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
@ -41,6 +42,9 @@ RUN set -ex; \
--with-png-dir=/usr/include/ \ --with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \
; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
@ -48,12 +52,13 @@ RUN set -ex; \
opcache \ opcache \
ctype \ ctype \
pcntl \ pcntl \
ldap \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install apcu-5.1.17; \ pecl install apcu-5.1.18; \
pecl install memcached-3.1.3; \ pecl install memcached-3.1.4; \
pecl install redis-5.0.2; \ pecl install redis-5.1.1; \
pecl install imagick-3.4.4; \ pecl install imagick-3.4.4; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

11
2019.12-dev/fpm-alpine/Dockerfile
View file

@ -28,6 +28,7 @@ RUN set -ex; \
librsvg \ librsvg \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
libldap2-dev \
; \ ; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
@ -37,18 +38,22 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
\ \
docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \
; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
zip \ zip \
opcache \ opcache \
pcntl \ pcntl \
ldap \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.17; \ pecl install APCu-5.1.18; \
pecl install memcached-3.1.3; \ pecl install memcached-3.1.4; \
pecl install redis-5.0.2; \ pecl install redis-5.1.1; \
pecl install imagick-3.4.4; \ pecl install imagick-3.4.4; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

11
2019.12-dev/fpm/Dockerfile
View file

@ -34,6 +34,7 @@ RUN set -ex; \
libfreetype6-dev \ libfreetype6-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \
libldap2-dev \
; \ ; \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
@ -41,6 +42,9 @@ RUN set -ex; \
--with-png-dir=/usr/include/ \ --with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \
; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
@ -48,12 +52,13 @@ RUN set -ex; \
opcache \ opcache \
ctype \ ctype \
pcntl \ pcntl \
ldap \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install apcu-5.1.17; \ pecl install apcu-5.1.18; \
pecl install memcached-3.1.3; \ pecl install memcached-3.1.4; \
pecl install redis-5.0.2; \ pecl install redis-5.1.1; \
pecl install imagick-3.4.4; \ pecl install imagick-3.4.4; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

5
Dockerfile-alpine.template
View file

@ -27,6 +27,7 @@ RUN set -ex; \
librsvg \ librsvg \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
libldap2-dev \
; \ ; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
@ -36,12 +37,16 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
\ \
docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \
; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
zip \ zip \
opcache \ opcache \
pcntl \ pcntl \
ldap \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately

5
Dockerfile-debian.template
View file

@ -33,6 +33,7 @@ RUN set -ex; \
libfreetype6-dev \ libfreetype6-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \
libldap2-dev \
; \ ; \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
@ -40,6 +41,9 @@ RUN set -ex; \
--with-png-dir=/usr/include/ \ --with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \
; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
@ -47,6 +51,7 @@ RUN set -ex; \
opcache \ opcache \
ctype \ ctype \
pcntl \ pcntl \
ldap \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately