From aae532547e5487bf3b6db46fb588b81f361dba00 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 | 36 +++++++++++-------- docker-compose_v3_alpine_pgsql_local.yaml | 26 ++++++-------- docker-compose_v3_centos_mysql_local.yaml | 26 +++++++------- docker-compose_v3_centos_pgsql_local.yaml | 26 ++++++-------- docker-compose_v3_ol_mysql_local.yaml | 24 ++++++------- docker-compose_v3_ol_pgsql_local.yaml | 26 ++++++-------- docker-compose_v3_ubuntu_mysql_local.yaml | 24 ++++++------- 78 files changed, 236 insertions(+), 180 deletions(-) diff --git a/.env b/.env index a0b37a6ed..9b642266f 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 12f4f5921..837dbe91f 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 733839bf1..f2d045145 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 6f20ce4bf..89fc6cdda 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 ee0e52d90..bb41585e2 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 9121b1558..4b1150b54 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 bc896e45a..80684a41e 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 426281025..ef75ee7f3 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 ceaec702b..a0370683b 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 bc26c6b30..522ad66bb 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 268b6c303..775046ac1 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 cb754299d..ce00c2203 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 291d852ad..b5c87e5a3 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 fae007fcb..e3bc32adf 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 6a8d78d16..5c2076612 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index 85c556dd1..7cd8cbdba 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 7af60d902..033d72244 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.4 ARG RELEASE=0 @@ -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 d9f075c87..6b9c87a44 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index e5e9f4399..d67c5bdae 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 8adf8226d..a74d2706d 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 3ecc76b29..5d5084b0f 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 556b3a9bf..19efbfd7e 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 183d7fe15..5f194586e 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 c8c3c91cc..c2a87b3f5 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 265a50b6f..5e6939ae6 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 c1f5ac339..04ad923e1 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 b9b6da590..c8e7b4157 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 bf0921346..992901362 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 b52cc8f81..b4bfd81d8 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 fffc2f9d1..b95f381eb 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 6b6d1b464..124146b23 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 6074465de..26d87217f 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 17ead9751..84264bf6d 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 ee8a2cdd4..416ad29a1 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 19cf8d194..99c6b2769 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 7bdffeeb4..543533775 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 f99e84332..002ce0c78 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 935a23349..78f5bc0af 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 1a90bd35d..d297f3e53 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 d26c5ff6d..46a575310 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 7ef76876c..65ffb0fad 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 fbe8d9c2b..ea338312f 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 570ac91fb..3bc688e96 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 1c0953267..feab27d58 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index bd62b1739..6543179c5 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile index 9245841a9..8ad401610 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index d5b6ee519..68ea00046 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.4 ARG RELEASE=0 diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index 88a34cd25..8116b5aaa 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 8423eaeb6..024928f56 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 189f71e3d..7ee40b731 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 79f2bfa6e..dbd14b8b7 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 3f7a550fb..b7313c182 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 33317de10..a61bba528 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 29206207d..564081e17 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 fba968edf..ed10ca6de 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 c2f1026a5..2888b268b 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 4b304a367..f6023862a 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 00e1d0d3f..17c341926 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 4b13e8722..f9f93cd9f 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 ef0b831d0..ede5e8f36 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 269dcd63e..b3e563c7e 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 47ddaf76d..7f2594dda 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 568bd8d3a..5c73c7fe8 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 a47ae54ee..cec370e5a 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 05d1a7331..4b9a76c12 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 fe4b65709..38dd20e43 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 295757d76..5fdcaa639 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 733225fae..528c72333 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 4d7ab085e..12d9da6ce 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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 ba16cb57f..cc382ab43 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.4 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION} @@ -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 839f703f0..fd8a3cd6b 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.4 ARG ZBX_VERSION=${MAJOR_VERSION} 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}