Allow ldap-sasl for php-ldap

Prepare to support improvements introduced in https://github.com/roundcube/roundcubemail/commit/7d13b337dbd2da7baf4ef636bd37637bc9707646

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 89c5722b1159c33b2e4fc835dcb4a8a09115526b..398fe4546f8e40ac82cb5b4e2feb2d967c9f00cc 100644 (file)
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -24,6 +24,7 @@ RUN set -ex; \
                libicu-dev \
                libjpeg62-turbo-dev \
                libldap2-dev \
+               libsasl2-dev \
                libmagickwand-dev \
                libpng-dev \
                libpq-dev \
@@ -46,7 +47,7 @@ RUN set -ex; \
        pecl bundle -d /usr/src/php/ext redis; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
        docker-php-ext-configure gd --with-jpeg --with-freetype; \
-       docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+       docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" --with-ldap-sasl; \
        docker-php-ext-install \
                exif \
                gd \
@@ -143,4 +144,4 @@ RUN sed -i /etc/apache2/sites-enabled/000-default.conf -e 's/:80>/:8000>/'
 
 EXPOSE 8000
 
-USER 33:33
\ No newline at end of file
+USER 33:33

diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index 5dda613c2c3469d50dd6972d20da30fa237fcff0..174db0025f3900412c0287611c61ceae998843b2 100644 (file)
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -31,6 +31,7 @@ RUN set -ex; \
                libzip-dev \
                libtool \
                openldap-dev \
+               cyrus-sasl-dev \
                postgresql-dev \
                sqlite-dev \
                aspell-dev \
@@ -40,7 +41,7 @@ RUN set -ex; \
        pecl bundle -d /usr/src/php/ext imagick; \
        pecl bundle -d /usr/src/php/ext redis; \
        docker-php-ext-configure gd --with-jpeg --with-freetype; \
-       docker-php-ext-configure ldap; \
+       docker-php-ext-configure ldap --with-ldap-sasl; \
        docker-php-ext-install \
                exif \
                gd \
@@ -122,4 +123,4 @@ CMD ["php-fpm"]
 
 FROM root as nonroot
 
-USER 82:82
\ No newline at end of file
+USER 82:82

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 59982bbe685137c6ddabcd705a7d25f256e340ae..7b0396254965a22c07ed6f0bfa46c64f59598c7b 100644 (file)
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -24,6 +24,7 @@ RUN set -ex; \
                libicu-dev \
                libjpeg62-turbo-dev \
                libldap2-dev \
+               libsasl2-dev \
                libmagickwand-dev \
                libpng-dev \
                libpq-dev \
@@ -46,7 +47,7 @@ RUN set -ex; \
        pecl bundle -d /usr/src/php/ext redis; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
        docker-php-ext-configure gd --with-jpeg --with-freetype; \
-       docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+       docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" --with-ldap-sasl; \
        docker-php-ext-install \
                exif \
                gd \
@@ -140,4 +141,4 @@ RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen; \
 
 
 
-USER 33:33
\ No newline at end of file
+USER 33:33

diff --git a/templates/Dockerfile-alpine.templ b/templates/Dockerfile-alpine.templ
index a68c349f96ddea56b2e51a73e8f4204251fc7604..e6fd88c715078c77a2d8209cb654b6c819e0a066 100644 (file)
--- a/templates/Dockerfile-alpine.templ
+++ b/templates/Dockerfile-alpine.templ
@@ -31,6 +31,7 @@ RUN set -ex; \
                libzip-dev \
                libtool \
                openldap-dev \
+               cyrus-sasl-dev \
                postgresql-dev \
                sqlite-dev \
                aspell-dev \
@@ -40,7 +41,7 @@ RUN set -ex; \
        pecl bundle -d /usr/src/php/ext imagick; \
        pecl bundle -d /usr/src/php/ext redis; \
        docker-php-ext-configure gd --with-jpeg --with-freetype; \
-       docker-php-ext-configure ldap; \
+       docker-php-ext-configure ldap --with-ldap-sasl; \
        docker-php-ext-install \
                exif \
                gd \
@@ -122,4 +123,4 @@ CMD ["%%CMD%%"]
 
 FROM root as nonroot
 
-USER 82:82
\ No newline at end of file
+USER 82:82

diff --git a/templates/Dockerfile-debian.templ b/templates/Dockerfile-debian.templ
index 06ee4fcd2fdc6cad720693a7eadecebf2b4ee75f..b232a5185ac175b0681fca409ceef61427b9f601 100644 (file)
--- a/templates/Dockerfile-debian.templ
+++ b/templates/Dockerfile-debian.templ
@@ -24,6 +24,7 @@ RUN set -ex; \
                libicu-dev \
                libjpeg62-turbo-dev \
                libldap2-dev \
+               libsasl2-dev \
                libmagickwand-dev \
                libpng-dev \
                libpq-dev \
@@ -46,7 +47,7 @@ RUN set -ex; \
        pecl bundle -d /usr/src/php/ext redis; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
        docker-php-ext-configure gd --with-jpeg --with-freetype; \
-       docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+       docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" --with-ldap-sasl; \
        docker-php-ext-install \
                exif \
                gd \
@@ -140,4 +141,4 @@ RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen; \
 
 %%NONROOT_ADD%%
 
-USER 33:33
\ No newline at end of file
+USER 33:33