Merge branch 'master' into 3.4

This commit is contained in:
root
2018-07-20 13:56:14 +09:00
5 changed files with 14 additions and 16 deletions

View File

@ -112,9 +112,8 @@ RUN groupadd --system zabbix && \
chown --quiet -R zabbix:root /var/lib/zabbix && \
mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
yum ${YUM_FLAGS_COMMON} makecache && \
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
yum ${YUM_FLAGS_PERSISTENT} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
yum ${YUM_FLAGS_PERSISTENT} install \
fping \
libcurl \
libevent \
libxml2 \