Merge remote-tracking branch 'origin/master' into 3.0

This commit is contained in:
root 2018-02-22 12:38:20 -08:00
commit 292a2427d8
2 changed files with 2 additions and 0 deletions

View File

@ -43,6 +43,7 @@ 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_DEV} install epel-release && \
yum ${YUM_FLAGS_PERSISTANT} install \
fping \
iksemel \

View File

@ -43,6 +43,7 @@ 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_DEV} install epel-release && \
yum ${YUM_FLAGS_PERSISTANT} install \
fping \
iksemel \