From cbf06bb6de39e80c8e88cd8cc53c4e5e7eda1a8c Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 17 May 2021 14:37:01 +0500 Subject: [PATCH] Prepare for Zabbix 5.4 release --- agent/alpine/Dockerfile | 4 ++-- agent/centos/Dockerfile | 4 ++-- agent/ubuntu/Dockerfile | 4 ++-- agent2/alpine/Dockerfile | 4 ++-- agent2/ubuntu/Dockerfile | 4 ++-- java-gateway/alpine/Dockerfile | 4 ++-- java-gateway/centos/Dockerfile | 4 ++-- java-gateway/ubuntu/Dockerfile | 4 ++-- proxy-mysql/alpine/Dockerfile | 4 ++-- proxy-mysql/centos/Dockerfile | 4 ++-- proxy-mysql/ubuntu/Dockerfile | 4 ++-- proxy-sqlite3/alpine/Dockerfile | 4 ++-- proxy-sqlite3/centos/Dockerfile | 4 ++-- proxy-sqlite3/ubuntu/Dockerfile | 4 ++-- server-mysql/alpine/Dockerfile | 4 ++-- server-mysql/centos/Dockerfile | 4 ++-- server-mysql/ubuntu/Dockerfile | 4 ++-- server-pgsql/alpine/Dockerfile | 4 ++-- server-pgsql/centos/Dockerfile | 4 ++-- server-pgsql/ubuntu/Dockerfile | 4 ++-- web-apache-mysql/alpine/Dockerfile | 4 ++-- web-apache-mysql/centos/Dockerfile | 4 ++-- web-apache-mysql/ubuntu/Dockerfile | 4 ++-- web-apache-pgsql/alpine/Dockerfile | 4 ++-- web-apache-pgsql/centos/Dockerfile | 4 ++-- web-apache-pgsql/ubuntu/Dockerfile | 4 ++-- web-nginx-mysql/alpine/Dockerfile | 4 ++-- web-nginx-mysql/centos/Dockerfile | 4 ++-- web-nginx-mysql/ubuntu/Dockerfile | 4 ++-- web-nginx-pgsql/alpine/Dockerfile | 4 ++-- web-nginx-pgsql/centos/Dockerfile | 4 ++-- web-nginx-pgsql/ubuntu/Dockerfile | 4 ++-- web-service/alpine/Dockerfile | 4 ++-- web-service/centos/Dockerfile | 4 ++-- web-service/ubuntu/Dockerfile | 4 ++-- zabbix-appliance/rhel/Dockerfile | 4 ++-- 36 files changed, 72 insertions(+), 72 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 872f76834..eae8eef40 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -36,8 +36,8 @@ RUN set -eux && \ libldap && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile index 2d8319cb2..c6d033cb4 100644 --- a/agent/centos/Dockerfile +++ b/agent/centos/Dockerfile @@ -59,8 +59,8 @@ RUN set -eux && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 5c2838654..a2097ac46 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -47,8 +47,8 @@ RUN set -eux && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/agent2/alpine/Dockerfile b/agent2/alpine/Dockerfile index 2834ea55e..6d6a9830c 100644 --- a/agent2/alpine/Dockerfile +++ b/agent2/alpine/Dockerfile @@ -34,8 +34,8 @@ RUN set -eux && \ iputils && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/agent2/ubuntu/Dockerfile b/agent2/ubuntu/Dockerfile index 229c9ebaa..60a0947a8 100644 --- a/agent2/ubuntu/Dockerfile +++ b/agent2/ubuntu/Dockerfile @@ -46,8 +46,8 @@ RUN set -eux && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 1ff96c48b..37a9b399a 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -28,8 +28,8 @@ RUN set -eux && \ openjdk8-jre-base && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ diff --git a/java-gateway/centos/Dockerfile b/java-gateway/centos/Dockerfile index 2a1ca5340..8f1e1aa62 100644 --- a/java-gateway/centos/Dockerfile +++ b/java-gateway/centos/Dockerfile @@ -28,8 +28,8 @@ RUN set -eux && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 5662455c3..4391c9a67 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -29,8 +29,8 @@ RUN set -eux && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index b44a7c087..55acf3a4f 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -51,8 +51,8 @@ RUN set -eux && \ fping && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index 220a9bafb..af3b408fa 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -80,8 +80,8 @@ RUN set -eux && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} 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 \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 2010f7267..fba7da8ac 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -63,8 +63,8 @@ RUN set -eux && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index a98976caa..6deec222e 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -49,8 +49,8 @@ RUN set -eux && \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} 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 7bcf3b451..e45f6170e 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -77,8 +77,8 @@ RUN set -eux && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} 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 \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 3ec08e390..060ab0bd4 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -61,8 +61,8 @@ RUN set -eux && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 7445c81a7..2606d608f 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -55,8 +55,8 @@ RUN set -eux && \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index 76d20587d..67710d243 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -85,8 +85,8 @@ RUN set -eux && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} 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 \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index c8fa29fb6..dcef343f7 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -68,8 +68,8 @@ RUN set -eux && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 5dd96e614..f2439011b 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -55,8 +55,8 @@ RUN set -eux && \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index 5a15d2263..44faa7e22 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -84,8 +84,8 @@ RUN set -eux && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} 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 \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 9bbb99443..e58c80d23 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -68,8 +68,8 @@ RUN set -eux && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index bc7829ea0..0d77dc499 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -58,8 +58,8 @@ RUN set -eux && \ rm -rf "/var/run/apache2/" && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index 541cc975f..585d5762d 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -50,8 +50,8 @@ RUN set -eux && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index d861207e1..c66695ef0 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -55,8 +55,8 @@ RUN set -eux && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index c33abc1b3..0e19d6560 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -57,8 +57,8 @@ RUN set -eux && \ rm -rf "/var/run/apache2/" && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index 9307313c9..7039b7a4c 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -50,8 +50,8 @@ RUN set -eux && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index cb85e8ff9..1268ea2e9 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -55,8 +55,8 @@ RUN set -eux && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 206492d71..166f5da46 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -51,8 +51,8 @@ RUN set -eux && \ ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index 8891f994a..191f7aeb8 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -42,8 +42,8 @@ RUN set -eux && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 2b5f178f2..95cf0bffe 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -66,8 +66,8 @@ RUN set -eux && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 5ca7e150d..d6337c93a 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -50,8 +50,8 @@ RUN set -eux && \ ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index 7730bb2f8..38c6b41f8 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -42,8 +42,8 @@ RUN set -eux && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 54de65fff..323421db4 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -66,8 +66,8 @@ RUN set -eux && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-service/alpine/Dockerfile b/web-service/alpine/Dockerfile index 74fcc0b47..fbe416289 100644 --- a/web-service/alpine/Dockerfile +++ b/web-service/alpine/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux && \ chromium && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-service/centos/Dockerfile b/web-service/centos/Dockerfile index 2bb6682d0..45342231b 100644 --- a/web-service/centos/Dockerfile +++ b/web-service/centos/Dockerfile @@ -32,8 +32,8 @@ RUN set -eux && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/web-service/ubuntu/Dockerfile b/web-service/ubuntu/Dockerfile index 37fa0edc9..f70a53022 100644 --- a/web-service/ubuntu/Dockerfile +++ b/web-service/ubuntu/Dockerfile @@ -45,8 +45,8 @@ RUN set -eux && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=5.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG MAJOR_VERSION=6.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile index 6f69cf802..70bb425c8 100644 --- a/zabbix-appliance/rhel/Dockerfile +++ b/zabbix-appliance/rhel/Dockerfile @@ -1,9 +1,9 @@ FROM registry.access.redhat.com/ubi8/ubi MAINTAINER Alexey Pustovalov -ARG MAJOR_VERSION=5.4 +ARG MAJOR_VERSION=6.0 ARG RELEASE=0 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \