some old modifes i forgot to commit

This commit is contained in:
2025-04-27 22:28:12 +02:00
parent 7d46d33d29
commit eec308a0ac
5 changed files with 66 additions and 3 deletions
+2
View File
@@ -10,3 +10,5 @@ DB_ROOT_PASSWORD=edlp
DB_NAME=edlp_d8 DB_NAME=edlp_d8
DB_USERNAME=edlp DB_USERNAME=edlp
DB_PASSWORD=edlp DB_PASSWORD=edlp
XDEBUG_INI=./ressources/xdebug.ini
+8 -2
View File
@@ -8,8 +8,14 @@ RUN apt-get update && apt-get install -y \
default-mysql-client \ default-mysql-client \
zip \ zip \
net-tools iproute2 \ net-tools iproute2 \
libzip-dev && \ libzip-dev
cp /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini && \
# ENV TZ=Europe/Paris
RUN apt-get install -y tzdata && \
echo "Europe/Paris" > /etc/timezone && \
dpkg-reconfigure -f noninteractive tzdata
RUN cp /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini && \
# docker-php-ext-install -j$(nproc) iconv && \ # docker-php-ext-install -j$(nproc) iconv && \
docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ && \ docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ && \
apt-get install -y imagemagick libmagickwand-dev && \ apt-get install -y imagemagick libmagickwand-dev && \
+5
View File
@@ -49,10 +49,15 @@ services:
- "${LOG_ROOT}:/var/log:rw" - "${LOG_ROOT}:/var/log:rw"
- "${PROJECT_ROOT}:/var/www/html" - "${PROJECT_ROOT}:/var/www/html"
- "${LEGACY_ROOT}:/var/www/drupal6" - "${LEGACY_ROOT}:/var/www/drupal6"
- "${XDEBUG_INI}:/usr/local/etc/php/conf.d/xdebug.ini"
networks: networks:
- database - database
- redis - redis
- server - server
# for xdebug
# https://github.com/docker/for-linux/issues/264#issuecomment-965465879
extra_hosts:
- host.docker.internal:host-gateway
depends_on: depends_on:
- mysql - mysql
- redis - redis
+50
View File
@@ -0,0 +1,50 @@
[xdebug]
; xdebug.remote_enable=1
xdebug.mode=debug
;Should use host.docker.internal but not working on linux
; 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
; 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 #
; 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_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
; 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
+1 -1
Submodule src updated: 2456deb160...b48fba3311