From 8a4defcf67c7f76e8e2fe684521d1334bd6326af Mon Sep 17 00:00:00 2001 From: v-zhuravlev Date: Fri, 28 Sep 2018 01:39:41 +0300 Subject: [PATCH 1/2] added ping and traceroute to centos/ubuntu version of server --- server-mysql/centos/Dockerfile | 2 ++ server-mysql/ubuntu/Dockerfile | 2 ++ server-pgsql/centos/Dockerfile | 2 ++ server-pgsql/ubuntu/Dockerfile | 2 ++ 4 files changed, 8 insertions(+) diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index bee3033d6..b952101c4 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -120,6 +120,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 \ http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \ yum ${YUM_FLAGS_PERSISTENT} install \ + iptuils \ + traceroute \ libcurl \ libxml2 \ mariadb \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 86a58143e..1c6899383 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -50,6 +50,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTENT} install \ + iputils-ping \ + traceroute \ fping \ libcurl4 \ libiksemel3 \ diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index 0d895cb29..15b1bbeae 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -120,6 +120,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 \ http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \ yum ${YUM_FLAGS_PERSISTENT} install \ + iptuils \ + traceroute \ fping \ iksemel \ libcurl \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 6f9b7da4d..6116babeb 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -50,6 +50,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTENT} install \ + iputils-ping \ + traceroute \ fping \ libcurl4 \ libiksemel3 \ From 4cc23086fa2c0b14ba7109177d66bd051f0ab124 Mon Sep 17 00:00:00 2001 From: v-zhuravlev Date: Fri, 28 Sep 2018 01:40:24 +0300 Subject: [PATCH 2/2] removed redundant installation of fping/iksemel --- server-pgsql/centos/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index 15b1bbeae..73bbe379d 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -122,8 +122,6 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTENT} install \ iptuils \ traceroute \ - fping \ - iksemel \ libcurl \ libxml2 \ net-snmp-libs \