Updated trunk version to 5.2

This commit is contained in:
Alexey Pustovalov 2020-08-27 14:07:49 -04:00
parent f6a70ac9d6
commit 99bb977661
34 changed files with 34 additions and 34 deletions

View File

@ -31,7 +31,7 @@ RUN set -eux && \
libldap && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -44,7 +44,7 @@ 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.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -34,7 +34,7 @@ RUN set -eux && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -29,7 +29,7 @@ RUN set -eux && \
iputils && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -22,7 +22,7 @@ RUN set -eux && \
openjdk8-jre-base && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -24,7 +24,7 @@ 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.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -26,7 +26,7 @@ RUN set -eux && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -47,7 +47,7 @@ RUN set -eux && \
fping && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -62,7 +62,7 @@ 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.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -52,7 +52,7 @@ RUN set -eux && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -45,7 +45,7 @@ RUN set -eux && \
unixodbc && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
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}

View File

@ -61,7 +61,7 @@ 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.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -50,7 +50,7 @@ RUN set -eux && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -50,7 +50,7 @@ RUN set -eux && \
unixodbc && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -66,7 +66,7 @@ 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.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -56,7 +56,7 @@ RUN set -eux && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -50,7 +50,7 @@ RUN set -eux && \
unixodbc && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -67,7 +67,7 @@ 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.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -56,7 +56,7 @@ RUN set -eux && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -1,6 +1,6 @@
FROM alpine:3.12
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -1,6 +1,6 @@
FROM centos:centos7
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -1,6 +1,6 @@
FROM ubuntu:bionic
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -55,7 +55,7 @@ RUN set -eux && \
rm -rf "/var/run/apache2/" && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -47,7 +47,7 @@ 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.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -54,7 +54,7 @@ RUN set -eux && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -54,7 +54,7 @@ RUN set -eux && \
rm -rf "/var/run/apache2/" && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -47,7 +47,7 @@ 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.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -54,7 +54,7 @@ RUN set -eux && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -48,7 +48,7 @@ RUN set -eux && \
ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -39,7 +39,7 @@ 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.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -64,7 +64,7 @@ RUN set -eux && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -47,7 +47,7 @@ RUN set -eux && \
ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -39,7 +39,7 @@ 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.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

View File

@ -64,7 +64,7 @@ RUN set -eux && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=5.0
ARG MAJOR_VERSION=5.2
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git