From c971e9089b695948e3ff2ff4fa3d876282533ad2 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 8 Jan 2025 16:49:55 +0900 Subject: [PATCH] Using env variable for base image on all images --- Dockerfiles/agent/alpine/Dockerfile | 4 ++-- Dockerfiles/agent/centos/Dockerfile | 4 ++-- Dockerfiles/agent/ol/Dockerfile | 4 ++-- Dockerfiles/agent/rhel/Dockerfile | 4 ++-- Dockerfiles/agent2/alpine/Dockerfile | 4 ++-- Dockerfiles/agent2/centos/Dockerfile | 4 ++-- Dockerfiles/agent2/ol/Dockerfile | 4 ++-- Dockerfiles/agent2/rhel/Dockerfile | 4 ++-- Dockerfiles/build-base/alpine/Dockerfile | 4 ++-- Dockerfiles/build-base/centos/Dockerfile | 4 ++-- Dockerfiles/build-base/ol/Dockerfile | 4 ++-- Dockerfiles/build-base/rhel/Dockerfile | 4 ++-- Dockerfiles/java-gateway/alpine/Dockerfile | 4 ++-- Dockerfiles/java-gateway/centos/Dockerfile | 4 ++-- Dockerfiles/java-gateway/ol/Dockerfile | 4 ++-- Dockerfiles/java-gateway/rhel/Dockerfile | 4 ++-- Dockerfiles/proxy-mysql/alpine/Dockerfile | 4 ++-- Dockerfiles/proxy-mysql/centos/Dockerfile | 4 ++-- Dockerfiles/proxy-mysql/ol/Dockerfile | 4 ++-- Dockerfiles/proxy-mysql/rhel/Dockerfile | 4 ++-- Dockerfiles/proxy-sqlite3/alpine/Dockerfile | 4 ++-- Dockerfiles/proxy-sqlite3/centos/Dockerfile | 4 ++-- Dockerfiles/proxy-sqlite3/ol/Dockerfile | 4 ++-- Dockerfiles/proxy-sqlite3/rhel/Dockerfile | 4 ++-- Dockerfiles/server-mysql/alpine/Dockerfile | 4 ++-- Dockerfiles/server-mysql/centos/Dockerfile | 4 ++-- Dockerfiles/server-mysql/ol/Dockerfile | 4 ++-- Dockerfiles/server-mysql/rhel/Dockerfile | 4 ++-- Dockerfiles/server-pgsql/alpine/Dockerfile | 4 ++-- Dockerfiles/server-pgsql/centos/Dockerfile | 4 ++-- Dockerfiles/server-pgsql/ol/Dockerfile | 4 ++-- Dockerfiles/server-pgsql/rhel/Dockerfile | 4 ++-- Dockerfiles/snmptraps/alpine/Dockerfile | 4 ++-- Dockerfiles/snmptraps/centos/Dockerfile | 4 ++-- Dockerfiles/snmptraps/ol/Dockerfile | 4 ++-- Dockerfiles/snmptraps/rhel/Dockerfile | 4 ++-- .../web-apache-mysql/alpine/Dockerfile | 4 ++-- .../web-apache-mysql/centos/Dockerfile | 4 ++-- Dockerfiles/web-apache-mysql/ol/Dockerfile | 4 ++-- .../web-apache-pgsql/alpine/Dockerfile | 4 ++-- .../web-apache-pgsql/centos/Dockerfile | 4 ++-- Dockerfiles/web-apache-pgsql/ol/Dockerfile | 4 ++-- Dockerfiles/web-nginx-mysql/alpine/Dockerfile | 4 ++-- Dockerfiles/web-nginx-mysql/centos/Dockerfile | 4 ++-- Dockerfiles/web-nginx-mysql/ol/Dockerfile | 4 ++-- Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 4 ++-- Dockerfiles/web-nginx-pgsql/alpine/Dockerfile | 4 ++-- Dockerfiles/web-nginx-pgsql/centos/Dockerfile | 4 ++-- Dockerfiles/web-nginx-pgsql/ol/Dockerfile | 4 ++-- Dockerfiles/web-nginx-pgsql/rhel/Dockerfile | 6 ++--- Dockerfiles/web-service/alpine/Dockerfile | 4 ++-- Dockerfiles/web-service/centos/Dockerfile | 4 ++-- Dockerfiles/web-service/ol/Dockerfile | 4 ++-- Dockerfiles/web-service/rhel/Dockerfile | 6 ++--- docker-compose_v3_alpine_mysql_local.yaml | 23 ++++++++++--------- docker-compose_v3_alpine_pgsql_local.yaml | 12 ++++++++++ docker-compose_v3_centos_mysql_local.yaml | 12 +++++++++- docker-compose_v3_centos_pgsql_local.yaml | 13 +++++++++++ docker-compose_v3_ol_mysql_local.yaml | 12 ++++++++++ docker-compose_v3_ol_pgsql_local.yaml | 12 ++++++++++ docker-compose_v3_ubuntu_mysql_local.yaml | 12 ++++++++++ docker-compose_v3_ubuntu_pgsql_local.yaml | 12 ++++++++++ 62 files changed, 206 insertions(+), 122 deletions(-) diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index a5abdd896..1e90d3c72 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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 ab0a7f93c..45d24989d 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile index 33f98a134..9e18f023c 100644 --- a/Dockerfiles/agent/ol/Dockerfile +++ b/Dockerfiles/agent/ol/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim +ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OL_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 290048fda..704b80857 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/ubi9/ubi-minimal:9.5 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -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/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index ab6c46ecb..204c79cff 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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 1f672c0bb..ac2ab6abf 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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/ol/Dockerfile b/Dockerfiles/agent2/ol/Dockerfile index ebb7a0622..e6b661d84 100644 --- a/Dockerfiles/agent2/ol/Dockerfile +++ b/Dockerfiles/agent2/ol/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim +ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OL_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 68c195635..ab7ba2cbd 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/ubi9/ubi-minimal:9.5 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -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/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index 14df3f5ec..fbaa20003 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 971843bec..7d2965241 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index 82787ddc2..4d3dbb1b1 100644 --- a/Dockerfiles/build-base/ol/Dockerfile +++ b/Dockerfiles/build-base/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim -FROM ${OL_BASE_IMAGE} +ARG OS_BASE_IMAGE=oraclelinux:9-slim +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 1bff3648e..28850e860 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/ubi9/ubi-minimal:9.5 -FROM ${RHEL_BASE_IMAGE} +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG RELEASE=8 diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index 181f6ceb0..35f9c6904 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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 fbf8fa23e..aa5d4b742 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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/ol/Dockerfile b/Dockerfiles/java-gateway/ol/Dockerfile index 4a3075d75..862a7048c 100644 --- a/Dockerfiles/java-gateway/ol/Dockerfile +++ b/Dockerfiles/java-gateway/ol/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim +ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OL_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 ef3d91730..30f3ac7cb 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/ubi9/ubi-minimal:9.5 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -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/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index 9f35f7c07..2ef5140ea 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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 2e49f1d25..bc1ca0385 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile index c7dbd6547..731e2210b 100644 --- a/Dockerfiles/proxy-mysql/ol/Dockerfile +++ b/Dockerfiles/proxy-mysql/ol/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim +ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OL_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 3217b720d..0df074b04 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/ubi9/ubi-minimal:9.5 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -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-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index e1506981a..ee8365e7c 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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 48933a8cc..06d0399eb 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile index 1ec25bbdd..f89e48548 100644 --- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim +ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OL_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 58ceeb7e8..ca29ceac7 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/ubi9/ubi-minimal:9.5 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -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/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index 052f28394..ab0ccf74b 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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 02fd8f98f..d8778a6e7 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile index d4ba35acc..010253338 100644 --- a/Dockerfiles/server-mysql/ol/Dockerfile +++ b/Dockerfiles/server-mysql/ol/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim +ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OL_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 fc1fe7a99..5e6a95242 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/ubi9/ubi-minimal:9.5 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -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-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 50687fc3c..9b58bcc15 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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 ad53220d9..a7ab3379a 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile index 0d3bb9cbd..700726d62 100644 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ b/Dockerfiles/server-pgsql/ol/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim +ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OL_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile index afcddf793..b099a0ef5 100644 --- a/Dockerfiles/server-pgsql/rhel/Dockerfile +++ b/Dockerfiles/server-pgsql/rhel/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -7,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${RHEL_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index 98baba1bf..606e144b2 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index dbcaf700a..a40dbaeac 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile index adb89fb3b..dd5443511 100644 --- a/Dockerfiles/snmptraps/ol/Dockerfile +++ b/Dockerfiles/snmptraps/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim -FROM ${OL_BASE_IMAGE} +ARG OS_BASE_IMAGE=oraclelinux:9-slim +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index e7cd0de14..85d0f6687 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/ubi9/ubi-minimal:9.5 -FROM ${RHEL_BASE_IMAGE} +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG RELEASE=8 diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 557429c3a..56b3ed76d 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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 0e673fca0..4b1f69bd2 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile index d91559e9d..9b4951b2c 100644 --- a/Dockerfiles/web-apache-mysql/ol/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ol/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim +ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OL_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 7589e9584..700034e2d 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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 09ec671ec..12695caeb 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile index 7aec4da58..194d91ada 100644 --- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim +ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OL_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 8b8a9c2ae..0ecce9af4 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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 ae3395a21..a5ba47d5a 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile index 973942b2b..bfb1473bf 100644 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim +ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OL_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 475033c9f..1fb13372e 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/ubi9/ubi-minimal:9.5 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -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-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index ee05c76fb..fb2937537 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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 891d17b7c..cacf8ab5e 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index 0b413771d..635b3822f 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim +ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OL_BASE_IMAGE} +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile index 3710bc878..9c328b934 100644 --- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -7,8 +7,8 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 -FROM ${RHEL_BASE_IMAGE} +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/web-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile index 7bf828043..10546ebc8 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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 8b8240f25..d6199fa21 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=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 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/ol/Dockerfile b/Dockerfiles/web-service/ol/Dockerfile index ce44b28af..712cffb3a 100644 --- a/Dockerfiles/web-service/ol/Dockerfile +++ b/Dockerfiles/web-service/ol/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -ARG OL_BASE_IMAGE=oraclelinux:9-slim +ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OL_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 5022686d8..ac5484aa9 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/ubi9/ubi-minimal:9.5 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -7,8 +7,8 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 -FROM ${RHEL_BASE_IMAGE} +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index 9f7de1465..084871a00 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 @@ -48,8 +48,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-server-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -57,6 +57,7 @@ services: - mysql-server - zabbix-build-mysql labels: + com.zabbix.description: "Zabbix server with MySQL database support" com.zabbix.os: "${ALPINE_OS_TAG}" zabbix-proxy-sqlite3: @@ -68,8 +69,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-proxy-sqlite3:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -87,8 +88,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-proxy-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -107,8 +108,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-web-apache-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -127,8 +128,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-web-nginx-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -147,8 +148,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-agent:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -166,8 +167,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-java-gateway:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -183,7 +184,7 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-snmptraps:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -199,8 +200,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 66f8dcdd3..0797023c8 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 @@ -62,6 +64,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: @@ -81,6 +84,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: @@ -99,6 +103,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: @@ -118,6 +123,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: @@ -137,6 +143,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: @@ -156,6 +163,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: @@ -174,6 +182,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: @@ -189,6 +198,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 @@ -204,6 +215,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 d8f1e9e59..f002e66a8 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 @@ -48,6 +48,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -68,6 +69,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -86,6 +88,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -105,6 +108,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -124,6 +128,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -143,6 +148,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -161,6 +167,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -176,6 +183,8 @@ services: context: ./Dockerfiles/snmptraps/${CENTOS_OS_TAG_SHORT} cache_from: - "${CENTOS_BASE_IMAGE}" + args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} image: zabbix-snmptraps:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -191,6 +200,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 47405d84b..92a3a6d1c 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 @@ -60,6 +62,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: @@ -68,6 +71,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: @@ -79,6 +83,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: @@ -97,6 +102,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: @@ -116,6 +122,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: @@ -135,6 +142,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: @@ -154,6 +162,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: @@ -172,6 +181,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: @@ -187,6 +197,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 @@ -202,6 +214,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 32133e179..f70a93bd7 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 @@ -46,6 +48,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: @@ -66,6 +69,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: @@ -84,6 +88,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: @@ -103,6 +108,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: @@ -122,6 +128,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: @@ -141,6 +148,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: @@ -159,6 +167,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: @@ -174,6 +183,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 @@ -189,6 +200,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 b0d708311..f47c62ecd 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 @@ -62,6 +64,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: @@ -81,6 +84,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: @@ -99,6 +103,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: @@ -118,6 +123,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: @@ -137,6 +143,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: @@ -156,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-agent:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -174,6 +182,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: @@ -189,6 +198,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 @@ -204,6 +215,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 b05ebdf8b..0dd4c8e57 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 @@ -46,6 +48,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: @@ -64,6 +67,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: @@ -80,6 +84,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: @@ -97,6 +102,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: @@ -114,6 +120,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: @@ -131,6 +138,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: @@ -147,6 +155,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: @@ -162,6 +171,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 @@ -177,6 +188,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 0bcc73bdb..dec383463 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: