Use EPEL to install fping instead of custom package (CentOS)

nAnderYang · Sep 7, 2020 · 1fdd3c9 · 1fdd3c9
1 parent 0d97236
commit 1fdd3c9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile
@@ -31,8 +31,9 @@ RUN set -eux && \
     mkdir -p /usr/lib/zabbix/externalscripts && \
     mkdir -p /usr/share/doc/zabbix-proxy-mysql && \
     yum --quiet makecache && \
-    yum -y install https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm --setopt=tsflags=nodocs && \
+    yum -y install epel-release && \
     yum -y install --setopt=tsflags=nodocs \
+            fping
             libcurl \
             libxml2 \
             mariadb \

diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile
@@ -31,8 +31,9 @@ RUN set -eux && \
     mkdir -p /usr/lib/zabbix/externalscripts && \
     mkdir -p /usr/share/doc/zabbix-proxy-sqlite3 && \
     yum --quiet makecache && \
-    yum -y install https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm --setopt=tsflags=nodocs && \
+    yum -y install epel-release && \
     yum -y install --setopt=tsflags=nodocs \
+            fping \
             libcurl \
             libxml2 \
             net-snmp-libs \

diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile
@@ -33,9 +33,10 @@ RUN set -eux && \
     mkdir -p /usr/lib/zabbix/externalscripts && \
     mkdir -p /usr/share/doc/zabbix-server-mysql && \
     yum --quiet makecache && \
-    yum -y install --setopt=tsflags=nodocs https://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm \
-                                        https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
+    yum -y install --setopt=tsflags=nodocs https://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm && \
+    yum -y install epel-release && \
     yum -y install --setopt=tsflags=nodocs \
+            fping \
             tzdata \
             iputils \
             traceroute \

diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile
@@ -33,9 +33,10 @@ RUN set -eux && \
     mkdir -p /usr/lib/zabbix/externalscripts && \
     mkdir -p /usr/share/doc/zabbix-server-postgresql && \
     yum --quiet makecache && \
-    yum -y install --setopt=tsflags=nodocs https://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm \
-                                        https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
+    yum -y install --setopt=tsflags=nodocs https://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm && \
+    yum -y install epel-release && \
     yum -y install --setopt=tsflags=nodocs \
+            fping \
             iputils \
             tzdata \
             traceroute \