mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-08-09 08:35:05 +02:00
Updated Alpine to 3.19, PHP to 8.3 on Alpine and to 8.2 ol OL / RHEL / CentOS.
This commit is contained in:
@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
|
||||
|
||||
FROM ${BUILD_BASE_IMAGE} as builder
|
||||
|
||||
FROM alpine:3.16
|
||||
FROM alpine:3.19
|
||||
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
@ -34,22 +34,22 @@ RUN set -eux && \
|
||||
tzdata \
|
||||
curl \
|
||||
nginx \
|
||||
php8-bcmath \
|
||||
php8-ctype \
|
||||
php8-fpm \
|
||||
php8-gd \
|
||||
php8-gettext \
|
||||
php8-json \
|
||||
php8-ldap \
|
||||
php8-mbstring \
|
||||
php8-pgsql \
|
||||
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-pgsql \
|
||||
php83-session \
|
||||
php83-simplexml \
|
||||
php83-sockets \
|
||||
php83-fileinfo \
|
||||
php83-xmlreader \
|
||||
php83-xmlwriter \
|
||||
php83-openssl \
|
||||
postgresql-client \
|
||||
supervisor" && \
|
||||
apk add \
|
||||
@ -78,7 +78,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 && \
|
||||
@ -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/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/
|
||||
|
@ -1,4 +1,4 @@
|
||||
include=/etc/php8/php-fpm.d/*.conf
|
||||
include=/etc/php83/php-fpm.d/*.conf
|
||||
|
||||
[global]
|
||||
|
@ -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
|
||||
|
||||
|
@ -150,7 +150,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"}
|
||||
|
@ -48,7 +48,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
||||
postgresql \
|
||||
supervisor" && \
|
||||
dnf -y install epel-release && \
|
||||
dnf -y module enable php:8.0 nginx:1.22 && \
|
||||
dnf -y module enable php:8.2 nginx:1.24 && \
|
||||
dnf -y install \
|
||||
--disablerepo "*" \
|
||||
--enablerepo "${REPOLIST}" \
|
||||
|
@ -47,7 +47,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
||||
php-xml \
|
||||
postgresql \
|
||||
supervisor" && \
|
||||
microdnf -y module enable php:8.0 nginx:1.22 && \
|
||||
microdnf -y module enable php:8.2 nginx:1.24 && \
|
||||
microdnf module enable postgresql:15 && \
|
||||
microdnf -y install \
|
||||
--disablerepo="*" \
|
||||
|
Reference in New Issue
Block a user