From 687136d26ba28aeb076b38d337987d1f4d5ff7b4 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sat, 16 Nov 2019 12:05:28 +0100 Subject: [PATCH] Add ldap support for ldapauth addon --- 2019.09/apache/Dockerfile | 11 ++++++++--- 2019.09/fpm-alpine/Dockerfile | 11 ++++++++--- 2019.09/fpm/Dockerfile | 11 ++++++++--- 2019.12-dev/apache/Dockerfile | 11 ++++++++--- 2019.12-dev/fpm-alpine/Dockerfile | 11 ++++++++--- 2019.12-dev/fpm/Dockerfile | 11 ++++++++--- Dockerfile-alpine.template | 5 +++++ Dockerfile-debian.template | 5 +++++ 8 files changed, 58 insertions(+), 18 deletions(-) diff --git a/2019.09/apache/Dockerfile b/2019.09/apache/Dockerfile index 5d385f8..e640e51 100644 --- a/2019.09/apache/Dockerfile +++ b/2019.09/apache/Dockerfile @@ -34,6 +34,7 @@ RUN set -ex; \ libfreetype6-dev \ librsvg2-2 \ libzip-dev \ + libldap2-dev \ ; \ docker-php-ext-configure gd \ --with-gd \ @@ -41,6 +42,9 @@ RUN set -ex; \ --with-png-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)" \ pdo_mysql \ gd \ @@ -48,12 +52,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 \ diff --git a/2019.09/fpm-alpine/Dockerfile b/2019.09/fpm-alpine/Dockerfile index a7a48c1..a5621d5 100644 --- a/2019.09/fpm-alpine/Dockerfile +++ b/2019.09/fpm-alpine/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex; \ librsvg \ pcre-dev \ libzip-dev \ + libldap2-dev \ ; \ \ docker-php-ext-configure gd \ @@ -37,18 +38,22 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ \ + docker-php-ext-configure ldap \ + --with-libdir=lib/x86_64-linux-gnu/ \ + ; \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ gd \ 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 \ diff --git a/2019.09/fpm/Dockerfile b/2019.09/fpm/Dockerfile index abe1e9f..217f6ec 100644 --- a/2019.09/fpm/Dockerfile +++ b/2019.09/fpm/Dockerfile @@ -34,6 +34,7 @@ RUN set -ex; \ libfreetype6-dev \ librsvg2-2 \ libzip-dev \ + libldap2-dev \ ; \ docker-php-ext-configure gd \ --with-gd \ @@ -41,6 +42,9 @@ RUN set -ex; \ --with-png-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)" \ pdo_mysql \ gd \ @@ -48,12 +52,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 \ diff --git a/2019.12-dev/apache/Dockerfile b/2019.12-dev/apache/Dockerfile index 5235f88..21c59a9 100644 --- a/2019.12-dev/apache/Dockerfile +++ b/2019.12-dev/apache/Dockerfile @@ -34,6 +34,7 @@ RUN set -ex; \ libfreetype6-dev \ librsvg2-2 \ libzip-dev \ + libldap2-dev \ ; \ docker-php-ext-configure gd \ --with-gd \ @@ -41,6 +42,9 @@ RUN set -ex; \ --with-png-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)" \ pdo_mysql \ gd \ @@ -48,12 +52,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 \ diff --git a/2019.12-dev/fpm-alpine/Dockerfile b/2019.12-dev/fpm-alpine/Dockerfile index 8e78aff..878b30e 100644 --- a/2019.12-dev/fpm-alpine/Dockerfile +++ b/2019.12-dev/fpm-alpine/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex; \ librsvg \ pcre-dev \ libzip-dev \ + libldap2-dev \ ; \ \ docker-php-ext-configure gd \ @@ -37,18 +38,22 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ \ + docker-php-ext-configure ldap \ + --with-libdir=lib/x86_64-linux-gnu/ \ + ; \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ gd \ 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 \ diff --git a/2019.12-dev/fpm/Dockerfile b/2019.12-dev/fpm/Dockerfile index d136eab..6c4240b 100644 --- a/2019.12-dev/fpm/Dockerfile +++ b/2019.12-dev/fpm/Dockerfile @@ -34,6 +34,7 @@ RUN set -ex; \ libfreetype6-dev \ librsvg2-2 \ libzip-dev \ + libldap2-dev \ ; \ docker-php-ext-configure gd \ --with-gd \ @@ -41,6 +42,9 @@ RUN set -ex; \ --with-png-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)" \ pdo_mysql \ gd \ @@ -48,12 +52,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 \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 485cb58..400900b 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -27,6 +27,7 @@ RUN set -ex; \ librsvg \ pcre-dev \ libzip-dev \ + libldap2-dev \ ; \ \ docker-php-ext-configure gd \ @@ -36,12 +37,16 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ \ + docker-php-ext-configure ldap \ + --with-libdir=lib/x86_64-linux-gnu/ \ + ; \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ gd \ zip \ opcache \ pcntl \ + ldap \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 4cb17d0..9271dc0 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -33,6 +33,7 @@ RUN set -ex; \ libfreetype6-dev \ librsvg2-2 \ libzip-dev \ + libldap2-dev \ ; \ docker-php-ext-configure gd \ --with-gd \ @@ -40,6 +41,9 @@ RUN set -ex; \ --with-png-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)" \ pdo_mysql \ gd \ @@ -47,6 +51,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