瀏覽代碼

updated php from 8.1 to 8.4

bach 1 周之前
父節點
當前提交
067841c724

+ 5 - 11
Docker/php-8.1-fpm/Dockerfile → 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 - && \

+ 0 - 0
Docker/php-8.1-fpm/bashrc → Docker/php-8.4-fpm/bashrc


+ 0 - 0
Docker/php-8.1-fpm/inputrc → Docker/php-8.4-fpm/inputrc


+ 0 - 0
Docker/php-8.1-fpm/php-custom.ini → Docker/php-8.4-fpm/php-custom.ini


+ 0 - 0
Docker/php-8.1-fpm/php-fpm-custom.conf → Docker/php-8.4-fpm/php-fpm-custom.conf


+ 0 - 0
Docker/php-8.1-fpm/rsyslog-drupal.conf → Docker/php-8.4-fpm/rsyslog-drupal.conf


+ 0 - 0
Docker/php-8.1-fpm/rsyslog.service → Docker/php-8.4-fpm/rsyslog.service


+ 1 - 3
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}

+ 1 - 1
src_d9

@@ -1 +1 @@
-Subproject commit 11bb49e6947d71b80108b0006ac0355901e89ee7
+Subproject commit 18dd8199a9d0dc70750d93a7752c68c3117063dc