feat: set php mysqli socket to user provided value

- Refactored mysql_connect_args to be set under a single condition

.env

@@ -80,7 +80,7 @@ RESTART_POLICY=unless-stopped
 # Cache base images
 ALPINE_BASE_IMAGE=alpine:3.22
 CENTOS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal
-OL_BASE_IMAGE=oraclelinux:9-slim
+OL_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
 UBUNTU_BASE_IMAGE=ubuntu:noble
 RHEL_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
 

.github/workflows/images_build.yml

@@ -735,6 +735,7 @@ jobs:
           egress-policy: block
           allowed-endpoints: >
             api.github.com:443
+            apt.postgresql.org:80
             auth.docker.io:443
             dl-cdn.alpinelinux.org:443
             github.com:443

Dockerfiles/agent/README.md

@@ -14,17 +14,17 @@ Zabbix agent is deployed on a monitoring target to actively monitor local resour
 
 # Zabbix agent images
 
-These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.21, Ubuntu 24.04 (noble), CentOS Stream 9, Oracle Linux 9, Windows 10 LTSC 2019 and Windows 11 LTSC 2022 images. The available versions of Zabbix agent are:
+These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.22, Ubuntu 24.04 (noble), CentOS Stream 10, Oracle Linux 10, Windows 10 LTSC 2019 and Windows 11 LTSC 2022 images. The available versions of Zabbix agent are:
 
-    Zabbix agent 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest, ltsc2019-5.0-latest, ltsc2022-5.0-latest)
-    Zabbix agent 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*, ltsc2019-5.0.*, ltsc2022-5.0.*)
     Zabbix agent 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest)
     Zabbix agent 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*, ltsc2019-6.0.*, ltsc2022-6.0.*)
     Zabbix agent 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest)
     Zabbix agent 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*, ltsc2019-7.0.*, ltsc2022-7.0.*)
-    Zabbix agent 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest, alpine-latest, ubuntu-latest, ol-latest, ltsc2019-latest, ltsc2022-latest, latest)
+    Zabbix agent 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest)
     Zabbix agent 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*, ltsc2019-7.2.*, ltsc2022-7.2.*)
-    Zabbix agent 7.4 (tags: alpine-trunk, ubuntu-trunk, ol-trunk, ltsc2019-trunk, ltsc2022-trunk)
+    Zabbix agent 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, ltsc2019-latest, ltsc2022-latest, latest)
+    Zabbix agent 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*, ltsc2019-7.4.*, ltsc2022-7.4.*)
+    Zabbix agent 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk, ltsc2019-trunk, ltsc2022-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 

Dockerfiles/agent/alpine/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=alpine:3.22
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
 

Dockerfiles/agent/centos/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 

Dockerfiles/agent/ol/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG OS_BASE_IMAGE=oraclelinux:9-slim
-ARG MAJOR_VERSION=7.4
+ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
@@ -35,7 +35,7 @@ STOPSIGNAL SIGTERM
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent/sbin/zabbix_agentd", "/usr/sbin/zabbix_agentd"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent/conf/", "${ZABBIX_CONF_DIR}/"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
+COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -44,14 +44,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             iputils \
             pcre2 \
             libcurl \
-            libmodbus \
+#            libmodbus \
             openssl-libs \
             zlib" && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol9_baseos_latest" \
-            --enablerepo="ol9_appstream" \
-            --enablerepo="ol9_developer_EPEL" \
+            --enablerepo="ol10_baseos_latest" \
+            --enablerepo="ol10_appstream" \
+            --enablerepo="ol10_u0_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \

Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo

@@ -0,0 +1,6 @@
+[ol10_u0_developer_EPEL]
+name=Oracle Linux $releasever.0 EPEL Packages for Development ($basearch)
+baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/0/developer/EPEL/$basearch/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
+gpgcheck=1
+enabled=0

Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo

@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0

Dockerfiles/agent/rhel/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG RELEASE=0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}

Dockerfiles/agent/ubuntu/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=ubuntu:noble
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 

Dockerfiles/agent/windows/Dockerfile

@@ -2,7 +2,7 @@
 # escape=`
 ARG OS_BASE_IMAGE=mcr.microsoft.com/windows/nanoserver:ltsc2022
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 ARG BUILD_BASE_IMAGE=zabbix-build-agent:ltsc2022-agent-${ZBX_VERSION}

Dockerfiles/agent2/README.md

@@ -14,17 +14,17 @@ Zabbix agent 2 is deployed on a monitoring target to actively monitor local reso
 
 # Zabbix agent 2 images
 
-These are the only official Zabbix agent 2 Docker images. They are based on Alpine Linux v3.21, Ubuntu 24.04 (noble), CentOS Stream 9, Oracle Linux 9, Windows 10 LTSC 2019 and Windows 11 LTSC 2022 images. The available versions of Zabbix agent 2 are:
+These are the only official Zabbix agent 2 Docker images. They are based on Alpine Linux v3.22, Ubuntu 24.04 (noble), CentOS Stream 10, Oracle Linux 10, Windows 10 LTSC 2019 and Windows 11 LTSC 2022 images. The available versions of Zabbix agent 2 are:
 
-    Zabbix agent 2 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest , ltsc2019-5.0-latest, ltsc2022-5.0-latest)
-    Zabbix agent 2 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*, ltsc2019-5.0.*, ltsc2022-5.0.*)
     Zabbix agent 2 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest)
     Zabbix agent 2 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*, ltsc2019-6.0.*, ltsc2022-6.0.*)
     Zabbix agent 2 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest)
     Zabbix agent 2 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*, ltsc2019-7.0.*, ltsc2022-7.0.*)
-    Zabbix agent 2 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest, alpine-latest, ubuntu-latest, ol-latest, ltsc2019-latest, ltsc2022-latest, latest)
-    Zabbix agent 2 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.0.*, ltsc2019-7.2.*, ltsc2022-7.2.*)
-    Zabbix agent 2 7.4 (tags: alpine-trunk, ubuntu-trunk, ol-trunk, ltsc2019-trunk, ltsc2022-trunk)
+    Zabbix agent 2 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest)
+    Zabbix agent 2 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*, ltsc2019-7.2.*, ltsc2022-7.2.*)
+    Zabbix agent 2 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, ltsc2019-latest, ltsc2022-latest, latest)
+    Zabbix agent 2 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*, ltsc2019-7.4.*, ltsc2022-7.4.*)
+    Zabbix agent 2 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk, ltsc2019-trunk, ltsc2022-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 

Dockerfiles/agent2/alpine/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=alpine:3.22
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
 

Dockerfiles/agent2/centos/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 

Dockerfiles/agent2/ol/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG OS_BASE_IMAGE=oraclelinux:9-slim
-ARG MAJOR_VERSION=7.4
+ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
@@ -35,7 +35,7 @@ STOPSIGNAL SIGTERM
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/", "/usr/sbin/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent2/conf/", "${ZABBIX_CONF_DIR}/"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
+COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -49,9 +49,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             openssl-libs" && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol9_baseos_latest" \
-            --enablerepo="ol9_appstream" \
-            --enablerepo="ol9_developer_EPEL" \
+            --enablerepo="ol10_baseos_latest" \
+            --enablerepo="ol10_appstream" \
+            --enablerepo="ol10_u0_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \

Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo

@@ -0,0 +1,6 @@
+[ol10_u0_developer_EPEL]
+name=Oracle Linux $releasever.0 EPEL Packages for Development ($basearch)
+baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/0/developer/EPEL/$basearch/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
+gpgcheck=1
+enabled=0

Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo

@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0

Dockerfiles/agent2/rhel/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG RELEASE=0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}

Dockerfiles/agent2/rhel/Dockerfile.cuda

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=nvidia/cuda:12.9.0-base-ubi9
-ARG MAJOR_VERSION=7.2
+ARG MAJOR_VERSION=8.0
 ARG RELEASE=7
 ARG ZBX_VERSION=${MAJOR_VERSION}.7
 ARG BUILD_BASE_IMAGE=registry.connect.redhat.com/zabbix/zabbix-agent2-72:${ZBX_VERSION}

Dockerfiles/agent2/ubuntu/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=ubuntu:noble
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 

Dockerfiles/agent2/windows/Dockerfile

@@ -2,7 +2,7 @@
 # escape=`
 ARG OS_BASE_IMAGE=mcr.microsoft.com/windows/nanoserver:ltsc2022
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 ARG BUILD_BASE_IMAGE=zabbix-build-agent:ltsc2022-agent2-${ZBX_VERSION}

Dockerfiles/build-base/README.md

@@ -14,17 +14,17 @@ Zabbix build base image is prepared build environment for building Zabbix compon
 
 # Zabbix build base images
 
-These are the only official Zabbix build base Docker images. They are based on Alpine Linux v3.21, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of the image are:
+These are the only official Zabbix build base Docker images. They are based on Alpine Linux v3.22, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are:
 
-    Zabbix build base 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest)
-    Zabbix build base 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*)
     Zabbix build base 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest)
     Zabbix build base 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*)
     Zabbix build base 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest)
     Zabbix build base 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*, ltsc2019-7.0.*, ltsc2022-7.0.*)
-    Zabbix build base 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix build base 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest)
     Zabbix build base 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*, ltsc2019-7.2.*, ltsc2022-7.2.*)
-    Zabbix build base 7.4 (tags: alpine-trunk, ubuntu-trunk, ol-trunk, ltsc2019-trunk, ltsc2022-trunk)
+    Zabbix build base 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix build base 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*, ltsc2019-7.4.*, ltsc2022-7.4.*)
+    Zabbix build base 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk, ltsc2019-trunk, ltsc2022-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 

Dockerfiles/build-base/alpine/Dockerfile

@@ -2,7 +2,7 @@
 ARG OS_BASE_IMAGE=alpine:3.22
 FROM ${OS_BASE_IMAGE}
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 ENV TERM=xterm \

Dockerfiles/build-base/centos/Dockerfile

@@ -2,7 +2,7 @@
 ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal
 FROM ${OS_BASE_IMAGE}
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 ENV TERM=xterm \
@@ -36,7 +36,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             openssl-devel \
             openldap-devel \
             make \
-            mysql-devel \
+            mysql8.4-devel \
             net-snmp-devel \
             OpenIPMI-devel \
             openldap-devel \

Dockerfiles/build-base/ol/Dockerfile

@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1
-ARG OS_BASE_IMAGE=oraclelinux:9-slim
+ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
 FROM ${OS_BASE_IMAGE}
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 ENV TERM=xterm \
@@ -18,7 +18,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
       org.opencontainers.image.vendor="Zabbix SIA" \
       org.opencontainers.image.version="${ZBX_VERSION}"
 
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
+COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -33,35 +33,29 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             libcurl-devel \
             libevent-devel \
             libssh-devel \
-            libmodbus-devel \
+#            libmodbus-devel \
             libxml2-devel \
             openssl-devel \
             openldap-devel \
             make \
-            mysql-devel \
+            mysql8.4-devel \
             net-snmp-devel \
             OpenIPMI-devel \
             openldap-devel \
             sqlite-devel \
             postgresql-private-devel \
             postgresql-server-devel \
-            java-17-openjdk-devel \
+            java-21-openjdk-devel \
             git \
             gettext \
             unixODBC-devel \
             zlib-devel" && \
-    microdnf -y module enable \
-        --disablerepo "*" \
-        --enablerepo "ol9_appstream" \
-        --setopt=install_weak_deps=0 \
-        --setopt=keepcache=0 \
-        postgresql:16 && \
     microdnf -y install \
         --disablerepo "*" \
-        --enablerepo "ol9_baseos_latest" \
-        --enablerepo "ol9_appstream" \
-        --enablerepo "ol9_codeready_builder" \
-        --enablerepo="ol9_developer_EPEL" \
+        --enablerepo "ol10_baseos_latest" \
+        --enablerepo "ol10_appstream" \
+        --enablerepo "ol10_codeready_builder" \
+        --enablerepo="ol10_u0_developer_EPEL" \
         --setopt=install_weak_deps=0 \
         --setopt=keepcache=0 \
         --best \

Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo

@@ -0,0 +1,6 @@
+[ol10_u0_developer_EPEL]
+name=Oracle Linux $releasever.0 EPEL Packages for Development ($basearch)
+baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/0/developer/EPEL/$basearch/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
+gpgcheck=1
+enabled=0

Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo

@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0

Dockerfiles/build-base/rhel/Dockerfile

@@ -2,7 +2,7 @@
 ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
 FROM ${OS_BASE_IMAGE}
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG RELEASE=0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 

Dockerfiles/build-base/ubuntu/Dockerfile

@@ -2,7 +2,7 @@
 ARG OS_BASE_IMAGE=ubuntu:noble
 FROM ${OS_BASE_IMAGE}
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 ENV TERM=xterm \
@@ -53,4 +53,23 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y \
             --no-install-recommends install \
-        ${INSTALL_PKGS}
+        gpg \
+        dirmngr \
+        gpg-agent && \
+    DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \
+    echo "deb http://apt.postgresql.org/pub/repos/apt $DISTRIB_CODENAME-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+    key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' && \
+    export GNUPGHOME="$(mktemp -d)" && \
+    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" && \
+    gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgresql.gpg && \
+    gpgconf --kill all && \
+    rm -rf "$GNUPGHOME" && \
+    apt-get -y update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y \
+            --no-install-recommends install \
+        ${INSTALL_PKGS} && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y \
+            purge \
+                gpg \
+                dirmngr \
+                gpg-agent

Dockerfiles/build-base/windows/Dockerfile.agent

@@ -15,7 +15,7 @@ ARG CURL_VERSION=8.11.1
 
 ARG BUILD_ARCH=x64
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 FROM ${OS_BASE_IMAGE} AS src

Dockerfiles/build-base/windows/Dockerfile.agent2

@@ -12,7 +12,7 @@ ARG MSYSTEM=UCRT64
 
 ARG BUILD_ARCH=x64
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 FROM ${OS_BASE_IMAGE} as src

Dockerfiles/build-base/windows/Dockerfile_llvm_clang.agent2

@@ -11,7 +11,7 @@ ARG MSYSTEM=CLANG64
 
 ARG BUILD_ARCH=x64
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 ARG VS_BUILDTOOLS_URL=https://aka.ms/vs/17/release/vs_buildtools.exe

Dockerfiles/build-base/windows/Dockerfile_msvcrt.agent2

@@ -11,7 +11,7 @@ ARG MSYSTEM=MINGW64
 
 ARG BUILD_ARCH=x64
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 ARG MINGW_URL=https://github.com/niXman/mingw-builds-binaries/releases/download/14.2.0-rt_v12-rev0/x86_64-14.2.0-release-win32-seh-msvcrt-rt_v12-rev0.7z

Dockerfiles/build-base/windows/Dockerfile_vcpkg.agent2

@@ -7,7 +7,7 @@ ARG GOLANG_VERSION=1.23.2
 
 ARG BUILD_ARCH=x64
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-busybox-64-bit.zip

Dockerfiles/build-mysql/README.md

@@ -14,17 +14,17 @@ Zabbix build base (MySQL) image is used for building Zabbix components. It conta
 
 # Zabbix build base (MySQL) images
 
-These are the only official Zabbix build base (MySQL) Docker images. They are based on Alpine Linux v3.21, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of the image are:
+These are the only official Zabbix build base (MySQL) Docker images. They are based on Alpine Linux v3.22, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are:
 
-    Zabbix build base 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest)
-    Zabbix build base 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*)
     Zabbix build base 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest)
     Zabbix build base 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*)
     Zabbix build base 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest)
     Zabbix build base 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*)
-    Zabbix build base 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix build base 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest)
     Zabbix build base 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*)
-    Zabbix build base 7.4 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
+    Zabbix build base 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix build base 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*)
+    Zabbix build base 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 

Dockerfiles/build-mysql/alpine/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION}
 

Dockerfiles/build-mysql/centos/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION}
 

Dockerfiles/build-mysql/ol/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION}
 
@@ -86,7 +86,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
             --enable-webservice \
             --with-ldap \
             --with-libcurl \
-            --with-libmodbus \
+#            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-${DB_TYPE} \

Dockerfiles/build-mysql/rhel/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG RELEASE=0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION}

Dockerfiles/build-mysql/ubuntu/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION}
 

Dockerfiles/build-mysql/windows/Dockerfile.agent

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 # escape=`
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:ltsc2022-agent-${ZBX_VERSION}
 

Dockerfiles/build-mysql/windows/Dockerfile.agent2

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 # escape=`
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:ltsc2022-agent2-${ZBX_VERSION}
 

Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 # escape=`
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:ltsc2022-agent2-${ZBX_VERSION}
 
@@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZABBIX_VERSION_RC_NUM=2400
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 # escape=`
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:ltsc2022-agent2-${ZBX_VERSION}
 
@@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZABBIX_VERSION_RC_NUM=2400
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

Dockerfiles/build-pgsql/README.md

@@ -14,17 +14,17 @@ Zabbix build base (PostgreSQL) image is used for building Zabbix components. It
 
 # Zabbix build base (PostgreSQL) images
 
-These are the only official Zabbix build base (PostgreSQL) Docker images. They are based on Alpine Linux v3.21, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of the image are:
+These are the only official Zabbix build base (PostgreSQL) Docker images. They are based on Alpine Linux v3.22, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are:
 
-    Zabbix build base 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest)
-    Zabbix build base 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*)
     Zabbix build base 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest)
     Zabbix build base 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*)
     Zabbix build base 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest)
     Zabbix build base 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*)
-    Zabbix build base 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix build base 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest)
     Zabbix build base 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*)
-    Zabbix build base 7.4 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
+    Zabbix build base 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix build base 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*)
+    Zabbix build base 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 

Dockerfiles/build-pgsql/alpine/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION}
 

Dockerfiles/build-pgsql/centos/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION}
 

Dockerfiles/build-pgsql/ol/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION}
 
@@ -88,7 +88,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
             --enable-webservice \
             --with-ldap \
             --with-libcurl \
-            --with-libmodbus \
+#            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-${DB_TYPE} \

Dockerfiles/build-pgsql/rhel/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG RELEASE=0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION}

Dockerfiles/build-pgsql/ubuntu/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION}
 

Dockerfiles/build-sqlite3/README.md

@@ -14,17 +14,17 @@ Zabbix build base (SQLite3) image is used for building Zabbix components. It con
 
 # Zabbix build base (SQLite3) images
 
-These are the only official Zabbix build base (SQLite3) Docker images. They are based on Alpine Linux v3.21, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of the image are:
+These are the only official Zabbix build base (SQLite3) Docker images. They are based on Alpine Linux v3.22, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are:
 
-    Zabbix build base 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest)
-    Zabbix build base 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*)
     Zabbix build base 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest)
     Zabbix build base 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*)
     Zabbix build base 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest)
     Zabbix build base 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*)
-    Zabbix build base 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix build base 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest)
     Zabbix build base 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*)
-    Zabbix build base 7.4 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
+    Zabbix build base 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix build base 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*)
+    Zabbix build base 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 

Dockerfiles/build-sqlite3/alpine/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION}
 

Dockerfiles/build-sqlite3/centos/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION}
 

Dockerfiles/build-sqlite3/ol/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION}
 
@@ -78,7 +78,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
             --enable-proxy \
             --with-ldap \
             --with-libcurl \
-            --with-libmodbus \
+#            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-${DB_TYPE} \

Dockerfiles/build-sqlite3/rhel/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG RELEASE=0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION}

Dockerfiles/build-sqlite3/ubuntu/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION}
 

Dockerfiles/java-gateway/README.md

@@ -14,17 +14,17 @@ Zabbix Java Gateway performs native support for monitoring JMX applications. Jav
 
 # Zabbix Java Gateway images
 
-These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.21, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix Java Gateway are:
+These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.22, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix Java Gateway are:
 
-    Zabbix Java Gateway 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest)
-    Zabbix Java Gateway 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*)
     Zabbix Java Gateway 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest)
     Zabbix Java Gateway 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*)
     Zabbix Java Gateway 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest)
     Zabbix Java Gateway 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*)
-    Zabbix Java Gateway 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix Java Gateway 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest)
     Zabbix Java Gateway 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*)
-    Zabbix Java Gateway 7.2 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
+    Zabbix Java Gateway 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix Java Gateway 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*)
+    Zabbix Java Gateway 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 

Dockerfiles/java-gateway/alpine/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=alpine:3.22
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
 

Dockerfiles/java-gateway/centos/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 

Dockerfiles/java-gateway/ol/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG OS_BASE_IMAGE=oraclelinux:9-slim
-ARG MAJOR_VERSION=7.4
+ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
@@ -35,12 +35,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
     set -eux && \
     INSTALL_PKGS="bash \
-            java-17-openjdk-headless \
+            java-21-openjdk-headless \
             findutils" && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol9_baseos_latest" \
-            --enablerepo="ol9_appstream" \
+            --enablerepo="ol10_baseos_latest" \
+            --enablerepo="ol10_appstream" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \

Dockerfiles/java-gateway/rhel/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG RELEASE=0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}

Dockerfiles/java-gateway/ubuntu/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=ubuntu:noble
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 

Dockerfiles/proxy-mysql/README.md

@@ -14,17 +14,17 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni
 
 # Zabbix proxy images
 
-These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.21, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix proxy are:
+These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.22, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix proxy are:
 
-    Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest)
-    Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*)
     Zabbix proxy 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest)
     Zabbix proxy 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*)
     Zabbix proxy 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest)
     Zabbix proxy 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*)
-    Zabbix proxy 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix proxy 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest)
     Zabbix proxy 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*)
-    Zabbix proxy 7.2 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
+    Zabbix proxy 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix proxy 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*)
+    Zabbix proxy 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 

Dockerfiles/proxy-mysql/alpine/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=alpine:3.22
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
 

Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh

@@ -160,9 +160,12 @@ file_process_from_env() {
 
 # Check prerequisites for MySQL database
 check_variables_mysql() {
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
+    else
         : ${DB_SERVER_HOST:="mysql-server"}
         : ${DB_SERVER_PORT:="3306"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
     fi
 
     USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
 
     DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
 
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
-        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
-    else
-        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
-    fi
 }
 
 db_tls_params() {
@@ -349,11 +347,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

Dockerfiles/proxy-mysql/centos/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 
@@ -59,8 +59,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             fping \
             iputils \
             libxml2 \
-            mysql \
-            mysql-libs \
+            mysql8.4 \
+            mysql8.4-libs \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \

Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh

@@ -160,9 +160,12 @@ file_process_from_env() {
 
 # Check prerequisites for MySQL database
 check_variables_mysql() {
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
+    else
         : ${DB_SERVER_HOST:="mysql-server"}
         : ${DB_SERVER_PORT:="3306"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
     fi
 
     USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
 
     DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
 
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
-        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
-    else
-        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
-    fi
 }
 
 db_tls_params() {
@@ -346,11 +344,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

Dockerfiles/proxy-mysql/ol/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG OS_BASE_IMAGE=oraclelinux:9-slim
-ARG MAJOR_VERSION=7.4
+ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
@@ -44,7 +44,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy"
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/", "${ZABBIX_CONF_DIR}/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/database/mysql/", "/usr/share/doc/zabbix-proxy-mysql/"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
+COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -59,8 +59,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             fping \
             iputils \
             libxml2 \
-            mysql \
-            mysql-libs \
+            mysql8.4 \
+            mysql8.4-libs \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
@@ -72,10 +72,10 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             unixODBC" && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol9_baseos_latest" \
-            --enablerepo="ol9_appstream" \
-            --enablerepo="ol9_codeready_builder" \
-            --enablerepo="ol9_developer_EPEL" \
+            --enablerepo="ol10_baseos_latest" \
+            --enablerepo="ol10_appstream" \
+            --enablerepo="ol10_codeready_builder" \
+            --enablerepo="ol10_u0_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \

Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo

@@ -0,0 +1,6 @@
+[ol10_u0_developer_EPEL]
+name=Oracle Linux $releasever.0 EPEL Packages for Development ($basearch)
+baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/0/developer/EPEL/$basearch/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
+gpgcheck=1
+enabled=0

Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo

@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0

Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh

@@ -160,9 +160,12 @@ file_process_from_env() {
 
 # Check prerequisites for MySQL database
 check_variables_mysql() {
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
+    else
         : ${DB_SERVER_HOST:="mysql-server"}
         : ${DB_SERVER_PORT:="3306"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
     fi
 
     USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
 
     DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
 
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
-        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
-    else
-        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
-    fi
 }
 
 db_tls_params() {
@@ -346,11 +344,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

Dockerfiles/proxy-mysql/rhel/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG RELEASE=0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}

Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh

@@ -160,9 +160,12 @@ file_process_from_env() {
 
 # Check prerequisites for MySQL database
 check_variables_mysql() {
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
+    else
         : ${DB_SERVER_HOST:="mysql-server"}
         : ${DB_SERVER_PORT:="3306"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
     fi
 
     USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
 
     DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
 
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
-        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
-    else
-        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
-    fi
 }
 
 db_tls_params() {
@@ -346,11 +344,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

Dockerfiles/proxy-mysql/ubuntu/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=ubuntu:noble
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 

Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh

@@ -160,9 +160,12 @@ file_process_from_env() {
 
 # Check prerequisites for MySQL database
 check_variables_mysql() {
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
+    else
         : ${DB_SERVER_HOST:="mysql-server"}
         : ${DB_SERVER_PORT:="3306"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
     fi
 
     USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
 
     DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
 
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
-        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
-    else
-        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
-    fi
 }
 
 db_tls_params() {
@@ -346,11 +344,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

Dockerfiles/proxy-sqlite3/README.md

@@ -14,17 +14,17 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni
 
 # Zabbix proxy images
 
-These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.21, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix proxy are:
+These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.22, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix proxy are:
 
-    Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest)
-    Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*)
     Zabbix proxy 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest)
     Zabbix proxy 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*)
     Zabbix proxy 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest)
     Zabbix proxy 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*)
-    Zabbix proxy 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix proxy 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest)
     Zabbix proxy 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*)
-    Zabbix proxy 7.4 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
+    Zabbix proxy 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix proxy 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*)
+    Zabbix proxy 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 

Dockerfiles/proxy-sqlite3/alpine/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=alpine:3.22
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION}
 

Dockerfiles/proxy-sqlite3/centos/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_VERSION}
 

Dockerfiles/proxy-sqlite3/ol/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG OS_BASE_IMAGE=oraclelinux:9-slim
-ARG MAJOR_VERSION=7.4
+ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION}
 
@@ -42,7 +42,7 @@ STOPSIGNAL SIGTERM
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy", "/usr/sbin/zabbix_proxy"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/", "${ZABBIX_CONF_DIR}/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/", "/usr/bin/"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
+COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -67,9 +67,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             unixODBC" && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol9_baseos_latest" \
-            --enablerepo="ol9_appstream" \
-            --enablerepo="ol9_developer_EPEL" \
+            --enablerepo="ol10_baseos_latest" \
+            --enablerepo="ol10_appstream" \
+            --enablerepo="ol10_u0_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \

Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo

@@ -0,0 +1,6 @@
+[ol10_u0_developer_EPEL]
+name=Oracle Linux $releasever.0 EPEL Packages for Development ($basearch)
+baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/0/developer/EPEL/$basearch/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
+gpgcheck=1
+enabled=0

Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo

@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0

Dockerfiles/proxy-sqlite3/rhel/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG RELEASE=0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:rhel-${ZBX_VERSION}

Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=ubuntu:noble
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION}
 

Dockerfiles/server-mysql/README.md

@@ -16,17 +16,17 @@ The server performs the polling and trapping of data, it calculates triggers, se
 
 # Zabbix server images
 
-These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.21, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix server are:
+These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.22, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix server are:
 
-    Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest)
-    Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*)
     Zabbix server 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest)
     Zabbix server 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*)
     Zabbix server 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest)
     Zabbix server 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*)
-    Zabbix server 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix server 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest)
     Zabbix server 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*)
-    Zabbix server 7.4 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
+    Zabbix server 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix server 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*)
+    Zabbix server 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 

Dockerfiles/server-mysql/alpine/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=alpine:3.22
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
 

Dockerfiles/server-mysql/alpine/docker-entrypoint.sh

@@ -159,9 +159,12 @@ file_process_from_env() {
 
 # Check prerequisites for MySQL database
 check_variables_mysql() {
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
+    else
         : ${DB_SERVER_HOST:="mysql-server"}
         : ${DB_SERVER_PORT:="3306"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
     fi
 
     USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
 
     DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
 
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
-        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
-    else
-        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
-    fi
 }
 
 db_tls_params() {
@@ -362,11 +360,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

Dockerfiles/server-mysql/centos/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 
@@ -62,8 +62,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             libpsl \
             libbrotli \
             libxml2 \
-            mysql \
-            mysql-libs \
+            mysql8.4 \
+            mysql8.4-libs \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \

Dockerfiles/server-mysql/centos/docker-entrypoint.sh

@@ -159,9 +159,12 @@ file_process_from_env() {
 
 # Check prerequisites for MySQL database
 check_variables_mysql() {
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
+    else
         : ${DB_SERVER_HOST:="mysql-server"}
         : ${DB_SERVER_PORT:="3306"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
     fi
 
     USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
 
     DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
 
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
-        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
-    else
-        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
-    fi
 }
 
 db_tls_params() {
@@ -359,11 +357,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

Dockerfiles/server-mysql/ol/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG OS_BASE_IMAGE=oraclelinux:9-slim
-ARG MAJOR_VERSION=7.4
+ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
@@ -44,7 +44,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_serve
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/conf/", "${ZABBIX_CONF_DIR}/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/database/mysql/create.sql.gz", "/usr/share/doc/zabbix-server-mysql/create.sql.gz"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
+COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -61,8 +61,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             libevent \
             libxml2 \
             libssh \
-            mysql \
-            mysql-libs \
+            mysql8.4 \
+            mysql8.4-libs \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
@@ -74,10 +74,10 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             unixODBC" && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol9_baseos_latest" \
-            --enablerepo="ol9_appstream" \
-            --enablerepo="ol9_codeready_builder" \
-            --enablerepo="ol9_developer_EPEL" \
+            --enablerepo="ol10_baseos_latest" \
+            --enablerepo="ol10_appstream" \
+            --enablerepo="ol10_codeready_builder" \
+            --enablerepo="ol10_u0_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \

Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo

@@ -0,0 +1,6 @@
+[ol10_u0_developer_EPEL]
+name=Oracle Linux $releasever.0 EPEL Packages for Development ($basearch)
+baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/0/developer/EPEL/$basearch/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
+gpgcheck=1
+enabled=0

Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo

@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0

Dockerfiles/server-mysql/ol/docker-entrypoint.sh

@@ -159,9 +159,12 @@ file_process_from_env() {
 
 # Check prerequisites for MySQL database
 check_variables_mysql() {
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
+    else
         : ${DB_SERVER_HOST:="mysql-server"}
         : ${DB_SERVER_PORT:="3306"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
     fi
 
     USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
 
     DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
 
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
-        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
-    else
-        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
-    fi
 }
 
 db_tls_params() {
@@ -359,11 +357,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

Dockerfiles/server-mysql/rhel/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG RELEASE=0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}

Dockerfiles/server-mysql/rhel/docker-entrypoint.sh

@@ -159,9 +159,12 @@ file_process_from_env() {
 
 # Check prerequisites for MySQL database
 check_variables_mysql() {
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
+    else
         : ${DB_SERVER_HOST:="mysql-server"}
         : ${DB_SERVER_PORT:="3306"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
     fi
 
     USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
 
     DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
 
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
-        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
-    else
-        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
-    fi
 }
 
 db_tls_params() {
@@ -359,11 +357,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

Dockerfiles/server-mysql/ubuntu/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=ubuntu:noble
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
@@ -122,7 +122,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
 EXPOSE 10051/TCP
 
 WORKDIR ${ZABBIX_USER_HOME_DIR}
-    
+
 VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"]
 
 COPY ["docker-entrypoint.sh", "/usr/bin/"]

Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh

@@ -159,9 +159,12 @@ file_process_from_env() {
 
 # Check prerequisites for MySQL database
 check_variables_mysql() {
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
+    else
         : ${DB_SERVER_HOST:="mysql-server"}
         : ${DB_SERVER_PORT:="3306"}
+        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
     fi
 
     USE_DB_ROOT_USER=false
@@ -199,11 +202,6 @@ check_variables_mysql() {
 
     DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
 
-    if [ ! -n "${DB_SERVER_SOCKET}" ]; then
-        mysql_connect_args="-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT}"
-    else
-        mysql_connect_args="-S ${DB_SERVER_SOCKET}"
-    fi
 }
 
 db_tls_params() {
@@ -359,11 +357,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

Dockerfiles/server-pgsql/README.md

@@ -16,17 +16,17 @@ The server performs the polling and trapping of data, it calculates triggers, se
 
 # Zabbix server images
 
-These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.21, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix server are:
+These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.22, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix server are:
 
-    Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest)
-    Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*)
     Zabbix server 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest)
     Zabbix server 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*)
     Zabbix server 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest)
     Zabbix server 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*)
-    Zabbix server 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix server 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest)
     Zabbix server 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*)
-    Zabbix server 7.4 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
+    Zabbix server 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix server 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*)
+    Zabbix server 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 

Dockerfiles/server-pgsql/alpine/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=alpine:3.22
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
 

Dockerfiles/server-pgsql/centos/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal
-ARG MAJOR_VERSION=7.4
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION}
 

Dockerfiles/server-pgsql/ol/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG OS_BASE_IMAGE=oraclelinux:9-slim
-ARG MAJOR_VERSION=7.4
+ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
+ARG MAJOR_VERSION=8.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION}
 
@@ -44,7 +44,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_serve
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/conf/", "${ZABBIX_CONF_DIR}/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/database/postgresql/", "/usr/share/doc/zabbix-server-postgresql/"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
+COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -72,18 +72,11 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             zlib \
             gzip \
             unixODBC" && \
-    microdnf -y module enable \
-        --disablerepo "*" \
-        --enablerepo "ol9_baseos_latest" \
-        --enablerepo "ol9_appstream" \
-        --setopt=install_weak_deps=0 \
-        --setopt=keepcache=0 \
-        postgresql:16 && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol9_baseos_latest" \
-            --enablerepo="ol9_appstream" \
-            --enablerepo="ol9_developer_EPEL" \
+            --enablerepo="ol10_baseos_latest" \
+            --enablerepo="ol10_appstream" \
+            --enablerepo="ol10_u0_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \