diff --git a/.env b/.env index 3d7661b27..c26d4536d 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 9fc389f23..c56cd0d1c 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 afe8f14de..5034c2e4e 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 e6c60af3f..fedef1047 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 e94a3d0d1..5000743a7 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.2 ARG RELEASE=2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 @@ -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 b37b369cd..75e69474d 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 d185d6a91..b1dbf5ba4 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 d6ab23de1..52c0b05d5 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 29770821d..7927278b1 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 3bd425c71..de3942613 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 68b4df694..e762f8a78 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.2 ARG RELEASE=2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 @@ -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 049394af0..ce8aedf26 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 9426ca85e..cc677765b 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 f867c416b..0cee02340 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 40724a43a..a2ca2e67f 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index ab85ea067..8c5c442b1 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 2ef2cf0a6..b0c5544ad 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.2 ARG RELEASE=2 @@ -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 e4b760a93..79bad2170 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index c5b526780..d5fcea4fe 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 a4d5af4f1..0c58b84bc 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 2c94c3bdd..cc5329226 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 57b58d132..2d2ab8bf3 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.2 ARG RELEASE=2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 @@ -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 15377d8e2..75db41137 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 71400a177..d7aa49392 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 ca43dbf8c..847103deb 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 a5e4bdcfd..505113ee0 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 0fd097e97..8d346297c 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.2 ARG RELEASE=2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 @@ -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 4fe50612d..418c57f9d 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 d0127f3ee..cdbccc63d 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 502032953..992d8a87f 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 c7843dc36..f6b2bc8ef 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 6ddda09dd..2ffc9dcdf 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.2 ARG RELEASE=2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 @@ -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 e0155bae8..4a94c2dfd 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 d83c07d3d..6fd2053cb 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 c73c0bdfa..76eb38847 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 0dc0dff0d..e1bf70265 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 d3311571a..f99fea270 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.2 ARG RELEASE=2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 @@ -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 4064c4736..bb0956f54 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 df75f4594..8fb806fdd 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 3da68c11d..267d1f93e 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 b61c63ac6..81d00f905 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 6276e9648..9e255b916 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.2 ARG RELEASE=2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 @@ -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 5a9c6a366..45f39e4a3 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 0ef65ac27..98a910af8 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index 1e7047c20..350a5e39c 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile index 365c1a9d2..8e8f9083f 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index c1186cca0..a41e21075 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.2 ARG RELEASE=2 diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index c7a011270..f9785030a 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index fdb7b5e60..5bef62df9 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 2521bea43..e870df713 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 ef7a95dbb..266216a4b 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 a37912c2b..82537bcef 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 a34194b88..39635680e 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 6ae2252db..b2a0e3b1f 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 3dd8ee783..43d82ec74 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 230d0052d..26c3ac92c 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 87dc547b0..4ca9a25d0 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 1660ee8fd..b70c9a3f7 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 9f672453b..83aa5ef29 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 854b6d867..d89f0f8a5 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.2 ARG RELEASE=2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 @@ -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 ed9181f67..d5df8081a 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 6248ccb30..728b06b41 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 91861404f..dde617786 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 7383648db..3b183c7cc 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 4fd18f676..6f3b037d1 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.2 ARG RELEASE=2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 @@ -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 48ecf02de..d19d601fa 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 44f0e35b6..d3944508a 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 d277af3f8..adc42e22b 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 831c5518e..292edc0a1 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 dde737fc5..66dec14b8 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.2 ARG RELEASE=2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 @@ -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 a00f9c6ec..cdf855003 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.2 ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 4eb041fa4..53e9ca9b0 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -4,8 +4,10 @@ services: context: ./Dockerfiles/build-base/${ALPINE_OS_TAG_SHORT} additional_contexts: - config_templates=./config_templates/ + 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 @@ -15,8 +17,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${ALPINE_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -30,8 +30,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${ALPINE_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -48,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 @@ -67,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 @@ -85,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 @@ -104,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 @@ -123,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 @@ -142,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 @@ -160,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 @@ -176,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 @@ -190,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 0937fdb6f..985d45760 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 @@ -13,8 +13,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${ALPINE_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -28,8 +26,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${ALPINE_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -45,8 +41,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${ALPINE_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -63,7 +57,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} @@ -82,7 +76,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} @@ -100,7 +94,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} @@ -119,7 +113,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} @@ -138,7 +132,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} @@ -157,7 +151,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} @@ -175,7 +169,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} @@ -191,7 +185,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 @@ -205,7 +199,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 4ea53e0f0..ab06610c1 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -5,7 +5,9 @@ services: additional_contexts: - config_templates=./config_templates/ 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 @@ -15,8 +17,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${CENTOS_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -30,8 +30,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${CENTOS_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -48,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} @@ -68,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} @@ -86,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} @@ -105,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} @@ -124,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} @@ -143,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} @@ -161,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} @@ -177,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 @@ -191,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 a37b61168..cfffed30a 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 @@ -13,8 +13,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${CENTOS_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -28,8 +26,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${CENTOS_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -44,8 +40,6 @@ services: context: ./Dockerfiles/build-sqlite3/${CENTOS_OS_TAG_SHORT} additional_contexts: - config_templates=./config_templates/ - cache_from: - - "${CENTOS_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -62,7 +56,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} @@ -81,7 +75,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} @@ -99,7 +93,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} @@ -118,7 +112,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} @@ -137,7 +131,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} @@ -156,7 +150,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} @@ -174,7 +168,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} @@ -190,7 +184,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 @@ -204,7 +198,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 fe83db5d2..8f3f72b46 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 @@ -13,8 +13,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${OL_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -28,8 +26,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${OL_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -46,7 +42,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} @@ -66,7 +62,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} @@ -84,7 +80,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} @@ -103,7 +99,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} @@ -122,7 +118,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} @@ -141,7 +137,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} @@ -159,7 +155,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} @@ -175,7 +171,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 @@ -189,7 +185,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 8f0425439..de0387c0c 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 @@ -13,8 +13,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${OL_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -28,8 +26,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${OL_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -45,8 +41,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${OL_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -63,7 +57,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} @@ -82,7 +76,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} @@ -100,7 +94,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} @@ -119,7 +113,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} @@ -138,7 +132,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} @@ -157,7 +151,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} @@ -175,7 +169,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} @@ -191,7 +185,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 @@ -205,7 +199,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 e1fc58ad4..76711faef 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 @@ -13,8 +13,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${UBUNTU_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -28,8 +26,6 @@ services: additional_contexts: - sources=./sources/ - config_templates=./config_templates/ - cache_from: - - "${UBUNTU_CACHE_FROM}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -46,7 +42,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} @@ -64,7 +60,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} @@ -80,7 +76,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} @@ -97,7 +93,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} @@ -114,7 +110,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} @@ -131,7 +127,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} @@ -147,7 +143,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} @@ -163,7 +159,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 @@ -177,7 +173,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}