From: Matwey V. Kornilov <redacted>
Date: Wed, 4 Jun 2025 11:23:18 +0000 (+0000)
Subject: Allow ldap-sasl for php-ldap
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7c21c3bac7be2f05cc8d73e77982b2b8be23af10;p=roundcube-roundcubemail-docker.git

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 89c5722..398fe45 100644
--- 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 5dda613..174db00 100644
--- 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 59982bb..7b03962 100644
--- 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 a68c349..e6fd88c 100644
--- 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 06ee4fc..b232a51 100644
--- 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