Commit 1a32fc8d authored by godog's avatar godog Committed by ale
Browse files

Switch to Buster and php 7.3

parent 2407bebe
Pipeline #6807 canceled with stage
in 18 seconds
FROM registry.git.autistici.org/ai3/docker/apache2-base:master
FROM registry.git.autistici.org/ai3/docker/apache2-base:buster
COPY conf /tmp/conf
COPY build.sh /tmp/build.sh
......
......@@ -11,12 +11,12 @@ BUILD_PACKAGES="curl rsync"
# We have to keep the python3 packages around in order to run
# chaperone (installed via pip).
PACKAGES="
php-cli
php-curl
php-fpm
php-mbstring
php-mysql
php-gd
php-cli
php-curl
php-fpm
php-mbstring
php-mysql
php-gd
"
# The default bitnami/minideb image defines an 'install_packages'
......@@ -43,7 +43,8 @@ chmod 0755 /usr/sbin/php-fpm-exporter
echo "export PHP_FPM_EXPORTER_PORT=\`expr \$APACHE_PORT + 200\`" >> /etc/apache2/envvars
# Enable php configuration.
a2enconf -q php7.0-fpm php7.0-fpm-proxy-fcgi
a2enmod proxy_fcgi setenvif
a2enconf -q php7.3-fpm
# Rsync our configuration, on top of /etc.
rsync -a /tmp/conf/ /etc/
......
fpm.service: {
command: "/usr/sbin/php-fpm7.0 --force-stderr --nodaemonize",
command: "/usr/sbin/php-fpm7.3 --force-stderr --nodaemonize",
exit_kills: true,
}
fpm-exporter.service: {
command: "sh -c '. /etc/apache2/envvars && HOME=/ exec /usr/sbin/php-fpm-exporter server --phpfpm.scrape-uri=unix:///run/php/php7.0-fpm.sock\\;/status --web.listen-address=:$PHP_FPM_EXPORTER_PORT'",
command: "sh -c '. /etc/apache2/envvars && HOME=/ exec /usr/sbin/php-fpm-exporter server --phpfpm.scrape-uri=unix:///run/php/php7.3-fpm.sock\\;/status --web.listen-address=:$PHP_FPM_EXPORTER_PORT'",
restart: true,
}
[global]
pid = /run/php/php7.0-fpm.pid
error_log = /var/log/php7.0-fpm.log
systemd_interval = 0
include=/etc/php/7.0/fpm/pool.d/*.conf
[global]
pid = /run/php/php7.3-fpm.pid
error_log = /var/log/php7.3-fpm.log
systemd_interval = 0
include=/etc/php/7.3/fpm/pool.d/*.conf
[www]
listen = /run/php/php7.0-fpm.sock
listen = /run/php/php7.3-fpm.sock
pm = dynamic
pm.max_children = 20
......@@ -25,5 +25,3 @@ php_admin_value[opcache.memory_consumption] = 64
php_admin_value[opcache.interned_strings_buffer] = 16
php_admin_value[opcache.max_accelerated_files] = 4000
php_admin_value[opcache.validate_timestamps] = 0
php_admin_value[opcache.fast_shutdown] = 1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment