From 0634b35a7224fc1735eaa7bcff13ccd050968fbd Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Jul 2018 13:55:20 +0900 Subject: [PATCH] Fixed missing iksemel-dev in Epel repository --- proxy-mysql/centos/Dockerfile | 3 +-- proxy-sqlite3/centos/Dockerfile | 3 +-- server-mysql/centos/Dockerfile | 9 ++++----- server-pgsql/centos/Dockerfile | 7 ++++--- zabbix-appliance/centos/Dockerfile | 8 ++++---- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index eaa06f143..d11aa25f1 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -111,9 +111,8 @@ RUN groupadd --system zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ + yum ${YUM_FLAGS_PERSISTENT} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \ yum ${YUM_FLAGS_PERSISTENT} install \ - fping \ libcurl \ libxml2 \ mariadb \ diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile index b459edbaf..a9f53ec53 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -111,9 +111,8 @@ RUN groupadd --system zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ + yum ${YUM_FLAGS_PERSISTENT} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \ yum ${YUM_FLAGS_PERSISTENT} install \ - fping \ libcurl \ libxml2 \ net-snmp-libs \ diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index 02f2ffcfa..bee3033d6 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -10,12 +10,12 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none RUN yum --quiet makecache && \ - yum ${YUM_FLAGS_DEV} install epel-release && \ + yum ${YUM_FLAGS_DEV} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-devel-1.4-2.el7.centos.x86_64.rpm \ + http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm && \ yum ${YUM_FLAGS_DEV} install \ autoconf \ automake \ gcc \ - iksemel-devel \ libcurl-devel \ libssh2-devel \ libxml2-devel \ @@ -117,10 +117,9 @@ RUN groupadd --system zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ + 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 \ - fping \ - iksemel \ libcurl \ libxml2 \ mariadb \ diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index a7b259691..0d895cb29 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -10,12 +10,12 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none RUN yum --quiet makecache && \ - yum ${YUM_FLAGS_DEV} install epel-release && \ + yum ${YUM_FLAGS_DEV} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-devel-1.4-2.el7.centos.x86_64.rpm \ + http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm && \ yum ${YUM_FLAGS_DEV} install \ autoconf \ automake \ gcc \ - iksemel-devel \ libcurl-devel \ libssh2-devel \ libxml2-devel \ @@ -117,7 +117,8 @@ RUN groupadd --system zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ + 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 \ fping \ iksemel \ diff --git a/zabbix-appliance/centos/Dockerfile b/zabbix-appliance/centos/Dockerfile index bf3779dbb..a2e8c838d 100644 --- a/zabbix-appliance/centos/Dockerfile +++ b/zabbix-appliance/centos/Dockerfile @@ -12,14 +12,14 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ COPY ["conf/tmp/font-config", "/tmp/font-config"] -RUN yum ${YUM_FLAGS_DEV} install epel-release && \ +RUN yum ${YUM_FLAGS_DEV} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-devel-1.4-2.el7.centos.x86_64.rpm \ + http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm && \ yum --quiet makecache && \ yum ${YUM_FLAGS_DEV} install \ autoconf \ automake \ gcc \ gettext \ - iksemel-devel \ java-1.8.0-openjdk-devel \ libcurl-devel \ libssh2-devel \ @@ -139,12 +139,12 @@ RUN groupadd --system zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/ && \ yum ${YUM_FLAGS_COMMON} makecache && \ + 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 epel-release && \ yum ${YUM_FLAGS_PERSISTENT} install \ OpenIPMI-libs \ dejavu-sans-fonts \ - fping \ - iksemel \ java-1.8.0-openjdk-headless \ libcurl \ libxml2 \