extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-02-02 19:09:21 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfiles/agent/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

2
Dockerfiles/agent2/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

2
Dockerfiles/build-base/alpine/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM alpine:3.16
FROM alpine:3.19
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}.30

2
Dockerfiles/java-gateway/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

2
Dockerfiles/proxy-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

2
Dockerfiles/proxy-sqlite3/alpine/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM alpine:3.16
FROM alpine:3.19
ARG MAJOR_VERSION
ARG ZBX_VERSION

2
Dockerfiles/server-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

2
Dockerfiles/server-pgsql/alpine/Dockerfile
View File

@ -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

2
Dockerfiles/snmptraps/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.16
FROM alpine:3.19
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}.30

40
Dockerfiles/web-apache-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 && \
curl \
mariadb-client \
mariadb-connector-c \
php8-apache2 \
php8-bcmath \
php8-ctype \
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-apache2 \
php83-bcmath \
php83-ctype \
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" && \
apk add \
--no-cache \
--clean-protected \
@ -99,9 +99,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/php8/ && \
chgrp -R 0 /etc/apache2/ /etc/php8/ && \
chmod -R g=u /etc/apache2/ /etc/php8/
chown --quiet -R zabbix:root /etc/apache2/ /etc/php83/ && \
chgrp -R 0 /etc/apache2/ /etc/php83/ && \
chmod -R g=u /etc/apache2/ /etc/php83/
EXPOSE 8080/TCP 8443/TCP

0
Dockerfiles/web-apache-mysql/alpine/conf/etc/php8/conf.d/99-zabbix.ini → Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/conf.d/99-zabbix.ini
View File

2
Dockerfiles/web-apache-mysql/centos/Dockerfile
View File

@ -51,7 +51,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
supervisor" && \
dnf -y install epel-release && \
dnf -y module enable mysql && \
dnf -y module enable php:8.0 && \
dnf -y module enable php:8.2 && \
dnf -y install \
--disablerepo "*" \
--enablerepo "${REPOLIST}" \

40
Dockerfiles/web-apache-pgsql/alpine/Dockerfile
View File

@ -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 \
apache2 \
curl \
php8-apache2 \
php8-bcmath \
php8-ctype \
php8-gd \
php8-gettext \
php8-json \
php8-ldap \
php8-pgsql \
php8-mbstring \
php8-session \
php8-simplexml \
php8-sockets \
php8-fileinfo \
php8-xmlreader \
php8-xmlwriter \
php8-openssl \
php83-apache2 \
php83-bcmath \
php83-ctype \
php83-gd \
php83-gettext \
php83-json \
php83-ldap \
php83-pgsql \
php83-mbstring \
php83-session \
php83-simplexml \
php83-sockets \
php83-fileinfo \
php83-xmlreader \
php83-xmlwriter \
php83-openssl \
postgresql-client" && \
apk add \
--no-cache \
@ -98,9 +98,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/php8/ && \
chgrp -R 0 /etc/apache2/ /etc/php8/ && \
chmod -R g=u /etc/apache2/ /etc/php8/
chown --quiet -R zabbix:root /etc/apache2/ /etc/php83/ && \
chgrp -R 0 /etc/apache2/ /etc/php83/ && \
chmod -R g=u /etc/apache2/ /etc/php83/
EXPOSE 8080/TCP 8443/TCP

0
Dockerfiles/web-apache-pgsql/alpine/conf/etc/php8/conf.d/99-zabbix.ini → Dockerfiles/web-apache-pgsql/alpine/conf/etc/php83/conf.d/99-zabbix.ini
View File

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"}

2
Dockerfiles/web-nginx-mysql/centos/Dockerfile
View File

@ -49,7 +49,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
supervisor" && \
dnf -y install epel-release && \
dnf -y module enable mysql && \
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}" \

2
Dockerfiles/web-nginx-mysql/ol/Dockerfile
View File

@ -48,7 +48,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
glibc-locale-source \
supervisor" && \
microdnf -y module enable mysql && \
microdnf -y module enable php:8.0 nginx:1.22 && \
microdnf -y module enable php:8.2 nginx:1.24 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \

2
Dockerfiles/web-nginx-mysql/rhel/Dockerfile
View File

@ -70,7 +70,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \
rm -rf /tmp/epel-release-latest-8.noarch.rpm && \
microdnf -y module enable mysql && \
microdnf -y module enable php:8.0 nginx:1.20 && \
microdnf -y module enable php:8.2 nginx:1.24 && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ubi-8-baseos-rpms" \

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

@ -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/

2
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.conf → Dockerfiles/web-nginx-pgsql/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-pgsql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf → Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
View File

4
Dockerfiles/web-nginx-pgsql/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-pgsql/alpine/docker-entrypoint.sh
View File

@ -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"}

2
Dockerfiles/web-nginx-pgsql/centos/Dockerfile
View File

@ -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}" \

2
Dockerfiles/web-nginx-pgsql/ol/Dockerfile
View File

@ -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="*" \

2
Dockerfiles/web-service/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