diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 45fccedc5..3b691a471 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/Dockerfiles/agent/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 03c15a5b2..1e2cb0e99 100644 --- a/Dockerfiles/agent/centos/Dockerfile +++ b/Dockerfiles/agent/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 7389b6a7e..5d84d918c 100644 --- a/Dockerfiles/agent/ol/Dockerfile +++ b/Dockerfiles/agent/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 a663a9391..265c50826 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 4b709d5e2..2d4fa8228 100644 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ b/Dockerfiles/agent/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 6427eac82..ecdd1678d 100644 --- a/Dockerfiles/agent/windows/Dockerfile +++ b/Dockerfiles/agent/windows/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # escape=` ARG MAJOR_VERSION=6.4 -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 ce338bdaf..9c969fb07 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/Dockerfiles/agent2/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 de0937f1d..861263dcd 100644 --- a/Dockerfiles/agent2/centos/Dockerfile +++ b/Dockerfiles/agent2/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 463a6bddc..84413b88a 100644 --- a/Dockerfiles/agent2/ol/Dockerfile +++ b/Dockerfiles/agent2/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 feba3f7ad..3f9ed856c 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 229dd0eb8..2a1e9c5ee 100644 --- a/Dockerfiles/agent2/ubuntu/Dockerfile +++ b/Dockerfiles/agent2/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 180031e88..cac72fabb 100644 --- a/Dockerfiles/agent2/windows/Dockerfile +++ b/Dockerfiles/agent2/windows/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # escape=` ARG MAJOR_VERSION=6.4 -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 e6d98d068..6e83b32c2 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.17 ARG MAJOR_VERSION=6.4 -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 8695c6ae2..396ff0553 100644 --- a/Dockerfiles/build-base/centos/Dockerfile +++ b/Dockerfiles/build-base/centos/Dockerfile @@ -2,7 +2,7 @@ FROM quay.io/centos/centos:stream9 ARG MAJOR_VERSION=6.4 -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 bbafd1d71..56fb27c71 100644 --- a/Dockerfiles/build-base/ol/Dockerfile +++ b/Dockerfiles/build-base/ol/Dockerfile @@ -2,7 +2,7 @@ FROM oraclelinux:9-slim ARG MAJOR_VERSION=6.4 -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 78aaf3e78..a2fbf29e2 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 ARG MAJOR_VERSION=6.4 -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 3a201c842..e296d7b55 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:jammy ARG MAJOR_VERSION=6.4 -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 d07a4d26f..d596ad217 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent +++ b/Dockerfiles/build-base/windows/Dockerfile.agent @@ -10,7 +10,7 @@ ARG BUILD_ARCH=x64 ARG CPU_MODEL=AMD64 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 ARG VS_BUILDTOOLS_URL=https://aka.ms/vs/16/release/vs_buildtools.exe ARG NASM_URL=https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/win64/nasm-2.15.05-installer-x64.exe diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2 index ad0233f2e..18a63bd5a 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-base/windows/Dockerfile.agent2 @@ -11,7 +11,7 @@ ARG BUILD_ARCH=x64 ARG CPU_MODEL=AMD64 ARG MAJOR_VERSION=6.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG ZBX_VERSION=${MAJOR_VERSION}.7 ARG VS_BUILDTOOLS_URL=https://aka.ms/vs/16/release/vs_buildtools.exe 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 diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index e48bb7a30..8294537d4 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 638d6bfaa..b201a05ea 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 1b390a059..05e400e9e 100644 --- a/Dockerfiles/build-mysql/ol/Dockerfile +++ b/Dockerfiles/build-mysql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 271053182..de0ba9d21 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 e07afbf3b..b21cbc401 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 90703aaeb..24f427577 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=6.4 -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 00c81695d..f2b61c34e 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=6.4 -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=6.4 -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 ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION ` diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index f55189586..34295ff43 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 e760952ef..cfa485e5d 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 27f7140d1..da6e91998 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index 5ef6db483..0e200bdd1 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 ebdf581e7..9c5650061 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 7979997fb..51ee12bb3 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 9ab5394da..980d42fb9 100644 --- a/Dockerfiles/build-sqlite3/ol/Dockerfile +++ b/Dockerfiles/build-sqlite3/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 c804a7ba6..6eaa802da 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 3537f51f4..196c1524a 100644 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 01b0ccbfc..5ad96e5c4 100644 --- a/Dockerfiles/java-gateway/alpine/Dockerfile +++ b/Dockerfiles/java-gateway/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 f6761625a..cdf4c152e 100644 --- a/Dockerfiles/java-gateway/centos/Dockerfile +++ b/Dockerfiles/java-gateway/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 c223c240a..14c354875 100644 --- a/Dockerfiles/java-gateway/ol/Dockerfile +++ b/Dockerfiles/java-gateway/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 6bfd5a815..ec38753cf 100644 --- a/Dockerfiles/java-gateway/rhel/Dockerfile +++ b/Dockerfiles/java-gateway/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 3a7b6db19..8b7fbe646 100644 --- a/Dockerfiles/java-gateway/ubuntu/Dockerfile +++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 5a3012af0..6eb9e5a0b 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 ebb46868b..d47b3d018 100644 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ b/Dockerfiles/proxy-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 38d558483..8b133639c 100644 --- a/Dockerfiles/proxy-mysql/ol/Dockerfile +++ b/Dockerfiles/proxy-mysql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 d3107d317..b965330ac 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 467292123..029b5d2a1 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 6de650709..d862259c5 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 45416997e..d7141ffcb 100644 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 f4484bee5..aed1ca22f 100644 --- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 abd69cffd..95336a5c3 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 a0609da43..4564a880d 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 e874a9deb..7ccda49b6 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 37e96c661..e54091e11 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/Dockerfiles/server-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 2dbc2f389..c8992bbe2 100644 --- a/Dockerfiles/server-mysql/ol/Dockerfile +++ b/Dockerfiles/server-mysql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 b78315b60..551cb5a38 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 2e271a0ae..3beebae26 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 19e9c5dda..fda1c9852 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 4caf348c3..b99028bbe 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 7f3aecfc1..dbb3ce120 100644 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ b/Dockerfiles/server-pgsql/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 24d666162..c4d5cedd0 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 88c2e80d5..87af00fd9 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.17 ARG MAJOR_VERSION=6.4 -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 69c7339bf..93a588ba9 100644 --- a/Dockerfiles/snmptraps/centos/Dockerfile +++ b/Dockerfiles/snmptraps/centos/Dockerfile @@ -1,7 +1,7 @@ FROM quay.io/centos/centos:stream9 ARG MAJOR_VERSION=6.4 -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 1727a924b..17799e81f 100644 --- a/Dockerfiles/snmptraps/ol/Dockerfile +++ b/Dockerfiles/snmptraps/ol/Dockerfile @@ -1,7 +1,7 @@ FROM oraclelinux:9-slim ARG MAJOR_VERSION=6.4 -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 ddd396da2..4dee506a4 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -1,8 +1,8 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal ARG MAJOR_VERSION=6.4 -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 99fc3a34d..66c54da2c 100644 --- a/Dockerfiles/snmptraps/ubuntu/Dockerfile +++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:jammy ARG MAJOR_VERSION=6.4 -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 543f2e38c..d3af0d120 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=6.4 -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 08246b10a..bb68de772 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=6.4 -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 7810c7a4f..7d1c6b315 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=6.4 -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 294c0998b..7cd168ae5 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=6.4 -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 8b47279b9..1fc3db6a6 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=6.4 -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 582c53699..eea2d8165 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=6.4 -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 289877dda..6467f0fff 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=6.4 -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 30153afc9..4c946336c 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=6.4 -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 3449c9745..a426b2292 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=6.4 -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 e7ce2f8ea..e779c2f5d 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=6.4 -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 fd18fad79..46ab1e270 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=6.4 -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 dc6a9be5a..797743b40 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=6.4 -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 aac45b8d7..3eeb58ac3 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=6.4 -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 9a59b8434..34e427d7f 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=6.4 -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 0b61d3dc5..8301b2bc6 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=6.4 -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 99b7d7c78..07912cd57 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=6.4 -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/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index 5147acc17..fe697435f 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=6.4 -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 2e130b0ff..fe925d6ee 100644 --- a/Dockerfiles/web-service/alpine/Dockerfile +++ b/Dockerfiles/web-service/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 f74f0e907..bb690fbbf 100644 --- a/Dockerfiles/web-service/centos/Dockerfile +++ b/Dockerfiles/web-service/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 a5ea60cb3..932602309 100644 --- a/Dockerfiles/web-service/ol/Dockerfile +++ b/Dockerfiles/web-service/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 90345364d..f10262aa2 100644 --- a/Dockerfiles/web-service/rhel/Dockerfile +++ b/Dockerfiles/web-service/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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 ca4f51ce7..b30b5b46b 100644 --- a/Dockerfiles/web-service/ubuntu/Dockerfile +++ b/Dockerfiles/web-service/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.4 -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