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

montée php8.1, ubuntu 22.04

Browse Source
This commit is contained in:
Rudy Masson
2022-04-07 14:35:36 +02:00
parent 12ededccc9
commit 08717e42d9
17 changed files with 419 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
containers/loginapp/000-default.conf
View File

@ -8,7 +8,7 @@
# Using SetHandler avoids issues with using ProxyPassMatch in combination
# with mod_rewrite or mod_autoindex
<FilesMatch \.php$>
SetHandler "proxy:unix:/run/php/php7.4-fpm.sock|fcgi://127.0.0.1:9000"
SetHandler "proxy:unix:/run/php/php8.1-fpm.sock|fcgi://127.0.0.1:9000"
# for Unix sockets, Apache 2.4.10 or higher
# SetHandler proxy:unix:/path/to/fpm.sock|fcgi://dummy
</FilesMatch>

16
containers/loginapp/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04
ARG HTTP_PROXY=
ARG HTTPS_PROXY=
@ -7,7 +7,7 @@ ARG https_proxy=
ENV WAITFORIT_VERSION="v2.4.1"
ARG PHP_VERSION="7.4"
ARG PHP_VERSION="8.1"
ENV PHP_VERSION $PHP_VERSION
RUN export DEBIAN_FRONTEND=noninteractive && \
@ -17,7 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get install -y --no-install-recommends \
git bash wget ca-certificates supervisor cron rsyslog mysql-client jq \
mutt tree vim python python3 python3-setuptools python3-pip make \
mutt tree vim python3-setuptools python3-pip make \
php${PHP_VERSION}-cli php${PHP_VERSION}-ldap php${PHP_VERSION}-soap \
php${PHP_VERSION}-intl php${PHP_VERSION}-curl php${PHP_VERSION}-gd \
php${PHP_VERSION}-xml php${PHP_VERSION}-bcmath \
@ -58,14 +58,14 @@ RUN chmod +x /loginapp/install-composer.sh &&\
# On active les mods d'apache nécessaires
RUN a2enmod rewrite
RUN a2enmod proxy_fcgi setenvif
RUN a2enconf php7.4-fpm
RUN a2enconf php8.1-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/7.4/fpm/pool.d/www.conf
COPY www.conf /etc/php/8.1/fpm/pool.d/www.conf
EXPOSE 5000
EXPOSE 80
@ -73,8 +73,8 @@ EXPOSE 80
WORKDIR /loginapp
# On démarre php-fpm une fois pour créer les sockets
RUN service php7.4-fpm start
RUN service php7.4-fpm stop
RUN service php8.1-fpm start
RUN service php8.1-fpm stop
COPY docker-entrypoint.sh /docker-entrypoint.sh
@ -89,7 +89,7 @@ RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
COPY rsyslog.conf /etc/rsyslog.d/loginapp.conf
COPY supervisor.ini /etc/supervisor/supervisor.ini
COPY php.ini /etc/php/7.4/fpm/php.ini
COPY php.ini /etc/php/8.1/fpm/php.ini
VOLUME /container-lifecycle

2
containers/loginapp/supervisor.ini
View File

@ -26,7 +26,7 @@ stderr_logfile_maxbytes=0
[program:php-fpm]
environment=HOSTNAME="%(ENV_HOSTNAME)s"
command = /usr/sbin/php-fpm7.4 -F
command = /usr/sbin/php-fpm8.1 -F
autostart = true
autorestart = true
directory = /loginapp

2
containers/loginapp/www.conf
View File

@ -6,7 +6,7 @@ error_log=/dev/stderr
user = www-data
group = www-data
listen = /run/php/php7.4-fpm.sock
listen = /run/php/php8.1-fpm.sock
listen.owner = www-data
listen.group = www-data