From c12909f78f5dc6dff0dfdbdb8fcaa6683bd05d3b Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 14 Jan 2025 15:32:46 +0900 Subject: [PATCH] Migrate to PHP-FPM for all Web images --- .../web-apache-mysql/alpine/Dockerfile | 1 + .../alpine/conf/etc/apache2/httpd.conf | 2 +- .../centos/conf/etc/httpd/modules.conf | 32 +++++++++---------- .../ol/conf/etc/httpd/modules.conf | 32 +++++++++---------- .../web-apache-pgsql/alpine/Dockerfile | 1 + .../alpine/conf/etc/apache2/httpd.conf | 2 +- .../centos/conf/etc/httpd/modules.conf | 32 +++++++++---------- .../ol/conf/etc/httpd/modules.conf | 32 +++++++++---------- 8 files changed, 68 insertions(+), 66 deletions(-) diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index b70fe2b32..2f42fc3e0 100644 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-mysql/alpine/Dockerfile @@ -87,6 +87,7 @@ RUN set -eux && \ rm -f "/etc/apache2/conf.d/info.conf" && \ rm -f "/etc/apache2/conf.d/mpm.conf" && \ rm -f "/etc/apache2/conf.d/proxy.conf" && \ + rm -f "/etc/apache2/conf.d/languages.conf" && \ rm -f "/etc/apache2/conf.d/userdir.conf" && \ mkdir -p /var/lib/php/session && \ rm -rf /etc/php83/php-fpm.d/www.conf && \ diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/httpd.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/httpd.conf index 74606784f..f7033e01b 100644 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/httpd.conf +++ b/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/httpd.conf @@ -1,4 +1,4 @@ -ServerRoot /etc/apache2/ +ServerRoot /var/www/ DefaultRuntimeDir ${APACHE_RUN_DIR} PidFile /tmp/apache2.pid diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/modules.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/modules.conf index e921be52b..2595627c0 100644 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/modules.conf +++ b/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/modules.conf @@ -1,17 +1,17 @@ -LoadModule logio_module /usr/lib64/httpd/modules/mod_logio.so -LoadModule unixd_module /usr/lib64/httpd/modules/mod_unixd.so -LoadModule log_config_module /usr/lib64/httpd/modules/mod_log_config.so -LoadModule auth_basic_module /usr/lib64/httpd/modules/mod_auth_basic.so -LoadModule authz_core_module /usr/lib64/httpd/modules/mod_authz_core.so -LoadModule authz_host_module /usr/lib64/httpd/modules/mod_authz_host.so -LoadModule dir_module /usr/lib64/httpd/modules/mod_dir.so -LoadModule mime_module /usr/lib64/httpd/modules/mod_mime.so -LoadModule mpm_event_module /usr/lib64/httpd/modules/mod_mpm_event.so -LoadModule reqtimeout_module /usr/lib64/httpd/modules/mod_reqtimeout.so -LoadModule setenvif_module /usr/lib64/httpd/modules/mod_setenvif.so -LoadModule status_module /usr/lib64/httpd/modules/mod_status.so +LoadModule logio_module modules/mod_logio.so +LoadModule unixd_module modules/mod_unixd.so +LoadModule log_config_module modules/mod_log_config.so +LoadModule auth_basic_module modules/mod_auth_basic.so +LoadModule authz_core_module modules/mod_authz_core.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule dir_module modules/mod_dir.so +LoadModule mime_module modules/mod_mime.so +LoadModule mpm_event_module modules/mod_mpm_event.so +LoadModule reqtimeout_module modules/mod_reqtimeout.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule status_module modules/mod_status.so -LoadModule proxy_module /usr/lib64/httpd/modules/mod_proxy.so -LoadModule proxy_fcgi_module /usr/lib64/httpd/modules/mod_proxy_fcgi.so -LoadModule expires_module /usr/lib64/httpd/modules/mod_expires.so -LoadModule headers_module /usr/lib64/httpd/modules/mod_headers.so +LoadModule proxy_module modules/mod_proxy.so +LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so +LoadModule expires_module modules/mod_expires.so +LoadModule headers_module modules/mod_headers.so diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/modules.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/modules.conf index e921be52b..2595627c0 100644 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/modules.conf +++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/modules.conf @@ -1,17 +1,17 @@ -LoadModule logio_module /usr/lib64/httpd/modules/mod_logio.so -LoadModule unixd_module /usr/lib64/httpd/modules/mod_unixd.so -LoadModule log_config_module /usr/lib64/httpd/modules/mod_log_config.so -LoadModule auth_basic_module /usr/lib64/httpd/modules/mod_auth_basic.so -LoadModule authz_core_module /usr/lib64/httpd/modules/mod_authz_core.so -LoadModule authz_host_module /usr/lib64/httpd/modules/mod_authz_host.so -LoadModule dir_module /usr/lib64/httpd/modules/mod_dir.so -LoadModule mime_module /usr/lib64/httpd/modules/mod_mime.so -LoadModule mpm_event_module /usr/lib64/httpd/modules/mod_mpm_event.so -LoadModule reqtimeout_module /usr/lib64/httpd/modules/mod_reqtimeout.so -LoadModule setenvif_module /usr/lib64/httpd/modules/mod_setenvif.so -LoadModule status_module /usr/lib64/httpd/modules/mod_status.so +LoadModule logio_module modules/mod_logio.so +LoadModule unixd_module modules/mod_unixd.so +LoadModule log_config_module modules/mod_log_config.so +LoadModule auth_basic_module modules/mod_auth_basic.so +LoadModule authz_core_module modules/mod_authz_core.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule dir_module modules/mod_dir.so +LoadModule mime_module modules/mod_mime.so +LoadModule mpm_event_module modules/mod_mpm_event.so +LoadModule reqtimeout_module modules/mod_reqtimeout.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule status_module modules/mod_status.so -LoadModule proxy_module /usr/lib64/httpd/modules/mod_proxy.so -LoadModule proxy_fcgi_module /usr/lib64/httpd/modules/mod_proxy_fcgi.so -LoadModule expires_module /usr/lib64/httpd/modules/mod_expires.so -LoadModule headers_module /usr/lib64/httpd/modules/mod_headers.so +LoadModule proxy_module modules/mod_proxy.so +LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so +LoadModule expires_module modules/mod_expires.so +LoadModule headers_module modules/mod_headers.so diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index e20860033..a5213dcb8 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -86,6 +86,7 @@ RUN set -eux && \ rm -f "/etc/apache2/conf.d/info.conf" && \ rm -f "/etc/apache2/conf.d/mpm.conf" && \ rm -f "/etc/apache2/conf.d/proxy.conf" && \ + rm -f "/etc/apache2/conf.d/languages.conf" && \ rm -f "/etc/apache2/conf.d/userdir.conf" && \ mkdir -p /var/lib/php/session && \ rm -rf /etc/php83/php-fpm.d/www.conf && \ diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/httpd.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/httpd.conf index 74606784f..f7033e01b 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/httpd.conf +++ b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/httpd.conf @@ -1,4 +1,4 @@ -ServerRoot /etc/apache2/ +ServerRoot /var/www/ DefaultRuntimeDir ${APACHE_RUN_DIR} PidFile /tmp/apache2.pid diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/modules.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/modules.conf index e921be52b..2595627c0 100644 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/modules.conf +++ b/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/modules.conf @@ -1,17 +1,17 @@ -LoadModule logio_module /usr/lib64/httpd/modules/mod_logio.so -LoadModule unixd_module /usr/lib64/httpd/modules/mod_unixd.so -LoadModule log_config_module /usr/lib64/httpd/modules/mod_log_config.so -LoadModule auth_basic_module /usr/lib64/httpd/modules/mod_auth_basic.so -LoadModule authz_core_module /usr/lib64/httpd/modules/mod_authz_core.so -LoadModule authz_host_module /usr/lib64/httpd/modules/mod_authz_host.so -LoadModule dir_module /usr/lib64/httpd/modules/mod_dir.so -LoadModule mime_module /usr/lib64/httpd/modules/mod_mime.so -LoadModule mpm_event_module /usr/lib64/httpd/modules/mod_mpm_event.so -LoadModule reqtimeout_module /usr/lib64/httpd/modules/mod_reqtimeout.so -LoadModule setenvif_module /usr/lib64/httpd/modules/mod_setenvif.so -LoadModule status_module /usr/lib64/httpd/modules/mod_status.so +LoadModule logio_module modules/mod_logio.so +LoadModule unixd_module modules/mod_unixd.so +LoadModule log_config_module modules/mod_log_config.so +LoadModule auth_basic_module modules/mod_auth_basic.so +LoadModule authz_core_module modules/mod_authz_core.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule dir_module modules/mod_dir.so +LoadModule mime_module modules/mod_mime.so +LoadModule mpm_event_module modules/mod_mpm_event.so +LoadModule reqtimeout_module modules/mod_reqtimeout.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule status_module modules/mod_status.so -LoadModule proxy_module /usr/lib64/httpd/modules/mod_proxy.so -LoadModule proxy_fcgi_module /usr/lib64/httpd/modules/mod_proxy_fcgi.so -LoadModule expires_module /usr/lib64/httpd/modules/mod_expires.so -LoadModule headers_module /usr/lib64/httpd/modules/mod_headers.so +LoadModule proxy_module modules/mod_proxy.so +LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so +LoadModule expires_module modules/mod_expires.so +LoadModule headers_module modules/mod_headers.so diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/modules.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/modules.conf index e921be52b..2595627c0 100644 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/modules.conf +++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/modules.conf @@ -1,17 +1,17 @@ -LoadModule logio_module /usr/lib64/httpd/modules/mod_logio.so -LoadModule unixd_module /usr/lib64/httpd/modules/mod_unixd.so -LoadModule log_config_module /usr/lib64/httpd/modules/mod_log_config.so -LoadModule auth_basic_module /usr/lib64/httpd/modules/mod_auth_basic.so -LoadModule authz_core_module /usr/lib64/httpd/modules/mod_authz_core.so -LoadModule authz_host_module /usr/lib64/httpd/modules/mod_authz_host.so -LoadModule dir_module /usr/lib64/httpd/modules/mod_dir.so -LoadModule mime_module /usr/lib64/httpd/modules/mod_mime.so -LoadModule mpm_event_module /usr/lib64/httpd/modules/mod_mpm_event.so -LoadModule reqtimeout_module /usr/lib64/httpd/modules/mod_reqtimeout.so -LoadModule setenvif_module /usr/lib64/httpd/modules/mod_setenvif.so -LoadModule status_module /usr/lib64/httpd/modules/mod_status.so +LoadModule logio_module modules/mod_logio.so +LoadModule unixd_module modules/mod_unixd.so +LoadModule log_config_module modules/mod_log_config.so +LoadModule auth_basic_module modules/mod_auth_basic.so +LoadModule authz_core_module modules/mod_authz_core.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule dir_module modules/mod_dir.so +LoadModule mime_module modules/mod_mime.so +LoadModule mpm_event_module modules/mod_mpm_event.so +LoadModule reqtimeout_module modules/mod_reqtimeout.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule status_module modules/mod_status.so -LoadModule proxy_module /usr/lib64/httpd/modules/mod_proxy.so -LoadModule proxy_fcgi_module /usr/lib64/httpd/modules/mod_proxy_fcgi.so -LoadModule expires_module /usr/lib64/httpd/modules/mod_expires.so -LoadModule headers_module /usr/lib64/httpd/modules/mod_headers.so +LoadModule proxy_module modules/mod_proxy.so +LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so +LoadModule expires_module modules/mod_expires.so +LoadModule headers_module modules/mod_headers.so