From b79d306004b29109463c458daddb2829fbf8be81 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Thu, 22 Apr 2021 23:34:17 +0800 Subject: [PATCH] feat(ldap extension): php-worker horizon #2956 --- .env.example | 2 ++ docker-compose.yml | 2 ++ laravel-horizon/Dockerfile | 8 ++++++++ php-worker/Dockerfile | 8 ++++++++ 4 files changed, 20 insertions(+) diff --git a/.env.example b/.env.example index 620b8c5d..5561ca10 100644 --- a/.env.example +++ b/.env.example @@ -286,6 +286,7 @@ PHP_WORKER_INSTALL_IMAGEMAGICK=false PHP_WORKER_IMAGEMAGICK_VERSION=latest PHP_WORKER_INSTALL_GMP=false PHP_WORKER_INSTALL_GNUPG=false +PHP_WORKER_INSTALL_LDAP=false PHP_WORKER_INSTALL_PGSQL=false PHP_WORKER_INSTALL_MONGO=false PHP_WORKER_INSTALL_BCMATH=false @@ -327,6 +328,7 @@ LARAVEL_HORIZON_INSTALL_BZ2=false LARAVEL_HORIZON_INSTALL_GD=false LARAVEL_HORIZON_INSTALL_GMP=false LARAVEL_HORIZON_INSTALL_GNUPG=false +LARAVEL_HORIZON_INSTALL_LDAP=false LARAVEL_HORIZON_INSTALL_IMAGEMAGICK=false LARAVEL_HORIZON_IMAGEMAGICK_VERSION=latest LARAVEL_HORIZON_INSTALL_SOCKETS=false diff --git a/docker-compose.yml b/docker-compose.yml index cbc23793..6c15b9a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -316,6 +316,7 @@ services: - INSTALL_IMAGEMAGICK=${PHP_WORKER_INSTALL_IMAGEMAGICK} - INSTALL_GMP=${PHP_WORKER_INSTALL_GMP} - INSTALL_GNUPG=${PHP_WORKER_INSTALL_GNUPG} + - INSTALL_LDAP=${PHP_WORKER_INSTALL_LDAP} - INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL} - INSTALL_MONGO=${PHP_WORKER_INSTALL_MONGO} - INSTALL_BCMATH=${PHP_WORKER_INSTALL_BCMATH} @@ -359,6 +360,7 @@ services: - INSTALL_GD=${LARAVEL_HORIZON_INSTALL_GD} - INSTALL_GMP=${LARAVEL_HORIZON_INSTALL_GMP} - INSTALL_GNUPG=${LARAVEL_HORIZON_INSTALL_GNUPG} + - INSTALL_LDAP=${LARAVEL_HORIZON_INSTALL_LDAP} - INSTALL_IMAGEMAGICK=${LARAVEL_HORIZON_INSTALL_IMAGEMAGICK} - INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL} - INSTALL_ZIP_ARCHIVE=${LARAVEL_HORIZON_INSTALL_ZIP_ARCHIVE} diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile index a0903d6f..8823a020 100644 --- a/laravel-horizon/Dockerfile +++ b/laravel-horizon/Dockerfile @@ -72,6 +72,14 @@ RUN set -eux; if [ ${INSTALL_GNUPG} = true ]; then \ docker-php-ext-enable gnupg; \ fi +#Install LDAP +ARG INSTALL_LDAP=false; +RUN set -eux; if [ ${INSTALL_LDAP} = true ]; then \ + apk add --no-cache --no-progress openldap-dev; \ + docker-php-ext-install ldap; \ + php -m | grep -oiE '^ldap$'; \ + fi + #Install GD package: ARG INSTALL_GD=false RUN if [ ${INSTALL_GD} = true ]; then \ diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 9f4bfb23..b901770b 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -72,6 +72,14 @@ RUN set -eux; if [ ${INSTALL_GNUPG} = true ]; then \ docker-php-ext-enable gnupg; \ fi +#Install LDAP +ARG INSTALL_LDAP=false; +RUN set -eux; if [ ${INSTALL_LDAP} = true ]; then \ + apk add --no-cache --no-progress openldap-dev; \ + docker-php-ext-install ldap; \ + php -m | grep -oiE '^ldap$'; \ + fi + #Install GD package: ARG INSTALL_GD=false RUN if [ ${INSTALL_GD} = true ]; then \