diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 873791bf8..c9be1bda9 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 0b82de6d9..bb77a73fc 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 09fd6b762..54c8e3b5f 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 796639c9f..9784b8c36 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 0b8c4f69b..da23fff8e 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 b3b1afee6..91d0025f7 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 f4c1da81a..e87b0f6c3 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 409b8df62..214626b2d 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 0f12343d0..e3fcc56e5 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 e10739584..43137be65 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 62f54bc8b..115b600bd 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 19c367dfa..aaef8ee27 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 8573d34f0..fc44ff35a 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 44ec849e4..3f37af50d 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 9e19f4453..1e5d169c5 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 17449d21a..89bf6e071 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 391dcea1e..df8ce62e4 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 43e030927..164e5ab4a 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 6865e0b10..a2edfd787 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 cd3c4084a..7f472e7d0 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 d94aebd8f..940033732 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 c661f8857..9239172cf 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 6d0b8194e..1626591d5 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 57b31af5e..b4e6f36ed 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 9a82d0862..db1452187 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 a4a9edf62..b863e0224 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 4a40495fb..dee9821ae 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 665af9469..a776ffaf4 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 febf8d1fd..9f551e1f0 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 2b645eefe..1b3c02ba2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 64269e247..11a3cdc8f 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 2efd1741f..cdc0c91cc 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 8e98df46b..e69daff82 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 8e7c3c9c1..97fcc9316 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 74c198548..0e9158335 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 47bbdf0a7..a1ea9ea5a 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=1 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG RELEASE=2 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 48125f374..24849160d 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 \