Prepare 3.2 branch

This commit is contained in:
dotneft 2016-08-05 14:10:16 -07:00
parent c814e54e4b
commit 1be979ef82
18 changed files with 36 additions and 36 deletions

View File

@ -25,8 +25,8 @@ RUN addgroup zabbix && \
libssl1.0 && \ libssl1.0 && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -30,8 +30,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
apt-get ${APT_FLAGS_COMMON} clean && \ apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -21,8 +21,8 @@ RUN addgroup zabbix && \
openjdk8-jre-base && \ openjdk8-jre-base && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -27,8 +27,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
apt-get ${APT_FLAGS_COMMON} clean && \ apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -43,8 +43,8 @@ RUN addgroup zabbix && \
libssh2 && \ libssh2 && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

View File

@ -48,8 +48,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \ apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

View File

@ -39,8 +39,8 @@ RUN addgroup zabbix && \
libssh2 && \ libssh2 && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

View File

@ -46,8 +46,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \ apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

View File

@ -44,8 +44,8 @@ RUN addgroup zabbix && \
libssh2 && \ libssh2 && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

View File

@ -49,8 +49,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \ apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

View File

@ -44,8 +44,8 @@ RUN addgroup zabbix && \
libssh2 && \ libssh2 && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

View File

@ -49,8 +49,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \ apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

View File

@ -37,8 +37,8 @@ RUN addgroup zabbix && \
ttf-dejavu && \ ttf-dejavu && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

View File

@ -36,8 +36,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
apt-get ${APT_FLAGS_COMMON} clean && \ apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

View File

@ -36,8 +36,8 @@ RUN addgroup zabbix && \
ttf-dejavu && \ ttf-dejavu && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

View File

@ -41,8 +41,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
apt-get ${APT_FLAGS_COMMON} clean && \ apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

View File

@ -35,8 +35,8 @@ RUN addgroup zabbix && \
ttf-dejavu && \ ttf-dejavu && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

View File

@ -41,8 +41,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
apt-get ${APT_FLAGS_COMMON} clean && \ apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}.0alfa1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}