From 42ebc6ea10eee01e0fbd129ccb4ef67fc3d652ee Mon Sep 17 00:00:00 2001 From: Zabbix Packager Date: Mon, 28 Jan 2019 18:02:52 +0200 Subject: [PATCH] Zabbix v3.0.25 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 ed7fad63b..48ce44cfa 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=agent @@ -48,7 +48,7 @@ ARG APK_FLAGS_COMMON="" ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ 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 3a6e1280d..97457daaa 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=agent @@ -48,7 +48,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ 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 1632e0a36..c29bcf6e4 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ ZBX_TYPE=agent ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -51,7 +51,7 @@ ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive 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 a5f45a69e..747ec60b7 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -35,7 +35,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/centos/Dockerfile b/java-gateway/centos/Dockerfile index dae1668f4..564e6aab4 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=java-gateway @@ -44,7 +44,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ 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 2fec775af..47f4a54e5 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -42,7 +42,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 935ba7f2b..ce6afca36 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -57,7 +57,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index 002214165..a04b3465c 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=proxy ZBX_DB_TYPE=mysql @@ -64,7 +64,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ 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 013ba0665..51e578669 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -65,7 +65,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 83af19710..695246950 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -55,7 +55,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile index 72bf4b2c0..cf95fe282 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3 @@ -64,7 +64,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ 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 69a663907..fb2a4555b 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -62,7 +62,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 7fda913f4..5764b15a6 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -59,7 +59,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index 31c495b0f..68dcff992 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none @@ -69,7 +69,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ 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 012cf1bb0..f9ad4110d 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -69,7 +69,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 23b955a12..4772acfa8 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -59,7 +59,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index c9ea65b36..e20b9181a 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none @@ -69,7 +69,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ 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 7dc23a479..d10b4f644 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -69,7 +69,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/snmptraps/alpine/Dockerfile b/snmptraps/alpine/Dockerfile index e8b04e14a..be9a5850c 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/snmptraps/centos/Dockerfile b/snmptraps/centos/Dockerfile index f08557e77..2deaa6fb6 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -35,7 +35,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ 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 65579f338..af3601dac 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index a950e46a6..d930c84a9 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -56,7 +56,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index 017c1e67c..aad500c48 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -35,7 +35,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 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=mysql ZBX_OPT_TYPE=apache diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 56569fdf3..47d82480c 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index 3bfe3e63f..c43809e48 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -55,7 +55,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index 501808c9c..ed8f3bfd9 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -35,7 +35,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 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 838a221bf..56183b090 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 852157998..c639a9871 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -56,7 +56,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index 37a9b1a40..62184be70 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 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=mysql ZBX_OPT_TYPE=nginx @@ -36,7 +36,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 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=mysql ZBX_OPT_TYPE=nginx diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 99abb27ff..591e99cb7 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -66,7 +66,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index b8b348219..7a7998a6f 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -55,7 +55,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index 5ec06356f..c08fb333a 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 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=nginx @@ -36,7 +36,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 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=nginx diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index c74476756..b046e97ff 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -66,7 +66,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/zabbix-appliance/alpine/Dockerfile b/zabbix-appliance/alpine/Dockerfile index 36e0d719a..afe1aab95 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm \ @@ -84,7 +84,7 @@ ARG APK_FLAGS_COMMON="" ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ 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 c36ba51bd..e3d1454b5 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \ @@ -85,7 +85,7 @@ ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ 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 995c3f5af..65bcd9e68 100644 --- a/zabbix-appliance/rhel/Dockerfile +++ b/zabbix-appliance/rhel/Dockerfile @@ -12,8 +12,8 @@ ARG BUILD_DATE ARG VCS_REF ARG MAJOR_VERSION=3.0 -ARG RELEASE=24 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG RELEASE=25 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/zabbix-appliance/ubuntu/Dockerfile b/zabbix-appliance/ubuntu/Dockerfile index 8ee211d39..27832f8fd 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=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ @@ -90,7 +90,7 @@ ARG VCS_REF ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG MAJOR_VERSION=3.0 -ARG ZBX_VERSION=${MAJOR_VERSION}.24 +ARG ZBX_VERSION=${MAJOR_VERSION}.25 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \