diff --git a/.env b/.env index 3739625..b9dd1e0 100644 --- a/.env +++ b/.env @@ -2,3 +2,6 @@ COMPOSE_PROJECT_NAME=figureslibres.cc PROJECT_ROOT=./public_html LOG_ROOT=./log + + +XDEBUG_INI=./ressources/xdebug.ini diff --git a/Docker/php/Dockerfile b/Docker/php/Dockerfile index f85b94d..818d785 100644 --- a/Docker/php/Dockerfile +++ b/Docker/php/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.3-fpm +FROM php:7.4-fpm RUN apt-get update && apt-get install -y \ libfreetype6-dev \ @@ -6,19 +6,21 @@ RUN apt-get update && apt-get install -y \ libmcrypt-dev \ libpng-dev \ zip \ - libzip-dev && \ - # docker-php-ext-install -j$(nproc) iconv && \ - docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \ + libzip-dev + +RUN docker-php-ext-configure gd && \ apt-get install -y imagemagick libmagickwand-dev && \ pecl install imagick && docker-php-ext-enable imagick && \ docker-php-ext-install -j$(nproc) gd && \ docker-php-ext-install zip && \ docker-php-ext-install opcache && \ docker-php-ext-install bcmath && \ - apt-get install -y git vim && \ - pecl install redis-4.3.0 && \ - pecl install xdebug-2.7.0 && \ - docker-php-ext-enable redis xdebug + apt-get install -y git vim + +RUN pecl install redis-5.3.4 && docker-php-ext-enable redis + +RUN pecl install xdebug-3.0.4 && \ + docker-php-ext-enable xdebug RUN export COMPOSER_HOME=/usr/local/composer && \ curl -sS https://getcomposer.org/installer \ diff --git a/Docker/php/bashrc b/Docker/php/bashrc index 70f55f9..e82cf1b 100644 --- a/Docker/php/bashrc +++ b/Docker/php/bashrc @@ -1,4 +1,4 @@ -PS1='\e[36m\e[1mPHP-7.3\e[0m:\e[90m\w\e[0m\n$ ' +PS1='\e[36m\e[1mPHP-7.4\e[0m:\e[90m\w\e[0m\n$ ' bind '"\e[A": history-search-backward' bind '"\e[B": history-search-forward' diff --git a/README.md b/README.md index 581630e..7d2990c 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ sudo systemctl start docker ### build only before the first run (may take some time) ``` -sudo docker-compose build +sudo docker-compose build --no-cache ``` ### run then each time you want to launch the app diff --git a/docker-compose.yml b/docker-compose.yml index eca903b..f58a09f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,7 @@ services: volumes: - php-root-data:/root - "${PROJECT_ROOT}:/var/www/html" + - "${XDEBUG_INI}:/usr/local/etc/php/conf.d/xdebug.ini" networks: - server diff --git a/public_html b/public_html index 3d5bc71..bd4137e 160000 --- a/public_html +++ b/public_html @@ -1 +1 @@ -Subproject commit 3d5bc71a7cf031864d7b8ed3f39a4b547f465587 +Subproject commit bd4137e00da701d61f954961c7ee09c8737bbad1 diff --git a/ressources/xdebug.ini b/ressources/xdebug.ini new file mode 100644 index 0000000..cacbdbe --- /dev/null +++ b/ressources/xdebug.ini @@ -0,0 +1,18 @@ +[xdebug] +xdebug.remote_enable=1 +;Should use host.docker.internal but not working on linux +xdebug.remote_host=172.20.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