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 Alpine to 3.19, PHP to 8.3 on Alpine and to 8.2 ol OL / RHEL / CentOS.

Browse Source
This commit is contained in:
Alexey Pustovalov
2024-05-29 17:20:56 +09:00
parent 14263c1b97
commit 940daaf8e1
30 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Dockerfiles/web-nginx-mysql/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.16
FROM alpine:3.19
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -36,22 +36,22 @@ RUN set -eux && \
mariadb-client \
mariadb-connector-c \
nginx \
php8-bcmath \
php8-ctype \
php8-fpm \
php8-gd \
php8-gettext \
php8-json \
php8-ldap \
php8-mbstring \
php8-mysqli \
php8-session \
php8-simplexml \
php8-sockets \
php8-fileinfo \
php8-xmlreader \
php8-xmlwriter \
php8-openssl \
php83-bcmath \
php83-ctype \
php83-fpm \
php83-gd \
php83-gettext \
php83-json \
php83-ldap \
php83-mbstring \
php83-mysqli \
php83-session \
php83-simplexml \
php83-sockets \
php83-fileinfo \
php83-xmlreader \
php83-xmlwriter \
php83-openssl \
supervisor" && \
apk add \
--no-cache \
@ -79,7 +79,7 @@ RUN set -eux && \
mkdir -p /etc/zabbix/web && \
mkdir -p /etc/zabbix/web/certs && \
mkdir -p /var/lib/php/session && \
rm -rf /etc/php8/php-fpm.d/www.conf && \
rm -rf /etc/php83/php-fpm.d/www.conf && \
rm -f /etc/nginx/http.d/*.conf && \
ln -sf /dev/stdout /var/log/nginx/access.log && \
ln -sf /dev/stderr /var/log/nginx/error.log && \
@ -94,9 +94,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/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \
chgrp -R 0 /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \
chmod -R g=u /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \
chown --quiet -R zabbix:root /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \
chgrp -R 0 /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \
chmod -R g=u /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \
chown --quiet -R zabbix:root /var/lib/php/session/ /var/lib/nginx/ && \
chgrp -R 0 /var/lib/php/session/ /var/lib/nginx/ && \
chmod -R g=u /var/lib/php/session/ /var/lib/nginx/

2
Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.conf → Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.conf
View File

@ -1,4 +1,4 @@
include=/etc/php8/php-fpm.d/*.conf
include=/etc/php83/php-fpm.d/*.conf
[global]

0
Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf → Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
View File

4
Dockerfiles/web-nginx-mysql/alpine/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-fpm8]
command = /usr/sbin/%(program_name)s -F -y /etc/php8/php-fpm.conf
[program:php-fpm83]
command = /usr/sbin/%(program_name)s -F -y /etc/php83/php-fpm.conf
auto_start = true
autorestart = true

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

@ -163,7 +163,7 @@ prepare_web_server() {
prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file"
PHP_CONFIG_FILE="/etc/php8/php-fpm.d/zabbix.conf"
PHP_CONFIG_FILE="/etc/php83/php-fpm.d/zabbix.conf"
export PHP_FPM_PM=${PHP_FPM_PM:-"dynamic"}
export PHP_FPM_PM_MAX_CHILDREN=${PHP_FPM_PM_MAX_CHILDREN:-"50"}