extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 00:24:58 +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

2
web-apache-mysql/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

22
web-apache-mysql/ubuntu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -28,13 +28,13 @@ RUN set -eux && \
ca-certificates \
mysql-client \
locales \
php7.2-bcmath \
php7.2-gd \
php7.2-json \
php7.2-ldap \
php7.2-mbstring \
php7.2-mysql \
php7.2-xml && \
php7.4-bcmath \
php7.4-gd \
php7.4-json \
php7.4-ldap \
php7.4-mbstring \
php7.4-mysql \
php7.4-xml && \
rm -f /etc/apache2/sites-available/* && \
rm -f /etc/apache2/sites-enabled/* && \
/usr/sbin/a2enmod ssl && \
@ -93,9 +93,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/apache2/ /etc/php/7.2/ && \
chgrp -R 0 /etc/apache2/ /etc/php/7.2/ && \
chmod -R g=u /etc/apache2/ /etc/php/7.2/ && \
chown --quiet -R zabbix:root /etc/apache2/ /etc/php/7.4/ && \
chgrp -R 0 /etc/apache2/ /etc/php/7.4/ && \
chmod -R g=u /etc/apache2/ /etc/php/7.4/ && \
DEBIAN_FRONTEND=noninteractive apt-get -y purge \
gettext \
git && \

0
web-apache-mysql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini → web-apache-mysql/ubuntu/conf/etc/php/7.4/apache2/conf.d/99-zabbix.ini
View File

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

@ -208,7 +208,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/apache2/conf.d/99-zabbix.ini"
PHP_CONFIG_FILE="/etc/php/7.4/apache2/conf.d/99-zabbix.ini"
update_config_var "$PHP_CONFIG_FILE" "max_execution_time" "${ZBX_MAXEXECUTIONTIME:-"600"}"
update_config_var "$PHP_CONFIG_FILE" "memory_limit" "${ZBX_MEMORYLIMIT:-"128M"}"