Revert "Merge branch 'trunk' into master"

This reverts commit 78b62d9ce5, reversing
changes made to f4e4c3f70f.
This commit is contained in:
root
2018-02-17 10:38:49 -08:00
parent 78b62d9ce5
commit 8f39e80b6f
25 changed files with 82 additions and 125 deletions

View File

@ -49,9 +49,7 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_PERSISTANT} install \
fping \
libcurl3 \
libevent-2.0 \
libopenipmi0 \
libpcre3 \
libsnmp30 \
libsqlite3-0 \
libssh2-1 \
@ -64,9 +62,9 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -81,10 +79,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libldap2-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libsqlite3-dev \
libssh2-1-dev \
@ -133,10 +129,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libldap2-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libsqlite3-dev \
libssh2-1-dev \