mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-08-17 20:11:00 +02:00
Merge branch 'master' into 3.0
This commit is contained in:
@ -122,7 +122,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 \
|
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 && \
|
http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
|
||||||
yum ${YUM_FLAGS_PERSISTENT} install \
|
yum ${YUM_FLAGS_PERSISTENT} install \
|
||||||
iptuils \
|
iputils \
|
||||||
traceroute \
|
traceroute \
|
||||||
libcurl \
|
libcurl \
|
||||||
libxml2 \
|
libxml2 \
|
||||||
|
@ -122,7 +122,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 \
|
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 && \
|
http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
|
||||||
yum ${YUM_FLAGS_PERSISTENT} install \
|
yum ${YUM_FLAGS_PERSISTENT} install \
|
||||||
iptuils \
|
iputils \
|
||||||
traceroute \
|
traceroute \
|
||||||
libcurl \
|
libcurl \
|
||||||
libxml2 \
|
libxml2 \
|
||||||
|
@ -145,6 +145,8 @@ RUN groupadd --system zabbix && \
|
|||||||
http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.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 epel-release && \
|
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
|
||||||
yum ${YUM_FLAGS_PERSISTENT} install \
|
yum ${YUM_FLAGS_PERSISTENT} install \
|
||||||
|
iputils \
|
||||||
|
traceroute \
|
||||||
curl \
|
curl \
|
||||||
OpenIPMI-libs \
|
OpenIPMI-libs \
|
||||||
dejavu-sans-fonts \
|
dejavu-sans-fonts \
|
||||||
|
@ -160,6 +160,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 && \
|
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_COMMON} update && \
|
||||||
apt-get ${APT_FLAGS_PERSISTENT} install \
|
apt-get ${APT_FLAGS_PERSISTENT} install \
|
||||||
|
iputils-ping \
|
||||||
|
traceroute \
|
||||||
curl \
|
curl \
|
||||||
fping \
|
fping \
|
||||||
libcurl4 \
|
libcurl4 \
|
||||||
|
Reference in New Issue
Block a user