Revert "Merge branch '3.4' into master"

This reverts commit 49a0e5deb7, reversing
changes made to b2bb957389.
This commit is contained in:
root
2018-02-17 10:22:18 -08:00
parent 49a0e5deb7
commit f4e4c3f70f
25 changed files with 81 additions and 124 deletions

View File

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