mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-06-30 06:41:08 +02:00
Ubuntu images use Ubuntu 22.04 version
This commit is contained in:
@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
|
||||
|
||||
FROM ${BUILD_BASE_IMAGE} as builder
|
||||
|
||||
FROM ubuntu:focal
|
||||
FROM ubuntu:jammy
|
||||
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
@ -37,14 +37,13 @@ RUN set -eux && \
|
||||
mysql-client \
|
||||
nginx \
|
||||
locales \
|
||||
php7.4-bcmath \
|
||||
php7.4-fpm \
|
||||
php7.4-gd \
|
||||
php7.4-json \
|
||||
php7.4-ldap \
|
||||
php7.4-mbstring \
|
||||
php7.4-mysql \
|
||||
php7.4-xml \
|
||||
php8.1-bcmath \
|
||||
php8.1-fpm \
|
||||
php8.1-gd \
|
||||
php8.1-ldap \
|
||||
php8.1-mbstring \
|
||||
php8.1-mysql \
|
||||
php8.1-xml \
|
||||
supervisor" && \
|
||||
INSTALL_TEMP_PKGS="gpg \
|
||||
ca-certificates \
|
||||
@ -93,9 +92,9 @@ RUN set -eux && \
|
||||
mkdir -p /var/lib/php/session && \
|
||||
rm -f /etc/nginx/conf.d/*.conf && \
|
||||
rm -rf /var/cache/nginx/ && \
|
||||
rm -f /etc/php/7.4/fpm/pool.d/www.conf && \
|
||||
rm -f /etc/php/8.1/fpm/pool.d/www.conf && \
|
||||
ln -sf /dev/fd/2 /var/log/nginx/error.log && \
|
||||
rm -f /etc/php/7.4/fpm/php-fpm.conf.dpkg-dist && \
|
||||
rm -f /etc/php/8.1/fpm/php-fpm.conf.dpkg-dist && \
|
||||
cd /usr/share/zabbix/ && \
|
||||
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
|
||||
rm -rf tests && \
|
||||
@ -113,9 +112,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.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 /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \
|
||||
chgrp -R 0 /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \
|
||||
chmod -R g=u /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/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/ && \
|
||||
|
@ -1,4 +1,4 @@
|
||||
include=/etc/php/7.4/fpm/pool.d/*.conf
|
||||
include=/etc/php/8.1/fpm/pool.d/*.conf
|
||||
|
||||
[global]
|
||||
|
@ -15,8 +15,8 @@ redirect_stderr=true
|
||||
stdout_logfile = /dev/stdout
|
||||
stdout_logfile_maxbytes = 0
|
||||
|
||||
[program:php-fpm7.4]
|
||||
command = /usr/sbin/%(program_name)s -F -y /etc/php/7.4/fpm/php-fpm.conf
|
||||
[program:php-fpm8.1]
|
||||
command = /usr/sbin/%(program_name)s -F -y /etc/php/8.1/fpm/php-fpm.conf
|
||||
auto_start = true
|
||||
autorestart = true
|
||||
|
||||
|
@ -143,7 +143,7 @@ prepare_web_server() {
|
||||
prepare_zbx_web_config() {
|
||||
echo "** Preparing Zabbix frontend configuration file"
|
||||
|
||||
PHP_CONFIG_FILE="/etc/php/7.4/fpm/pool.d/zabbix.conf"
|
||||
PHP_CONFIG_FILE="/etc/php/8.1/fpm/pool.d/zabbix.conf"
|
||||
|
||||
export PHP_FPM_PM=${PHP_FPM_PM:-"dynamic"}
|
||||
export PHP_FPM_PM_MAX_CHILDREN=${PHP_FPM_PM_MAX_CHILDREN:-"50"}
|
||||
|
Reference in New Issue
Block a user