diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 55ca9b9..ead3c01 100755 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -67,7 +67,7 @@ services: - user_known_hosts - composer_auth db: - image: mariadb:11 + image: mariadb:11.8.5 restart: always environment: MYSQL_ROOT_PASSWORD: 123456 diff --git a/dockerfiles/php-fpm/php84.Dockerfile b/dockerfiles/php-fpm/php84.Dockerfile index 9d4a0ab..d0e34b9 100644 --- a/dockerfiles/php-fpm/php84.Dockerfile +++ b/dockerfiles/php-fpm/php84.Dockerfile @@ -4,4 +4,6 @@ FROM dimti/php:8.4 ARG PHP_VERSION=8.4 ENV PHP_VERSION ${PHP_VERSION} +RUN docker-php-ext-install ldap + INCLUDE+ ./php.base.Dockerfile diff --git a/dockerfiles/workspace/workspace84.Dockerfile b/dockerfiles/workspace/workspace84.Dockerfile index f8912f0..c48311f 100644 --- a/dockerfiles/workspace/workspace84.Dockerfile +++ b/dockerfiles/workspace/workspace84.Dockerfile @@ -4,4 +4,18 @@ FROM dimti/workspace:8.4 ARG PHP_VERSION=8.4 ENV PHP_VERSION ${PHP_VERSION} +USER root + INCLUDE+ ./workspace.base.Dockerfile + +# once please +RUN apt update -qq + +RUN apt-get install -qq php${PHP_VERSION}-ldap + +RUN apt-get install -qq sudo + +RUN 'laradock ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/laradock + +# Clean up +RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ No newline at end of file