From 7f1a6917e81edf58550fa64c14d25c40034f06eb Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Wed, 8 Jan 2025 18:13:46 +0900
Subject: [PATCH] Updated env variables for building process

---
 Dockerfiles/agent/ubuntu/Dockerfile            | 4 ++--
 Dockerfiles/agent2/ubuntu/Dockerfile           | 4 ++--
 Dockerfiles/build-base/ubuntu/Dockerfile       | 4 ++--
 Dockerfiles/java-gateway/ubuntu/Dockerfile     | 4 ++--
 Dockerfiles/proxy-mysql/ubuntu/Dockerfile      | 4 ++--
 Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile    | 4 ++--
 Dockerfiles/server-mysql/ubuntu/Dockerfile     | 4 ++--
 Dockerfiles/server-pgsql/ubuntu/Dockerfile     | 4 ++--
 Dockerfiles/snmptraps/ubuntu/Dockerfile        | 4 ++--
 Dockerfiles/web-apache-mysql/ubuntu/Dockerfile | 4 ++--
 Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile | 4 ++--
 Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile  | 4 ++--
 Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile  | 4 ++--
 Dockerfiles/web-service/ubuntu/Dockerfile      | 4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile
index b379569fb..91b95d26c 100644
--- a/Dockerfiles/agent/ubuntu/Dockerfile
+++ b/Dockerfiles/agent/ubuntu/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile
index 54eec0ea0..a1488d15e 100644
--- a/Dockerfiles/agent2/ubuntu/Dockerfile
+++ b/Dockerfiles/agent2/ubuntu/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile
index bce290c9a..cd0919a10 100644
--- a/Dockerfiles/build-base/ubuntu/Dockerfile
+++ b/Dockerfiles/build-base/ubuntu/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
-FROM ${UBUNTU_BASE_IMAGE}
+ARG OS_BASE_IMAGE=ubuntu:noble
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile
index 1426055c2..d61446d75 100644
--- a/Dockerfiles/java-gateway/ubuntu/Dockerfile
+++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
index be5fa1497..86146c49e 100644
--- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
index 08391e115..2685834c0 100644
--- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile
index 654aa987c..3a2022a5c 100644
--- a/Dockerfiles/server-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile
index d09d711f7..80c350f2f 100644
--- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile
index 7f0832b5e..7904fd9f8 100644
--- a/Dockerfiles/snmptraps/ubuntu/Dockerfile
+++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
-FROM ${UBUNTU_BASE_IMAGE}
+ARG OS_BASE_IMAGE=ubuntu:noble
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile
index 972562eeb..2d3589f2b 100644
--- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile
index 7c164c742..f23457d48 100644
--- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile
index d872625fd..966c01951 100644
--- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile
index c17ebfcb4..0bef07faa 100644
--- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
diff --git a/Dockerfiles/web-service/ubuntu/Dockerfile b/Dockerfiles/web-service/ubuntu/Dockerfile
index 962abebf9..2d6617015 100644
--- a/Dockerfiles/web-service/ubuntu/Dockerfile
+++ b/Dockerfiles/web-service/ubuntu/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.8
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION