From 20e2c04775cb002b1f21bd77a94bc2cc279e3fe3 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/agent/ubuntu/Dockerfile | 4 ++-- Dockerfiles/agent2/alpine/Dockerfile | 4 ++-- Dockerfiles/agent2/centos/Dockerfile | 4 ++-- Dockerfiles/agent2/ol/Dockerfile | 4 ++-- Dockerfiles/agent2/rhel/Dockerfile | 4 ++-- Dockerfiles/agent2/ubuntu/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/build-base/ubuntu/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/java-gateway/ubuntu/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-mysql/ubuntu/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/proxy-sqlite3/ubuntu/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-mysql/ubuntu/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/server-pgsql/ubuntu/Dockerfile | 4 ++-- Dockerfiles/snmptraps/alpine/Dockerfile | 4 ++-- Dockerfiles/snmptraps/centos/Dockerfile | 4 ++-- Dockerfiles/snmptraps/ol/Dockerfile | 4 ++-- Dockerfiles/snmptraps/rhel/Dockerfile | 4 ++-- Dockerfiles/snmptraps/ubuntu/Dockerfile | 4 ++-- .../web-apache-mysql/alpine/Dockerfile | 4 ++-- .../web-apache-mysql/centos/Dockerfile | 4 ++-- Dockerfiles/web-apache-mysql/ol/Dockerfile | 4 ++-- .../web-apache-mysql/ubuntu/Dockerfile | 4 ++-- .../web-apache-pgsql/alpine/Dockerfile | 4 ++-- .../web-apache-pgsql/centos/Dockerfile | 4 ++-- Dockerfiles/web-apache-pgsql/ol/Dockerfile | 4 ++-- .../web-apache-pgsql/ubuntu/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-mysql/ubuntu/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-nginx-pgsql/ubuntu/Dockerfile | 4 ++-- Dockerfiles/web-service/alpine/Dockerfile | 4 ++-- Dockerfiles/web-service/centos/Dockerfile | 4 ++-- Dockerfiles/web-service/ol/Dockerfile | 4 ++-- Dockerfiles/web-service/rhel/Dockerfile | 6 ++--- Dockerfiles/web-service/ubuntu/Dockerfile | 4 ++-- 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 ++++++++++ 76 files changed, 234 insertions(+), 150 deletions(-) diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 5626aa64e..1a7afddb9 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 865d9b703..a25ab0ce4 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 e4aea9b45..b765ea0c3 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 44cdef085..6bcc15ab7 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 aac274476..4c12476a4 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 d52bf50f2..5893ecac7 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 f06dfdcb4..1244cf24e 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 c626eb9da..976376f16 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 8d48da7e9..2aaeff2e0 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 6f5201268..d52688224 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 fb5624311..c895e46eb 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 92ad331dd..7a5d07b35 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index a488c3a14..76d76c58a 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 23d3edab2..bca7ead6c 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=6.4 ARG RELEASE=20 diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index 62f7fba79..3090f6801 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index a1b1bbdb8..e3c7b8542 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 5c0511c1c..17eadccee 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 9e46809b1..39b2ef380 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 13e814a41..1d0cc595e 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 15f4fad7d..58a324447 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 b769802e8..22e6dbc2a 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 26e7e410a..d497e5d74 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 2ef3d0312..286484e6e 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 05b2e1e81..29160fe7f 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 b037434b3..36e8d6ee5 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 88477d494..3dae3c71e 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 eed188773..39e41d03e 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 ddb6dca65..1dc62110a 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 a2fbdc8f9..6d6d5cf74 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 816e76cc1..ee1ef35ee 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 e54917dc6..d9a04935d 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 0c1676cec..b1b242642 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 9d41f4b20..257b6f8a1 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 0f94a6ccc..4bcdd8732 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 30c0abd68..77528cabd 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 50767f650..931c9be7a 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 12b4f9f4a..d066ffaed 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 24093c158..957e74b79 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 5dceb69b6..3f5df46f2 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 67401e4ff..0cc8c5ec2 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 3a2f6cf55..d5b303bc1 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index c378bebca..450926b4f 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile index 7625a34d3..f3dcb3a68 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index 44a3615d2..4d605f762 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=6.4 ARG RELEASE=20 diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index 5bdd75e56..bb07f0f0f 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 2c9a7479d..6df21fbb8 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 9d4fa1619..2ec1317c8 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 c3901ffef..2314d7b07 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile index a35bd0e06..a0969cfbe 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 af17f9cc8..6f10f126c 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 f92c73139..a2e56ba48 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 390d86523..f21d58d9f 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile index 4ce6c90e7..c59ed63a3 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 1f6a73165..0f4e24c06 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 3aaef52fc..3634970ae 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 5fa13da89..2ee5bd683 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 59241d37c..7dec1fd40 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 5fd8afb30..06ad9a13b 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 d871fde36..9aa6c4187 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 7debe75c9..e1180d0ce 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 a243a317d..adf06d986 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 0a1fc1fb6..5bba04761 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index 746fe21d5..74eeb3ccb 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 818abc86a..4a23fabcd 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 2cd698c5b..776e798d0 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 3e93af903..5ada2c857 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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 0eec8d616..8927020b2 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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/Dockerfiles/web-service/ubuntu/Dockerfile b/Dockerfiles/web-service/ubuntu/Dockerfile index 646982844..0ad1c8fcb 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 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: