mirror of
https://github.com/friendica/docker
synced 2025-03-04 18:13:47 +01:00
Merge pull request #84 from nupplaphil/bug/83-ldap-support
Add ldap support for ldapauth addon
This commit is contained in:
GitHub
commit
5da7979222
8 changed files with 67 additions and 18 deletions
|
|
@ -34,13 +34,20 @@ RUN set -ex; \
|
|||
libfreetype6-dev \
|
||||
librsvg2-2 \
|
||||
libzip-dev \
|
||||
libldap2-dev \
|
||||
; \
|
||||
\
|
||||
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||
\
|
||||
docker-php-ext-configure gd \
|
||||
--with-gd \
|
||||
--with-freetype-dir=/usr/include/ \
|
||||
--with-png-dir=/usr/include/ \
|
||||
--with-jpeg-dir=/usr/include/ \
|
||||
; \
|
||||
docker-php-ext-configure ldap \
|
||||
--with-libdir=lib/$debMultiarch/ \
|
||||
; \
|
||||
docker-php-ext-install -j "$(nproc)" \
|
||||
pdo_mysql \
|
||||
gd \
|
||||
|
|
@ -48,12 +55,13 @@ RUN set -ex; \
|
|||
opcache \
|
||||
ctype \
|
||||
pcntl \
|
||||
ldap \
|
||||
; \
|
||||
\
|
||||
# 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 memcached-3.1.3; \
|
||||
pecl install redis-5.0.2; \
|
||||
pecl install apcu-5.1.18; \
|
||||
pecl install memcached-3.1.4; \
|
||||
pecl install redis-5.1.1; \
|
||||
pecl install imagick-3.4.4; \
|
||||
\
|
||||
docker-php-ext-enable \
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ RUN set -ex; \
|
|||
librsvg \
|
||||
pcre-dev \
|
||||
libzip-dev \
|
||||
icu-dev \
|
||||
openldap-dev \
|
||||
; \
|
||||
\
|
||||
docker-php-ext-configure gd \
|
||||
|
|
@ -43,12 +45,13 @@ RUN set -ex; \
|
|||
zip \
|
||||
opcache \
|
||||
pcntl \
|
||||
ldap \
|
||||
; \
|
||||
\
|
||||
# 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 memcached-3.1.3; \
|
||||
pecl install redis-5.0.2; \
|
||||
pecl install APCu-5.1.18; \
|
||||
pecl install memcached-3.1.4; \
|
||||
pecl install redis-5.1.1; \
|
||||
pecl install imagick-3.4.4; \
|
||||
\
|
||||
docker-php-ext-enable \
|
||||
|
|
|
|||
|
|
@ -34,13 +34,20 @@ RUN set -ex; \
|
|||
libfreetype6-dev \
|
||||
librsvg2-2 \
|
||||
libzip-dev \
|
||||
libldap2-dev \
|
||||
; \
|
||||
\
|
||||
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||
\
|
||||
docker-php-ext-configure gd \
|
||||
--with-gd \
|
||||
--with-freetype-dir=/usr/include/ \
|
||||
--with-png-dir=/usr/include/ \
|
||||
--with-jpeg-dir=/usr/include/ \
|
||||
; \
|
||||
docker-php-ext-configure ldap \
|
||||
--with-libdir=lib/$debMultiarch/ \
|
||||
; \
|
||||
docker-php-ext-install -j "$(nproc)" \
|
||||
pdo_mysql \
|
||||
gd \
|
||||
|
|
@ -48,12 +55,13 @@ RUN set -ex; \
|
|||
opcache \
|
||||
ctype \
|
||||
pcntl \
|
||||
ldap \
|
||||
; \
|
||||
\
|
||||
# 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 memcached-3.1.3; \
|
||||
pecl install redis-5.0.2; \
|
||||
pecl install apcu-5.1.18; \
|
||||
pecl install memcached-3.1.4; \
|
||||
pecl install redis-5.1.1; \
|
||||
pecl install imagick-3.4.4; \
|
||||
\
|
||||
docker-php-ext-enable \
|
||||
|
|
|
|||
|
|
@ -34,13 +34,20 @@ RUN set -ex; \
|
|||
libfreetype6-dev \
|
||||
librsvg2-2 \
|
||||
libzip-dev \
|
||||
libldap2-dev \
|
||||
; \
|
||||
\
|
||||
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||
\
|
||||
docker-php-ext-configure gd \
|
||||
--with-gd \
|
||||
--with-freetype-dir=/usr/include/ \
|
||||
--with-png-dir=/usr/include/ \
|
||||
--with-jpeg-dir=/usr/include/ \
|
||||
; \
|
||||
docker-php-ext-configure ldap \
|
||||
--with-libdir=lib/$debMultiarch/ \
|
||||
; \
|
||||
docker-php-ext-install -j "$(nproc)" \
|
||||
pdo_mysql \
|
||||
gd \
|
||||
|
|
@ -48,12 +55,13 @@ RUN set -ex; \
|
|||
opcache \
|
||||
ctype \
|
||||
pcntl \
|
||||
ldap \
|
||||
; \
|
||||
\
|
||||
# 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 memcached-3.1.3; \
|
||||
pecl install redis-5.0.2; \
|
||||
pecl install apcu-5.1.18; \
|
||||
pecl install memcached-3.1.4; \
|
||||
pecl install redis-5.1.1; \
|
||||
pecl install imagick-3.4.4; \
|
||||
\
|
||||
docker-php-ext-enable \
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ RUN set -ex; \
|
|||
librsvg \
|
||||
pcre-dev \
|
||||
libzip-dev \
|
||||
icu-dev \
|
||||
openldap-dev \
|
||||
; \
|
||||
\
|
||||
docker-php-ext-configure gd \
|
||||
|
|
@ -43,12 +45,13 @@ RUN set -ex; \
|
|||
zip \
|
||||
opcache \
|
||||
pcntl \
|
||||
ldap \
|
||||
; \
|
||||
\
|
||||
# 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 memcached-3.1.3; \
|
||||
pecl install redis-5.0.2; \
|
||||
pecl install APCu-5.1.18; \
|
||||
pecl install memcached-3.1.4; \
|
||||
pecl install redis-5.1.1; \
|
||||
pecl install imagick-3.4.4; \
|
||||
\
|
||||
docker-php-ext-enable \
|
||||
|
|
|
|||
|
|
@ -34,13 +34,20 @@ RUN set -ex; \
|
|||
libfreetype6-dev \
|
||||
librsvg2-2 \
|
||||
libzip-dev \
|
||||
libldap2-dev \
|
||||
; \
|
||||
\
|
||||
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||
\
|
||||
docker-php-ext-configure gd \
|
||||
--with-gd \
|
||||
--with-freetype-dir=/usr/include/ \
|
||||
--with-png-dir=/usr/include/ \
|
||||
--with-jpeg-dir=/usr/include/ \
|
||||
; \
|
||||
docker-php-ext-configure ldap \
|
||||
--with-libdir=lib/$debMultiarch/ \
|
||||
; \
|
||||
docker-php-ext-install -j "$(nproc)" \
|
||||
pdo_mysql \
|
||||
gd \
|
||||
|
|
@ -48,12 +55,13 @@ RUN set -ex; \
|
|||
opcache \
|
||||
ctype \
|
||||
pcntl \
|
||||
ldap \
|
||||
; \
|
||||
\
|
||||
# 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 memcached-3.1.3; \
|
||||
pecl install redis-5.0.2; \
|
||||
pecl install apcu-5.1.18; \
|
||||
pecl install memcached-3.1.4; \
|
||||
pecl install redis-5.1.1; \
|
||||
pecl install imagick-3.4.4; \
|
||||
\
|
||||
docker-php-ext-enable \
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ RUN set -ex; \
|
|||
librsvg \
|
||||
pcre-dev \
|
||||
libzip-dev \
|
||||
icu-dev \
|
||||
openldap-dev \
|
||||
; \
|
||||
\
|
||||
docker-php-ext-configure gd \
|
||||
|
|
@ -42,6 +44,7 @@ RUN set -ex; \
|
|||
zip \
|
||||
opcache \
|
||||
pcntl \
|
||||
ldap \
|
||||
; \
|
||||
\
|
||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||
|
|
|
|||
|
|
@ -33,13 +33,20 @@ RUN set -ex; \
|
|||
libfreetype6-dev \
|
||||
librsvg2-2 \
|
||||
libzip-dev \
|
||||
libldap2-dev \
|
||||
; \
|
||||
\
|
||||
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||
\
|
||||
docker-php-ext-configure gd \
|
||||
--with-gd \
|
||||
--with-freetype-dir=/usr/include/ \
|
||||
--with-png-dir=/usr/include/ \
|
||||
--with-jpeg-dir=/usr/include/ \
|
||||
; \
|
||||
docker-php-ext-configure ldap \
|
||||
--with-libdir=lib/$debMultiarch/ \
|
||||
; \
|
||||
docker-php-ext-install -j "$(nproc)" \
|
||||
pdo_mysql \
|
||||
gd \
|
||||
|
|
@ -47,6 +54,7 @@ RUN set -ex; \
|
|||
opcache \
|
||||
ctype \
|
||||
pcntl \
|
||||
ldap \
|
||||
; \
|
||||
\
|
||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||
|
|
|
|||
Loading…
Reference in a new issue