From 123d2868459763ab28867616ff047b55a5012285 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 16 Dec 2024 14:33:26 +0900
Subject: [PATCH] Updated next Zabbix version to 7.4

---
 Dockerfiles/build-base/windows/Dockerfile.agent              | 2 +-
 Dockerfiles/build-base/windows/Dockerfile.agent2             | 2 +-
 Dockerfiles/build-base/windows/Dockerfile_llvm_clang.agent2  | 2 +-
 Dockerfiles/build-base/windows/Dockerfile_msvcrt.agent2      | 2 +-
 Dockerfiles/build-base/windows/Dockerfile_vcpkg.agent2       | 2 +-
 Dockerfiles/build-mysql/windows/Dockerfile.agent             | 2 +-
 Dockerfiles/build-mysql/windows/Dockerfile.agent2            | 4 ++--
 Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2 | 4 ++--
 Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2      | 4 ++--
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent b/Dockerfiles/build-base/windows/Dockerfile.agent
index 73ccb2db3..03e2687cd 100644
--- a/Dockerfiles/build-base/windows/Dockerfile.agent
+++ b/Dockerfiles/build-base/windows/Dockerfile.agent
@@ -12,7 +12,7 @@ ARG CURL_VERSION=8.10.1
 ARG BUILD_ARCH=x64
 ARG CPU_MODEL=AMD64
 
-ARG MAJOR_VERSION=7.2
+ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 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-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2
index fa2b06839..954e7fcbc 100644
--- a/Dockerfiles/build-base/windows/Dockerfile.agent2
+++ b/Dockerfiles/build-base/windows/Dockerfile.agent2
@@ -13,7 +13,7 @@ ARG MSYSTEM=UCRT64
 ARG BUILD_ARCH=x64
 ARG CPU_MODEL=AMD64
 
-ARG MAJOR_VERSION=7.2
+ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 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-base/windows/Dockerfile_llvm_clang.agent2 b/Dockerfiles/build-base/windows/Dockerfile_llvm_clang.agent2
index 3b45ec3b8..66d7fd820 100644
--- a/Dockerfiles/build-base/windows/Dockerfile_llvm_clang.agent2
+++ b/Dockerfiles/build-base/windows/Dockerfile_llvm_clang.agent2
@@ -12,7 +12,7 @@ ARG MSYSTEM=CLANG64
 ARG BUILD_ARCH=x64
 ARG CPU_MODEL=AMD64
 
-ARG MAJOR_VERSION=7.2
+ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 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-base/windows/Dockerfile_msvcrt.agent2 b/Dockerfiles/build-base/windows/Dockerfile_msvcrt.agent2
index 77ff52757..d976ed9f5 100644
--- a/Dockerfiles/build-base/windows/Dockerfile_msvcrt.agent2
+++ b/Dockerfiles/build-base/windows/Dockerfile_msvcrt.agent2
@@ -13,7 +13,7 @@ ARG MSYSTEM=MINGW64
 ARG BUILD_ARCH=x64
 ARG CPU_MODEL=AMD64
 
-ARG MAJOR_VERSION=7.2
+ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 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-base/windows/Dockerfile_vcpkg.agent2 b/Dockerfiles/build-base/windows/Dockerfile_vcpkg.agent2
index 598b8d8c1..eafdf6771 100644
--- a/Dockerfiles/build-base/windows/Dockerfile_vcpkg.agent2
+++ b/Dockerfiles/build-base/windows/Dockerfile_vcpkg.agent2
@@ -8,7 +8,7 @@ ARG GOLANG_VERSION=1.22.3
 ARG BUILD_ARCH=x64
 ARG CPU_MODEL=AMD64
 
-ARG MAJOR_VERSION=7.2
+ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 
 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/windows/Dockerfile.agent b/Dockerfiles/build-mysql/windows/Dockerfile.agent
index 26475bbc7..16ee42867 100644
--- a/Dockerfiles/build-mysql/windows/Dockerfile.agent
+++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 # escape=`
-ARG MAJOR_VERSION=7.2
+ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-base:ltsc2022-agent-${ZBX_VERSION}
 
diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile.agent2
index 1b7b02bbb..892a5ade7 100644
--- a/Dockerfiles/build-mysql/windows/Dockerfile.agent2
+++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent2
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 # escape=`
-ARG MAJOR_VERSION=7.2
+ARG MAJOR_VERSION=7.4
 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.2
+ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZABBIX_VERSION_RC_NUM=2400
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
diff --git a/Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2
index dcc1a268d..749b063aa 100644
--- a/Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2
+++ b/Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 # escape=`
-ARG MAJOR_VERSION=7.2
+ARG MAJOR_VERSION=7.4
 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.2
+ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZABBIX_VERSION_RC_NUM=2400
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
diff --git a/Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2
index 6785d38ec..13027c603 100644
--- a/Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2
+++ b/Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 # escape=`
-ARG MAJOR_VERSION=7.2
+ARG MAJOR_VERSION=7.4
 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.2
+ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZABBIX_VERSION_RC_NUM=2400
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git