extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-10 00:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch '3.4' into master"

Browse Source 
This reverts commit e3dd845396, reversing
changes made to 461f869a4a.
This commit is contained in:
root
2018-02-17 16:12:34 -08:00
parent e3dd845396
commit 1be4813733
35 changed files with 101 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proxy-sqlite3/centos/Dockerfile
View File

@ -45,7 +45,6 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} install \
fping \
libcurl \
libevent \
libxml2 \
net-snmp-libs \
OpenIPMI-libs \
@ -57,8 +56,8 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
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}
@ -73,7 +72,6 @@ RUN yum --quiet makecache && \
automake \
gcc \
libcurl-devel \
libevent-devel \
libssh2-devel \
libxml2-devel \
make \