Merge branch 'master' into 4.2

This commit is contained in:
root 2019-05-20 18:13:08 +03:00
commit 7de99092bc
4 changed files with 6 additions and 2 deletions

View File

@ -123,7 +123,7 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTENT} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm \
http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
yum ${YUM_FLAGS_PERSISTENT} install \
iptuils \
iputils \
traceroute \
libcurl \
libevent \

View File

@ -124,7 +124,7 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTENT} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm \
http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
yum ${YUM_FLAGS_PERSISTENT} install \
iptuils \
iputils \
traceroute \
libcurl \
libevent \

View File

@ -146,6 +146,8 @@ RUN groupadd --system zabbix && \
http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
yum ${YUM_FLAGS_PERSISTENT} install \
iputils \
traceroute \
curl \
OpenIPMI-libs \
dejavu-sans-fonts \

View File

@ -162,6 +162,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
echo "deb http://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \
apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install \
iputils-ping \
traceroute \
curl \
fping \
libcurl4 \