From 7bf59247087ff8631807ea70f074214d0232dc83 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 6 Jan 2025 17:24:57 +0900 Subject: [PATCH] Updated env variables for building process --- .env | 10 +++--- Dockerfiles/agent/alpine/Dockerfile | 3 +- Dockerfiles/agent/centos/Dockerfile | 3 +- Dockerfiles/agent/ol/Dockerfile | 3 +- Dockerfiles/agent/rhel/Dockerfile | 3 +- Dockerfiles/agent/ubuntu/Dockerfile | 3 +- Dockerfiles/agent/windows/Dockerfile | 2 +- Dockerfiles/agent2/alpine/Dockerfile | 3 +- Dockerfiles/agent2/centos/Dockerfile | 3 +- Dockerfiles/agent2/ol/Dockerfile | 3 +- Dockerfiles/agent2/rhel/Dockerfile | 3 +- Dockerfiles/agent2/ubuntu/Dockerfile | 3 +- Dockerfiles/agent2/windows/Dockerfile | 2 +- Dockerfiles/build-base/alpine/Dockerfile | 3 +- Dockerfiles/build-base/centos/Dockerfile | 3 +- Dockerfiles/build-base/ol/Dockerfile | 3 +- Dockerfiles/build-base/rhel/Dockerfile | 6 ++-- Dockerfiles/build-base/ubuntu/Dockerfile | 3 +- Dockerfiles/java-gateway/alpine/Dockerfile | 3 +- Dockerfiles/java-gateway/centos/Dockerfile | 3 +- Dockerfiles/java-gateway/ol/Dockerfile | 3 +- Dockerfiles/java-gateway/rhel/Dockerfile | 3 +- Dockerfiles/java-gateway/ubuntu/Dockerfile | 3 +- Dockerfiles/proxy-mysql/alpine/Dockerfile | 3 +- Dockerfiles/proxy-mysql/centos/Dockerfile | 3 +- Dockerfiles/proxy-mysql/ol/Dockerfile | 3 +- Dockerfiles/proxy-mysql/rhel/Dockerfile | 3 +- Dockerfiles/proxy-mysql/ubuntu/Dockerfile | 3 +- Dockerfiles/proxy-sqlite3/alpine/Dockerfile | 3 +- Dockerfiles/proxy-sqlite3/centos/Dockerfile | 3 +- Dockerfiles/proxy-sqlite3/ol/Dockerfile | 3 +- Dockerfiles/proxy-sqlite3/rhel/Dockerfile | 3 +- Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile | 3 +- Dockerfiles/server-mysql/alpine/Dockerfile | 3 +- Dockerfiles/server-mysql/centos/Dockerfile | 3 +- Dockerfiles/server-mysql/ol/Dockerfile | 3 +- Dockerfiles/server-mysql/rhel/Dockerfile | 3 +- Dockerfiles/server-mysql/ubuntu/Dockerfile | 3 +- Dockerfiles/server-pgsql/alpine/Dockerfile | 3 +- Dockerfiles/server-pgsql/centos/Dockerfile | 3 +- Dockerfiles/server-pgsql/ol/Dockerfile | 3 +- Dockerfiles/server-pgsql/rhel/Dockerfile | 3 +- Dockerfiles/server-pgsql/ubuntu/Dockerfile | 3 +- 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 | 3 +- .../web-apache-mysql/centos/Dockerfile | 3 +- Dockerfiles/web-apache-mysql/ol/Dockerfile | 3 +- .../web-apache-mysql/ubuntu/Dockerfile | 3 +- .../web-apache-pgsql/alpine/Dockerfile | 3 +- .../web-apache-pgsql/centos/Dockerfile | 3 +- Dockerfiles/web-apache-pgsql/ol/Dockerfile | 3 +- .../web-apache-pgsql/ubuntu/Dockerfile | 3 +- Dockerfiles/web-nginx-mysql/alpine/Dockerfile | 3 +- Dockerfiles/web-nginx-mysql/centos/Dockerfile | 3 +- Dockerfiles/web-nginx-mysql/ol/Dockerfile | 3 +- Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 3 +- Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile | 3 +- Dockerfiles/web-nginx-pgsql/alpine/Dockerfile | 3 +- Dockerfiles/web-nginx-pgsql/centos/Dockerfile | 3 +- Dockerfiles/web-nginx-pgsql/ol/Dockerfile | 3 +- Dockerfiles/web-nginx-pgsql/rhel/Dockerfile | 4 ++- Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile | 3 +- Dockerfiles/web-service/alpine/Dockerfile | 3 +- Dockerfiles/web-service/centos/Dockerfile | 3 +- Dockerfiles/web-service/ol/Dockerfile | 3 +- Dockerfiles/web-service/rhel/Dockerfile | 4 ++- Dockerfiles/web-service/ubuntu/Dockerfile | 3 +- docker-compose_v3_alpine_mysql_local.yaml | 32 +++++++++++++------ docker-compose_v3_alpine_pgsql_local.yaml | 20 ++++++------ docker-compose_v3_centos_mysql_local.yaml | 22 +++++++------ docker-compose_v3_centos_pgsql_local.yaml | 20 ++++++------ docker-compose_v3_ol_mysql_local.yaml | 20 ++++++------ docker-compose_v3_ol_pgsql_local.yaml | 20 ++++++------ docker-compose_v3_ubuntu_mysql_local.yaml | 20 ++++++------ 78 files changed, 236 insertions(+), 146 deletions(-) diff --git a/.env b/.env index 7b374880c..06322f8f9 100644 --- a/.env +++ b/.env @@ -78,11 +78,11 @@ ENV_VARS_DIRECTORY=./env_vars RESTART_POLICY=unless-stopped # Cache base images -ALPINE_CACHE_FROM=alpine:3.21 -CENTOS_CACHE_FROM=quay.io/centos/centos:stream9-minimal -OL_CACHE_FROM=oraclelinux:9-slim -UBUNTU_CACHE_FROM=ubuntu:noble -RHEL_CACHE_FROM=registry.access.redhat.com/ubi9/ubi-minimal:9.5 +ALPINE_BASE_IMAGE=alpine:3.21 +CENTOS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal +OL_BASE_IMAGE=oraclelinux:9-slim +UBUNTU_BASE_IMAGE=ubuntu:noble +RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 # Base images BUILD_BASE_IMAGE=zabbix-build-base diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index ca4d1b9d9..a5abdd896 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/Dockerfiles/agent/alpine/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG ALPINE_BASE_IMAGE=alpine:3.21 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine:3.21 +FROM ${ALPINE_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile index 0b9aaaa97..ab0a7f93c 100644 --- a/Dockerfiles/agent/centos/Dockerfile +++ b/Dockerfiles/agent/centos/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile index c12890f79..33f98a134 100644 --- a/Dockerfiles/agent/ol/Dockerfile +++ b/Dockerfiles/agent/ol/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG OL_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index 41c194752..290048fda 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -6,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile index 89f92c0a2..b379569fb 100644 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ b/Dockerfiles/agent/ubuntu/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG UBUNTU_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent/windows/Dockerfile b/Dockerfiles/agent/windows/Dockerfile index 9734eb9c7..23b27f1ed 100644 --- a/Dockerfiles/agent/windows/Dockerfile +++ b/Dockerfiles/agent/windows/Dockerfile @@ -8,7 +8,7 @@ ARG BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022 FROM ${BUILD_BASE_IMAGE} AS builder -FROM $BASE_IMAGE +FROM ${BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index bb31481a6..ab6c46ecb 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/Dockerfiles/agent2/alpine/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG ALPINE_BASE_IMAGE=alpine:3.21 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine:3.21 +FROM ${ALPINE_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile index 75103a4ba..1f672c0bb 100644 --- a/Dockerfiles/agent2/centos/Dockerfile +++ b/Dockerfiles/agent2/centos/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/ol/Dockerfile b/Dockerfiles/agent2/ol/Dockerfile index 622f2c5ad..ebb7a0622 100644 --- a/Dockerfiles/agent2/ol/Dockerfile +++ b/Dockerfiles/agent2/ol/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG OL_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index f26833868..68c195635 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -6,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile index 183356190..54eec0ea0 100644 --- a/Dockerfiles/agent2/ubuntu/Dockerfile +++ b/Dockerfiles/agent2/ubuntu/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG UBUNTU_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/windows/Dockerfile b/Dockerfiles/agent2/windows/Dockerfile index 68e79ad86..99df5580d 100644 --- a/Dockerfiles/agent2/windows/Dockerfile +++ b/Dockerfiles/agent2/windows/Dockerfile @@ -8,7 +8,7 @@ ARG BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022 FROM ${BUILD_BASE_IMAGE} AS builder -FROM $BASE_IMAGE +FROM ${BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index c787d4840..14df3f5ec 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -1,5 +1,6 @@ # syntax=docker/dockerfile:1 -FROM alpine:3.21 +ARG ALPINE_BASE_IMAGE=alpine:3.21 +FROM ${ALPINE_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 9a2d6f071..971843bec 100644 --- a/Dockerfiles/build-base/centos/Dockerfile +++ b/Dockerfiles/build-base/centos/Dockerfile @@ -1,5 +1,6 @@ # syntax=docker/dockerfile:1 -FROM quay.io/centos/centos:stream9-minimal +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index b94c3d857..82787ddc2 100644 --- a/Dockerfiles/build-base/ol/Dockerfile +++ b/Dockerfiles/build-base/ol/Dockerfile @@ -1,5 +1,6 @@ # syntax=docker/dockerfile:1 -FROM oraclelinux:9-slim +ARG OL_BASE_IMAGE=oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 2a6785893..af1ce26af 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -1,5 +1,7 @@ # syntax=docker/dockerfile:1 -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 +#ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 +ARG RHEL_BASE_IMAGE=registry.redhat.io/ubi10-beta/ubi-minimal +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG RELEASE=8 @@ -32,7 +34,7 @@ COPY ["licenses", "/licenses"] RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ - --mount=type=bind,target=/run/secrets/,src=secrets/ \ +# --mount=type=bind,target=/run/secrets/,src=secrets/ \ set -eux && \ INSTALL_PKGS="autoconf \ automake \ diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index 9e38b738d..bce290c9a 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -1,5 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ubuntu:noble +ARG UBUNTU_BASE_IMAGE=ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index 172ebe6a4..181f6ceb0 100644 --- a/Dockerfiles/java-gateway/alpine/Dockerfile +++ b/Dockerfiles/java-gateway/alpine/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG ALPINE_BASE_IMAGE=alpine:3.21 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine:3.21 +FROM ${ALPINE_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/java-gateway/centos/Dockerfile b/Dockerfiles/java-gateway/centos/Dockerfile index 2cefabb96..fbf8fa23e 100644 --- a/Dockerfiles/java-gateway/centos/Dockerfile +++ b/Dockerfiles/java-gateway/centos/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/java-gateway/ol/Dockerfile b/Dockerfiles/java-gateway/ol/Dockerfile index 38579e1a4..4a3075d75 100644 --- a/Dockerfiles/java-gateway/ol/Dockerfile +++ b/Dockerfiles/java-gateway/ol/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG OL_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile index 64a74af48..ef3d91730 100644 --- a/Dockerfiles/java-gateway/rhel/Dockerfile +++ b/Dockerfiles/java-gateway/rhel/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -6,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile index 597a7ce92..1426055c2 100644 --- a/Dockerfiles/java-gateway/ubuntu/Dockerfile +++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG UBUNTU_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index fd0da2ba8..9f35f7c07 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG ALPINE_BASE_IMAGE=alpine:3.21 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine:3.21 +FROM ${ALPINE_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile index 53dc08e4d..2e49f1d25 100644 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ b/Dockerfiles/proxy-mysql/centos/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile index e866e1b22..c7dbd6547 100644 --- a/Dockerfiles/proxy-mysql/ol/Dockerfile +++ b/Dockerfiles/proxy-mysql/ol/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG OL_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index 31175be98..3217b720d 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -6,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index d61d15b00..be5fa1497 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG UBUNTU_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 4eec1f382..e1506981a 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG ALPINE_BASE_IMAGE=alpine:3.21 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine:3.21 +FROM ${ALPINE_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile index 6afbd473d..48933a8cc 100644 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile index 8d6c85176..1ec25bbdd 100644 --- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG OL_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index 24db3a114..58ceeb7e8 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -6,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index 2cebad0d7..08391e115 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG UBUNTU_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index 242eca587..052f28394 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG ALPINE_BASE_IMAGE=alpine:3.21 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine:3.21 +FROM ${ALPINE_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index 7e04fd75b..02fd8f98f 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/Dockerfiles/server-mysql/centos/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile index af578cd5f..d4ba35acc 100644 --- a/Dockerfiles/server-mysql/ol/Dockerfile +++ b/Dockerfiles/server-mysql/ol/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG OL_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index 1ba652ae4..fc1fe7a99 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -6,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index 5a21d7534..654aa987c 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG UBUNTU_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 20f6f5e0e..50687fc3c 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG ALPINE_BASE_IMAGE=alpine:3.21 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine:3.21 +FROM ${ALPINE_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index 9e00cc957..ad53220d9 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile index 741bc6f4b..0d3bb9cbd 100644 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ b/Dockerfiles/server-pgsql/ol/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG OL_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile index f29f9251a..afcddf793 100644 --- a/Dockerfiles/server-pgsql/rhel/Dockerfile +++ b/Dockerfiles/server-pgsql/rhel/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -6,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 3986ffb6c..d09d711f7 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG UBUNTU_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index 1a7f2b7a7..98baba1bf 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,4 +1,6 @@ -FROM alpine:3.21 +# syntax=docker/dockerfile:1 +ARG ALPINE_BASE_IMAGE=alpine:3.21 +FROM ${ALPINE_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index b2042073a..dbcaf700a 100644 --- a/Dockerfiles/snmptraps/centos/Dockerfile +++ b/Dockerfiles/snmptraps/centos/Dockerfile @@ -1,4 +1,6 @@ -FROM quay.io/centos/centos:stream9-minimal +# syntax=docker/dockerfile:1 +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile index c25607767..adb89fb3b 100644 --- a/Dockerfiles/snmptraps/ol/Dockerfile +++ b/Dockerfiles/snmptraps/ol/Dockerfile @@ -1,4 +1,6 @@ -FROM oraclelinux:9-slim +# syntax=docker/dockerfile:1 +ARG OL_BASE_IMAGE=oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index b0b547a6e..e7cd0de14 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -1,4 +1,6 @@ -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 +# syntax=docker/dockerfile:1 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG RELEASE=8 diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index 9b49e1479..7f0832b5e 100644 --- a/Dockerfiles/snmptraps/ubuntu/Dockerfile +++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile @@ -1,4 +1,6 @@ -FROM ubuntu:noble +# syntax=docker/dockerfile:1 +ARG UBUNTU_BASE_IMAGE=ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 2ad0af2c4..557429c3a 100644 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-mysql/alpine/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG ALPINE_BASE_IMAGE=alpine:3.21 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine:3.21 +FROM ${ALPINE_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 56b6060e2..0e673fca0 100644 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile index d029565a0..d91559e9d 100644 --- a/Dockerfiles/web-apache-mysql/ol/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ol/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG OL_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile index af4a3337b..972562eeb 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG UBUNTU_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index e492fe702..7589e9584 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG ALPINE_BASE_IMAGE=alpine:3.21 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine:3.21 +FROM ${ALPINE_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 48b5af5a9..09ec671ec 100644 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile index 8fd9469db..7aec4da58 100644 --- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG OL_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile index c0088fc69..7c164c742 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG UBUNTU_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index aa22de0cd..8b8a9c2ae 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG ALPINE_BASE_IMAGE=alpine:3.21 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine:3.21 +FROM ${ALPINE_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 ba7e6996f..ae3395a21 100644 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile index 4f2493776..973942b2b 100644 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG OL_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index 1bc658a67..475033c9f 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -6,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile index ba4c3aeed..d872625fd 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG UBUNTU_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index 2d7c16b4b..ee05c76fb 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG ALPINE_BASE_IMAGE=alpine:3.21 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine:3.21 +FROM ${ALPINE_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 fa698f214..891d17b7c 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index b2789035c..0b413771d 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG OL_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile index ab57d1b01..3710bc878 100644 --- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -6,7 +7,8 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index d9e64ec47..c17ebfcb4 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG UBUNTU_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile index 2e2665309..7bf828043 100644 --- a/Dockerfiles/web-service/alpine/Dockerfile +++ b/Dockerfiles/web-service/alpine/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG ALPINE_BASE_IMAGE=alpine:3.21 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine:3.21 +FROM ${ALPINE_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-service/centos/Dockerfile b/Dockerfiles/web-service/centos/Dockerfile index 249b55b57..8b8240f25 100644 --- a/Dockerfiles/web-service/centos/Dockerfile +++ b/Dockerfiles/web-service/centos/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM quay.io/centos/centos:stream9-minimal +FROM ${CENTOS_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-service/ol/Dockerfile b/Dockerfiles/web-service/ol/Dockerfile index 03cdc02e4..ce44b28af 100644 --- a/Dockerfiles/web-service/ol/Dockerfile +++ b/Dockerfiles/web-service/ol/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG OL_BASE_IMAGE=oraclelinux:9-slim ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM oraclelinux:9-slim +FROM ${OL_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile index f7268d80a..5022686d8 100644 --- a/Dockerfiles/web-service/rhel/Dockerfile +++ b/Dockerfiles/web-service/rhel/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 ARG RELEASE=8 ARG ZBX_VERSION=${MAJOR_VERSION}.8 @@ -6,7 +7,8 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/web-service/ubuntu/Dockerfile b/Dockerfiles/web-service/ubuntu/Dockerfile index 1f4fcd90b..962abebf9 100644 --- a/Dockerfiles/web-service/ubuntu/Dockerfile +++ b/Dockerfiles/web-service/ubuntu/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +ARG UBUNTU_BASE_IMAGE=ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION}.8 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index e44cae7a4..9f7de1465 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -2,8 +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_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} attach: false @@ -44,9 +46,10 @@ services: build: context: ./Dockerfiles/server-mysql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-server-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -63,9 +66,10 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-proxy-sqlite3:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -81,9 +85,10 @@ services: build: context: ./Dockerfiles/proxy-mysql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-proxy-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -100,9 +105,10 @@ services: build: context: ./Dockerfiles/web-apache-mysql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-web-apache-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -119,9 +125,10 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-web-nginx-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -138,9 +145,10 @@ services: build: context: ./Dockerfiles/agent/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-agent:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -156,9 +164,10 @@ services: build: context: ./Dockerfiles/java-gateway/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-java-gateway:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -172,7 +181,9 @@ services: build: context: ./Dockerfiles/snmptraps/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" + args: + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-snmptraps:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -186,9 +197,10 @@ services: build: context: ./Dockerfiles/web-service/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-web-service:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index da0d92f86..66f8dcdd3 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -3,7 +3,7 @@ services: build: context: ./Dockerfiles/build-base/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} attach: false @@ -60,7 +60,7 @@ services: build: context: ./Dockerfiles/server-pgsql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-pgsql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -79,7 +79,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -97,7 +97,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -116,7 +116,7 @@ services: build: context: ./Dockerfiles/web-apache-pgsql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-pgsql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -135,7 +135,7 @@ services: build: context: ./Dockerfiles/web-nginx-pgsql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-pgsql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -154,7 +154,7 @@ services: build: context: ./Dockerfiles/agent/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -172,7 +172,7 @@ services: build: context: ./Dockerfiles/java-gateway/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -188,7 +188,7 @@ services: build: context: ./Dockerfiles/snmptraps/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" image: zabbix-snmptraps:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-pgsql @@ -202,7 +202,7 @@ services: build: context: ./Dockerfiles/web-service/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-service:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index fdf426a0b..d8f1e9e59 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -3,7 +3,9 @@ services: build: context: ./Dockerfiles/build-base/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" + args: + CENTOS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} image: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} attach: false @@ -44,7 +46,7 @@ services: build: context: ./Dockerfiles/server-mysql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -64,7 +66,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -82,7 +84,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -101,7 +103,7 @@ services: build: context: ./Dockerfiles/web-apache-mysql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -120,7 +122,7 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -139,7 +141,7 @@ services: build: context: ./Dockerfiles/agent/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -157,7 +159,7 @@ services: build: context: ./Dockerfiles/java-gateway/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -173,7 +175,7 @@ services: build: context: ./Dockerfiles/snmptraps/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" image: zabbix-snmptraps:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -187,7 +189,7 @@ services: build: context: ./Dockerfiles/web-service/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-service:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index 3a48e1a60..47405d84b 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -3,7 +3,7 @@ services: build: context: ./Dockerfiles/build-base/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} attach: false @@ -58,7 +58,7 @@ services: build: context: ./Dockerfiles/server-pgsql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-pgsql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -77,7 +77,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -95,7 +95,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -114,7 +114,7 @@ services: build: context: ./Dockerfiles/web-apache-pgsql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-pgsql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -133,7 +133,7 @@ services: build: context: ./Dockerfiles/web-nginx-pgsql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-pgsql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -152,7 +152,7 @@ services: build: context: ./Dockerfiles/agent/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -170,7 +170,7 @@ services: build: context: ./Dockerfiles/java-gateway/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -186,7 +186,7 @@ services: build: context: ./Dockerfiles/snmptraps/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" image: zabbix-snmptraps:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-pgsql @@ -200,7 +200,7 @@ services: build: context: ./Dockerfiles/web-service/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-service:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index 8465cf78b..32133e179 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/docker-compose_v3_ol_mysql_local.yaml @@ -3,7 +3,7 @@ services: build: context: ./Dockerfiles/build-base/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} attach: false @@ -44,7 +44,7 @@ services: build: context: ./Dockerfiles/server-mysql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -64,7 +64,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -82,7 +82,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -101,7 +101,7 @@ services: build: context: ./Dockerfiles/web-apache-mysql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -120,7 +120,7 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -139,7 +139,7 @@ services: build: context: ./Dockerfiles/agent/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -157,7 +157,7 @@ services: build: context: ./Dockerfiles/java-gateway/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -173,7 +173,7 @@ services: build: context: ./Dockerfiles/snmptraps/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" image: zabbix-snmptraps:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -187,7 +187,7 @@ services: build: context: ./Dockerfiles/web-service/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-service:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index c43cc9116..b0d708311 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/docker-compose_v3_ol_pgsql_local.yaml @@ -3,7 +3,7 @@ services: build: context: ./Dockerfiles/build-base/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} attach: false @@ -60,7 +60,7 @@ services: build: context: ./Dockerfiles/server-pgsql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-pgsql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -79,7 +79,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -97,7 +97,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -116,7 +116,7 @@ services: build: context: ./Dockerfiles/web-apache-pgsql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-pgsql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -135,7 +135,7 @@ services: build: context: ./Dockerfiles/web-nginx-pgsql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-pgsql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -154,7 +154,7 @@ services: build: context: ./Dockerfiles/agent/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -172,7 +172,7 @@ services: build: context: ./Dockerfiles/java-gateway/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -188,7 +188,7 @@ services: build: context: ./Dockerfiles/snmptraps/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" image: zabbix-snmptraps:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-pgsql @@ -202,7 +202,7 @@ services: build: context: ./Dockerfiles/web-service/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-service:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index c80a26a30..b05ebdf8b 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -3,7 +3,7 @@ services: build: context: ./Dockerfiles/build-base/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} attach: false @@ -44,7 +44,7 @@ services: build: context: ./Dockerfiles/server-mysql/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -62,7 +62,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -78,7 +78,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -95,7 +95,7 @@ services: build: context: ./Dockerfiles/web-apache-mysql/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -112,7 +112,7 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -129,7 +129,7 @@ services: build: context: ./Dockerfiles/agent/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -145,7 +145,7 @@ services: build: context: ./Dockerfiles/java-gateway/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -161,7 +161,7 @@ services: build: context: ./Dockerfiles/snmptraps/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" image: zabbix-snmptraps:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -175,7 +175,7 @@ services: build: context: ./Dockerfiles/web-service/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-service:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}