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

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line 
# 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).

Dockerfile-5.x

+7 −3
Original line number Diff line number Diff line
@@ -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

Dockerfile-5.x.sh

+7 −3
Original line number Diff line number Diff line
@@ -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

Dockerfile-7.x

+7 −3
Original line number Diff line number Diff line
@@ -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

Dockerfile-7.x.sh

+7 −3
Original line number Diff line number Diff line
@@ -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