From 1bf3cd83b785c534b3539549e588b7b1ddafa35d Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Fri, 2 Aug 2024 19:04:06 +0900 Subject: [PATCH 1/2] workflows: Fix CentOS7 build failure for EPEL epel-release is already included in Extra repo on CentOS 7. Signed-off-by: Hiroshi Hatake --- dockerfiles/Dockerfile.centos7 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dockerfiles/Dockerfile.centos7 b/dockerfiles/Dockerfile.centos7 index cc5b7cc440d..9ff9ee88ad9 100644 --- a/dockerfiles/Dockerfile.centos7 +++ b/dockerfiles/Dockerfile.centos7 @@ -11,8 +11,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ - wget -q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ - rpm -ivh epel-release-latest-7.noarch.rpm && \ + yum install -y epel-release && \ yum install -y cmake3 COPY . /src/ From 883d5d29ad577d0c6020f623fd890dbc0aa2d336 Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Fri, 2 Aug 2024 19:16:20 +0900 Subject: [PATCH 2/2] packaging: centos7: Use extra repo's epel-release package Signed-off-by: Hiroshi Hatake --- packaging/distros/centos/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packaging/distros/centos/Dockerfile b/packaging/distros/centos/Dockerfile index 2e0042849a5..8e70b32d478 100644 --- a/packaging/distros/centos/Dockerfile +++ b/packaging/distros/centos/Dockerfile @@ -20,8 +20,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ - wget -q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ - rpm -ivh epel-release-latest-7.noarch.rpm && \ + yum install -y epel-release && \ yum install -y cmake3 && \ yum clean all @@ -41,8 +40,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ - wget -q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ - rpm -ivh epel-release-latest-7.noarch.rpm && \ + yum install -y epel-release && \ yum install -y cmake3 && \ yum clean all