Using env variable for base image on all images

Dockerfiles/agent/alpine/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/agent/centos/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/agent/rhel/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
 ARG MAJOR_VERSION=7.2
 ARG RELEASE=2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
@@ -7,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${RHEL_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG RELEASE

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.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 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

Dockerfiles/agent2/alpine/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/agent2/centos/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/agent2/rhel/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
 ARG MAJOR_VERSION=7.2
 ARG RELEASE=2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
@@ -7,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${RHEL_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG RELEASE

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.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 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

Dockerfiles/build-base/alpine/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2

Dockerfiles/build-base/centos/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2

Dockerfiles/build-base/rhel/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
-FROM ${RHEL_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.2
 ARG RELEASE=2

Dockerfiles/build-base/ubuntu/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2

Dockerfiles/java-gateway/alpine/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/java-gateway/centos/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/java-gateway/rhel/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
 ARG MAJOR_VERSION=7.2
 ARG RELEASE=2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
@@ -7,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${RHEL_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG RELEASE

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.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 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

Dockerfiles/proxy-mysql/alpine/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/proxy-mysql/centos/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/proxy-mysql/rhel/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
 ARG MAJOR_VERSION=7.2
 ARG RELEASE=2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
@@ -7,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${RHEL_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG RELEASE

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.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 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

Dockerfiles/proxy-sqlite3/alpine/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/proxy-sqlite3/centos/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/proxy-sqlite3/rhel/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
 ARG MAJOR_VERSION=7.2
 ARG RELEASE=2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
@@ -7,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:rhel-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${RHEL_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG RELEASE

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.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 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

Dockerfiles/server-mysql/alpine/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/server-mysql/centos/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/server-mysql/rhel/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
 ARG MAJOR_VERSION=7.2
 ARG RELEASE=2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
@@ -7,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${RHEL_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG RELEASE

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.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 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

Dockerfiles/server-pgsql/alpine/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/server-pgsql/centos/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/server-pgsql/rhel/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
 ARG MAJOR_VERSION=7.2
 ARG RELEASE=2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
@@ -7,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${RHEL_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG RELEASE

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.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 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

Dockerfiles/snmptraps/alpine/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2

Dockerfiles/snmptraps/centos/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2

Dockerfiles/snmptraps/rhel/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
-FROM ${RHEL_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.2
 ARG RELEASE=2

Dockerfiles/snmptraps/ubuntu/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+ARG OS_BASE_IMAGE=ubuntu:noble
-FROM ${UBUNTU_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2

Dockerfiles/web-apache-mysql/alpine/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-apache-mysql/centos/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

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.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 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

Dockerfiles/web-apache-pgsql/alpine/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-apache-pgsql/centos/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

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.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 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

Dockerfiles/web-nginx-mysql/alpine/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-nginx-mysql/centos/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-nginx-mysql/rhel/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
 ARG MAJOR_VERSION=7.2
 ARG RELEASE=2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
@@ -7,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${RHEL_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG RELEASE

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.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 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

Dockerfiles/web-nginx-pgsql/alpine/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-nginx-pgsql/centos/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-nginx-pgsql/rhel/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
 ARG MAJOR_VERSION=7.2
 ARG RELEASE=2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
@@ -7,8 +7,8 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
-FROM ${RHEL_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG RELEASE

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.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 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

Dockerfiles/web-service/alpine/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG ALPINE_BASE_IMAGE=alpine:3.21
+ARG OS_BASE_IMAGE=alpine:3.21
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${ALPINE_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-service/centos/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
+ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ${CENTOS_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-service/rhel/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
 ARG MAJOR_VERSION=7.2
 ARG RELEASE=2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
@@ -7,8 +7,8 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
-FROM ${RHEL_BASE_IMAGE}
+FROM ${OS_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG RELEASE

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.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.2
 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

docker-compose_v3_alpine_mysql_local.yaml

@@ -2,12 +2,10 @@ services:
  zabbix-build-base:
   build:
    context: ./Dockerfiles/build-base/${ALPINE_OS_TAG_SHORT}
-   additional_contexts:
-    - config_templates=./config_templates/
-   args:
-    ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
+   args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -48,8 +46,8 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
-    ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
   image: zabbix-server-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
    - /etc/timezone:/etc/timezone:ro
@@ -57,6 +55,7 @@ services:
    - mysql-server
    - zabbix-build-mysql
   labels:
+   com.zabbix.description: "Zabbix server with MySQL database support"
    com.zabbix.os: "${ALPINE_OS_TAG}"
 
  zabbix-proxy-sqlite3:
@@ -68,8 +67,8 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
-    ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
   image: zabbix-proxy-sqlite3:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
    - /etc/timezone:/etc/timezone:ro
@@ -87,8 +86,8 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
-    ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
   image: zabbix-proxy-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
    - /etc/timezone:/etc/timezone:ro
@@ -107,8 +106,8 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
-    ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
   image: zabbix-web-apache-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
    - /etc/timezone:/etc/timezone:ro
@@ -127,8 +126,8 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
-    ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
   image: zabbix-web-nginx-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
    - /etc/timezone:/etc/timezone:ro
@@ -147,8 +146,8 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
-    ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
   image: zabbix-agent:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
    - /etc/timezone:/etc/timezone:ro
@@ -166,8 +165,8 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
-    ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
   image: zabbix-java-gateway:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-mysql
@@ -183,7 +182,7 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
-    ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
   image: zabbix-snmptraps:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-mysql
@@ -199,8 +198,8 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
-    ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
   image: zabbix-web-service:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-mysql

docker-compose_v3_alpine_pgsql_local.yaml

@@ -4,6 +4,8 @@ services:
    context: ./Dockerfiles/build-base/${ALPINE_OS_TAG_SHORT}
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
+   args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -59,6 +61,7 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-server-pgsql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -78,6 +81,7 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-sqlite3:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -96,6 +100,7 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -115,6 +120,7 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-apache-pgsql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -134,6 +140,7 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-nginx-pgsql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -153,6 +160,7 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-agent:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -171,6 +179,7 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-java-gateway:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -186,6 +195,8 @@ services:
    context: ./Dockerfiles/snmptraps/${ALPINE_OS_TAG_SHORT}
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
+   args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
   image: zabbix-snmptraps:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-pgsql
@@ -201,6 +212,7 @@ services:
    cache_from:
     - "${ALPINE_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-service:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:

docker-compose_v3_centos_mysql_local.yaml

@@ -2,12 +2,10 @@ services:
  zabbix-build-base:
   build:
    context: ./Dockerfiles/build-base/${CENTOS_OS_TAG_SHORT}
-   additional_contexts:
-    - config_templates=./config_templates/
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
-    CENTOS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -48,6 +46,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-server-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -68,6 +67,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-sqlite3:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -86,6 +86,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -105,6 +106,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-apache-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -124,6 +126,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-nginx-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -143,6 +146,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-agent:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -161,6 +165,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-java-gateway:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -176,6 +181,8 @@ services:
    context: ./Dockerfiles/snmptraps/${CENTOS_OS_TAG_SHORT}
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
+   args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
   image: zabbix-snmptraps:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-mysql
@@ -191,6 +198,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-service:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:

docker-compose_v3_centos_pgsql_local.yaml

@@ -4,6 +4,8 @@ services:
    context: ./Dockerfiles/build-base/${CENTOS_OS_TAG_SHORT}
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
+   args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -58,6 +60,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-server-pgsql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -66,6 +69,7 @@ services:
    - postgres-server
    - zabbix-build-pgsql
   labels:
+   com.zabbix.description: "Zabbix server with PostgreSQL database support"
    com.zabbix.os: "${CENTOS_OS_TAG}"
 
  zabbix-proxy-sqlite3:
@@ -77,6 +81,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-sqlite3:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -95,6 +100,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -114,6 +120,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-apache-pgsql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -133,6 +140,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-nginx-pgsql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -152,6 +160,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-agent:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -170,6 +179,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-java-gateway:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -185,6 +195,8 @@ services:
    context: ./Dockerfiles/snmptraps/${CENTOS_OS_TAG_SHORT}
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
+   args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
   image: zabbix-snmptraps:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-pgsql
@@ -200,6 +212,7 @@ services:
    cache_from:
     - "${CENTOS_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-service:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:

docker-compose_v3_ol_mysql_local.yaml

@@ -4,6 +4,8 @@ services:
    context: ./Dockerfiles/build-base/${OL_OS_TAG_SHORT}
    cache_from:
     - "${OL_BASE_IMAGE}"
+   args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -44,6 +46,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-server-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -64,6 +67,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-sqlite3:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -82,6 +86,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -101,6 +106,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-apache-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -120,6 +126,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-nginx-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -139,6 +146,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-agent:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -157,6 +165,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-java-gateway:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -172,6 +181,8 @@ services:
    context: ./Dockerfiles/snmptraps/${OL_OS_TAG_SHORT}
    cache_from:
     - "${OL_BASE_IMAGE}"
+   args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
   image: zabbix-snmptraps:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-mysql
@@ -187,6 +198,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-service:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:

docker-compose_v3_ol_pgsql_local.yaml

@@ -4,6 +4,8 @@ services:
    context: ./Dockerfiles/build-base/${OL_OS_TAG_SHORT}
    cache_from:
     - "${OL_BASE_IMAGE}"
+   args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -59,6 +61,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-server-pgsql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -78,6 +81,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-sqlite3:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -96,6 +100,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -115,6 +120,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-apache-pgsql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -134,6 +140,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-nginx-pgsql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -153,6 +160,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-agent:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   volumes:
@@ -171,6 +179,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-java-gateway:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -186,6 +195,8 @@ services:
    context: ./Dockerfiles/snmptraps/${OL_OS_TAG_SHORT}
    cache_from:
     - "${OL_BASE_IMAGE}"
+   args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
   image: zabbix-snmptraps:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-pgsql
@@ -201,6 +212,7 @@ services:
    cache_from:
     - "${OL_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${OL_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-service:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:

docker-compose_v3_ubuntu_mysql_local.yaml

@@ -4,6 +4,8 @@ services:
    context: ./Dockerfiles/build-base/${UBUNTU_OS_TAG_SHORT}
    cache_from:
     - "${UBUNTU_BASE_IMAGE}"
+   args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -44,6 +46,7 @@ services:
    cache_from:
     - "${UBUNTU_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-server-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -62,6 +65,7 @@ services:
    cache_from:
     - "${UBUNTU_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-sqlite3:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -78,6 +82,7 @@ services:
    cache_from:
     - "${UBUNTU_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -95,6 +100,7 @@ services:
    cache_from:
     - "${UBUNTU_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-apache-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -112,6 +118,7 @@ services:
    cache_from:
     - "${UBUNTU_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-nginx-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -129,6 +136,7 @@ services:
    cache_from:
     - "${UBUNTU_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-agent:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -145,6 +153,7 @@ services:
    cache_from:
     - "${UBUNTU_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-java-gateway:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -160,6 +169,8 @@ services:
    context: ./Dockerfiles/snmptraps/${UBUNTU_OS_TAG_SHORT}
    cache_from:
     - "${UBUNTU_BASE_IMAGE}"
+   args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
   image: zabbix-snmptraps:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-mysql
@@ -175,6 +186,7 @@ services:
    cache_from:
     - "${UBUNTU_BASE_IMAGE}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-service:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:

docker-compose_v3_ubuntu_pgsql_local.yaml

@@ -4,6 +4,8 @@ services:
    context: ./Dockerfiles/build-base/${UBUNTU_OS_TAG_SHORT}
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
+   args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -65,6 +67,7 @@ services:
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-server-pgsql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -82,6 +85,7 @@ services:
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-sqlite3:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -98,6 +102,7 @@ services:
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-proxy-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -115,6 +120,7 @@ services:
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-apache-pgsql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -132,6 +138,7 @@ services:
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-nginx-pgsql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -149,6 +156,7 @@ services:
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-agent:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -165,6 +173,7 @@ services:
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-java-gateway:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
@@ -180,6 +189,8 @@ services:
    context: ./Dockerfiles/snmptraps/${UBUNTU_OS_TAG_SHORT}
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
+   args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
   image: zabbix-snmptraps:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-pgsql
@@ -195,6 +206,7 @@ services:
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
+    OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
     BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: zabbix-web-service:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on: