diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index e257dd0d4..ce1a155a4 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -44,7 +44,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile index 007348780..e2488bd49 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 261bc923d..ae2216afd 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 7952849c6..f770aefb8 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 c16aa5649..bc4c45fd6 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 91d361d90..b420e659b 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 4f5505358..28026b861 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 b01fd3615..926fd8e60 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 13b6ee40e..91bad5b04 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 99ea6f0e4..bee500ae4 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 f93f70eee..9159127e4 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 7e53ec3de..75068a88b 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 ae3ef3bd3..df7562ab4 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 a62d6168a..f47528c21 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 733c79e79..e2af53de2 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 fad0d0393..c6216d8be 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 9ec8b393b..d9242c575 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 8126e91ee..8139ccf5e 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 32102f367..04bcbdd12 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 433e71b0d..934b0d52a 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 f846e309e..b04e7d04b 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 776b40117..ed15c659f 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 47cc7596a..cdbb1b3c8 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 3cb29e2a0..173428aaa 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 b9407e794..41fb137cc 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 a72d42295..d67167ba5 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 af3867bbe..b586989b1 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 3e38d9f84..e4158a24f 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 e399e4a80..0abd6558e 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 a16962bb1..d4823da33 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 831c5f4e3..0767a36b3 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 15f58b78d..f7663d073 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 1f92b2859..b3798d864 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 dbe8aaa1e..6e207ec85 100644 --- a/zabbix-appliance/alpine/Dockerfile +++ b/zabbix-appliance/alpine/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 8d5a69dd6..7214ea5a7 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 f1020afc1..25c826e0a 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=4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG RELEASE=5 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 1c666e6af..40ebddfad 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 \