Browse Source

updated php to 8.1

bach 6 months ago
parent
commit
4cd581aa9a

+ 8 - 8
Docker/php-7.4-fpm/Dockerfile → Docker/php-8.1-fpm/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4-fpm
+FROM php:8.1-fpm
 
 RUN apt-get update && apt-get install -y \
 		libfreetype6-dev \
@@ -20,7 +20,7 @@ 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-2.9.2 && \
+    pecl install xdebug-3.2.2 && \
     docker-php-ext-enable redis xdebug
 
 RUN export COMPOSER_HOME=/usr/local/composer && \
@@ -33,12 +33,12 @@ RUN export COMPOSER_HOME=/usr/local/composer && \
 				-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 - && \
-		echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt-get update && \
-		apt-get install -y nodejs yarn
+# 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 - && \
+# 		echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+#     apt-get update && \
+# 		apt-get install -y nodejs yarn
 
 RUN apt-get install -y rsyslog
 COPY ./rsyslog-drupal.conf /etc/rsyslog.d/drupal.conf

+ 1 - 1
Docker/php-7.4-fpm/bashrc → Docker/php-8.1-fpm/bashrc

@@ -1,4 +1,4 @@
 
-PS1='\e[36m\e[1mPHP-7.4\e[0m:\e[90m\w\e[0m\n$ '
+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'

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


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


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


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


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


+ 9 - 0
Makefile

@@ -24,6 +24,15 @@ build:
 buildnc:
 		docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME)
 
+build_php:
+		docker-compose build --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) php
+
+buildnc_php:
+		docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) php
+
+buildnc_mysql:
+		docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) mysql
+
 downbuildup: down build up
 
 up:

+ 1 - 1
docker-compose.yml

@@ -27,7 +27,7 @@ services:
       - "6379"
 
   php:
-    build: ./Docker/php-7.4-fpm/
+    build: ./Docker/php-8.1-fpm/
     user: ${USER_UID}:${USER_GID}
     volumes:
       - php-user-data:/home/${USER_UNAME}

+ 0 - 18
ressources/xdebug.ini.exemple

@@ -1,18 +0,0 @@
-[xdebug]
-xdebug.remote_enable=1
-;Should use host.docker.internal but not working on linux
-xdebug.remote_host=172.21.0.1
-;Not working on docker context
-xdebug.remote_connect_back=0
-;9000 is already bound by php-fpm
-xdebug.remote_port=9001
-xdebug.remote_handler=dbgp
-xdebug.remote_mode=req
-xdebug.remote_autostart=true
-; ?=XDEBUG_SESSION_START=1
-;Log file is mounted on volume so you can follow it
-xdebug.remote_log=/var/log/xdebug-error.log
-xdebug.profiler_enable_trigger=1
-xdebug.profiler_enable=0
-xdebug.profiler_output_dir=/var/log/
-; Example: http://localhost:8080/test?XDEBUG_PROFILE=1

+ 1 - 1
src_d9

@@ -1 +1 @@
-Subproject commit 31a7b199487141b17ee2bbddef8cdb72ac6a0a5e
+Subproject commit fd0559ba3d05d9a3905291fe23d974181c914302