From 9220f5bd548d2b61ad44da152e3e4003cf61217d Mon Sep 17 00:00:00 2001 From: Zabbix Packager Date: Thu, 19 Dec 2019 16:29:04 +0200 Subject: [PATCH] Zabbix v4.4.4 release --- agent/alpine/Dockerfile | 2 +- agent/centos/Dockerfile | 4 ++-- agent/ubuntu/Dockerfile | 4 ++-- agent2/alpine/Dockerfile | 2 +- java-gateway/alpine/Dockerfile | 2 +- java-gateway/centos/Dockerfile | 4 ++-- java-gateway/ubuntu/Dockerfile | 2 +- proxy-mysql/alpine/Dockerfile | 2 +- proxy-mysql/centos/Dockerfile | 4 ++-- proxy-mysql/ubuntu/Dockerfile | 2 +- proxy-sqlite3/alpine/Dockerfile | 2 +- proxy-sqlite3/centos/Dockerfile | 4 ++-- proxy-sqlite3/ubuntu/Dockerfile | 2 +- server-mysql/alpine/Dockerfile | 2 +- server-mysql/centos/Dockerfile | 4 ++-- server-mysql/ubuntu/Dockerfile | 2 +- server-pgsql/alpine/Dockerfile | 2 +- server-pgsql/centos/Dockerfile | 4 ++-- server-pgsql/ubuntu/Dockerfile | 2 +- snmptraps/alpine/Dockerfile | 2 +- snmptraps/centos/Dockerfile | 4 ++-- snmptraps/ubuntu/Dockerfile | 2 +- web-apache-mysql/alpine/Dockerfile | 2 +- web-apache-mysql/centos/Dockerfile | 4 ++-- web-apache-mysql/ubuntu/Dockerfile | 2 +- web-apache-pgsql/alpine/Dockerfile | 2 +- web-apache-pgsql/centos/Dockerfile | 4 ++-- web-apache-pgsql/ubuntu/Dockerfile | 2 +- web-nginx-mysql/alpine/Dockerfile | 2 +- web-nginx-mysql/centos/Dockerfile | 4 ++-- web-nginx-mysql/ubuntu/Dockerfile | 2 +- web-nginx-pgsql/alpine/Dockerfile | 2 +- web-nginx-pgsql/centos/Dockerfile | 4 ++-- web-nginx-pgsql/ubuntu/Dockerfile | 2 +- zabbix-appliance/alpine/Dockerfile | 2 +- zabbix-appliance/centos/Dockerfile | 4 ++-- zabbix-appliance/rhel/Dockerfile | 4 ++-- zabbix-appliance/ubuntu/Dockerfile | 4 ++-- 38 files changed, 53 insertions(+), 53 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 456560273..944ebff66 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -33,7 +33,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile index 0d8351107..26616ae1d 100644 --- a/agent/centos/Dockerfile +++ b/agent/centos/Dockerfile @@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=agent @@ -51,7 +51,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 607633a1a..639d80e74 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -4,7 +4,7 @@ ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 TERM=xterm \ ZBX_TYPE=agent ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -56,7 +56,7 @@ ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 TERM=xterm \ ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none \ diff --git a/agent2/alpine/Dockerfile b/agent2/alpine/Dockerfile index 64d4fcb84..ca81525a2 100644 --- a/agent2/alpine/Dockerfile +++ b/agent2/alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 7ae6315fb..e762826cf 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -24,7 +24,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ diff --git a/java-gateway/centos/Dockerfile b/java-gateway/centos/Dockerfile index 201fc392c..4ed09588f 100644 --- a/java-gateway/centos/Dockerfile +++ b/java-gateway/centos/Dockerfile @@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=java-gateway @@ -45,7 +45,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index aee03bb9b..6050973f0 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -43,7 +43,7 @@ RUN set -eux && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index bb9157ffc..3144b820a 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -49,7 +49,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index 1de8a754d..f6467e0fb 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=proxy ZBX_DB_TYPE=mysql @@ -66,7 +66,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 1634cdf1c..7b7772dc5 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -70,7 +70,7 @@ RUN set -eux && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 532fa2571..32c1779cb 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -47,7 +47,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile index e3aa506b6..c228f79d0 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3 @@ -66,7 +66,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index e7bffa443..0d1bfe141 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -67,7 +67,7 @@ RUN set -eux && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 475068ead..a37e8d5f9 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -51,7 +51,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index 226e9fd2d..5c427c0ab 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none @@ -71,7 +71,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 17aa15795..0a91be50d 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -74,7 +74,7 @@ RUN set -eux && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 4d94697b0..309f8fde8 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -51,7 +51,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index 94448c452..0ad63ae78 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none @@ -71,7 +71,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 80ec89b76..3a7526820 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -74,7 +74,7 @@ RUN set -eux && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/snmptraps/alpine/Dockerfile b/snmptraps/alpine/Dockerfile index 79891f6c9..0714dbd9e 100644 --- a/snmptraps/alpine/Dockerfile +++ b/snmptraps/alpine/Dockerfile @@ -4,7 +4,7 @@ ARG APK_FLAGS_PERSISTENT="--clean-protected --no-cache" ARG APK_FLAGS_DEV="--no-cache" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ diff --git a/snmptraps/centos/Dockerfile b/snmptraps/centos/Dockerfile index 077b9c545..cbdc12db4 100644 --- a/snmptraps/centos/Dockerfile +++ b/snmptraps/centos/Dockerfile @@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -36,7 +36,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL diff --git a/snmptraps/ubuntu/Dockerfile b/snmptraps/ubuntu/Dockerfile index 0d3d0c99b..4c65372a0 100644 --- a/snmptraps/ubuntu/Dockerfile +++ b/snmptraps/ubuntu/Dockerfile @@ -20,7 +20,7 @@ LABEL org.label-schema.name="zabbix-snmptraps-ubuntu" \ org.label-schema.license="GPL v2.0" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 4cbcfd94b..84c9b5161 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -55,7 +55,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index 4ec578627..efba12446 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -33,7 +33,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=apache diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 0acb49feb..346614bb8 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -54,7 +54,7 @@ RUN set -eux && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index d71f1d3f0..22b92c4ab 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -54,7 +54,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index 0c0636f32..81460e64d 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -34,7 +34,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=apache diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 6174a848f..0e273ed24 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -55,7 +55,7 @@ RUN set -eux && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index f862906bf..3815035c4 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -58,7 +58,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index 9be976f23..48c947d58 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx @@ -35,7 +35,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index db4a63b44..168ee365a 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 726476456..59468563e 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -57,7 +57,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index 540771ffe..6c2fa0aa8 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx @@ -34,7 +34,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 3446bd855..cd204ba26 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/zabbix-appliance/alpine/Dockerfile b/zabbix-appliance/alpine/Dockerfile index fa6f9fe26..6dab3608f 100644 --- a/zabbix-appliance/alpine/Dockerfile +++ b/zabbix-appliance/alpine/Dockerfile @@ -84,7 +84,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/zabbix-appliance/centos/Dockerfile b/zabbix-appliance/centos/Dockerfile index ee2350029..db73fde63 100644 --- a/zabbix-appliance/centos/Dockerfile +++ b/zabbix-appliance/centos/Dockerfile @@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \ @@ -82,7 +82,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile index d45b4ae58..48472a20c 100644 --- a/zabbix-appliance/rhel/Dockerfile +++ b/zabbix-appliance/rhel/Dockerfile @@ -12,8 +12,8 @@ ARG BUILD_DATE ARG VCS_REF ARG MAJOR_VERSION=4.4 -ARG RELEASE=3 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG RELEASE=4 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/zabbix-appliance/ubuntu/Dockerfile b/zabbix-appliance/ubuntu/Dockerfile index e8efb5156..fdf34fee9 100644 --- a/zabbix-appliance/ubuntu/Dockerfile +++ b/zabbix-appliance/ubuntu/Dockerfile @@ -4,7 +4,7 @@ ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 TERM=xterm \ @@ -88,7 +88,7 @@ ARG VCS_REF ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG MAJOR_VERSION=4.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 TERM=xterm \