extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 08:35:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to PHP-FPM for all Web images

Browse Source
This commit is contained in:
Alexey Pustovalov
2025-01-14 02:53:25 +09:00
parent b10947d72a
commit fb2f54d2e2
7 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf
View File

@ -1,5 +1,5 @@
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so LoadModule ssl_module modules/mod_ssl.so
LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
Listen 8443 Listen 8443

10
Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/includes.conf
View File

@ -1,8 +1,8 @@
IncludeOptional /etc/apache2/modules.conf IncludeOptional /etc/apache2/modules.conf
IncludeOptional mods-enabled/mime.conf IncludeOptional /etc/apache2/mods-enabled/mime.conf
IncludeOptional mods-enabled/negotiation.conf IncludeOptional /etc/apache2/mods-enabled/negotiation.conf
IncludeOptional mods-enabled/reqtimeout.conf IncludeOptional /etc/apache2/mods-enabled/reqtimeout.conf
IncludeOptional mods-enabled/setenvif.conf IncludeOptional /etc/apache2/mods-enabled/setenvif.conf
IncludeOptional sites-enabled/*.conf IncludeOptional /etc/apache2/sites-enabled/*.conf

10
Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/includes.conf
View File

@ -1,8 +1,8 @@
IncludeOptional /etc/apache2/modules.conf IncludeOptional /etc/apache2/modules.conf
IncludeOptional mods-enabled/mime.conf IncludeOptional /etc/apache2/mods-enabled/mime.conf
IncludeOptional mods-enabled/negotiation.conf IncludeOptional /etc/apache2/mods-enabled/negotiation.conf
IncludeOptional mods-enabled/reqtimeout.conf IncludeOptional /etc/apache2/mods-enabled/reqtimeout.conf
IncludeOptional mods-enabled/setenvif.conf IncludeOptional /etc/apache2/mods-enabled/setenvif.conf
IncludeOptional sites-enabled/*.conf IncludeOptional /etc/apache2/sites-enabled/*.conf

2
Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -179,7 +179,7 @@ prepare_web_server() {
export APACHE_SERVER_SIGNATURE="Off" export APACHE_SERVER_SIGNATURE="Off"
fi fi
mkdir -p /tmp/httpd mkdir -p /tmp/apache2
} }
prepare_zbx_php_config() { prepare_zbx_php_config() {

2
Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -24,7 +24,7 @@ fi
# Default directories # Default directories
# Nginx main configuration file # Nginx main configuration file
NGINX_MAIN_FILE="/etc/nginx/nginx.conf" NGINX_CONF_FILE="/etc/nginx/nginx.conf"
# Nginx virtual hosts configuration directory # Nginx virtual hosts configuration directory
NGINX_CONFD_DIR="/etc/nginx/http.d" NGINX_CONFD_DIR="/etc/nginx/http.d"
# Directory with SSL certificate files for Nginx # Directory with SSL certificate files for Nginx

4
Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -24,9 +24,9 @@ fi
# Default directories # Default directories
# Nginx main configuration file # Nginx main configuration file
NGINX_MAIN_FILE="/etc/nginx/nginx.conf" NGINX_CONF_FILE="/etc/nginx/nginx.conf"
# Nginx virtual hosts configuration directory # 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 # Directory with SSL certificate files for Nginx
NGINX_SSL_CONFIG_DIR="/etc/ssl/nginx" NGINX_SSL_CONFIG_DIR="/etc/ssl/nginx"
# PHP-FPM configuration file # PHP-FPM configuration file

27
docker-compose_v3_ubuntu_pgsql_local.yaml
View File

@ -3,7 +3,7 @@ services:
build: build:
context: ./Dockerfiles/build-base/${UBUNTU_OS_TAG_SHORT} context: ./Dockerfiles/build-base/${UBUNTU_OS_TAG_SHORT}
cache_from: cache_from:
- "${UBUNTU_CACHE_FROM}" - "${UBUNTU_BASE_IMAGE}"
args: args:
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
image: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -15,8 +15,6 @@ services:
additional_contexts: additional_contexts:
- sources=./sources/ - sources=./sources/
- config_templates=./config_templates/ - config_templates=./config_templates/
cache_from:
- "${UBUNTU_CACHE_FROM}"
args: args:
BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} 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} image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -30,8 +28,6 @@ services:
additional_contexts: additional_contexts:
- sources=./sources/ - sources=./sources/
- config_templates=./config_templates/ - config_templates=./config_templates/
cache_from:
- "${UBUNTU_CACHE_FROM}"
args: args:
BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} 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} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -47,8 +43,6 @@ services:
additional_contexts: additional_contexts:
- sources=./sources/ - sources=./sources/
- config_templates=./config_templates/ - config_templates=./config_templates/
cache_from:
- "${UBUNTU_CACHE_FROM}"
args: args:
BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} 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} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -65,7 +59,7 @@ services:
build: build:
context: ./Dockerfiles/server-pgsql/${UBUNTU_OS_TAG_SHORT} context: ./Dockerfiles/server-pgsql/${UBUNTU_OS_TAG_SHORT}
cache_from: cache_from:
- "${UBUNTU_CACHE_FROM}" - "${UBUNTU_BASE_IMAGE}"
args: args:
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -83,7 +77,7 @@ services:
build: build:
context: ./Dockerfiles/proxy-sqlite3/${UBUNTU_OS_TAG_SHORT} context: ./Dockerfiles/proxy-sqlite3/${UBUNTU_OS_TAG_SHORT}
cache_from: cache_from:
- "${UBUNTU_CACHE_FROM}" - "${UBUNTU_BASE_IMAGE}"
args: args:
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -100,7 +94,7 @@ services:
build: build:
context: ./Dockerfiles/proxy-mysql/${UBUNTU_OS_TAG_SHORT} context: ./Dockerfiles/proxy-mysql/${UBUNTU_OS_TAG_SHORT}
cache_from: cache_from:
- "${UBUNTU_CACHE_FROM}" - "${UBUNTU_BASE_IMAGE}"
args: args:
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} 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}" com.zabbix.os: "${UBUNTU_OS_TAG}"
zabbix-web-apache-pgsql: zabbix-web-apache-pgsql:
user: root
extends: extends:
file: compose_zabbix_components.yaml file: compose_zabbix_components.yaml
service: web-apache-pgsql service: web-apache-pgsql
build: build:
context: ./Dockerfiles/web-apache-pgsql/${UBUNTU_OS_TAG_SHORT} context: ./Dockerfiles/web-apache-pgsql/${UBUNTU_OS_TAG_SHORT}
cache_from: cache_from:
- "${UBUNTU_CACHE_FROM}" - "${UBUNTU_BASE_IMAGE}"
args: args:
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -136,7 +131,7 @@ services:
build: build:
context: ./Dockerfiles/web-nginx-pgsql/${UBUNTU_OS_TAG_SHORT} context: ./Dockerfiles/web-nginx-pgsql/${UBUNTU_OS_TAG_SHORT}
cache_from: cache_from:
- "${UBUNTU_CACHE_FROM}" - "${UBUNTU_BASE_IMAGE}"
args: args:
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -154,7 +149,7 @@ services:
build: build:
context: ./Dockerfiles/agent/${UBUNTU_OS_TAG_SHORT} context: ./Dockerfiles/agent/${UBUNTU_OS_TAG_SHORT}
cache_from: cache_from:
- "${UBUNTU_CACHE_FROM}" - "${UBUNTU_BASE_IMAGE}"
args: args:
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -171,7 +166,7 @@ services:
build: build:
context: ./Dockerfiles/java-gateway/${UBUNTU_OS_TAG_SHORT} context: ./Dockerfiles/java-gateway/${UBUNTU_OS_TAG_SHORT}
cache_from: cache_from:
- "${UBUNTU_CACHE_FROM}" - "${UBUNTU_BASE_IMAGE}"
args: args:
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -188,7 +183,7 @@ services:
build: build:
context: ./Dockerfiles/snmptraps/${UBUNTU_OS_TAG_SHORT} context: ./Dockerfiles/snmptraps/${UBUNTU_OS_TAG_SHORT}
cache_from: cache_from:
- "${UBUNTU_CACHE_FROM}" - "${UBUNTU_BASE_IMAGE}"
args: args:
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
image: zabbix-snmptraps:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-snmptraps:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@ -204,7 +199,7 @@ services:
build: build:
context: ./Dockerfiles/web-service/${UBUNTU_OS_TAG_SHORT} context: ./Dockerfiles/web-service/${UBUNTU_OS_TAG_SHORT}
cache_from: cache_from:
- "${UBUNTU_CACHE_FROM}" - "${UBUNTU_BASE_IMAGE}"
args: args:
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}