From ac9cb5cdaaab29734db4003f5207f08909047ea2 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 | 25 +++++++++---------- docker-compose_v3_alpine_pgsql_local.yaml | 12 +++++++++ docker-compose_v3_centos_mysql_local.yaml | 14 ++++++++--- 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(+), 154 deletions(-) diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 837dbe91f..dd3dfd691 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 f2d045145..54c6674b8 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 89fc6cdda..ac1b184de 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 bb41585e2..6831c1740 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 4b1150b54..0938d54d6 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_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 ef75ee7f3..ea1e3cf73 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 a0370683b..b577d6eaf 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 522ad66bb..99ec59e3f 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 775046ac1..204a8f75c 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 ce00c2203..e76b088cc 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_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 e3bc32adf..155430d1e 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 5c2076612..3d9f1b474 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index 7cd8cbdba..00955e0b6 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 479026195..93e2a78b5 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.4 ARG RELEASE=0 diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index 6b9c87a44..064ab3fe3 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index d67c5bdae..c6221488c 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 a74d2706d..6ae78269e 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 5d5084b0f..40f0e7a5e 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 19efbfd7e..1634a7a93 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 5f194586e..e460b5b46 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_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 c2a87b3f5..2433257dd 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 5e6939ae6..3b074bb76 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 04ad923e1..8ffbc996d 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 c8e7b4157..629ba4f79 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 992901362..d917dd92c 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_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 b4bfd81d8..af401db72 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 b95f381eb..03885901a 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 124146b23..d7a556a05 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 26d87217f..c84c9199c 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 84264bf6d..6249e5967 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_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 416ad29a1..e75711153 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 99c6b2769..21b45146e 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 543533775..67412a34b 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 002ce0c78..d14242e79 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 78f5bc0af..a793d6a00 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_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 d297f3e53..3d95d4e25 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 46a575310..7765f2b5a 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 65ffb0fad..baf84f459 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 ea338312f..928ede8be 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 3bc688e96..66a10ff68 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_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 feab27d58..7ae10e149 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index 6543179c5..2f81e7d29 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile index 8ad401610..72d5ba4b1 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index 68ea00046..c13726a37 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.4 ARG RELEASE=0 diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index 8116b5aaa..74cde35df 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 024928f56..ae12dcbe3 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 7ee40b731..62901f4af 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 dbd14b8b7..7d4132489 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 b7313c182..902cb0ba7 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_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 a61bba528..269aa1243 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 564081e17..aae3e6b85 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 ed10ca6de..76423c102 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 2888b268b..70b0912d2 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_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 f6023862a..6f4ae5630 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 17c341926..a00fcf93e 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 f9f93cd9f..57f97a612 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 ede5e8f36..e48ffee23 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 b3e563c7e..9113f5841 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_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 7f2594dda..0e168fa74 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 5c73c7fe8..40566e543 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 cec370e5a..68cfafd8e 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 4b9a76c12..cd1fab47d 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 38dd20e43..9863859a2 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_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 5fdcaa639..627647e7a 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 528c72333..7f53d293f 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 12d9da6ce..4ae85a82d 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 cc382ab43..d6b1f94fb 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 fd8a3cd6b..1fd4078e7 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=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${UBUNTU_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 53e9ca9b0..975e317a2 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -2,12 +2,10 @@ services: zabbix-build-base: build: context: ./Dockerfiles/build-base/${ALPINE_OS_TAG_SHORT} - additional_contexts: - - config_templates=./config_templates/ - args: - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} cache_from: - "${ALPINE_BASE_IMAGE}" + args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} attach: false @@ -48,8 +46,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-server-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -57,6 +55,7 @@ services: - mysql-server - zabbix-build-mysql labels: + com.zabbix.description: "Zabbix server with MySQL database support" com.zabbix.os: "${ALPINE_OS_TAG}" zabbix-proxy-sqlite3: @@ -68,8 +67,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-proxy-sqlite3:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -87,8 +86,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-proxy-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -107,8 +106,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-web-apache-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -127,8 +126,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-web-nginx-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -147,8 +146,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-agent:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -166,8 +165,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-java-gateway:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -183,7 +182,7 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-snmptraps:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -199,8 +198,8 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} - ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-web-service:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 985d45760..770426ac8 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 @@ -59,6 +61,7 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-pgsql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -78,6 +81,7 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -96,6 +100,7 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -115,6 +120,7 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-pgsql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -134,6 +140,7 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-pgsql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -153,6 +160,7 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -171,6 +179,7 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -186,6 +195,8 @@ services: context: ./Dockerfiles/snmptraps/${ALPINE_OS_TAG_SHORT} cache_from: - "${ALPINE_BASE_IMAGE}" + args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-snmptraps:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-pgsql @@ -201,6 +212,7 @@ services: cache_from: - "${ALPINE_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-service:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index ab06610c1..b10dd6103 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -2,12 +2,10 @@ services: zabbix-build-base: build: context: ./Dockerfiles/build-base/${CENTOS_OS_TAG_SHORT} - additional_contexts: - - config_templates=./config_templates/ cache_from: - "${CENTOS_BASE_IMAGE}" args: - CENTOS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} image: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} attach: false @@ -48,6 +46,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -68,6 +67,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -86,6 +86,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -105,6 +106,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -124,6 +126,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -143,6 +146,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -161,6 +165,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -176,6 +181,8 @@ services: context: ./Dockerfiles/snmptraps/${CENTOS_OS_TAG_SHORT} cache_from: - "${CENTOS_BASE_IMAGE}" + args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} image: zabbix-snmptraps:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -191,6 +198,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-service:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index cfffed30a..207c47798 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 @@ -58,6 +60,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-pgsql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -66,6 +69,7 @@ services: - postgres-server - zabbix-build-pgsql labels: + com.zabbix.description: "Zabbix server with PostgreSQL database support" com.zabbix.os: "${CENTOS_OS_TAG}" zabbix-proxy-sqlite3: @@ -77,6 +81,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -95,6 +100,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -114,6 +120,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-pgsql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -133,6 +140,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-pgsql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -152,6 +160,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -170,6 +179,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -185,6 +195,8 @@ services: context: ./Dockerfiles/snmptraps/${CENTOS_OS_TAG_SHORT} cache_from: - "${CENTOS_BASE_IMAGE}" + args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} image: zabbix-snmptraps:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-pgsql @@ -200,6 +212,7 @@ services: cache_from: - "${CENTOS_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-service:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index 8f3f72b46..f218531f1 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 @@ -44,6 +46,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -64,6 +67,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -82,6 +86,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -101,6 +106,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -120,6 +126,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -139,6 +146,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -157,6 +165,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -172,6 +181,8 @@ services: context: ./Dockerfiles/snmptraps/${OL_OS_TAG_SHORT} cache_from: - "${OL_BASE_IMAGE}" + args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} image: zabbix-snmptraps:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -187,6 +198,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-service:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index de0387c0c..2da89befc 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 @@ -59,6 +61,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-pgsql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -78,6 +81,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -96,6 +100,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -115,6 +120,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-pgsql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -134,6 +140,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-pgsql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -153,6 +160,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: @@ -171,6 +179,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -186,6 +195,8 @@ services: context: ./Dockerfiles/snmptraps/${OL_OS_TAG_SHORT} cache_from: - "${OL_BASE_IMAGE}" + args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} image: zabbix-snmptraps:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-pgsql @@ -201,6 +212,7 @@ services: cache_from: - "${OL_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${OL_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-service:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 76711faef..742384dc8 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 @@ -44,6 +46,7 @@ services: cache_from: - "${UBUNTU_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -62,6 +65,7 @@ services: cache_from: - "${UBUNTU_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -78,6 +82,7 @@ services: cache_from: - "${UBUNTU_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -95,6 +100,7 @@ services: cache_from: - "${UBUNTU_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -112,6 +118,7 @@ services: cache_from: - "${UBUNTU_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -129,6 +136,7 @@ services: cache_from: - "${UBUNTU_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -145,6 +153,7 @@ services: cache_from: - "${UBUNTU_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -160,6 +169,8 @@ services: context: ./Dockerfiles/snmptraps/${UBUNTU_OS_TAG_SHORT} cache_from: - "${UBUNTU_BASE_IMAGE}" + args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} image: zabbix-snmptraps:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -175,6 +186,7 @@ services: cache_from: - "${UBUNTU_BASE_IMAGE}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-service:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index 9039e67bf..530917411 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 @@ -65,6 +67,7 @@ services: cache_from: - "${UBUNTU_CACHE_FROM}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-pgsql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -82,6 +85,7 @@ services: cache_from: - "${UBUNTU_CACHE_FROM}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -98,6 +102,7 @@ services: cache_from: - "${UBUNTU_CACHE_FROM}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -115,6 +120,7 @@ services: cache_from: - "${UBUNTU_CACHE_FROM}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-pgsql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -132,6 +138,7 @@ services: cache_from: - "${UBUNTU_CACHE_FROM}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-pgsql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -149,6 +156,7 @@ services: cache_from: - "${UBUNTU_CACHE_FROM}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -165,6 +173,7 @@ services: cache_from: - "${UBUNTU_CACHE_FROM}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: @@ -180,6 +189,8 @@ services: context: ./Dockerfiles/snmptraps/${UBUNTU_OS_TAG_SHORT} cache_from: - "${UBUNTU_CACHE_FROM}" + args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} image: zabbix-snmptraps:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-pgsql @@ -195,6 +206,7 @@ services: cache_from: - "${UBUNTU_CACHE_FROM}" args: + OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE} BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-service:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: