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

All images updated to latest stable base images Alpine 3.12, Ubuntu 20 (focal), CentOS 8

Browse Source
This commit is contained in:
Alexey Pustovalov
2020-08-06 16:19:22 -04:00
parent 5bcb06e8c7
commit 45e2969dc7
38 changed files with 216 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
web-nginx-mysql/ubuntu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal
LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -46,18 +46,18 @@ RUN set -eux && \
mysql-client \
nginx \
locales \
php7.2-bcmath \
php7.2-fpm \
php7.2-gd \
php7.2-json \
php7.2-ldap \
php7.2-mbstring \
php7.2-mysql \
php7.2-xml \
php7.4-bcmath \
php7.4-fpm \
php7.4-gd \
php7.4-json \
php7.4-ldap \
php7.4-mbstring \
php7.4-mysql \
php7.4-xml \
supervisor && \
rm -f /etc/nginx/conf.d/*.conf && \
rm -rf /var/cache/nginx/ && \
rm -f /etc/php/7.2/fpm/pool.d/www.conf && \
rm -f /etc/php/7.4/fpm/pool.d/www.conf && \
ln -sf /dev/fd/2 /var/log/nginx/error.log && \
DEBIAN_FRONTEND=noninteractive apt-get -y purge gpg dirmngr gpg-agent && \
apt-get -y autoremove && \
@ -103,9 +103,9 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chown --quiet -R zabbix:root /etc/nginx/ /etc/php/7.2/fpm/php-fpm.conf /etc/php/7.2/fpm/pool.d/ && \
chgrp -R 0 /etc/nginx/ /etc/php/7.2/fpm/php-fpm.conf /etc/php/7.2/fpm/pool.d/ && \
chmod -R g=u /etc/nginx/ /etc/php/7.2/fpm/php-fpm.conf /etc/php/7.2/fpm/pool.d/ && \
chown --quiet -R zabbix:root /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \
chgrp -R 0 /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \
chmod -R g=u /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \
chown --quiet -R zabbix:root /var/lib/php/session/ && \
chgrp -R 0 /var/lib/php/session/ && \
chmod -R g=u /var/lib/php/session/ && \

2
web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/php-fpm.conf → web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf
View File

@ -1,4 +1,4 @@
include=/etc/php/7.2/fpm/pool.d/*.conf
include=/etc/php/7.4/fpm/pool.d/*.conf
[global]

0
web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/pool.d/zabbix.conf → web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf
View File

4
web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -15,8 +15,8 @@ redirect_stderr=true
stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0
[program:php-fpm7.2]
command = /usr/sbin/%(program_name)s -F -y /etc/php/7.2/fpm/php-fpm.conf
[program:php-fpm7.4]
command = /usr/sbin/%(program_name)s -F -y /etc/php/7.4/fpm/php-fpm.conf
auto_start = true
autorestart = true

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

@ -228,7 +228,7 @@ prepare_zbx_web_config() {
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
PHP_CONFIG_FILE="/etc/php/7.2/fpm/pool.d/zabbix.conf"
PHP_CONFIG_FILE="/etc/php/7.4/fpm/pool.d/zabbix.conf"
update_config_var "$PHP_CONFIG_FILE" "php_value[max_execution_time]" "${ZBX_MAXEXECUTIONTIME:-"600"}"
update_config_var "$PHP_CONFIG_FILE" "php_value[memory_limit]" "${ZBX_MEMORYLIMIT:-"128M"}"