Commit 35608955 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

AJout d'un numéro au nom du fichier de config PHP de l'appli pour garantir l'ordre de chargement.

parent 79cbab9d

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ ADD docker/apache-ports.conf ${APACHE_CONF_DIR}/ports.conf 
ADD docker/apache-site.conf     ${APACHE_CONF_DIR}/sites-available/app.conf

ADD docker/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/app-ssl.conf

ADD docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/app.conf

ADD docker/fpm/conf.d/app.ini   ${PHP_CONF_DIR}/fpm/conf.d/app.ini

ADD docker/fpm/conf.d/app.ini   ${PHP_CONF_DIR}/fpm/conf.d/90-app.ini



# Copie des scripts complémentaires à lancer au démarrage du container

COPY docker/entrypoint.d/* /entrypoint.d/

Dockerfile.sh

+5 −5
Original line number Diff line number Diff line
@@ -42,11 +42,11 @@ cd ${SYGAL_DIR} 


# Configuration Apache et FPM

cp docker/apache-ports.conf    ${APACHE_CONF_DIR}/ports.conf

cp docker/apache-site.conf     ${APACHE_CONF_DIR}/sites-available/sygal.conf

cp docker/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/sygal-ssl.conf

cp docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/sygal.conf

cp docker/fpm/conf.d/app.ini   ${PHP_CONF_DIR}/fpm/conf.d/sygal.ini

cp docker/apache-site.conf     ${APACHE_CONF_DIR}/sites-available/app.conf

cp docker/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/app-ssl.conf

cp docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/app.conf

cp docker/fpm/conf.d/app.ini   ${PHP_CONF_DIR}/fpm/conf.d/90-app.ini



a2ensite sygal sygal-ssl && \

a2ensite app app-ssl && \

    service apache2 reload && \

    service php${PHP_VERSION}-fpm reload