diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf index 3ad14f8..47eec65 100644 --- a/Docker/nginx/default.conf +++ b/Docker/nginx/default.conf @@ -34,4 +34,8 @@ server { location ~ /\.ht { deny all; } + + location ~ \.mjs$ { + default_type application/javascript; + } } diff --git a/Docker/php-8.4-fpm/Dockerfile b/Docker/php-8.4-fpm/Dockerfile new file mode 100644 index 0000000..cdf56d3 --- /dev/null +++ b/Docker/php-8.4-fpm/Dockerfile @@ -0,0 +1,65 @@ +FROM php:8.4-fpm + +RUN apt-get update && apt-get install -y \ + libfreetype6-dev \ + libjpeg62-turbo-dev \ + libmcrypt-dev \ + libpng-dev \ + mariadb-client \ + zip \ + libzip-dev + # docker-php-ext-install -j$(nproc) iconv && \ +RUN docker-php-ext-configure gd --with-freetype --with-jpeg && \ + apt-get install -y imagemagick libmagickwand-dev && \ + pecl install imagick && docker-php-ext-enable imagick && \ + docker-php-ext-install -j$(nproc) gd && \ + docker-php-ext-install pdo_mysql zip && \ + docker-php-ext-install opcache && \ + docker-php-ext-install bcmath + + +RUN apt-get install -y git vim + +RUN pecl install redis && \ + docker-php-ext-enable redis + +RUN pecl install xdebug && \ + docker-php-ext-enable xdebug + +RUN export COMPOSER_HOME=/usr/local/composer && \ + curl -sS https://getcomposer.org/installer \ + | php -- --install-dir=/usr/local/bin --filename=composer && \ + curl https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar \ + -L -o /usr/local/bin/drush && \ + chmod +x /usr/local/bin/drush + +RUN apt-get install -y rsyslog +COPY ./rsyslog-drupal.conf /etc/rsyslog.d/drupal.conf +# ENTRYPOINT ["sh", "-c", "service rsyslog start ; tail -f /dev/null"] + +COPY ./php-custom.ini /usr/local/etc/php/conf.d/php-custom.ini +# COPY ./php-fpm-custom.conf /usr/local/etc/php-fpm.d/php-fpm-custom.conf + +# COPY ./bashrc /root/.bashrc +# COPY ./inputrc /root/.inputrc + +ARG USER_UID +ARG USER_UNAME +ARG USER_GID +ARG USER_GNAME + +RUN if getent group ${USER_GNAME} ; then groupdel ${USER_GNAME}; fi &&\ + groupadd -g ${USER_GID} ${USER_GNAME} &&\ + useradd -l -u ${USER_UID} -g ${USER_GNAME} ${USER_UNAME} &&\ + install -d -m 0755 -o ${USER_UNAME} -g ${USER_GNAME} /home/${USER_UNAME} &&\ + chown --changes --silent --no-dereference --recursive \ + --from=33:33 ${USER_UID}:${USER_GID} \ + /home/${USER_UNAME} + # /.composer \ + # /var/run/php-fpm \ + # /var/lib/php/sessions \ + +COPY ./bashrc /home/${USER_UNAME}/.bashrc +COPY ./inputrc /home/${USER_UNAME}/.inputrc + +USER ${USER_UNAME} diff --git a/Docker/php-8.4-fpm/bashrc b/Docker/php-8.4-fpm/bashrc new file mode 100644 index 0000000..6c45676 --- /dev/null +++ b/Docker/php-8.4-fpm/bashrc @@ -0,0 +1,4 @@ + +PS1='\e[36m\e[1mPHP-8.1\e[0m:\e[90m\w\e[0m\n$ ' +bind '"\e[A": history-search-backward' +bind '"\e[B": history-search-forward' diff --git a/Docker/php-8.4-fpm/inputrc b/Docker/php-8.4-fpm/inputrc new file mode 100644 index 0000000..db8d91d --- /dev/null +++ b/Docker/php-8.4-fpm/inputrc @@ -0,0 +1,2 @@ +set show-all-if-ambiguous on +set completion-ignore-case on diff --git a/Docker/php-8.4-fpm/php-custom.ini b/Docker/php-8.4-fpm/php-custom.ini new file mode 100644 index 0000000..ac5669b --- /dev/null +++ b/Docker/php-8.4-fpm/php-custom.ini @@ -0,0 +1,9 @@ +memory_limit = 8192M +upload_max_filesize = 50M +post_max_size = 50M +max_execution_time = 150 + +; Log level +; Possible Values: alert, error, warning, notice, debug +; Default Value: notice +log_level = debug diff --git a/Docker/php-8.4-fpm/php-fpm-custom.conf b/Docker/php-8.4-fpm/php-fpm-custom.conf new file mode 100644 index 0000000..8c6ab5d --- /dev/null +++ b/Docker/php-8.4-fpm/php-fpm-custom.conf @@ -0,0 +1 @@ +request_terminate_timeout = 150 diff --git a/Docker/php-8.4-fpm/rsyslog-drupal.conf b/Docker/php-8.4-fpm/rsyslog-drupal.conf new file mode 100644 index 0000000..145f7bb --- /dev/null +++ b/Docker/php-8.4-fpm/rsyslog-drupal.conf @@ -0,0 +1 @@ +local6.* /var/log/drupal.log diff --git a/Docker/php-8.4-fpm/rsyslog.service b/Docker/php-8.4-fpm/rsyslog.service new file mode 100644 index 0000000..19ac9dd --- /dev/null +++ b/Docker/php-8.4-fpm/rsyslog.service @@ -0,0 +1,17 @@ +[Unit] +Description=rsyslog +After=docker.service +Requires=docker.service + +[Service] +ExecStartPre=-/usr/bin/docker rm %n +ExecStart=/usr/bin/docker run --rm \ + --name %n \ + -h %H \ + jumanjiman/rsyslog +ExecStop=/usr/bin/docker stop %n +RestartSec=5s +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/docker-compose.yml b/docker-compose.yml index 426225a..13efea1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: - "6379" php: - build: ./Docker/php-8.3-fpm/ + build: ./Docker/php-8.4-fpm/ user: ${USER_UID}:${USER_GID} volumes: - php-user-data:/home/${USER_UNAME} @@ -34,6 +34,7 @@ services: working_dir: "/var/www/leshed/" environment: - APP_ENV=development + - XDEBUG_MODE=debug networks: - database - redis diff --git a/ressources/drupal/settings.php b/ressources/drupal/settings.php index 006438e..0d856e7 100644 --- a/ressources/drupal/settings.php +++ b/ressources/drupal/settings.php @@ -893,9 +893,9 @@ $settings['migrate_node_migrate_type_classic'] = FALSE; # include $app_root . '/' . $site_path . '/settings.local.php'; # } $databases['default']['default'] = array ( - 'database' => 'mathallo', + 'database' => 'leshed', 'username' => 'root', - 'password' => 'mathallo', + 'password' => 'leshed', 'prefix' => '', 'host' => 'mysql', 'port' => '3306',