diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 04a15f569..222ae2a9d 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/Dockerfiles/agent/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 b97b0e70d..44aa46aed 100644 --- a/Dockerfiles/agent/centos/Dockerfile +++ b/Dockerfiles/agent/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 64f446eb1..a32ac90ac 100644 --- a/Dockerfiles/agent/ol/Dockerfile +++ b/Dockerfiles/agent/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 f3c584a93..74dde1532 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.0 -ARG RELEASE=13 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG RELEASE=14 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 e682d730f..7b8512c22 100644 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ b/Dockerfiles/agent/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 5395555c2..9c82a9630 100644 --- a/Dockerfiles/agent/windows/Dockerfile +++ b/Dockerfiles/agent/windows/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # escape=` ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 df763fda3..4c22533f8 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/Dockerfiles/agent2/alpine/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 42ba2366d..cdfe2a92a 100644 --- a/Dockerfiles/agent2/centos/Dockerfile +++ b/Dockerfiles/agent2/centos/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 dea8dbf2c..a25ffb154 100644 --- a/Dockerfiles/agent2/ol/Dockerfile +++ b/Dockerfiles/agent2/ol/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 5b084f886..8fa736ebe 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.0 -ARG RELEASE=13 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG RELEASE=14 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 e446dac1c..34a751d80 100644 --- a/Dockerfiles/agent2/ubuntu/Dockerfile +++ b/Dockerfiles/agent2/ubuntu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 d051b6d03..2be41da61 100644 --- a/Dockerfiles/agent2/windows/Dockerfile +++ b/Dockerfiles/agent2/windows/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # escape=` ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 e0a2ba0f2..e04204a3f 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.16 ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index ac1e6017d..c8318cb2d 100644 --- a/Dockerfiles/build-base/centos/Dockerfile +++ b/Dockerfiles/build-base/centos/Dockerfile @@ -2,7 +2,7 @@ FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index e6544bd5b..4842ed033 100644 --- a/Dockerfiles/build-base/ol/Dockerfile +++ b/Dockerfiles/build-base/ol/Dockerfile @@ -2,7 +2,7 @@ FROM oraclelinux:8-slim ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index dbae732c0..81e2fec7e 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -2,8 +2,8 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal ARG MAJOR_VERSION=6.0 -ARG RELEASE=13 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG RELEASE=14 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index c037753bd..fe5acb08d 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:jammy ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent b/Dockerfiles/build-base/windows/Dockerfile.agent index 1cbebef3c..84ff6457d 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 720879fd7..fc1c26dfa 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 ec7af2b7c..bd0bacd1d 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 87775720c..d1c7196f9 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 e7d9ee2cf..6f6a00840 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 58bf3690e..15707a14e 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.0 -ARG RELEASE=13 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG RELEASE=14 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 c638b1961..975c1b911 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 fe2eacec0..6178b5bcb 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 6dfa5601f..0b9f603b2 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 df1300fdf..793676847 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 83d125696..829f42e45 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 0119d6c71..e3f6f1174 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 81bd9b1d1..a36f0d818 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 75fdeac1d..c42ccef0e 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 f67a25882..89a4db3d8 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 a0c6ae79f..0adbffce7 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 c3ea0ed84..d1783e98b 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.0 -ARG RELEASE=13 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG RELEASE=14 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 534b45b43..b4a5fc7c7 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 1374c4961..85fa37d2e 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 fc6901146..2ed7cde75 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 9f32b0f3d..b477c702f 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 29929955b..1698b7ce4 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.0 -ARG RELEASE=13 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG RELEASE=14 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 4aa376d9a..34ab2237c 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 baacdd6c5..167990923 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 de58ccbc4..fe1b3c283 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 ca7244fa5..58941f1d4 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 fd1dc24d6..5252c01b3 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.0 -ARG RELEASE=13 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG RELEASE=14 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 47d316a5d..2f52a973b 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 5019858fa..9d238fd14 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 c9a547678..b3d69f1f2 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 f477d06b5..20298e96b 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 f1e063239..99124e0a3 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.0 -ARG RELEASE=13 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG RELEASE=14 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 e6925c3ee..b55ef4bd1 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 915efc98a..ec5a14ff6 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 5bdd2b1d0..511a8242c 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 422b3bcc5..bc7d5a10a 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 15ec8186f..cee1c290a 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.0 -ARG RELEASE=13 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG RELEASE=14 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 6cea68634..0932e9c9b 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 f8d6b0513..7c9b85c77 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 23b560468..5cd86f2ed 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 47e59c1c1..1d0bbf488 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 234e5f8c2..8a9c56d28 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 b838e1a36..a577c1867 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.16 ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 b43e5b77a..81f382ed0 100644 --- a/Dockerfiles/snmptraps/centos/Dockerfile +++ b/Dockerfiles/snmptraps/centos/Dockerfile @@ -1,7 +1,7 @@ FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 31017f88c..6017901e7 100644 --- a/Dockerfiles/snmptraps/ol/Dockerfile +++ b/Dockerfiles/snmptraps/ol/Dockerfile @@ -1,7 +1,7 @@ FROM oraclelinux:8-slim ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 1c4ca2fdf..23deed1ef 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -1,8 +1,8 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal ARG MAJOR_VERSION=6.0 -ARG RELEASE=13 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG RELEASE=14 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index d43de2684..f9dbfde03 100644 --- a/Dockerfiles/snmptraps/ubuntu/Dockerfile +++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:jammy ARG MAJOR_VERSION=6.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 b4796489f..6d47bf4a3 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 da86a50d8..298650d34 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 9d26e5ff2..3afb43b77 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 bee5159a1..9f158fdad 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 2a73f99e2..bdb07cf82 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 1e9253a3a..7872e5aa5 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 a9550ebe0..3928a8555 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 fad7395b0..02412bd1e 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 abb908cb7..ec45b1e16 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 702c9a455..cfee1efe9 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 4d16d875a..c86723ff9 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 5811ebc12..282dcd4c0 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.0 -ARG RELEASE=13 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG RELEASE=14 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 329adbd72..dc08c2071 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 3c81e821d..7c83a8855 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 b5334f78f..45b64e93a 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 cdd0757f9..0d2971f26 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 b60183edb..ea4de5998 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 574cca431..869f606ea 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 63c0df5dc..d4a245ee7 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 21e28cf89..bb789e9f4 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 bc8a8c0d3..da0cf5be6 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.0 -ARG RELEASE=13 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG RELEASE=14 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 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 13d3480e8..23f41e77f 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.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder diff --git a/Dockerfiles/zabbix-appliance/rhel/Dockerfile b/Dockerfiles/zabbix-appliance/rhel/Dockerfile index bf7a24497..756422f28 100644 --- a/Dockerfiles/zabbix-appliance/rhel/Dockerfile +++ b/Dockerfiles/zabbix-appliance/rhel/Dockerfile @@ -1,8 +1,8 @@ FROM registry.access.redhat.com/ubi8/ubi ARG MAJOR_VERSION=6.0 -ARG RELEASE=13 -ARG ZBX_VERSION=${MAJOR_VERSION}.13 +ARG RELEASE=14 +ARG ZBX_VERSION=${MAJOR_VERSION}.14 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm \