diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index e1fdc94ac..be5f60151 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile index e022c4b08..b277e8128 100644 --- a/Dockerfiles/agent/centos/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index 0dd480d39..c85b2478e 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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 diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile index 4dec921b5..664c3c2d4 100644 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ b/Dockerfiles/agent/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index 79f349835..31b9ccddf 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile index f10805f62..9388c2533 100644 --- a/Dockerfiles/agent2/centos/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index e5a743f16..db772586c 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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 diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile index e79aea657..1cc183ec7 100644 --- a/Dockerfiles/agent2/ubuntu/Dockerfile +++ b/Dockerfiles/agent2/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index 8f09452c7..8445f4779 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG ALPINE_BASE_IMAGE=alpine:3.21 -FROM ${ALPINE_BASE_IMAGE} +ARG OS_BASE_IMAGE=alpine:3.21 +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 2c5eaf1f9..fade172e6 100644 --- a/Dockerfiles/build-base/centos/Dockerfile +++ b/Dockerfiles/build-base/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal -FROM ${CENTOS_BASE_IMAGE} +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index ac218a137..c05859f78 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 -FROM ${RHEL_BASE_IMAGE} +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=6.0 ARG RELEASE=37 diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index 0246110c8..38a9ff955 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble -FROM ${UBUNTU_BASE_IMAGE} +ARG OS_BASE_IMAGE=ubuntu:noble +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index 497815587..7002c9f1a 100644 --- a/Dockerfiles/java-gateway/alpine/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/java-gateway/centos/Dockerfile b/Dockerfiles/java-gateway/centos/Dockerfile index b6cf19dde..03ebd86c0 100644 --- a/Dockerfiles/java-gateway/centos/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile index 6d0e421b8..19633207c 100644 --- a/Dockerfiles/java-gateway/rhel/Dockerfile +++ b/Dockerfiles/java-gateway/rhel/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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 diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile index adccd0fb1..85857eda5 100644 --- a/Dockerfiles/java-gateway/ubuntu/Dockerfile +++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index f578ae62c..6d024fbe3 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile index e5506b457..62b70f0c2 100644 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index 4d9c23b28..147ca864b 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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 diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index a17fd11c5..314c98ef6 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 0a33bde92..eeae67781 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile index 01d0d96ca..e4f71df71 100644 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index 230be012b..8702dec61 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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 diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index 0dd89583d..055ab70f3 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index 0af7cd23c..bb9427fbb 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index e8e5aaa20..babdf47a9 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index dec07a75a..3548b69af 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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 diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index 1b1ec4bb7..01ef4d316 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 8e3589a41..cd5711d5c 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index 97277c08d..1441ce436 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 2616b9098..239f9c350 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index 7a613e5ce..27a3c73eb 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG ALPINE_BASE_IMAGE=alpine:3.21 -FROM ${ALPINE_BASE_IMAGE} +ARG OS_BASE_IMAGE=alpine:3.21 +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index f076c2b84..7afb0e59e 100644 --- a/Dockerfiles/snmptraps/centos/Dockerfile +++ b/Dockerfiles/snmptraps/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal -FROM ${CENTOS_BASE_IMAGE} +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index 1ba73ea45..8392a30b1 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 -FROM ${RHEL_BASE_IMAGE} +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=6.0 ARG RELEASE=37 diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index 87a5d305c..c511f559f 100644 --- a/Dockerfiles/snmptraps/ubuntu/Dockerfile +++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble -FROM ${UBUNTU_BASE_IMAGE} +ARG OS_BASE_IMAGE=ubuntu:noble +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index ad3fd15b0..d53b8a3aa 100644 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index 22e8cea6b..48985fe3b 100644 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile index f686d353e..bee53e3a7 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index 485ee0665..3ef0020f6 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile index b320dd890..b58c6b081 100644 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile index c7935e7d1..b5a49a902 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index 973152c8a..56ac07671 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile index 468ef7fb4..658896122 100644 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index 092515fc4..59539d612 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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 diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile index c2c14af00..62e78878c 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index 239a6c387..c2fc08db5 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile index 8ffd676a6..c88a6b7ef 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index f43ebe155..35119feb8 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile index 9269f0ef5..ab2a3a22f 100644 --- a/Dockerfiles/web-service/alpine/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/web-service/centos/Dockerfile b/Dockerfiles/web-service/centos/Dockerfile index 216022cb5..de675f444 100644 --- a/Dockerfiles/web-service/centos/Dockerfile +++ b/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=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 diff --git a/Dockerfiles/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile index dc42cb1f9..44d642480 100644 --- a/Dockerfiles/web-service/rhel/Dockerfile +++ b/Dockerfiles/web-service/rhel/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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 diff --git a/Dockerfiles/web-service/ubuntu/Dockerfile b/Dockerfiles/web-service/ubuntu/Dockerfile index f4e24f2e7..228bce177 100644 --- a/Dockerfiles/web-service/ubuntu/Dockerfile +++ b/Dockerfiles/web-service/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG UBUNTU_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index ad4b82e3c..3ab2ceb35 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -2,10 +2,10 @@ services: zabbix-build-base: build: context: ./Dockerfiles/build-base/${ALPINE_OS_TAG_SHORT} - 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 @@ -44,8 +44,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 @@ -53,6 +53,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: @@ -64,8 +65,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 @@ -83,8 +84,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 @@ -103,8 +104,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 @@ -123,8 +124,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 @@ -143,8 +144,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 @@ -162,8 +163,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 @@ -179,7 +180,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 @@ -195,8 +196,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 diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index d775af1be..4894709b4 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/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 @@ -56,6 +58,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: @@ -75,6 +78,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: @@ -93,6 +97,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: @@ -112,6 +117,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: @@ -131,6 +137,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: @@ -150,6 +157,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: @@ -168,6 +176,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: @@ -183,6 +192,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 @@ -198,6 +209,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: diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index 018264b49..ee74d08f8 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -5,7 +5,7 @@ services: 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 @@ -44,6 +44,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: @@ -64,6 +65,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: @@ -82,6 +84,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: @@ -101,6 +104,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: @@ -120,6 +124,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: @@ -139,6 +144,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: @@ -157,6 +163,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: @@ -172,6 +179,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 @@ -187,6 +196,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: diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index a1b28cd29..2ada8c3b5 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/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 @@ -54,6 +56,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: @@ -62,6 +65,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: @@ -73,6 +77,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: @@ -91,6 +96,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: @@ -110,6 +116,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: @@ -129,6 +136,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: @@ -148,6 +156,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: @@ -166,6 +175,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: @@ -181,6 +191,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 @@ -196,6 +208,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: diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index 84717d4d5..8169c09ea 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/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 @@ -42,6 +44,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: @@ -62,6 +65,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: @@ -80,6 +84,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: @@ -99,6 +104,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: @@ -118,6 +124,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: @@ -137,6 +144,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: @@ -155,6 +163,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: @@ -170,6 +179,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 @@ -185,6 +196,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: diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index 966d868ee..fa6065037 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/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 @@ -56,6 +58,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: @@ -75,6 +78,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: @@ -93,6 +97,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: @@ -112,6 +117,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: @@ -131,6 +137,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: @@ -150,6 +157,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: @@ -168,6 +176,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: @@ -183,6 +192,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 @@ -198,6 +209,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: diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 3bba802ff..39a8ad510 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/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 @@ -42,6 +44,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: @@ -60,6 +63,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: @@ -76,6 +80,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: @@ -93,6 +98,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: @@ -110,6 +116,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: @@ -127,6 +134,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: @@ -143,6 +151,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: @@ -158,6 +167,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 @@ -173,6 +184,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: diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index ca81ec808..a57f8282f 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/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 @@ -62,6 +64,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: @@ -79,6 +82,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: @@ -95,6 +99,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: @@ -112,6 +117,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: @@ -129,6 +135,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: @@ -146,6 +153,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: @@ -162,6 +170,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: @@ -177,6 +186,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 @@ -192,6 +203,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: