Updated env variables for building process

.env

@@ -78,11 +78,11 @@ ENV_VARS_DIRECTORY=./env_vars
 RESTART_POLICY=unless-stopped
 
 # Cache base images
-ALPINE_CACHE_FROM=alpine:3.21
-CENTOS_CACHE_FROM=quay.io/centos/centos:stream9-minimal
-OL_CACHE_FROM=oraclelinux:9-slim
-UBUNTU_CACHE_FROM=ubuntu:noble
-RHEL_CACHE_FROM=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ALPINE_BASE_IMAGE=alpine:3.21
+CENTOS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal
+OL_BASE_IMAGE=oraclelinux:9-slim
+UBUNTU_BASE_IMAGE=ubuntu:noble
+RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
 
 # Base images
 BUILD_BASE_IMAGE=zabbix-build-base

Dockerfiles/agent/alpine/Dockerfile

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

Dockerfiles/agent/centos/Dockerfile

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

Dockerfiles/agent/ol/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/agent/rhel/Dockerfile

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

Dockerfiles/agent/ubuntu/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/agent/windows/Dockerfile

@@ -8,7 +8,7 @@ ARG BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM $BASE_IMAGE
+FROM ${BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/agent2/alpine/Dockerfile

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

Dockerfiles/agent2/centos/Dockerfile

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

Dockerfiles/agent2/ol/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/agent2/rhel/Dockerfile

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

Dockerfiles/agent2/ubuntu/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/agent2/windows/Dockerfile

@@ -8,7 +8,7 @@ ARG BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM $BASE_IMAGE
+FROM ${BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/build-base/alpine/Dockerfile

@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM alpine:3.21
+ARG ALPINE_BASE_IMAGE=alpine:3.21
+FROM ${ALPINE_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}

Dockerfiles/build-base/centos/Dockerfile

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

Dockerfiles/build-base/ol/Dockerfile

@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM oraclelinux:9-slim
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}

Dockerfiles/build-base/rhel/Dockerfile

@@ -1,5 +1,7 @@
 # syntax=docker/dockerfile:1
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
+#ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
+ARG RHEL_BASE_IMAGE=registry.redhat.io/ubi10-beta/ubi-minimal
+FROM ${RHEL_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.4
 ARG RELEASE=0
@@ -32,7 +34,7 @@ COPY ["licenses", "/licenses"]
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
-    --mount=type=bind,target=/run/secrets/,src=secrets/ \
+#    --mount=type=bind,target=/run/secrets/,src=secrets/ \
     set -eux && \
     INSTALL_PKGS="autoconf \
             automake \

Dockerfiles/build-base/ubuntu/Dockerfile

@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM ubuntu:noble
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}

Dockerfiles/java-gateway/alpine/Dockerfile

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

Dockerfiles/java-gateway/centos/Dockerfile

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

Dockerfiles/java-gateway/ol/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/java-gateway/rhel/Dockerfile

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

Dockerfiles/java-gateway/ubuntu/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/proxy-mysql/alpine/Dockerfile

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

Dockerfiles/proxy-mysql/centos/Dockerfile

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

Dockerfiles/proxy-mysql/ol/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/proxy-mysql/rhel/Dockerfile

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

Dockerfiles/proxy-mysql/ubuntu/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/proxy-sqlite3/alpine/Dockerfile

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

Dockerfiles/proxy-sqlite3/centos/Dockerfile

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

Dockerfiles/proxy-sqlite3/ol/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/proxy-sqlite3/rhel/Dockerfile

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

Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/server-mysql/alpine/Dockerfile

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

Dockerfiles/server-mysql/centos/Dockerfile

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

Dockerfiles/server-mysql/ol/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/server-mysql/rhel/Dockerfile

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

Dockerfiles/server-mysql/ubuntu/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/server-pgsql/alpine/Dockerfile

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

Dockerfiles/server-pgsql/centos/Dockerfile

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

Dockerfiles/server-pgsql/ol/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/server-pgsql/rhel/Dockerfile

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

Dockerfiles/server-pgsql/ubuntu/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/snmptraps/alpine/Dockerfile

@@ -1,4 +1,6 @@
-FROM alpine:3.21
+# syntax=docker/dockerfile:1
+ARG ALPINE_BASE_IMAGE=alpine:3.21
+FROM ${ALPINE_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}

Dockerfiles/snmptraps/centos/Dockerfile

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

Dockerfiles/snmptraps/ol/Dockerfile

@@ -1,4 +1,6 @@
-FROM oraclelinux:9-slim
+# syntax=docker/dockerfile:1
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}

Dockerfiles/snmptraps/rhel/Dockerfile

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

Dockerfiles/snmptraps/ubuntu/Dockerfile

@@ -1,4 +1,6 @@
-FROM ubuntu:noble
+# syntax=docker/dockerfile:1
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}

Dockerfiles/web-apache-mysql/alpine/Dockerfile

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

Dockerfiles/web-apache-mysql/centos/Dockerfile

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

Dockerfiles/web-apache-mysql/ol/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-apache-mysql/ubuntu/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-apache-pgsql/alpine/Dockerfile

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

Dockerfiles/web-apache-pgsql/centos/Dockerfile

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

Dockerfiles/web-apache-pgsql/ol/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-nginx-mysql/alpine/Dockerfile

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

Dockerfiles/web-nginx-mysql/centos/Dockerfile

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

Dockerfiles/web-nginx-mysql/ol/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-nginx-mysql/rhel/Dockerfile

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

Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-nginx-pgsql/alpine/Dockerfile

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

Dockerfiles/web-nginx-pgsql/centos/Dockerfile

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

Dockerfiles/web-nginx-pgsql/ol/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-nginx-pgsql/rhel/Dockerfile

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

Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-service/alpine/Dockerfile

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

Dockerfiles/web-service/centos/Dockerfile

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

Dockerfiles/web-service/ol/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG OL_BASE_IMAGE=oraclelinux:9-slim
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:9-slim
+FROM ${OL_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

Dockerfiles/web-service/rhel/Dockerfile

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

Dockerfiles/web-service/ubuntu/Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1
+ARG UBUNTU_BASE_IMAGE=ubuntu:noble
 ARG MAJOR_VERSION=7.4
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM ubuntu:noble
+FROM ${UBUNTU_BASE_IMAGE}
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION

docker-compose_v3_alpine_mysql_local.yaml

@@ -4,8 +4,10 @@ services:
    context: ./Dockerfiles/build-base/${ALPINE_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+   args:
+    ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -15,8 +17,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${ALPINE_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -30,8 +30,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${ALPINE_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -48,9 +46,10 @@ services:
   build:
    context: ./Dockerfiles/server-mysql/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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
@@ -67,9 +66,10 @@ services:
   build:
    context: ./Dockerfiles/proxy-sqlite3/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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
@@ -85,9 +85,10 @@ services:
   build:
    context: ./Dockerfiles/proxy-mysql/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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
@@ -104,9 +105,10 @@ services:
   build:
    context: ./Dockerfiles/web-apache-mysql/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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
@@ -123,9 +125,10 @@ services:
   build:
    context: ./Dockerfiles/web-nginx-mysql/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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
@@ -142,9 +145,10 @@ services:
   build:
    context: ./Dockerfiles/agent/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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
@@ -160,9 +164,10 @@ services:
   build:
    context: ./Dockerfiles/java-gateway/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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
@@ -176,7 +181,9 @@ services:
   build:
    context: ./Dockerfiles/snmptraps/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
+   args:
+    ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
   image: zabbix-snmptraps:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-mysql
@@ -190,9 +197,10 @@ services:
   build:
    context: ./Dockerfiles/web-service/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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

@@ -3,7 +3,7 @@ services:
   build:
    context: ./Dockerfiles/build-base/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -13,8 +13,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${ALPINE_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -28,8 +26,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${ALPINE_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -45,8 +41,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${ALPINE_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -63,7 +57,7 @@ services:
   build:
    context: ./Dockerfiles/server-pgsql/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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}
@@ -82,7 +76,7 @@ services:
   build:
    context: ./Dockerfiles/proxy-sqlite3/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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}
@@ -100,7 +94,7 @@ services:
   build:
    context: ./Dockerfiles/proxy-mysql/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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}
@@ -119,7 +113,7 @@ services:
   build:
    context: ./Dockerfiles/web-apache-pgsql/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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}
@@ -138,7 +132,7 @@ services:
   build:
    context: ./Dockerfiles/web-nginx-pgsql/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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}
@@ -157,7 +151,7 @@ services:
   build:
    context: ./Dockerfiles/agent/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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}
@@ -175,7 +169,7 @@ services:
   build:
    context: ./Dockerfiles/java-gateway/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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}
@@ -191,7 +185,7 @@ services:
   build:
    context: ./Dockerfiles/snmptraps/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
   image: zabbix-snmptraps:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-pgsql
@@ -205,7 +199,7 @@ services:
   build:
    context: ./Dockerfiles/web-service/${ALPINE_OS_TAG_SHORT}
    cache_from:
-    - "${ALPINE_CACHE_FROM}"
+    - "${ALPINE_BASE_IMAGE}"
    args:
     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}

docker-compose_v3_centos_mysql_local.yaml

@@ -5,7 +5,9 @@ services:
    additional_contexts:
     - config_templates=./config_templates/
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
+   args:
+    CENTOS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -15,8 +17,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${CENTOS_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -30,8 +30,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${CENTOS_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -48,7 +46,7 @@ services:
   build:
    context: ./Dockerfiles/server-mysql/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -68,7 +66,7 @@ services:
   build:
    context: ./Dockerfiles/proxy-sqlite3/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -86,7 +84,7 @@ services:
   build:
    context: ./Dockerfiles/proxy-mysql/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -105,7 +103,7 @@ services:
   build:
    context: ./Dockerfiles/web-apache-mysql/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -124,7 +122,7 @@ services:
   build:
    context: ./Dockerfiles/web-nginx-mysql/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -143,7 +141,7 @@ services:
   build:
    context: ./Dockerfiles/agent/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -161,7 +159,7 @@ services:
   build:
    context: ./Dockerfiles/java-gateway/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -177,7 +175,7 @@ services:
   build:
    context: ./Dockerfiles/snmptraps/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
   image: zabbix-snmptraps:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-mysql
@@ -191,7 +189,7 @@ services:
   build:
    context: ./Dockerfiles/web-service/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}

docker-compose_v3_centos_pgsql_local.yaml

@@ -3,7 +3,7 @@ services:
   build:
    context: ./Dockerfiles/build-base/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -13,8 +13,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${CENTOS_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -28,8 +26,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${CENTOS_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -44,8 +40,6 @@ services:
    context: ./Dockerfiles/build-sqlite3/${CENTOS_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
-   cache_from:
-    - "${CENTOS_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -62,7 +56,7 @@ services:
   build:
    context: ./Dockerfiles/server-pgsql/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -81,7 +75,7 @@ services:
   build:
    context: ./Dockerfiles/proxy-sqlite3/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -99,7 +93,7 @@ services:
   build:
    context: ./Dockerfiles/proxy-mysql/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -118,7 +112,7 @@ services:
   build:
    context: ./Dockerfiles/web-apache-pgsql/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -137,7 +131,7 @@ services:
   build:
    context: ./Dockerfiles/web-nginx-pgsql/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -156,7 +150,7 @@ services:
   build:
    context: ./Dockerfiles/agent/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -174,7 +168,7 @@ services:
   build:
    context: ./Dockerfiles/java-gateway/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}
@@ -190,7 +184,7 @@ services:
   build:
    context: ./Dockerfiles/snmptraps/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
   image: zabbix-snmptraps:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-pgsql
@@ -204,7 +198,7 @@ services:
   build:
    context: ./Dockerfiles/web-service/${CENTOS_OS_TAG_SHORT}
    cache_from:
-    - "${CENTOS_CACHE_FROM}"
+    - "${CENTOS_BASE_IMAGE}"
    args:
     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}

docker-compose_v3_ol_mysql_local.yaml

@@ -3,7 +3,7 @@ services:
   build:
    context: ./Dockerfiles/build-base/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -13,8 +13,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${OL_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -28,8 +26,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${OL_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -46,7 +42,7 @@ services:
   build:
    context: ./Dockerfiles/server-mysql/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -66,7 +62,7 @@ services:
   build:
    context: ./Dockerfiles/proxy-sqlite3/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -84,7 +80,7 @@ services:
   build:
    context: ./Dockerfiles/proxy-mysql/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -103,7 +99,7 @@ services:
   build:
    context: ./Dockerfiles/web-apache-mysql/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -122,7 +118,7 @@ services:
   build:
    context: ./Dockerfiles/web-nginx-mysql/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -141,7 +137,7 @@ services:
   build:
    context: ./Dockerfiles/agent/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -159,7 +155,7 @@ services:
   build:
    context: ./Dockerfiles/java-gateway/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -175,7 +171,7 @@ services:
   build:
    context: ./Dockerfiles/snmptraps/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
   image: zabbix-snmptraps:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-mysql
@@ -189,7 +185,7 @@ services:
   build:
    context: ./Dockerfiles/web-service/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}

docker-compose_v3_ol_pgsql_local.yaml

@@ -3,7 +3,7 @@ services:
   build:
    context: ./Dockerfiles/build-base/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -13,8 +13,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${OL_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -28,8 +26,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${OL_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -45,8 +41,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${OL_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -63,7 +57,7 @@ services:
   build:
    context: ./Dockerfiles/server-pgsql/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -82,7 +76,7 @@ services:
   build:
    context: ./Dockerfiles/proxy-sqlite3/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -100,7 +94,7 @@ services:
   build:
    context: ./Dockerfiles/proxy-mysql/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -119,7 +113,7 @@ services:
   build:
    context: ./Dockerfiles/web-apache-pgsql/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -138,7 +132,7 @@ services:
   build:
    context: ./Dockerfiles/web-nginx-pgsql/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -157,7 +151,7 @@ services:
   build:
    context: ./Dockerfiles/agent/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -175,7 +169,7 @@ services:
   build:
    context: ./Dockerfiles/java-gateway/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}
@@ -191,7 +185,7 @@ services:
   build:
    context: ./Dockerfiles/snmptraps/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
   image: zabbix-snmptraps:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-pgsql
@@ -205,7 +199,7 @@ services:
   build:
    context: ./Dockerfiles/web-service/${OL_OS_TAG_SHORT}
    cache_from:
-    - "${OL_CACHE_FROM}"
+    - "${OL_BASE_IMAGE}"
    args:
     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}

docker-compose_v3_ubuntu_mysql_local.yaml

@@ -3,7 +3,7 @@ services:
   build:
    context: ./Dockerfiles/build-base/${UBUNTU_OS_TAG_SHORT}
    cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
   image: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   attach: false
 
@@ -13,8 +13,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -28,8 +26,6 @@ services:
    additional_contexts:
     - sources=./sources/
     - config_templates=./config_templates/
-   cache_from:
-    - "${UBUNTU_CACHE_FROM}"
    args:
     BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
@@ -46,7 +42,7 @@ services:
   build:
    context: ./Dockerfiles/server-mysql/${UBUNTU_OS_TAG_SHORT}
    cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
    args:
     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}
@@ -64,7 +60,7 @@ services:
   build:
    context: ./Dockerfiles/proxy-sqlite3/${UBUNTU_OS_TAG_SHORT}
    cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
    args:
     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}
@@ -80,7 +76,7 @@ services:
   build:
    context: ./Dockerfiles/proxy-mysql/${UBUNTU_OS_TAG_SHORT}
    cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
    args:
     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}
@@ -97,7 +93,7 @@ services:
   build:
    context: ./Dockerfiles/web-apache-mysql/${UBUNTU_OS_TAG_SHORT}
    cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
    args:
     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}
@@ -114,7 +110,7 @@ services:
   build:
    context: ./Dockerfiles/web-nginx-mysql/${UBUNTU_OS_TAG_SHORT}
    cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
    args:
     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}
@@ -131,7 +127,7 @@ services:
   build:
    context: ./Dockerfiles/agent/${UBUNTU_OS_TAG_SHORT}
    cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
    args:
     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}
@@ -147,7 +143,7 @@ services:
   build:
    context: ./Dockerfiles/java-gateway/${UBUNTU_OS_TAG_SHORT}
    cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
    args:
     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}
@@ -163,7 +159,7 @@ services:
   build:
    context: ./Dockerfiles/snmptraps/${UBUNTU_OS_TAG_SHORT}
    cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
   image: zabbix-snmptraps:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
   depends_on:
    - zabbix-build-mysql
@@ -177,7 +173,7 @@ services:
   build:
    context: ./Dockerfiles/web-service/${UBUNTU_OS_TAG_SHORT}
    cache_from:
-    - "${UBUNTU_CACHE_FROM}"
+    - "${UBUNTU_BASE_IMAGE}"
    args:
     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}