From 3da7e30f5934840b486aeeecb8b3fde7e7537b1f 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 | 4 ++- 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, 237 insertions(+), 180 deletions(-) diff --git a/.env b/.env index 557caed83..3dd1f1348 100644 --- a/.env +++ b/.env @@ -68,11 +68,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 8b5061486..5626aa64e 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine: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 d6167f51b..865d9b703 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 26303c9a6..e4aea9b45 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 20dfc94c4..44cdef085 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 9e1ec4871..aac274476 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent/windows/Dockerfile b/Dockerfiles/agent/windows/Dockerfile index 472eb7fd4..7c7050b21 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 7128af10f..d52bf50f2 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine: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 ed7cb0f93..f06dfdcb4 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 46b5a70bc..c626eb9da 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 4f338b309..8d48da7e9 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 c41e566a4..6f5201268 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/windows/Dockerfile b/Dockerfiles/agent2/windows/Dockerfile index 9bd9246a0..1f79a0374 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 42a377860..fb5624311 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 073e9c62a..92ad331dd 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index e52c91036..a488c3a14 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 53afa2804..ce70aac02 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=6.4 ARG RELEASE=20 @@ -31,7 +33,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 68eb01167..62f7fba79 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index 4baa2dc0d..a1b1bbdb8 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine: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 7ad75ee7a..5c0511c1c 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 46b1868df..9e46809b1 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 a584f573b..13e814a41 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 @@ -46,6 +47,7 @@ LABEL description="Zabbix Java Gateway performs native support for monitoring JM STOPSIGNAL SIGTERM +COPY ["licenses", "/licenses"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/", "/usr/sbin/zabbix_java/"] RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile index 5fc1c65df..15f4fad7d 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu: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 e569458f6..b769802e8 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine: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 b62094b08..26e7e410a 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 3784b3e06..2ef3d0312 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 91809dd2d..05b2e1e81 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 1df1a708f..b037434b3 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu: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 3653e94eb..88477d494 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine: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 628c8beac..eed188773 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 5f4724ace..ddb6dca65 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 468f0000b..a2fbdc8f9 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 068e65f14..816e76cc1 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu: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 46c478121..e54917dc6 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine: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 cadc00662..0c1676cec 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 435ec165a..9d41f4b20 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 44a1f8095..0f94a6ccc 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 80628eacc..30c0abd68 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu: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 5b73e6827..50767f650 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine: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 be1d422cf..12b4f9f4a 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 2d7d90299..24093c158 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 dcdf2676f..5dceb69b6 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 4d5c36a39..67401e4ff 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:noble +FROM ${UBUNTU_BASE_IMAGE} ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index d81346025..3a2f6cf55 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index 8e83f3b84..c378bebca 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile index 24e2b4681..7625a34d3 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index e535fe54d..44a3615d2 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=6.4 ARG RELEASE=20 diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index 305946933..5bdd75e56 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index b49800c1a..2c9a7479d 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine: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 36fc5c4ba..9d4fa1619 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 bb741b044..c3901ffef 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 3c2324ac3..a35bd0e06 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu: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 ea14427d1..af17f9cc8 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine: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 245a560df..f92c73139 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 4dd6db4c9..390d86523 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 102ed1921..4ce6c90e7 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu: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 ea9d63619..1f6a73165 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine: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 09981aac4..3aaef52fc 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 7affde07b..5fa13da89 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 926db1e26..59241d37c 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 ecfdc0d23..5fd8afb30 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu: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 8af706964..d871fde36 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine: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 31d8de515..7debe75c9 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 9653b6337..a243a317d 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 6dfa27756..0a1fc1fb6 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 5b619b46e..746fe21d5 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu: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 6ca9e8794..818abc86a 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM alpine: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 2e9246e97..2cd698c5b 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 09aab1538..3e93af903 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM 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 dbac8e1a7..0eec8d616 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=6.4 ARG RELEASE=20 ARG ZBX_VERSION=${MAJOR_VERSION}.20 @@ -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 c4b92975d..646982844 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=6.4 ARG ZBX_VERSION=${MAJOR_VERSION}.20 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu: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 54d9576ec..ad4b82e3c 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -2,8 +2,10 @@ services: zabbix-build-base: build: context: ./Dockerfiles/build-base/${ALPINE_OS_TAG_SHORT} + args: + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} attach: false @@ -12,8 +14,6 @@ services: context: ./Dockerfiles/build-mysql/${ALPINE_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -26,8 +26,6 @@ services: context: ./Dockerfiles/build-sqlite3/${ALPINE_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -44,9 +42,10 @@ services: build: context: ./Dockerfiles/server-mysql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-server-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -63,9 +62,10 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-proxy-sqlite3:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -81,9 +81,10 @@ services: build: context: ./Dockerfiles/proxy-mysql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-proxy-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -100,9 +101,10 @@ services: build: context: ./Dockerfiles/web-apache-mysql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-web-apache-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -119,9 +121,10 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-web-nginx-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -138,9 +141,10 @@ services: build: context: ./Dockerfiles/agent/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-agent:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} volumes: - /etc/timezone:/etc/timezone:ro @@ -156,9 +160,10 @@ services: build: context: ./Dockerfiles/java-gateway/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-java-gateway:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -172,7 +177,9 @@ services: build: context: ./Dockerfiles/snmptraps/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" + args: + ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE} image: zabbix-snmptraps:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -186,9 +193,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 adea8031b..d775af1be 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 @@ -12,8 +12,6 @@ services: context: ./Dockerfiles/build-pgsql/${ALPINE_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -26,8 +24,6 @@ services: context: ./Dockerfiles/build-mysql/${ALPINE_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -42,8 +38,6 @@ services: context: ./Dockerfiles/build-sqlite3/${ALPINE_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -60,7 +54,7 @@ services: build: context: ./Dockerfiles/server-pgsql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-pgsql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -79,7 +73,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -97,7 +91,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -116,7 +110,7 @@ services: build: context: ./Dockerfiles/web-apache-pgsql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-pgsql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -135,7 +129,7 @@ services: build: context: ./Dockerfiles/web-nginx-pgsql/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-pgsql:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -154,7 +148,7 @@ services: build: context: ./Dockerfiles/agent/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -172,7 +166,7 @@ services: build: context: ./Dockerfiles/java-gateway/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -188,7 +182,7 @@ services: build: context: ./Dockerfiles/snmptraps/${ALPINE_OS_TAG_SHORT} cache_from: - - "${ALPINE_CACHE_FROM}" + - "${ALPINE_BASE_IMAGE}" image: zabbix-snmptraps:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-pgsql @@ -202,7 +196,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 bd3cec255..018264b49 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -3,7 +3,9 @@ services: build: context: ./Dockerfiles/build-base/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" + args: + CENTOS_BASE_IMAGE: ${CENTOS_BASE_IMAGE} image: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} attach: false @@ -12,8 +14,6 @@ services: context: ./Dockerfiles/build-mysql/${CENTOS_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -26,8 +26,6 @@ services: context: ./Dockerfiles/build-sqlite3/${CENTOS_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -44,7 +42,7 @@ services: build: context: ./Dockerfiles/server-mysql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -64,7 +62,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -82,7 +80,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -101,7 +99,7 @@ services: build: context: ./Dockerfiles/web-apache-mysql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -120,7 +118,7 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -139,7 +137,7 @@ services: build: context: ./Dockerfiles/agent/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -157,7 +155,7 @@ services: build: context: ./Dockerfiles/java-gateway/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -173,7 +171,7 @@ services: build: context: ./Dockerfiles/snmptraps/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" image: zabbix-snmptraps:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -187,7 +185,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 7ba3d7c54..a1b28cd29 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 @@ -12,8 +12,6 @@ services: context: ./Dockerfiles/build-pgsql/${CENTOS_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -26,8 +24,6 @@ services: context: ./Dockerfiles/build-mysql/${CENTOS_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -40,8 +36,6 @@ services: zabbix-build-sqlite3: build: context: ./Dockerfiles/build-sqlite3/${CENTOS_OS_TAG_SHORT} - 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} @@ -58,7 +52,7 @@ services: build: context: ./Dockerfiles/server-pgsql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-pgsql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -77,7 +71,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -95,7 +89,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -114,7 +108,7 @@ services: build: context: ./Dockerfiles/web-apache-pgsql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-pgsql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -133,7 +127,7 @@ services: build: context: ./Dockerfiles/web-nginx-pgsql/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-pgsql:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -152,7 +146,7 @@ services: build: context: ./Dockerfiles/agent/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -170,7 +164,7 @@ services: build: context: ./Dockerfiles/java-gateway/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -186,7 +180,7 @@ services: build: context: ./Dockerfiles/snmptraps/${CENTOS_OS_TAG_SHORT} cache_from: - - "${CENTOS_CACHE_FROM}" + - "${CENTOS_BASE_IMAGE}" image: zabbix-snmptraps:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-pgsql @@ -200,7 +194,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 b92351e45..84717d4d5 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 @@ -12,8 +12,6 @@ services: context: ./Dockerfiles/build-mysql/${OL_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -26,8 +24,6 @@ services: context: ./Dockerfiles/build-sqlite3/${OL_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -44,7 +40,7 @@ services: build: context: ./Dockerfiles/server-mysql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -64,7 +60,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -82,7 +78,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -101,7 +97,7 @@ services: build: context: ./Dockerfiles/web-apache-mysql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -120,7 +116,7 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -139,7 +135,7 @@ services: build: context: ./Dockerfiles/agent/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -157,7 +153,7 @@ services: build: context: ./Dockerfiles/java-gateway/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -173,7 +169,7 @@ services: build: context: ./Dockerfiles/snmptraps/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" image: zabbix-snmptraps:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -187,7 +183,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 b1f6a8aec..966d868ee 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 @@ -12,8 +12,6 @@ services: context: ./Dockerfiles/build-pgsql/${OL_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -26,8 +24,6 @@ services: context: ./Dockerfiles/build-mysql/${OL_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -42,8 +38,6 @@ services: context: ./Dockerfiles/build-sqlite3/${OL_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -60,7 +54,7 @@ services: build: context: ./Dockerfiles/server-pgsql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-pgsql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -79,7 +73,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -97,7 +91,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -116,7 +110,7 @@ services: build: context: ./Dockerfiles/web-apache-pgsql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-pgsql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -135,7 +129,7 @@ services: build: context: ./Dockerfiles/web-nginx-pgsql/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-pgsql:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -154,7 +148,7 @@ services: build: context: ./Dockerfiles/agent/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -172,7 +166,7 @@ services: build: context: ./Dockerfiles/java-gateway/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -188,7 +182,7 @@ services: build: context: ./Dockerfiles/snmptraps/${OL_OS_TAG_SHORT} cache_from: - - "${OL_CACHE_FROM}" + - "${OL_BASE_IMAGE}" image: zabbix-snmptraps:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-pgsql @@ -202,7 +196,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 7612db877..3bba802ff 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 @@ -12,8 +12,6 @@ services: context: ./Dockerfiles/build-mysql/${UBUNTU_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -26,8 +24,6 @@ services: context: ./Dockerfiles/build-sqlite3/${UBUNTU_OS_TAG_SHORT} additional_contexts: - sources=./sources/ - 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} @@ -44,7 +40,7 @@ services: build: context: ./Dockerfiles/server-mysql/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-server-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -62,7 +58,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-sqlite3:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -78,7 +74,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-proxy-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -95,7 +91,7 @@ services: build: context: ./Dockerfiles/web-apache-mysql/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-apache-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -112,7 +108,7 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-web-nginx-mysql:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -129,7 +125,7 @@ services: build: context: ./Dockerfiles/agent/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-agent:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -145,7 +141,7 @@ services: build: context: ./Dockerfiles/java-gateway/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" args: BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: zabbix-java-gateway:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} @@ -161,7 +157,7 @@ services: build: context: ./Dockerfiles/snmptraps/${UBUNTU_OS_TAG_SHORT} cache_from: - - "${UBUNTU_CACHE_FROM}" + - "${UBUNTU_BASE_IMAGE}" image: zabbix-snmptraps:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} depends_on: - zabbix-build-mysql @@ -175,7 +171,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}