From ac0677bbd20cffe741525052e8de3ad18c3921ae Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Tue, 22 Aug 2023 13:09:29 +0300 Subject: [PATCH] Zabbix v6.4.6 release --- Dockerfiles/agent/alpine/Dockerfile | 2 +- Dockerfiles/agent/centos/Dockerfile | 2 +- Dockerfiles/agent/ol/Dockerfile | 2 +- Dockerfiles/agent/rhel/Dockerfile | 4 ++-- Dockerfiles/agent/ubuntu/Dockerfile | 2 +- Dockerfiles/agent/windows/Dockerfile | 2 +- Dockerfiles/agent2/alpine/Dockerfile | 2 +- Dockerfiles/agent2/centos/Dockerfile | 2 +- Dockerfiles/agent2/ol/Dockerfile | 2 +- Dockerfiles/agent2/rhel/Dockerfile | 4 ++-- Dockerfiles/agent2/ubuntu/Dockerfile | 2 +- Dockerfiles/agent2/windows/Dockerfile | 2 +- Dockerfiles/build-base/alpine/Dockerfile | 2 +- Dockerfiles/build-base/centos/Dockerfile | 2 +- Dockerfiles/build-base/ol/Dockerfile | 2 +- Dockerfiles/build-base/rhel/Dockerfile | 4 ++-- Dockerfiles/build-base/ubuntu/Dockerfile | 2 +- Dockerfiles/build-base/windows/Dockerfile.agent | 2 +- Dockerfiles/build-base/windows/Dockerfile.agent2 | 2 +- Dockerfiles/build-mysql/alpine/Dockerfile | 2 +- Dockerfiles/build-mysql/centos/Dockerfile | 2 +- Dockerfiles/build-mysql/ol/Dockerfile | 2 +- Dockerfiles/build-mysql/rhel/Dockerfile | 4 ++-- Dockerfiles/build-mysql/ubuntu/Dockerfile | 2 +- Dockerfiles/build-mysql/windows/Dockerfile.agent | 2 +- Dockerfiles/build-mysql/windows/Dockerfile.agent2 | 4 ++-- Dockerfiles/build-pgsql/alpine/Dockerfile | 2 +- Dockerfiles/build-pgsql/centos/Dockerfile | 2 +- Dockerfiles/build-pgsql/ol/Dockerfile | 2 +- Dockerfiles/build-pgsql/ubuntu/Dockerfile | 2 +- Dockerfiles/build-sqlite3/alpine/Dockerfile | 2 +- Dockerfiles/build-sqlite3/centos/Dockerfile | 2 +- Dockerfiles/build-sqlite3/ol/Dockerfile | 2 +- Dockerfiles/build-sqlite3/rhel/Dockerfile | 4 ++-- Dockerfiles/build-sqlite3/ubuntu/Dockerfile | 2 +- Dockerfiles/java-gateway/alpine/Dockerfile | 2 +- Dockerfiles/java-gateway/centos/Dockerfile | 2 +- Dockerfiles/java-gateway/ol/Dockerfile | 2 +- Dockerfiles/java-gateway/rhel/Dockerfile | 4 ++-- Dockerfiles/java-gateway/ubuntu/Dockerfile | 2 +- Dockerfiles/proxy-mysql/alpine/Dockerfile | 2 +- Dockerfiles/proxy-mysql/centos/Dockerfile | 2 +- Dockerfiles/proxy-mysql/ol/Dockerfile | 2 +- Dockerfiles/proxy-mysql/rhel/Dockerfile | 4 ++-- Dockerfiles/proxy-mysql/ubuntu/Dockerfile | 2 +- Dockerfiles/proxy-sqlite3/alpine/Dockerfile | 2 +- Dockerfiles/proxy-sqlite3/centos/Dockerfile | 2 +- Dockerfiles/proxy-sqlite3/ol/Dockerfile | 2 +- Dockerfiles/proxy-sqlite3/rhel/Dockerfile | 4 ++-- Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile | 2 +- Dockerfiles/server-mysql/alpine/Dockerfile | 2 +- Dockerfiles/server-mysql/centos/Dockerfile | 2 +- Dockerfiles/server-mysql/ol/Dockerfile | 2 +- Dockerfiles/server-mysql/rhel/Dockerfile | 4 ++-- Dockerfiles/server-mysql/ubuntu/Dockerfile | 2 +- Dockerfiles/server-pgsql/alpine/Dockerfile | 2 +- Dockerfiles/server-pgsql/centos/Dockerfile | 2 +- Dockerfiles/server-pgsql/ol/Dockerfile | 2 +- Dockerfiles/server-pgsql/ubuntu/Dockerfile | 2 +- Dockerfiles/snmptraps/alpine/Dockerfile | 2 +- Dockerfiles/snmptraps/centos/Dockerfile | 2 +- Dockerfiles/snmptraps/ol/Dockerfile | 2 +- Dockerfiles/snmptraps/rhel/Dockerfile | 4 ++-- Dockerfiles/snmptraps/ubuntu/Dockerfile | 2 +- Dockerfiles/web-apache-mysql/alpine/Dockerfile | 2 +- Dockerfiles/web-apache-mysql/centos/Dockerfile | 2 +- Dockerfiles/web-apache-mysql/ol/Dockerfile | 2 +- Dockerfiles/web-apache-mysql/ubuntu/Dockerfile | 2 +- Dockerfiles/web-apache-pgsql/alpine/Dockerfile | 2 +- Dockerfiles/web-apache-pgsql/centos/Dockerfile | 2 +- Dockerfiles/web-apache-pgsql/ol/Dockerfile | 2 +- Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/alpine/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/centos/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/ol/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 4 ++-- Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/alpine/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/centos/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/ol/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile | 2 +- Dockerfiles/web-service/alpine/Dockerfile | 2 +- Dockerfiles/web-service/centos/Dockerfile | 2 +- Dockerfiles/web-service/ol/Dockerfile | 2 +- Dockerfiles/web-service/rhel/Dockerfile | 4 ++-- Dockerfiles/web-service/ubuntu/Dockerfile | 2 +- 86 files changed, 99 insertions(+), 99 deletions(-) diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 5b63e2467d..45fccedc54 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/Dockerfiles/agent/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile index 8b5553b14b..03c15a5b22 100644 --- a/Dockerfiles/agent/centos/Dockerfile +++ b/Dockerfiles/agent/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile index 9fd4c20337..7389b6a7e7 100644 --- a/Dockerfiles/agent/ol/Dockerfile +++ b/Dockerfiles/agent/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index 7535d796de..a663a93918 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG RELEASE=5 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG RELEASE=6 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile index bd05ee4df1..4b709d5e22 100644 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ b/Dockerfiles/agent/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/agent/windows/Dockerfile b/Dockerfiles/agent/windows/Dockerfile index 378d5914ef..6427eac823 100644 --- a/Dockerfiles/agent/windows/Dockerfile +++ b/Dockerfiles/agent/windows/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # escape=` ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-agent:ltsc2022-agent-${ZBX_VERSION} ARG BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022 diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index fc710afc11..ce338bdafc 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/Dockerfiles/agent2/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile index 3b38415b66..de0937f1d7 100644 --- a/Dockerfiles/agent2/centos/Dockerfile +++ b/Dockerfiles/agent2/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/agent2/ol/Dockerfile b/Dockerfiles/agent2/ol/Dockerfile index adebf29ab3..463a6bddc8 100644 --- a/Dockerfiles/agent2/ol/Dockerfile +++ b/Dockerfiles/agent2/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index 2f87b61fa1..feba3f7ad7 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG RELEASE=5 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG RELEASE=6 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile index a68382e16a..229dd0eb8c 100644 --- a/Dockerfiles/agent2/ubuntu/Dockerfile +++ b/Dockerfiles/agent2/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/agent2/windows/Dockerfile b/Dockerfiles/agent2/windows/Dockerfile index afdb585c41..180031e88b 100644 --- a/Dockerfiles/agent2/windows/Dockerfile +++ b/Dockerfiles/agent2/windows/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # escape=` ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-agent:ltsc2022-agent2-${ZBX_VERSION} ARG BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022 diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index 40274bf3bd..e6d98d0688 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.17 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index f5ad56712f..8695c6ae2b 100644 --- a/Dockerfiles/build-base/centos/Dockerfile +++ b/Dockerfiles/build-base/centos/Dockerfile @@ -2,7 +2,7 @@ FROM quay.io/centos/centos:stream9 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index e84d5ab1c7..bbafd1d713 100644 --- a/Dockerfiles/build-base/ol/Dockerfile +++ b/Dockerfiles/build-base/ol/Dockerfile @@ -2,7 +2,7 @@ FROM oraclelinux:9-slim ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 4d2ac1e4a9..78aaf3e781 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -2,8 +2,8 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal ARG MAJOR_VERSION=6.4 -ARG RELEASE=5 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG RELEASE=6 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index a703b80947..3a201c842d 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:jammy ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent b/Dockerfiles/build-base/windows/Dockerfile.agent index 6019e6bb2c..d07a4d26ff 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent +++ b/Dockerfiles/build-base/windows/Dockerfile.agent @@ -10,7 +10,7 @@ ARG BUILD_ARCH=x64 ARG CPU_MODEL=AMD64 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG VS_BUILDTOOLS_URL=https://aka.ms/vs/16/release/vs_buildtools.exe ARG NASM_URL=https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/win64/nasm-2.15.05-installer-x64.exe diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2 index dff1eadc87..ad0233f2eb 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-base/windows/Dockerfile.agent2 @@ -11,7 +11,7 @@ ARG BUILD_ARCH=x64 ARG CPU_MODEL=AMD64 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG VS_BUILDTOOLS_URL=https://aka.ms/vs/16/release/vs_buildtools.exe ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v2.33.0.windows.2/MinGit-2.33.0.2-busybox-64-bit.zip diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index b6fcf1531b..e48bb7a306 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index 3ad6066fb2..638d6bfaab 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile index 51fb414e5d..1b390a0590 100644 --- a/Dockerfiles/build-mysql/ol/Dockerfile +++ b/Dockerfiles/build-mysql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index 71c9215cf6..2710531825 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG RELEASE=5 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG RELEASE=6 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile index 2324182288..e07afbf3bf 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent b/Dockerfiles/build-mysql/windows/Dockerfile.agent index c09df57d0c..90703aaeb6 100644 --- a/Dockerfiles/build-mysql/windows/Dockerfile.agent +++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # escape=` ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:ltsc2022-agent-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile.agent2 index c5065c83af..00c81695d9 100644 --- a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent2 @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # escape=` ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:ltsc2022-agent2-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder @@ -9,7 +9,7 @@ FROM ${BUILD_BASE_IMAGE} as builder SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZABBIX_VERSION_RC_NUM=2400 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION ` diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index 846a44646e..f55189586e 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index 5a81a1b168..e760952ef8 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile index 5cd98bbf9a..27f7140d1b 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index 2663a42bce..5ef6db4833 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index b5cfaf6061..ebdf581e7c 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile index ddd5d95498..7979997fbe 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile index e6e6c3620a..9ab5394dae 100644 --- a/Dockerfiles/build-sqlite3/ol/Dockerfile +++ b/Dockerfiles/build-sqlite3/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile index d0ec2b5e30..c804a7ba69 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG RELEASE=5 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG RELEASE=6 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile index f68ee735e2..3537f51f43 100644 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index 66508f1c0d..01b0ccbfc5 100644 --- a/Dockerfiles/java-gateway/alpine/Dockerfile +++ b/Dockerfiles/java-gateway/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/java-gateway/centos/Dockerfile b/Dockerfiles/java-gateway/centos/Dockerfile index e612f263a0..f6761625a1 100644 --- a/Dockerfiles/java-gateway/centos/Dockerfile +++ b/Dockerfiles/java-gateway/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/java-gateway/ol/Dockerfile b/Dockerfiles/java-gateway/ol/Dockerfile index e2c249580b..c223c240a5 100644 --- a/Dockerfiles/java-gateway/ol/Dockerfile +++ b/Dockerfiles/java-gateway/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile index 1f45c2d6b4..6bfd5a815c 100644 --- a/Dockerfiles/java-gateway/rhel/Dockerfile +++ b/Dockerfiles/java-gateway/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG RELEASE=5 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG RELEASE=6 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile index 6bd27cd244..3a7b6db198 100644 --- a/Dockerfiles/java-gateway/ubuntu/Dockerfile +++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index d6e6a8fa96..5a3012af09 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile index 9e50b16e58..ebb46868bc 100644 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ b/Dockerfiles/proxy-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile index 693533558f..38d5584834 100644 --- a/Dockerfiles/proxy-mysql/ol/Dockerfile +++ b/Dockerfiles/proxy-mysql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index af8d824ebd..d3107d3178 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG RELEASE=5 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG RELEASE=6 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index ccd1f5c40f..467292123c 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 31cbf49a15..6de650709a 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile index b8c04e84cd..45416997ea 100644 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile index 274629883f..f4484bee59 100644 --- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index c48c44c71b..abd69cffd8 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG RELEASE=5 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG RELEASE=6 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index 9c64632a72..a0609da431 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index 2098e6a4c1..e874a9debb 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index 5792083a11..37e96c6614 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/Dockerfiles/server-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile index 0b1c8b0299..2dbc2f389b 100644 --- a/Dockerfiles/server-mysql/ol/Dockerfile +++ b/Dockerfiles/server-mysql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index 15cf0976cd..b78315b600 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG RELEASE=5 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG RELEASE=6 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index 8c10204644..2e271a0ae2 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 148fb6f9c4..19e9c5ddac 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index 1a6ffb9f38..4caf348c3c 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile index c9446289db..7f3aecfc18 100644 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ b/Dockerfiles/server-pgsql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 7c963ddf0e..24d666162b 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index 427d035aa7..88c2e80d50 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.17 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm \ diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index 0cf1191c45..69c7339bf3 100644 --- a/Dockerfiles/snmptraps/centos/Dockerfile +++ b/Dockerfiles/snmptraps/centos/Dockerfile @@ -1,7 +1,7 @@ FROM quay.io/centos/centos:stream9 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm \ diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile index a2f13e2a2a..1727a924bf 100644 --- a/Dockerfiles/snmptraps/ol/Dockerfile +++ b/Dockerfiles/snmptraps/ol/Dockerfile @@ -1,7 +1,7 @@ FROM oraclelinux:9-slim ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm \ diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index 3c585d339d..ddd396da2d 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -1,8 +1,8 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal ARG MAJOR_VERSION=6.4 -ARG RELEASE=5 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG RELEASE=6 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index 94baba2f46..99fc3a34de 100644 --- a/Dockerfiles/snmptraps/ubuntu/Dockerfile +++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:jammy ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm \ diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 8728b14a4a..543f2e38c6 100644 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-mysql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index 0e40d030b9..08246b10a6 100644 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile index 8ec840a32f..7810c7a4f4 100644 --- a/Dockerfiles/web-apache-mysql/ol/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile index b4e77d2dc8..294c0998b1 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index f010678494..8b47279b99 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile index 310fe369e1..582c536997 100644 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile index 99f0f145e3..289877dda5 100644 --- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile index b34efd9c45..30153afc92 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index 79d3e9bbe8..3449c97457 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile index 85fbb5120e..e7ce2f8ea2 100644 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile index 4e7b76351e..fd18fad799 100644 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index 3a99a2cafa..dc6a9be5a0 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG RELEASE=5 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG RELEASE=6 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile index 4489c3118d..aac45b8d7a 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index 536028a24d..9a59b84345 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile index 861ebfc4d1..0b61d3dc52 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index 07754ba8a1..99b7d7c788 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index fb9d1790df..5147acc177 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile index 1eca854ae1..2e130b0ff3 100644 --- a/Dockerfiles/web-service/alpine/Dockerfile +++ b/Dockerfiles/web-service/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-service/centos/Dockerfile b/Dockerfiles/web-service/centos/Dockerfile index 3fcc79805e..f74f0e907a 100644 --- a/Dockerfiles/web-service/centos/Dockerfile +++ b/Dockerfiles/web-service/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-service/ol/Dockerfile b/Dockerfiles/web-service/ol/Dockerfile index aeaa5b830c..a5ea60cb3a 100644 --- a/Dockerfiles/web-service/ol/Dockerfile +++ b/Dockerfiles/web-service/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile index fe0f9ea3ad..90345364dc 100644 --- a/Dockerfiles/web-service/rhel/Dockerfile +++ b/Dockerfiles/web-service/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG RELEASE=5 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG RELEASE=6 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/web-service/ubuntu/Dockerfile b/Dockerfiles/web-service/ubuntu/Dockerfile index 96bafb6ea8..ca4f51ce7c 100644 --- a/Dockerfiles/web-service/ubuntu/Dockerfile +++ b/Dockerfiles/web-service/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder