From de662a65872017fbf77725770b5983c1865ead91 Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Tue, 24 Sep 2024 11:09:07 +0300 Subject: [PATCH] Zabbix v7.0.4 release --- Dockerfiles/agent/alpine/Dockerfile | 2 +- Dockerfiles/agent/centos/Dockerfile | 2 +- Dockerfiles/agent/ol/Dockerfile | 2 +- Dockerfiles/agent/rhel/Dockerfile | 4 ++-- Dockerfiles/agent/ubuntu/Dockerfile | 2 +- Dockerfiles/agent/windows/Dockerfile | 2 +- Dockerfiles/agent2/alpine/Dockerfile | 2 +- Dockerfiles/agent2/centos/Dockerfile | 2 +- Dockerfiles/agent2/ol/Dockerfile | 2 +- Dockerfiles/agent2/rhel/Dockerfile | 4 ++-- Dockerfiles/agent2/ubuntu/Dockerfile | 2 +- Dockerfiles/agent2/windows/Dockerfile | 2 +- Dockerfiles/build-base/alpine/Dockerfile | 2 +- Dockerfiles/build-base/centos/Dockerfile | 2 +- Dockerfiles/build-base/ol/Dockerfile | 2 +- Dockerfiles/build-base/rhel/Dockerfile | 4 ++-- Dockerfiles/build-base/ubuntu/Dockerfile | 2 +- Dockerfiles/build-base/windows/Dockerfile.agent | 2 +- Dockerfiles/build-base/windows/Dockerfile.agent2 | 2 +- Dockerfiles/build-mysql/alpine/Dockerfile | 2 +- Dockerfiles/build-mysql/centos/Dockerfile | 2 +- Dockerfiles/build-mysql/ol/Dockerfile | 2 +- Dockerfiles/build-mysql/rhel/Dockerfile | 4 ++-- Dockerfiles/build-mysql/ubuntu/Dockerfile | 2 +- Dockerfiles/build-mysql/windows/Dockerfile.agent | 2 +- Dockerfiles/build-mysql/windows/Dockerfile.agent2 | 4 ++-- Dockerfiles/build-pgsql/alpine/Dockerfile | 2 +- Dockerfiles/build-pgsql/centos/Dockerfile | 2 +- Dockerfiles/build-pgsql/ol/Dockerfile | 2 +- Dockerfiles/build-pgsql/rhel/Dockerfile | 4 ++-- Dockerfiles/build-pgsql/ubuntu/Dockerfile | 2 +- Dockerfiles/build-sqlite3/alpine/Dockerfile | 2 +- Dockerfiles/build-sqlite3/centos/Dockerfile | 2 +- Dockerfiles/build-sqlite3/ol/Dockerfile | 2 +- Dockerfiles/build-sqlite3/rhel/Dockerfile | 4 ++-- Dockerfiles/build-sqlite3/ubuntu/Dockerfile | 2 +- Dockerfiles/java-gateway/alpine/Dockerfile | 2 +- Dockerfiles/java-gateway/centos/Dockerfile | 2 +- Dockerfiles/java-gateway/ol/Dockerfile | 2 +- Dockerfiles/java-gateway/rhel/Dockerfile | 4 ++-- Dockerfiles/java-gateway/ubuntu/Dockerfile | 2 +- Dockerfiles/proxy-mysql/alpine/Dockerfile | 2 +- Dockerfiles/proxy-mysql/centos/Dockerfile | 2 +- Dockerfiles/proxy-mysql/ol/Dockerfile | 2 +- Dockerfiles/proxy-mysql/rhel/Dockerfile | 4 ++-- Dockerfiles/proxy-mysql/ubuntu/Dockerfile | 2 +- Dockerfiles/proxy-sqlite3/alpine/Dockerfile | 2 +- Dockerfiles/proxy-sqlite3/centos/Dockerfile | 2 +- Dockerfiles/proxy-sqlite3/ol/Dockerfile | 2 +- Dockerfiles/proxy-sqlite3/rhel/Dockerfile | 4 ++-- Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile | 2 +- Dockerfiles/server-mysql/alpine/Dockerfile | 2 +- Dockerfiles/server-mysql/centos/Dockerfile | 2 +- Dockerfiles/server-mysql/ol/Dockerfile | 2 +- Dockerfiles/server-mysql/rhel/Dockerfile | 4 ++-- Dockerfiles/server-mysql/ubuntu/Dockerfile | 2 +- Dockerfiles/server-pgsql/alpine/Dockerfile | 2 +- Dockerfiles/server-pgsql/centos/Dockerfile | 2 +- Dockerfiles/server-pgsql/ol/Dockerfile | 2 +- Dockerfiles/server-pgsql/rhel/Dockerfile | 4 ++-- Dockerfiles/server-pgsql/ubuntu/Dockerfile | 2 +- Dockerfiles/snmptraps/alpine/Dockerfile | 2 +- Dockerfiles/snmptraps/centos/Dockerfile | 2 +- Dockerfiles/snmptraps/ol/Dockerfile | 2 +- Dockerfiles/snmptraps/rhel/Dockerfile | 4 ++-- Dockerfiles/snmptraps/ubuntu/Dockerfile | 2 +- Dockerfiles/web-apache-mysql/alpine/Dockerfile | 2 +- Dockerfiles/web-apache-mysql/centos/Dockerfile | 2 +- Dockerfiles/web-apache-mysql/ol/Dockerfile | 2 +- Dockerfiles/web-apache-mysql/ubuntu/Dockerfile | 2 +- Dockerfiles/web-apache-pgsql/alpine/Dockerfile | 2 +- Dockerfiles/web-apache-pgsql/centos/Dockerfile | 2 +- Dockerfiles/web-apache-pgsql/ol/Dockerfile | 2 +- Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/alpine/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/centos/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/ol/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 4 ++-- Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/alpine/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/centos/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/ol/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/rhel/Dockerfile | 4 ++-- Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile | 2 +- Dockerfiles/web-service/alpine/Dockerfile | 2 +- Dockerfiles/web-service/centos/Dockerfile | 2 +- Dockerfiles/web-service/ol/Dockerfile | 2 +- Dockerfiles/web-service/rhel/Dockerfile | 4 ++-- Dockerfiles/web-service/ubuntu/Dockerfile | 2 +- 89 files changed, 105 insertions(+), 105 deletions(-) diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index e77dead73..d6ca932f1 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/Dockerfiles/agent/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile index b7f04f2b6..a2c2df3e0 100644 --- a/Dockerfiles/agent/centos/Dockerfile +++ b/Dockerfiles/agent/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile index ed0472fc0..c4c4585a3 100644 --- a/Dockerfiles/agent/ol/Dockerfile +++ b/Dockerfiles/agent/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index 7cc0ea856..f5d84af52 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile index 24843fa2b..cbc925c0f 100644 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ b/Dockerfiles/agent/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/agent/windows/Dockerfile b/Dockerfiles/agent/windows/Dockerfile index f6ee1e281..120279193 100644 --- a/Dockerfiles/agent/windows/Dockerfile +++ b/Dockerfiles/agent/windows/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # escape=` ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-agent:ltsc2022-agent-${ZBX_VERSION} ARG BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022 diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index a1f30331f..b406ac6e9 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/Dockerfiles/agent2/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile index c9784e227..6e8f38076 100644 --- a/Dockerfiles/agent2/centos/Dockerfile +++ b/Dockerfiles/agent2/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/agent2/ol/Dockerfile b/Dockerfiles/agent2/ol/Dockerfile index 64a047f5e..c607f1591 100644 --- a/Dockerfiles/agent2/ol/Dockerfile +++ b/Dockerfiles/agent2/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index 7b027b7ea..966dbf871 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile index fea36ccd5..57a960579 100644 --- a/Dockerfiles/agent2/ubuntu/Dockerfile +++ b/Dockerfiles/agent2/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/agent2/windows/Dockerfile b/Dockerfiles/agent2/windows/Dockerfile index 38b75fb31..d8667f13c 100644 --- a/Dockerfiles/agent2/windows/Dockerfile +++ b/Dockerfiles/agent2/windows/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # escape=` ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-agent:ltsc2022-agent2-${ZBX_VERSION} ARG BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022 diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index a55d1457e..715a41416 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.20 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 68976ae88..19a3b383c 100644 --- a/Dockerfiles/build-base/centos/Dockerfile +++ b/Dockerfiles/build-base/centos/Dockerfile @@ -2,7 +2,7 @@ FROM quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index 5e7b2c45f..c0e28de4e 100644 --- a/Dockerfiles/build-base/ol/Dockerfile +++ b/Dockerfiles/build-base/ol/Dockerfile @@ -2,7 +2,7 @@ FROM oraclelinux:9-slim ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index a86dac1b3..a722f63a9 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -2,8 +2,8 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index 0d3789373..c15b55363 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:noble ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent b/Dockerfiles/build-base/windows/Dockerfile.agent index 202d72d20..a427369f5 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent +++ b/Dockerfiles/build-base/windows/Dockerfile.agent @@ -13,7 +13,7 @@ ARG BUILD_ARCH=x64 ARG CPU_MODEL=AMD64 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v2.33.0.windows.2/MinGit-2.33.0.2-busybox-64-bit.zip ARG PERL_URL=https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_53822_64bit/strawberry-perl-5.38.2.2-64bit-portable.zip diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2 index fb1a8d9b9..d96bb3802 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-base/windows/Dockerfile.agent2 @@ -14,7 +14,7 @@ ARG BUILD_ARCH=x64 ARG CPU_MODEL=AMD64 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v2.33.0.windows.2/MinGit-2.33.0.2-busybox-64-bit.zip ARG SEVEN_ZIP_URL=https://www.7-zip.org/a/7z$SEVEN_ZIP_VERSION-$BUILD_ARCH.msi diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index e17453754..924a10ba8 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index 9c230a9ba..b293da9d6 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile index e605af5e6..153ff4042 100644 --- a/Dockerfiles/build-mysql/ol/Dockerfile +++ b/Dockerfiles/build-mysql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index e777925e8..98139454d 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile index 008ed86a5..69309f580 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent b/Dockerfiles/build-mysql/windows/Dockerfile.agent index 3e0eae9c3..87aeb505a 100644 --- a/Dockerfiles/build-mysql/windows/Dockerfile.agent +++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # escape=` ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:ltsc2022-agent-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile.agent2 index a224bf039..33f13d600 100644 --- a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent2 @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # escape=` ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:ltsc2022-agent2-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder @@ -9,7 +9,7 @@ FROM ${BUILD_BASE_IMAGE} as builder SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZABBIX_VERSION_RC_NUM=2400 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ARG MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index 9d24122d5..2642ef9d6 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index e7396f3df..a3c67c9d9 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile index 99e3f2bba..34f95ad1f 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-pgsql/rhel/Dockerfile b/Dockerfiles/build-pgsql/rhel/Dockerfile index e1ef3c6c4..e386154a6 100644 --- a/Dockerfiles/build-pgsql/rhel/Dockerfile +++ b/Dockerfiles/build-pgsql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index ee05e2b48..afb9690f4 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index adaed91c8..8b8d04bc2 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile index 7741fecb3..7adba1797 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile index 905ec2e6e..171bdafc7 100644 --- a/Dockerfiles/build-sqlite3/ol/Dockerfile +++ b/Dockerfiles/build-sqlite3/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile index cfc3d49e8..292e85aa1 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile index 6b9688b9a..4c5344113 100644 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index e60d5b4a5..72a775428 100644 --- a/Dockerfiles/java-gateway/alpine/Dockerfile +++ b/Dockerfiles/java-gateway/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/java-gateway/centos/Dockerfile b/Dockerfiles/java-gateway/centos/Dockerfile index f4ef22de7..6e90d5bee 100644 --- a/Dockerfiles/java-gateway/centos/Dockerfile +++ b/Dockerfiles/java-gateway/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/java-gateway/ol/Dockerfile b/Dockerfiles/java-gateway/ol/Dockerfile index 545f96419..2e7f212d4 100644 --- a/Dockerfiles/java-gateway/ol/Dockerfile +++ b/Dockerfiles/java-gateway/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile index 95670ac6d..203ec19e1 100644 --- a/Dockerfiles/java-gateway/rhel/Dockerfile +++ b/Dockerfiles/java-gateway/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile index 70514bcb4..782d85348 100644 --- a/Dockerfiles/java-gateway/ubuntu/Dockerfile +++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index 24feb8de0..0a9331e89 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile index 0a633a70a..c4d841f8d 100644 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ b/Dockerfiles/proxy-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile index 266f29c1a..52539c15d 100644 --- a/Dockerfiles/proxy-mysql/ol/Dockerfile +++ b/Dockerfiles/proxy-mysql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index 6e6c691bf..dff81dc60 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index ae4485ce0..b330704cf 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 2cd585e7b..ba7090382 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile index 508ebaa9d..850ec2655 100644 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile index dfb7f1eb7..82da9722e 100644 --- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index c7ce68c2a..22c488ea5 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index 574e6a0b3..20872a9f2 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index ea3238894..b0dd7f729 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index 62044b323..653f99e45 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/Dockerfiles/server-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile index 3c58d37e2..eee6eef40 100644 --- a/Dockerfiles/server-mysql/ol/Dockerfile +++ b/Dockerfiles/server-mysql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index 855709de8..b94246b3d 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index b3bd44996..19279d5f3 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 7ea6be21c..a77ec6987 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index 90a509417..30757b0d1 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile index 9b895b86a..eeabe32b2 100644 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ b/Dockerfiles/server-pgsql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile index 6bab660d8..a066659f8 100644 --- a/Dockerfiles/server-pgsql/rhel/Dockerfile +++ b/Dockerfiles/server-pgsql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index db26cadd2..c641d2e14 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index b6b2b86e2..ea56e4b78 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.20 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm \ diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index 20d76f998..a2732c9d4 100644 --- a/Dockerfiles/snmptraps/centos/Dockerfile +++ b/Dockerfiles/snmptraps/centos/Dockerfile @@ -1,7 +1,7 @@ FROM quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm \ diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile index 76850024f..ccf7ad037 100644 --- a/Dockerfiles/snmptraps/ol/Dockerfile +++ b/Dockerfiles/snmptraps/ol/Dockerfile @@ -1,7 +1,7 @@ FROM oraclelinux:9-slim ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm \ diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index a25667efb..2a7e08d94 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -1,8 +1,8 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index 49537e2fd..1c8e9be59 100644 --- a/Dockerfiles/snmptraps/ubuntu/Dockerfile +++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:noble ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm \ diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 52c5e7ae0..1e204dd8b 100644 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-mysql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index 290080f60..943791927 100644 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile index 12b6f6c9a..dc59e0728 100644 --- a/Dockerfiles/web-apache-mysql/ol/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile index e9c470788..5bccccdb4 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index b1c5d84a9..f18a3eacc 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile index bbcdafce6..f4b79d856 100644 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile index 91607fd17..4bc4973f1 100644 --- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile index c740f9777..b4dcca5f7 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index ec65cd6b2..b785d21aa 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile index 727bde0a2..16f7d7a9a 100644 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile index ac3ea4fb9..87b62027d 100644 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index d91073418..32706a7ea 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile index 4a8605a2e..7fa15c7e6 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index eec65be0c..b22a0b67f 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile index bff053bd8..ae08079fa 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index 427e53259..4abea5108 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile index 4774036ee..cc5c02fc0 100644 --- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index 1abe9761c..3108abb92 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile index 68234b2b2..a29ab5c41 100644 --- a/Dockerfiles/web-service/alpine/Dockerfile +++ b/Dockerfiles/web-service/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-service/centos/Dockerfile b/Dockerfiles/web-service/centos/Dockerfile index bf935b44a..bf1835aac 100644 --- a/Dockerfiles/web-service/centos/Dockerfile +++ b/Dockerfiles/web-service/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-service/ol/Dockerfile b/Dockerfiles/web-service/ol/Dockerfile index fa0ea7d59..15912e4f8 100644 --- a/Dockerfiles/web-service/ol/Dockerfile +++ b/Dockerfiles/web-service/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile index e69d13c26..d4d2e2e57 100644 --- a/Dockerfiles/web-service/rhel/Dockerfile +++ b/Dockerfiles/web-service/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder diff --git a/Dockerfiles/web-service/ubuntu/Dockerfile b/Dockerfiles/web-service/ubuntu/Dockerfile index f2ff49d4e..724b1a5a9 100644 --- a/Dockerfiles/web-service/ubuntu/Dockerfile +++ b/Dockerfiles/web-service/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder