From 9ec904f806b34df556f15ce9380cf84bb3a66849 Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Wed, 18 Dec 2024 13:35:25 +0200 Subject: [PATCH] Zabbix v7.0.7 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 45c4a3d9a..47946cc6c 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 aabb94f67..133854903 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 b29a4573e..f70071a6f 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 7abf0a0fa..53f537e25 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=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 ba04b98fc..875a2a220 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 76fa57b39..b4529ca7e 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 57a2e0fee..6e64ba8a0 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 7291f6eab..b9d282da9 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 928ed0562..55425f627 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 0c49b57ca..d8d466616 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=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 b425da66c..c69fba6a6 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 709949879..0255919d3 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 539daddf1..f63fa67d3 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.21 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 8067d0180..b76cc3f85 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index 764e3250a..a4b4ef319 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 1ec7a3700..38f17ab7b 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.5 ARG MAJOR_VERSION=7.0 -ARG RELEASE=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index 74b6d777f..96826ab35 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent b/Dockerfiles/build-base/windows/Dockerfile.agent index 3c0b83091..74d0718a6 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 112b0510e..daef7d008 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 777689252..ba4286c6c 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 dc93689eb..1d2fd257c 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 bd755e15f..828b3fa11 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 8162c6d37..540ef73af 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=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 df356395d..26cd388f7 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 1d1f43e3e..29bb5c6ce 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 888179e4c..6507b4d69 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 b8e036a27..f862e4fd7 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 b9b9c4990..1fa0bc57d 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 d7dfef140..d98352515 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 082154bbb..03273eca8 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=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 bd22db3bb..1d2560118 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 deb66f838..ae7d5eb9c 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 1e1c3b5ee..630fd22ed 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 92b24a511..c85c2afaa 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 c9f662412..fa2bae5da 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=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 6ad2f9e0c..852e6b8aa 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 0818436ab..f40758f86 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 a8e7a4ef8..57b5d6fdd 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 aacb3f48d..981b0d332 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 f16459f98..9a0a1d0a8 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=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 c23501d5b..685763f1e 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 8e5a0dd20..c8d637407 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 46ff0628b..21069a9a5 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 a04dcca28..04ee4fc77 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 c3e70b886..5f5eeceb1 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=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 655525d2c..09081a310 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 e94306740..4f99981d0 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 4ef7eed17..7419f2f92 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 82e1fa241..56794e82f 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 35e202dff..ac3af2bce 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=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 315a4401a..5a77a3b11 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 1d013e1e0..69a9b06ed 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 d32d86459..4d3e302ad 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 2fcb2b3ed..fdab423a5 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 3f3acee3a..78900d377 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=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 25d277a86..2cf46aa1a 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 a5f03263a..07b4e05c9 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 b0a45ddd9..274252c0b 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 c8cdf9dad..cd9df28c6 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 021285704..102015c84 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=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 1b782dc76..56a124cc2 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 fc0454109..b7c609b96 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.21 ARG MAJOR_VERSION=7.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 061634529..6af89ca16 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 82e255c93..e3c2f2e50 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 2db4f4521..d2743c569 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -1,8 +1,8 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 ARG MAJOR_VERSION=7.0 -ARG RELEASE=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index bb98aa169..15c13db72 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 67438d006..b598f8c7c 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 7fe459eac..ae49f9187 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 f33b8729f..cbe48f8fc 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 eab8a73d8..516c5243c 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 073afff8f..367d1e1bf 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 aa0a53ce0..cba8b66b8 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 cf9a358bc..c071034fc 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 406584296..1c4440b59 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 7a4c8d247..1a9d9f828 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 16d70347a..92ed6fd7d 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 a1c388db4..12c545143 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 c2dbb65cc..e6c3c1df9 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=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 0e28c37db..ebd0a9b75 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 a6ee7bc1c..b37616d28 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 387c88b3f..280981fca 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 710deb385..2d5064c0c 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 1f209053b..71955ee0e 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=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 b2126ee36..5bc346e2d 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 078ca432c..f7cb8f178 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 99246ec0b..c82d70c0d 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 531e6d4b7..76cb3cbd1 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 c6a637f80..028efe454 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=6 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG RELEASE=7 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 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 ac05938d3..03b55deb9 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}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder