From 067841c7243229789964f471f22fa54d7fc93173 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 9 Mar 2026 12:23:35 +0100 Subject: [PATCH] updated php from 8.1 to 8.4 --- Docker/{php-8.1-fpm => php-8.4-fpm}/Dockerfile | 16 +++++----------- Docker/{php-8.1-fpm => php-8.4-fpm}/bashrc | 0 Docker/{php-8.1-fpm => php-8.4-fpm}/inputrc | 0 .../{php-8.1-fpm => php-8.4-fpm}/php-custom.ini | 0 .../php-fpm-custom.conf | 0 .../rsyslog-drupal.conf | 0 .../{php-8.1-fpm => php-8.4-fpm}/rsyslog.service | 0 docker-compose.yml | 4 +--- src_d9 | 2 +- 9 files changed, 7 insertions(+), 15 deletions(-) rename Docker/{php-8.1-fpm => php-8.4-fpm}/Dockerfile (83%) rename Docker/{php-8.1-fpm => php-8.4-fpm}/bashrc (100%) rename Docker/{php-8.1-fpm => php-8.4-fpm}/inputrc (100%) rename Docker/{php-8.1-fpm => php-8.4-fpm}/php-custom.ini (100%) rename Docker/{php-8.1-fpm => php-8.4-fpm}/php-fpm-custom.conf (100%) rename Docker/{php-8.1-fpm => php-8.4-fpm}/rsyslog-drupal.conf (100%) rename Docker/{php-8.1-fpm => php-8.4-fpm}/rsyslog.service (100%) diff --git a/Docker/php-8.1-fpm/Dockerfile b/Docker/php-8.4-fpm/Dockerfile similarity index 83% rename from Docker/php-8.1-fpm/Dockerfile rename to Docker/php-8.4-fpm/Dockerfile index 0ef493b..65344a8 100644 --- a/Docker/php-8.1-fpm/Dockerfile +++ b/Docker/php-8.4-fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1-fpm +FROM php:8.4-fpm RUN apt-get update && apt-get install -y \ libfreetype6-dev \ @@ -19,20 +19,14 @@ RUN apt-get update && apt-get install -y \ RUN apt-get install -y git vim -RUN pecl install redis-5.3.3 && \ - pecl install xdebug-3.2.2 && \ - docker-php-ext-enable redis xdebug +RUN pecl install redis +RUN pecl install xdebug-3.5.0 +RUN docker-php-ext-enable redis xdebug RUN export COMPOSER_HOME=/usr/local/composer && \ curl -sS https://getcomposer.org/installer \ | php -- --install-dir=/usr/local/bin --filename=composer && \ - curl https://drupalconsole.com/installer \ - -L -o /usr/local/bin/drupal && \ - chmod +x /usr/local/bin/drupal && \ - 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 curl && \ # curl -sL https://deb.nodesource.com/setup_11.x | bash - && \ # curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ diff --git a/Docker/php-8.1-fpm/bashrc b/Docker/php-8.4-fpm/bashrc similarity index 100% rename from Docker/php-8.1-fpm/bashrc rename to Docker/php-8.4-fpm/bashrc diff --git a/Docker/php-8.1-fpm/inputrc b/Docker/php-8.4-fpm/inputrc similarity index 100% rename from Docker/php-8.1-fpm/inputrc rename to Docker/php-8.4-fpm/inputrc diff --git a/Docker/php-8.1-fpm/php-custom.ini b/Docker/php-8.4-fpm/php-custom.ini similarity index 100% rename from Docker/php-8.1-fpm/php-custom.ini rename to Docker/php-8.4-fpm/php-custom.ini diff --git a/Docker/php-8.1-fpm/php-fpm-custom.conf b/Docker/php-8.4-fpm/php-fpm-custom.conf similarity index 100% rename from Docker/php-8.1-fpm/php-fpm-custom.conf rename to Docker/php-8.4-fpm/php-fpm-custom.conf diff --git a/Docker/php-8.1-fpm/rsyslog-drupal.conf b/Docker/php-8.4-fpm/rsyslog-drupal.conf similarity index 100% rename from Docker/php-8.1-fpm/rsyslog-drupal.conf rename to Docker/php-8.4-fpm/rsyslog-drupal.conf diff --git a/Docker/php-8.1-fpm/rsyslog.service b/Docker/php-8.4-fpm/rsyslog.service similarity index 100% rename from Docker/php-8.1-fpm/rsyslog.service rename to Docker/php-8.4-fpm/rsyslog.service diff --git a/docker-compose.yml b/docker-compose.yml index 36eed4b..38801f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: mysql: image: mariadb:latest @@ -27,7 +25,7 @@ services: - "6379" php: - build: ./Docker/php-8.1-fpm/ + build: ./Docker/php-8.4-fpm/ user: ${USER_UID}:${USER_GID} volumes: - php-user-data:/home/${USER_UNAME} diff --git a/src_d9 b/src_d9 index 11bb49e..18dd819 160000 --- a/src_d9 +++ b/src_d9 @@ -1 +1 @@ -Subproject commit 11bb49e6947d71b80108b0006ac0355901e89ee7 +Subproject commit 18dd8199a9d0dc70750d93a7752c68c3117063dc