Cadoles/hydra-sql
22
0
Fork 0
Code Issues 5 Pull Requests 2 Projects Releases Wiki Activity

Amélioration de la structure du projet et démarrage de Docker OK

Browse Source
This commit is contained in:
Teddy Cornaut
2022-04-07 13:07:00 +02:00
parent 5c116e15b1
commit 8ac12f715c
14 changed files with 415 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
containers/loginapp/Dockerfile
View File

@ -7,7 +7,7 @@ ARG https_proxy=
ENV WAITFORIT_VERSION="v2.4.1"
ARG PHP_VERSION="8.1"
ARG PHP_VERSION="7.4"
ENV PHP_VERSION $PHP_VERSION
RUN export DEBIAN_FRONTEND=noninteractive && \
@ -50,34 +50,32 @@ VOLUME /loginapp/var/logs
VOLUME /loginapp/var/cache
# Install composer
COPY install-composer.sh /root/install-composer.sh
RUN chmod +x /root/install-composer.sh &&\
/root/install-composer.sh &&\
rm -f /root/install-composer.sh
COPY install-composer.sh /loginapp/install-composer.sh
RUN chmod +x /loginapp/install-composer.sh &&\
/loginapp/install-composer.sh &&\
rm -f /loginapp/install-composer.sh
# On active les mods d'apache nécessaires
RUN a2enmod rewrite
RUN a2enmod proxy_fcgi setenvif
RUN a2enconf php8.1-fpm
RUN a2enconf php7.4-fpm
RUN a2enmod proxy
RUN a2enmod expires
RUN a2enmod headers
# On injecte les bonnes configs apache et php-fpm
COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
COPY www.conf /etc/php/8.1/fpm/pool.d/www.conf
# Allow passing of environment variables to PHP
# Used in web/app_dev.php to detect docker-compose environment
RUN for i in /etc/php/*; do mkdir -p $i/cli/conf.d; echo 'variables_order = "EGPCS"' > $i/cli/conf.d/mse.ini; done;
COPY www.conf /etc/php/7.4/fpm/pool.d/www.conf
EXPOSE 5000
EXPOSE 80
WORKDIR /loginapp
# Flag to allow access to app_dev.php from Docker host
ENV MSE_DOCKER_COMPOSER_DEVELOPMENT=yes
# On démarre php-fpm une fois pour créer les sockets
RUN service php7.4-fpm start
RUN service php7.4-fpm stop
COPY docker-entrypoint.sh /docker-entrypoint.sh
RUN chmod +x /docker-entrypoint.sh
@ -85,9 +83,6 @@ RUN chmod +x /docker-entrypoint.sh
COPY first-run.sh /root/first-run.sh
RUN chmod +x /root/first-run.sh
# On crée un point d'entrée non restrictif et non tracké pour être utilisé par apache
COPY app_docker.php /root/app_docker.php
# Disable rsyslog privileges drop to allow stdout logging
RUN sed -i 's/^\$\(PrivDropTo.*\)$/#\1/' /etc/rsyslog.conf
RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf