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

Updated Ubuntu to 18.04 (bionic) release

Browse Source
This commit is contained in:
root
2018-07-20 11:01:53 +09:00
parent 58d03d1453 e3a3f68138
commit c1c1669c15
2785 changed files with 3097 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web-nginx-mysql/alpine/README.md
View File

@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
# Zabbix web interface images
These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix web interface are:
These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

5
web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -593,6 +593,7 @@ prepare_web_server_nginx() {
fi
ln -sf /dev/fd/2 /var/log/php5-fpm.log
ln -sf /dev/fd/2 /var/log/php7.2-fpm.log
}
stop_databases() {
@ -845,6 +846,10 @@ prepare_zbx_web_config() {
PHP_CONFIG_FILE="/etc/php.d/99-zabbix.ini"
elif [ -f "/etc/php7/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php7/conf.d/99-zabbix.ini"
elif [ -f "/etc/php/7.2/fpm/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php/7.2/fpm/conf.d/99-zabbix.ini"
elif [ -f "/etc/php/7.2/apache2/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php/7.2/apache2/conf.d/99-zabbix.ini"
fi
if [ -n "$PHP_CONFIG_FILE" ]; then