Skip to content
Snippets Groups Projects
Commit f8ee01ae authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Réorganisation des configs PHP par version car la config de xdebug v2 (PHP...

Réorganisation des configs PHP par version car la config de xdebug v2 (PHP 5.x) n'est pas pareille à celle de la v3 (PHP 7.x, 8.x).
parent d49724b6
No related branches found
No related tags found
No related merge requests found
Pipeline #15309 passed
# CHANGELOG
## 1.1.1
- Réorganisation des configs PHP par version car la config de xdebug v2 (PHP 5.x) n'est pas pareille à celle de la v3 (PHP 7.x, 8.x).
## 1.1.0
- Correction des Dockerfile pour forcer l'install de composer v1 (car la v2 génère des problèmes).
......
......@@ -16,6 +16,9 @@ ENV PHP_VERSION=${PHP_VERSION} \
APACHE_CONF_DIR=/etc/apache2 \
PHP_CONF_DIR=/etc/php/${PHP_VERSION}
ENV APACHE_CONF_LOCAL_DIR=configs/apache \
PHP_CONF_LOCAL_DIR=configs/php/5.x
# Mise à niveau de la distrib
RUN echo "Acquire::http::proxy \"${http_proxy}\";" >> /etc/apt/apt.conf.d/proxy && \
echo "Acquire::https::proxy \"${http_proxy}\";" >> /etc/apt/apt.conf.d/proxy && \
......@@ -93,8 +96,9 @@ RUN apt-get -qq update && \
RUN update-alternatives --set php /usr/bin/php${PHP_VERSION}
# Config PHP
ADD configs/php.conf ${PHP_CONF_DIR}/fpm/conf.d/20-php-unicaen.ini
ADD configs/php-opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/20-opcache-unicaen.ini
ADD ${PHP_CONF_LOCAL_DIR}/opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/90-opcache.ini
ADD ${PHP_CONF_LOCAL_DIR}/php.conf ${PHP_CONF_DIR}/fpm/conf.d/91-unicaen.ini
ADD ${PHP_CONF_LOCAL_DIR}/xdebug.conf ${PHP_CONF_DIR}/fpm/conf.d/92-xdebug.ini
# Package PHP Oracle OCI8
RUN pear config-set http_proxy "${http_proxy}"
......@@ -115,7 +119,7 @@ RUN unzip -o /tmp/instantclient-basiclite-linux.x64-12.2.0.1.0.zip -d /usr/local
# Apache
RUN a2enmod actions alias rewrite ssl proxy proxy_fcgi setenvif headers && \
a2dismod mpm_event && a2enmod mpm_worker
ADD configs/apache/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf
ADD ${APACHE_CONF_LOCAL_DIR}/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf
RUN a2disconf security.conf && \
a2enconf security-unicaen.conf php${PHP_VERSION}-fpm
......
......@@ -23,6 +23,9 @@ export OCI8_PACKAGE="oci8-2.0.12"
export APACHE_CONF_DIR=/etc/apache2
export PHP_CONF_DIR=/etc/php/${PHP_VERSION}
export APACHE_CONF_LOCAL_DIR=configs/apache
export PHP_CONF_LOCAL_DIR=configs/php/5.x
# Mise à niveau de la distrib
echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf.d/05proxy
echo "Acquire::https::proxy \"${http_proxy}\";" >> /etc/apt/apt.conf.d/05proxy
......@@ -101,8 +104,9 @@ apt -qq update && \
update-alternatives --set php /usr/bin/php${PHP_VERSION}
# Config PHP.
cp configs/php.conf ${PHP_CONF_DIR}/fpm/conf.d/20-php-unicaen.ini
cp configs/php-opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/20-opcache-unicaen.ini
cp ${PHP_CONF_LOCAL_DIR}/opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/90-opcache.ini
cp ${PHP_CONF_LOCAL_DIR}/php.conf ${PHP_CONF_DIR}/fpm/conf.d/91-unicaen.ini
cp ${PHP_CONF_LOCAL_DIR}/xdebug.conf ${PHP_CONF_DIR}/fpm/conf.d/92-xdebug.ini
# Package PHP Oracle OCI8
cp resources/instantclient-basiclite-linux.x64-12.2.0.1.0.zip /tmp/
......@@ -121,7 +125,7 @@ echo "/usr/local/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf &&
a2enmod actions alias rewrite ssl proxy proxy_fcgi setenvif headers && \
a2dismod mpm_event mpm_prefork && a2enmod mpm_worker
cp configs/apache/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf
cp ${APACHE_CONF_LOCAL_DIR}/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf
a2disconf security.conf && \
a2enconf security-unicaen.conf php${PHP_VERSION}-fpm
......
......@@ -25,6 +25,9 @@ ENV PHP_VERSION=${PHP_VERSION} \
APACHE_CONF_DIR=/etc/apache2 \
PHP_CONF_DIR=/etc/php/${PHP_VERSION}
ENV APACHE_CONF_LOCAL_DIR=configs/apache \
PHP_CONF_LOCAL_DIR=configs/php/7.x
# Mise à niveau de la distrib
RUN echo "Acquire::http::proxy \"${http_proxy}\";" >> /etc/apt/apt.conf.d/proxy && \
echo "Acquire::https::proxy \"${http_proxy}\";" >> /etc/apt/apt.conf.d/proxy && \
......@@ -102,8 +105,9 @@ RUN apt-get -qq update && \
RUN update-alternatives --set php /usr/bin/php${PHP_VERSION}
# Config PHP
ADD configs/php.conf ${PHP_CONF_DIR}/fpm/conf.d/20-php-unicaen.ini
ADD configs/php-opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/20-opcache-unicaen.ini
ADD ${PHP_CONF_LOCAL_DIR}/opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/90-opcache.ini
ADD ${PHP_CONF_LOCAL_DIR}/php.conf ${PHP_CONF_DIR}/fpm/conf.d/91-unicaen.ini
ADD ${PHP_CONF_LOCAL_DIR}/xdebug.conf ${PHP_CONF_DIR}/fpm/conf.d/92-xdebug.ini
# Package PHP Oracle OCI8
RUN pear config-set http_proxy "${http_proxy}"
......@@ -123,7 +127,7 @@ RUN unzip -o /tmp/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip -d /usr/l
# Apache
RUN a2enmod actions alias rewrite ssl proxy proxy_fcgi setenvif headers && \
a2dismod mpm_event && a2enmod mpm_worker
ADD configs/apache/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf
ADD ${APACHE_CONF_LOCAL_DIR}/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf
RUN a2disconf security.conf && \
a2enconf security-unicaen.conf php${PHP_VERSION}-fpm
......
......@@ -25,6 +25,9 @@ export OCI8_PACKAGE="oci8-2.2.0"
export APACHE_CONF_DIR=/etc/apache2
export PHP_CONF_DIR=/etc/php/${PHP_VERSION}
export APACHE_CONF_LOCAL_DIR=configs/apache
export PHP_CONF_LOCAL_DIR=configs/php/7.x
# Mise à niveau de la distrib
echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf.d/05proxy
echo "Acquire::https::proxy \"${http_proxy}\";" >> /etc/apt/apt.conf.d/05proxy
......@@ -103,8 +106,9 @@ apt -qq update && \
update-alternatives --set php /usr/bin/php${PHP_VERSION}
# Config PHP.
cp configs/php.conf ${PHP_CONF_DIR}/fpm/conf.d/20-php-unicaen.ini
cp configs/php-opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/20-opcache-unicaen.ini
cp ${PHP_CONF_LOCAL_DIR}/opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/90-opcache.ini
cp ${PHP_CONF_LOCAL_DIR}/php.conf ${PHP_CONF_DIR}/fpm/conf.d/91-unicaen.ini
cp ${PHP_CONF_LOCAL_DIR}/xdebug.conf ${PHP_CONF_DIR}/fpm/conf.d/92-xdebug.ini
# Package PHP Oracle OCI8
cp resources/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip /tmp/
......@@ -122,7 +126,7 @@ echo "/usr/local/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf &&
a2enmod actions alias rewrite ssl proxy proxy_fcgi setenvif headers && \
a2dismod mpm_event mpm_prefork && a2enmod mpm_worker
cp configs/apache/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf
cp ${APACHE_CONF_LOCAL_DIR}/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf
a2disconf security.conf && \
a2enconf security-unicaen.conf php${PHP_VERSION}-fpm
......
......@@ -25,6 +25,9 @@ ENV PHP_VERSION=${PHP_VERSION} \
APACHE_CONF_DIR=/etc/apache2 \
PHP_CONF_DIR=/etc/php/${PHP_VERSION}
ENV APACHE_CONF_LOCAL_DIR=configs/apache \
PHP_CONF_LOCAL_DIR=configs/php/8.x
# Mise à niveau de la distrib
RUN echo "Acquire::http::proxy \"${http_proxy}\";" >> /etc/apt/apt.conf.d/proxy && \
echo "Acquire::https::proxy \"${http_proxy}\";" >> /etc/apt/apt.conf.d/proxy && \
......@@ -102,8 +105,9 @@ RUN apt-get -qq update && \
RUN update-alternatives --set php /usr/bin/php${PHP_VERSION}
# Config PHP
ADD configs/php.conf ${PHP_CONF_DIR}/fpm/conf.d/20-php-unicaen.ini
ADD configs/php-opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/20-opcache-unicaen.ini
ADD ${PHP_CONF_LOCAL_DIR}/opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/90-opcache.ini
ADD ${PHP_CONF_LOCAL_DIR}/php.conf ${PHP_CONF_DIR}/fpm/conf.d/91-unicaen.ini
ADD ${PHP_CONF_LOCAL_DIR}/xdebug.conf ${PHP_CONF_DIR}/fpm/conf.d/92-xdebug.ini
# Package PHP Oracle OCI8
RUN pear config-set http_proxy "${http_proxy}"
......@@ -123,7 +127,7 @@ RUN unzip -o /tmp/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip -d /usr/l
# Apache
RUN a2enmod actions alias rewrite ssl proxy proxy_fcgi setenvif headers && \
a2dismod mpm_event && a2enmod mpm_worker
ADD configs/apache/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf
ADD ${APACHE_CONF_LOCAL_DIR}/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf
RUN a2disconf security.conf && \
a2enconf security-unicaen.conf php${PHP_VERSION}-fpm
......
......@@ -25,6 +25,9 @@ export OCI8_PACKAGE="oci8-3.0.0"
export APACHE_CONF_DIR=/etc/apache2
export PHP_CONF_DIR=/etc/php/${PHP_VERSION}
export APACHE_CONF_LOCAL_DIR=configs/apache
export PHP_CONF_LOCAL_DIR=configs/php/8.x
# Mise à niveau de la distrib
echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf.d/05proxy
echo "Acquire::https::proxy \"${http_proxy}\";" >> /etc/apt/apt.conf.d/05proxy
......@@ -88,7 +91,7 @@ apt -qq update && \
php${PHP_VERSION}-zip \
php${PHP_VERSION}-cli \
php${PHP_VERSION}-common \
php${PHP_VERSION}-json \
# php${PHP_VERSION}-json \ # inutile en PHP 8 car absorbé par php-fpm notamment
php${PHP_VERSION}-opcache \
php${PHP_VERSION}-readline \
ssh \
......@@ -103,8 +106,9 @@ apt -qq update && \
update-alternatives --set php /usr/bin/php${PHP_VERSION}
# Config PHP.
cp configs/php.conf ${PHP_CONF_DIR}/fpm/conf.d/20-php-unicaen.ini
cp configs/php-opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/20-opcache-unicaen.ini
cp ${PHP_CONF_LOCAL_DIR}/opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/90-opcache.ini
cp ${PHP_CONF_LOCAL_DIR}/php.conf ${PHP_CONF_DIR}/fpm/conf.d/91-unicaen.ini
cp ${PHP_CONF_LOCAL_DIR}/xdebug.conf ${PHP_CONF_DIR}/fpm/conf.d/92-xdebug.ini
# Package PHP Oracle OCI8
cp resources/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip /tmp/
......@@ -122,7 +126,7 @@ echo "/usr/local/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf &&
a2enmod actions alias rewrite ssl proxy proxy_fcgi setenvif headers && \
a2dismod mpm_event mpm_prefork && a2enmod mpm_worker
cp configs/apache/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf
cp ${APACHE_CONF_LOCAL_DIR}/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf
a2disconf security.conf && \
a2enconf security-unicaen.conf php${PHP_VERSION}-fpm
......
File moved
date.timezone = Europe/Paris
log_errors = On
display_startup_errors = On
display_errors = On
error_reporting = E_ALL
upload_max_filesize = 51M
post_max_size = 60M
# Xdebug v2
xdebug.remote_enable = 0
xdebug.remote_autostart = 1
#xdebug.remote_host = 192.168.0.27
xdebug.remote_port = 9000
xdebug.idekey = PHPSTORM
#xdebug.collect_params = 4
xdebug.var_display_max_children = 1024
xdebug.var_display_max_data = 1024
xdebug.max_nesting_level = 256
# Attention: trop diminuer 'max_nesting_level' peut causer une erreur 'Maximum function nesting level of x reached'
opcache.enable=0
opcache.memory_consumption=128
opcache.interned_strings_buffer=8
opcache.max_accelerated_files=4000
opcache.revalidate_freq=60
opcache.fast_shutdown=1
opcache.enable_cli=1
date.timezone = Europe/Paris
log_errors = On
display_startup_errors = On
display_errors = On
error_reporting = E_ALL
upload_max_filesize = 51M
post_max_size = 60M
date.timezone = Europe/Paris
log_errors = On
display_startup_errors = On
display_errors = On
error_reporting = E_ALL
upload_max_filesize = 51M
post_max_size = 60M
# Xdebug v3
xdebug.mode = develop,debug
xdebug.client_host = localhost
......
opcache.enable=0
opcache.memory_consumption=128
opcache.interned_strings_buffer=8
opcache.max_accelerated_files=4000
opcache.revalidate_freq=60
opcache.fast_shutdown=1
opcache.enable_cli=1
date.timezone = Europe/Paris
log_errors = On
display_startup_errors = On
display_errors = On
error_reporting = E_ALL
upload_max_filesize = 51M
post_max_size = 60M
# Xdebug v3
xdebug.mode = develop,debug
xdebug.client_host = localhost
xdebug.client_port = 9003
xdebug.start_with_request = yes
xdebug.remote_handler = dbgp
xdebug.discover_client_host = true
xdebug.var_display_max_children = 1024
xdebug.var_display_max_data = -1
xdebug.max_nesting_level = 256
# Attention: trop diminuer 'max_nesting_level' peut causer une erreur 'Maximum function nesting level of x reached'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment