Merge pull request #381 from zabbix/master

Master
This commit is contained in:
Alexey Pustovalov 2018-09-28 14:03:01 +03:00 committed by GitHub
commit 3c4d6fb11c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions

View File

@ -121,6 +121,8 @@ 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 \
traceroute \
libcurl \ libcurl \
libevent \ libevent \
libxml2 \ libxml2 \

View File

@ -50,6 +50,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
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 \
fping \ fping \
libcurl4 \ libcurl4 \
libevent-2.1 \ libevent-2.1 \

View File

@ -121,8 +121,8 @@ 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 \
fping \ iptuils \
iksemel \ traceroute \
libcurl \ libcurl \
libevent \ libevent \
libxml2 \ libxml2 \

View File

@ -50,6 +50,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
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 \
fping \ fping \
libcurl4 \ libcurl4 \
libevent-2.1 \ libevent-2.1 \