From 5608ea8a19bb6a69bd8df82013b31303f69d5cce Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 8 Oct 2019 01:02:44 +0300 Subject: [PATCH] Zabbix 4.4 tag --- agent/alpine/Dockerfile | 4 ++-- agent/centos/Dockerfile | 8 ++++---- agent/ubuntu/Dockerfile | 8 ++++---- java-gateway/alpine/Dockerfile | 4 ++-- java-gateway/centos/Dockerfile | 8 ++++---- java-gateway/ubuntu/Dockerfile | 4 ++-- proxy-mysql/alpine/Dockerfile | 4 ++-- proxy-mysql/centos/Dockerfile | 8 ++++---- proxy-mysql/ubuntu/Dockerfile | 4 ++-- proxy-sqlite3/alpine/Dockerfile | 4 ++-- proxy-sqlite3/centos/Dockerfile | 8 ++++---- proxy-sqlite3/ubuntu/Dockerfile | 4 ++-- server-mysql/alpine/Dockerfile | 4 ++-- server-mysql/centos/Dockerfile | 8 ++++---- server-mysql/ubuntu/Dockerfile | 4 ++-- server-pgsql/alpine/Dockerfile | 4 ++-- server-pgsql/centos/Dockerfile | 8 ++++---- server-pgsql/ubuntu/Dockerfile | 4 ++-- snmptraps/alpine/Dockerfile | 4 ++-- snmptraps/centos/Dockerfile | 8 ++++---- snmptraps/ubuntu/Dockerfile | 4 ++-- web-apache-mysql/alpine/Dockerfile | 4 ++-- web-apache-mysql/centos/Dockerfile | 8 ++++---- web-apache-mysql/ubuntu/Dockerfile | 4 ++-- web-apache-pgsql/alpine/Dockerfile | 4 ++-- web-apache-pgsql/centos/Dockerfile | 8 ++++---- web-apache-pgsql/ubuntu/Dockerfile | 4 ++-- web-nginx-mysql/alpine/Dockerfile | 4 ++-- web-nginx-mysql/centos/Dockerfile | 8 ++++---- web-nginx-mysql/ubuntu/Dockerfile | 4 ++-- web-nginx-pgsql/alpine/Dockerfile | 4 ++-- web-nginx-pgsql/centos/Dockerfile | 8 ++++---- web-nginx-pgsql/ubuntu/Dockerfile | 4 ++-- zabbix-appliance/alpine/Dockerfile | 4 ++-- zabbix-appliance/centos/Dockerfile | 8 ++++---- zabbix-appliance/rhel/Dockerfile | 6 +++--- zabbix-appliance/ubuntu/Dockerfile | 8 ++++---- 37 files changed, 103 insertions(+), 103 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index aea2fe1e8..940f1dce9 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -43,8 +43,8 @@ RUN set -eux && \ libldap && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 dde0cb044..636ad37ba 100644 --- a/agent/centos/Dockerfile +++ b/agent/centos/Dockerfile @@ -3,8 +3,8 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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,8 +50,8 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 d58df0fa3..d291efecf 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:bionic as builder 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}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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} @@ -55,8 +55,8 @@ 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}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 3bd8564cd..ed22eb316 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -35,8 +35,8 @@ RUN set -eux && \ openjdk8-jre-base && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 7e4ec9cbf..40042c437 100644 --- a/java-gateway/centos/Dockerfile +++ b/java-gateway/centos/Dockerfile @@ -3,8 +3,8 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 @@ -44,8 +44,8 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 974793e97..4a8a20f95 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -42,8 +42,8 @@ RUN set -eux && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 164925af7..921cc8bf1 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -60,8 +60,8 @@ RUN set -eux && \ fping && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 f96e29583..c27a72666 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -3,8 +3,8 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 @@ -65,8 +65,8 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 88aee5a2a..1f66d2622 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -69,8 +69,8 @@ RUN set -eux && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 1e6b9fb25..f48637219 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -58,8 +58,8 @@ RUN set -eux && \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 9bf8f76bd..557f127c2 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -3,8 +3,8 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 @@ -65,8 +65,8 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 fdde3c455..debf522b2 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -66,8 +66,8 @@ RUN set -eux && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 12d3e8c0d..98cdcbcd4 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -62,8 +62,8 @@ RUN set -eux && \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 b8a1b01c4..9e0624965 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -3,8 +3,8 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 @@ -70,8 +70,8 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 34f453cd6..28f2b3794 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -73,8 +73,8 @@ RUN set -eux && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 d374b0f83..10c439abf 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -62,8 +62,8 @@ RUN set -eux && \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 36ce0b021..70ba17b9f 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -3,8 +3,8 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 @@ -70,8 +70,8 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 0673ba3bd..63abf126d 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -73,8 +73,8 @@ RUN set -eux && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 0c2005940..e902c0bb5 100644 --- a/snmptraps/alpine/Dockerfile +++ b/snmptraps/alpine/Dockerfile @@ -18,8 +18,8 @@ LABEL org.label-schema.name="zabbix-snmptraps-alpine" \ org.label-schema.schema-version="1.0" \ org.label-schema.license="GPL v2.0" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 a0342656a..e68903115 100644 --- a/snmptraps/centos/Dockerfile +++ b/snmptraps/centos/Dockerfile @@ -3,8 +3,8 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -35,8 +35,8 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 d188f8a56..158826eda 100644 --- a/snmptraps/ubuntu/Dockerfile +++ b/snmptraps/ubuntu/Dockerfile @@ -19,8 +19,8 @@ LABEL org.label-schema.name="zabbix-snmptraps-ubuntu" \ org.label-schema.schema-version="1.0" \ org.label-schema.license="GPL v2.0" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 8b19c37ff..ea8476b09 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -55,8 +55,8 @@ RUN set -eux && \ apk add ${APK_FLAGS_PERSISTENT} --no-scripts apache2-ssl && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 c4142f5e3..27152acfc 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -3,8 +3,8 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -32,8 +32,8 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 91f639a31..d230d93f2 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -53,8 +53,8 @@ RUN set -eux && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 a9dd9e6ab..2dcf8fda2 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -54,8 +54,8 @@ RUN set -eux && \ apk add ${APK_FLAGS_PERSISTENT} --no-scripts apache2-ssl && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 5e320bdba..bc6e1e9c5 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -3,8 +3,8 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -33,8 +33,8 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 5c944d863..84e5e8a51 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -54,8 +54,8 @@ RUN set -eux && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 d48fbcbe7..6ad12e848 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -55,8 +55,8 @@ RUN set -eux && \ supervisor && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 2fcbb432d..ac3149208 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -3,8 +3,8 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 @@ -34,8 +34,8 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 7377527a0..11c1d5774 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -74,8 +74,8 @@ RUN set -eux && \ rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 49355ca1a..e3b80a619 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -54,8 +54,8 @@ RUN set -eux && \ supervisor && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 d190a4f94..77f284016 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -3,8 +3,8 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 @@ -33,8 +33,8 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 1816abd19..73824d9d4 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -74,8 +74,8 @@ RUN set -eux && \ rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 0d607b9e6..7f5b77c40 100644 --- a/zabbix-appliance/alpine/Dockerfile +++ b/zabbix-appliance/alpine/Dockerfile @@ -82,8 +82,8 @@ RUN set -eux && \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 57e48c24e..042dc4a4f 100644 --- a/zabbix-appliance/centos/Dockerfile +++ b/zabbix-appliance/centos/Dockerfile @@ -3,8 +3,8 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 \ @@ -81,8 +81,8 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 44f5397c6..fad3b8d4c 100644 --- a/zabbix-appliance/rhel/Dockerfile +++ b/zabbix-appliance/rhel/Dockerfile @@ -11,9 +11,9 @@ ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ARG BUILD_DATE ARG VCS_REF -ARG MAJOR_VERSION=4.2 -ARG RELEASE=7 -ARG ZBX_VERSION=${MAJOR_VERSION}.7 +ARG MAJOR_VERSION=4.4 +ARG RELEASE=0 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 94c5a1599..e154b00cd 100644 --- a/zabbix-appliance/ubuntu/Dockerfile +++ b/zabbix-appliance/ubuntu/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:bionic as builder 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}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 \ @@ -87,8 +87,8 @@ 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}.7 +ARG MAJOR_VERSION=4.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 \