src_d9 update

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,9 @@ 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 && \
+    docker-php-ext-enable redis
+
+RUN pecl install xdebug-3.2.1 && \
     docker-php-ext-enable redis xdebug
 
 RUN export COMPOSER_HOME=/usr/local/composer && \
@@ -33,13 +35,6 @@ 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 rsyslog
 COPY ./rsyslog-drupal.conf /etc/rsyslog.d/drupal.conf
 # ENTRYPOINT ["sh", "-c", "service rsyslog start ; tail -f /dev/null"]

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'

Makefile

@@ -24,6 +24,12 @@ 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)
 
+buildnc_php_d9:
+		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_d9
+
+buildncnginx:
+		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) nginx
+
 downbuildup: down build up
 
 up:
@@ -83,4 +89,4 @@ dump_d7_db:
 	docker exec popsu-mysql_d7-1 sh -c 'exec mysqldump -uroot -ppopsu popsu-d7' > ./ressources/popsu-d7-$(DATE_NOW)-local.sql
 
 dump_d9_db:
-	docker exec popsu-mysql_d9-1 sh -c 'exec mysqldump -uroot -ppopsu popsu-d9' > ./ressources/popsu-d9-$(DATE_NOW)-local.sql
+	docker exec popsu-mysql_d9-1 sh -c 'exec mysqldump -uroot -ppopsu popsu_d9' > ./ressources/popsu-d9-$(DATE_NOW)-local.sql

docker-compose.yml

@@ -53,7 +53,7 @@ services:
       - redis
 
   php_d9:
-    build: ./Docker/php-7.4-fpm/
+    build: ./Docker/php-8.1-fpm/
     user: ${USER_UID}:${USER_GID}
     volumes:
       - php-d9-user-data:/home/${USER_UNAME}
@@ -66,6 +66,10 @@ services:
       - database
       - redis
       - server
+    # for xdebug 
+    # https://github.com/docker/for-linux/issues/264#issuecomment-965465879
+    extra_hosts:
+      - host.docker.internal:host-gateway
     depends_on:
       - mysql_d9
       - redis

ressources/xdebug.ini.exemple

@@ -1,18 +1,50 @@
 [xdebug]
-xdebug.remote_enable=1
+; xdebug.remote_enable=1
+xdebug.mode=debug
+
 ;Should use host.docker.internal but not working on linux
-xdebug.remote_host=172.21.0.1
+; xdebug.remote_host=172.20.0.1
+; Replaced by xdebug.client_host.
+xdebug.client_host=host.docker.internal
+
+
 ;Not working on docker context
-xdebug.remote_connect_back=0
+; xdebug.remote_connect_back=0
+; Replaced by xdebug.discover_client_host.
+xdebug.discover_client_host=0
+
+
 ;9000 is already bound by php-fpm
-xdebug.remote_port=9001
+; xdebug.remote_port=9001
+; xdebug.remote_port #
+; Replaced by xdebug.client_port.
+; The default value has also changed from 9000 to 9003.
+xdebug.client_port=9001
+
 xdebug.remote_handler=dbgp
-xdebug.remote_mode=req
-xdebug.remote_autostart=true
+
+; xdebug.remote_mode=req
+; xdebug.remote_mode #
+; For the req value (the original default), use xdebug.mode=debug with xdebug.start_with_request=trigger. If the original xdebug.remote_autostart behaviour is necessary, use xdebug.start_with_request=yes instead of trigger.
+
+; For the jit value, use xdebug.mode=debug and xdebug.start_upon_error=yes.
+
+
+; xdebug.remote_autostart=true
+; Use xdebug.mode=debug with xdebug.start_with_request=yes
+xdebug.start_with_request=yes
+
 ; ?=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/
+; xdebug.remote_log=/var/log/xdebug-error.log
+; Replaced by xdebug.log, which also includes log messages beyond Step Debugging.
+xdebug.log=/var/log/xdebug-error.log
+
+; xdebug.profiler_enable=0
+; xdebug.profiler_enable_trigger=1
+; Use xdebug.mode=profile with xdebug.start_with_request=trigger.
+xdebug.profiler_output_name = cachegrind.out.%t.%R
+xdebug.output_dir=/var/log/
+; Use the generic xdebug.output_dir setting.
+
 ; Example: http://localhost:8080/test?XDEBUG_PROFILE=1

src_d9

@@ -1 +1 @@
-Subproject commit fa8d7c43473773cd259f19ae4a05136f767aa50d
+Subproject commit cef79dc5a3d4a2155ea9e5fb8ec3bde3883c4bf3