Migrate to PHP-FPM for all Web images

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
 

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

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

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() {

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

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

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}
@@ -56,7 +56,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}
@@ -74,7 +74,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}
@@ -91,7 +91,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}
@@ -103,13 +103,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}
@@ -127,7 +128,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}
@@ -145,7 +146,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}
@@ -162,7 +163,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}
@@ -179,7 +180,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}
@@ -195,7 +196,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}