Migrate to PHP-FPM for all Web images

2025-06-11 04:17:02 +02:00 · 2025-01-14 02:53:25 +09:00 · 2025-01-14 02:53:25 +09:00 · 83190c8268
commit 83190c8268
parent 109d9bae3d
7 changed files with 27 additions and 32 deletions
--- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf
+++ b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf
@ -1,5 +1,5 @@
-LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
-LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule socache_shmcb_module modules/mod_socache_shmcb.so

 Listen 8443

--- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/includes.conf
+++ b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/includes.conf
@ -1,8 +1,8 @@
 IncludeOptional /etc/apache2/modules.conf

-IncludeOptional mods-enabled/mime.conf
-IncludeOptional mods-enabled/negotiation.conf
-IncludeOptional mods-enabled/reqtimeout.conf
-IncludeOptional mods-enabled/setenvif.conf
+IncludeOptional /etc/apache2/mods-enabled/mime.conf
+IncludeOptional /etc/apache2/mods-enabled/negotiation.conf
+IncludeOptional /etc/apache2/mods-enabled/reqtimeout.conf
+IncludeOptional /etc/apache2/mods-enabled/setenvif.conf

-IncludeOptional sites-enabled/*.conf
+IncludeOptional /etc/apache2/sites-enabled/*.conf
--- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/includes.conf
+++ b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/includes.conf
@ -1,8 +1,8 @@
 IncludeOptional /etc/apache2/modules.conf

-IncludeOptional mods-enabled/mime.conf
-IncludeOptional mods-enabled/negotiation.conf
-IncludeOptional mods-enabled/reqtimeout.conf
-IncludeOptional mods-enabled/setenvif.conf
+IncludeOptional /etc/apache2/mods-enabled/mime.conf
+IncludeOptional /etc/apache2/mods-enabled/negotiation.conf
+IncludeOptional /etc/apache2/mods-enabled/reqtimeout.conf
+IncludeOptional /etc/apache2/mods-enabled/setenvif.conf

-IncludeOptional sites-enabled/*.conf
+IncludeOptional /etc/apache2/sites-enabled/*.conf
--- a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh
@ -179,7 +179,7 @@ prepare_web_server() {
        export APACHE_SERVER_SIGNATURE="Off"
    fi

-    mkdir -p /tmp/httpd
+    mkdir -p /tmp/apache2
 }

 prepare_zbx_php_config() {
--- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
@ -24,7 +24,7 @@ fi

 # Default directories
 # Nginx main configuration file
-NGINX_MAIN_FILE="/etc/nginx/nginx.conf"
+NGINX_CONF_FILE="/etc/nginx/nginx.conf"
 # Nginx virtual hosts configuration directory
 NGINX_CONFD_DIR="/etc/nginx/http.d"
 # Directory with SSL certificate files for Nginx
--- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
@ -24,9 +24,9 @@ fi

 # Default directories
 # Nginx main configuration file
-NGINX_MAIN_FILE="/etc/nginx/nginx.conf"
+NGINX_CONF_FILE="/etc/nginx/nginx.conf"
 # Nginx virtual hosts configuration directory
-NGINX_CONFD_DIR="/etc/nginx/http.d"
+NGINX_CONFD_DIR="/etc/nginx/conf.d"
 # Directory with SSL certificate files for Nginx
 NGINX_SSL_CONFIG_DIR="/etc/ssl/nginx"
 # PHP-FPM configuration file
--- a/docker-compose_v3_ubuntu_pgsql_local.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_local.yaml
@ -3,7 +3,7 @@ services:
  build:
   context: ./Dockerfiles/build-base/${UBUNTU_OS_TAG_SHORT}
   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
   args:
    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
  image: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -15,8 +15,6 @@ services:
   additional_contexts:
    - sources=./sources/
    - config_templates=./config_templates/
-   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
   args:
    BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
  image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -30,8 +28,6 @@ services:
   additional_contexts:
    - sources=./sources/
    - config_templates=./config_templates/
-   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
   args:
    BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
  image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -47,8 +43,6 @@ services:
   additional_contexts:
    - sources=./sources/
    - config_templates=./config_templates/
-   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
   args:
    BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
  image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -65,7 +59,7 @@ services:
  build:
   context: ./Dockerfiles/server-pgsql/${UBUNTU_OS_TAG_SHORT}
   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
   args:
    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
    BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -83,7 +77,7 @@ services:
  build:
   context: ./Dockerfiles/proxy-sqlite3/${UBUNTU_OS_TAG_SHORT}
   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
   args:
    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
    BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -100,7 +94,7 @@ services:
  build:
   context: ./Dockerfiles/proxy-mysql/${UBUNTU_OS_TAG_SHORT}
   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
   args:
    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
    BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -112,13 +106,14 @@ services:
   com.zabbix.os: "${UBUNTU_OS_TAG}"

 zabbix-web-apache-pgsql:
+  user: root
  extends:
   file: compose_zabbix_components.yaml
   service: web-apache-pgsql
  build:
   context: ./Dockerfiles/web-apache-pgsql/${UBUNTU_OS_TAG_SHORT}
   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
   args:
    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
    BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -136,7 +131,7 @@ services:
  build:
   context: ./Dockerfiles/web-nginx-pgsql/${UBUNTU_OS_TAG_SHORT}
   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
   args:
    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
    BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -154,7 +149,7 @@ services:
  build:
   context: ./Dockerfiles/agent/${UBUNTU_OS_TAG_SHORT}
   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
   args:
    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
    BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -171,7 +166,7 @@ services:
  build:
   context: ./Dockerfiles/java-gateway/${UBUNTU_OS_TAG_SHORT}
   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
   args:
    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
    BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -188,7 +183,7 @@ services:
  build:
   context: ./Dockerfiles/snmptraps/${UBUNTU_OS_TAG_SHORT}
   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
   args:
    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
  image: zabbix-snmptraps:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -204,7 +199,7 @@ services:
  build:
   context: ./Dockerfiles/web-service/${UBUNTU_OS_TAG_SHORT}
   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
   args:
    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
    BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}