From 18c52aa9c94cd7c71d9af4838fd627880551b247 Mon Sep 17 00:00:00 2001 From: Zabbix Packager Date: Mon, 10 Jun 2019 09:52:54 +0300 Subject: [PATCH] Zabbix v4.2.3 release --- agent/alpine/Dockerfile | 4 ++-- agent/centos/Dockerfile | 4 ++-- agent/ubuntu/Dockerfile | 4 ++-- 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 | 4 ++-- zabbix-appliance/centos/Dockerfile | 4 ++-- zabbix-appliance/rhel/Dockerfile | 4 ++-- zabbix-appliance/ubuntu/Dockerfile | 4 ++-- 37 files changed, 54 insertions(+), 54 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index c9be1bda9..8a0389269 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -4,7 +4,7 @@ ARG APK_FLAGS_COMMON="" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 @@ -50,7 +50,7 @@ ARG APK_FLAGS_COMMON="" ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/centos/Dockerfile b/agent/centos/Dockerfile index bb77a73fc..abaf2b23c 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 @@ -49,7 +49,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 54c8e3b5f..84000cc02 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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} @@ -54,7 +54,7 @@ ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 9784b8c36..2534a46d9 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -36,7 +36,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/centos/Dockerfile b/java-gateway/centos/Dockerfile index da23fff8e..f450040f2 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 91d0025f7..163b29e22 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 e87b0f6c3..08db133c4 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -61,7 +61,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index 214626b2d..da1913196 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 e3fcc56e5..94e314743 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 43137be65..e25c72cd6 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -59,7 +59,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 115b600bd..b92f63584 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 aaef8ee27..f168ffbdc 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 fc44ff35a..f412ce784 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -63,7 +63,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/centos/Dockerfile b/server-mysql/centos/Dockerfile index 3f37af50d..0e635ff6f 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 1e5d169c5..1dae6ba4e 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 89bf6e071..fff84fe20 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -63,7 +63,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/centos/Dockerfile b/server-pgsql/centos/Dockerfile index df8ce62e4..8fb254fa3 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 164e5ab4a..ce6990d84 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 a2edfd787..f17681da5 100644 --- a/snmptraps/alpine/Dockerfile +++ b/snmptraps/alpine/Dockerfile @@ -19,7 +19,7 @@ LABEL org.label-schema.name="zabbix-snmptraps-alpine" \ org.label-schema.license="GPL v2.0" ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/snmptraps/centos/Dockerfile b/snmptraps/centos/Dockerfile index 7f472e7d0..844214d7f 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 940033732..47901d759 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 9239172cf..af27bdff3 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -56,7 +56,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index 1626591d5..8226db2e1 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 b4e6f36ed..241745f56 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 db1452187..f3ac38454 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -55,7 +55,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index b863e0224..dc4605e24 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ 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 dee9821ae..7ee581b37 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 a776ffaf4..f22c96100 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -56,7 +56,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 9f551e1f0..f8e7efd1f 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 1b3c02ba2..42a1f4fbc 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -75,7 +75,7 @@ RUN set -eux && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 11a3cdc8f..0627f7ad3 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -55,7 +55,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 cdc0c91cc..827f3d34d 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 e69daff82..2822c247f 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -75,7 +75,7 @@ RUN set -eux && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 fc974a52e..2abd6754f 100644 --- a/zabbix-appliance/alpine/Dockerfile +++ b/zabbix-appliance/alpine/Dockerfile @@ -4,7 +4,7 @@ ARG APK_FLAGS_COMMON="" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm \ @@ -83,7 +83,7 @@ ARG APK_FLAGS_COMMON="" ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm \ diff --git a/zabbix-appliance/centos/Dockerfile b/zabbix-appliance/centos/Dockerfile index 0e9158335..e4cfb395a 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 a1ea9ea5a..05e11cc4e 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.2 -ARG RELEASE=2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG RELEASE=3 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 24849160d..a80f3ad56 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 \