From 70c92de3279322644d7cb0ec351d229263ab54fa 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 | 5 +-- 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/ubuntu/Dockerfile | 3 +- Dockerfiles/snmptraps/alpine/Dockerfile | 3 +- 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/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 | 3 +- 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 ++++++------- 76 files changed, 228 insertions(+), 178 deletions(-) diff --git a/.env b/.env index ebce54ef0..229b2b8da 100644 --- a/.env +++ b/.env @@ -70,11 +70,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-slim -OL_CACHE_FROM=oraclelinux:9-slim -UBUNTU_CACHE_FROM=ubuntu:noble -RHEL_CACHE_FROM=registry.access.redhat.com/ubi8/ubi-minimal:8.10 +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/ubi8/ubi-minimal:8.10 # Base images BUILD_BASE_IMAGE=zabbix-build-base diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index b4f741911..e1fdc94ac 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 3b9b5d3fc..e022c4b08 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 35145c325..de3ecd77d 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 a577736b2..0dd480d39 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/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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/ubi8/ubi-minimal:8.10 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile index 5d848e971..4dec921b5 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 5f38437ab..2e4638e70 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 cb78a7367..79f349835 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 644f3200c..f10805f62 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 2de90da66..462965737 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 8255aaf55..e5a743f16 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/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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/ubi8/ubi-minimal:8.10 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile index 19b62b2d2..e79aea657 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 8a41236cf..d08fc10bf 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 39842f760..8f09452c7 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 5a33e250d..2c5eaf1f9 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index 3545f17ba..3516e2ac4 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index b55047994..e9898b387 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -1,5 +1,6 @@ # syntax=docker/dockerfile:1 -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION=6.0 ARG RELEASE=37 @@ -31,7 +32,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 4a1ea0588..0246110c8 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index 5953d9e16..497815587 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 01bfc7dd3..b6cf19dde 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 05e557b42..de6e92e6e 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 7599c5618..6d0e421b8 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/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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/ubi8/ubi-minimal:8.10 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile index 459a72c53..adccd0fb1 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 3c4937ba6..f578ae62c 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 6b6ded6a7..e5506b457 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 d886add3b..6d8be1215 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 70b23178f..4d9c23b28 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/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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/ubi8/ubi-minimal:8.10 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index d00842f77..a17fd11c5 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 e41aa3314..0a33bde92 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 ae1bda2bf..01d0d96ca 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 89f9e47cd..95e72c487 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 b0351bea5..230be012b 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/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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/ubi8/ubi-minimal:8.10 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index f52c3943a..0dd89583d 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 9315c9eae..0af7cd23c 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 dc1ffd2a4..e8e5aaa20 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 675eadb03..70af6d57e 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 857d55359..dec07a75a 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/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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/ubi8/ubi-minimal:8.10 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index b27df0485..1b1ec4bb7 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 adf4f5826..8e3589a41 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 4e68828ef..97277c08d 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 b15eb1014..32bdbe4a9 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index a39675e59..2616b9098 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 dc7916fa2..7a613e5ce 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index 353841873..f076c2b84 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile index b712d2749..0517cc484 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index 710c7ec84..1ba73ea45 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -1,4 +1,6 @@ -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10 +# syntax=docker/dockerfile:1 +ARG RHEL_BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.10 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION=6.0 ARG RELEASE=37 diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index 2b8e2a0b3..87a5d305c 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index d6e7c857e..ad3fd15b0 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 d6af5e297..22e8cea6b 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 f3d08fa46..97c6e9731 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 1c92b8497..f686d353e 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 cce84c26a..485ee0665 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 b398dae3b..b320dd890 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 50e78a9d5..89beefc8e 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 f2962295b..c7935e7d1 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 edd14851b..973152c8a 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 17ae3c41b..468ef7fb4 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 e711394d4..7f08cbb97 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 ff59a6f3e..092515fc4 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/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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/ubi8/ubi-minimal:8.10 +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 f3e5d6a35..c2c14af00 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 908a10816..239a6c387 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 1311ae8e4..8ffd676a6 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 120a0c0d0..fde0e9ff5 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index c107b360f..f43ebe155 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 93e767d84..9269f0ef5 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 e88fd8742..216022cb5 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 4a60a92a2..07bda2af0 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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 6cd4c6e75..dc42cb1f9 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/ubi8/ubi-minimal:8.10 ARG MAJOR_VERSION=6.0 ARG RELEASE=37 ARG ZBX_VERSION=${MAJOR_VERSION}.37 @@ -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/ubi8/ubi-minimal:8.10 +FROM ${RHEL_BASE_IMAGE} ARG MAJOR_VERSION ARG RELEASE diff --git a/Dockerfiles/web-service/ubuntu/Dockerfile b/Dockerfiles/web-service/ubuntu/Dockerfile index 47536bc08..f4e24f2e7 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.0 ARG ZBX_VERSION=${MAJOR_VERSION}.37 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}