From 5acd1c39a1389e36bb93c95fb32403da683a84ff Mon Sep 17 00:00:00 2001 From: Shizuo Fujita Date: Wed, 26 Feb 2025 13:58:53 +0900 Subject: [PATCH 1/3] centos7: fix mirror list Signed-off-by: Shizuo Fujita --- fluent-package/yum/centos-7/Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/fluent-package/yum/centos-7/Dockerfile b/fluent-package/yum/centos-7/Dockerfile index 01f7e4fd7..fc093189f 100644 --- a/fluent-package/yum/centos-7/Dockerfile +++ b/fluent-package/yum/centos-7/Dockerfile @@ -22,10 +22,23 @@ COPY qemu-* /usr/bin/ ARG DEBUG +RUN sed -i'' -e 's/^mirrorlist/#mirrorlist/g' \ + -e 's/^#baseurl/baseurl/g' \ + -e 's,mirror.centos.org/centos/$releasever,vault.centos.org/7.9.2009,g' \ + /etc/yum.repos.d/CentOS-Base.repo + RUN \ quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \ yum update -y ${quiet} && \ yum install -y ${quiet} centos-release-scl && \ + sed -i'' -e 's/^mirrorlist/#mirrorlist/g' \ + -e 's/^# baseurl/baseurl/g' \ + -e 's,mirror.centos.org/centos/7,vault.centos.org/7.9.2009,g' \ + /etc/yum.repos.d/CentOS-SCLo-scl.repo && \ + sed -i'' -e 's/^mirrorlist/#mirrorlist/g' \ + -e 's/^#baseurl/baseurl/g' \ + -e 's,mirror.centos.org/centos/7,vault.centos.org/7.9.2009,g' \ + /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo && \ yum install -y ${quiet} epel-release && \ yum groupinstall -y ${quiet} "Development Tools" && \ yum install -y ${quiet} \ From 616074cd61f3c6a182df5e7d08251f87408be4ef Mon Sep 17 00:00:00 2001 From: Shizuo Fujita Date: Wed, 26 Feb 2025 14:01:39 +0900 Subject: [PATCH 2/3] centos7: remove unnecessary python file This will remove following files * /root/rpmbuild/BUILDROOT/fluent-package-5.2.0-1.el7.x86_64/opt/fluent/lib/ruby/gems/3.2.0/gems/ffi-1.17.0/ext/ffi_c/libffi/generate-darwin-source-and-headers.py * /root/rpmbuild/BUILDROOT/fluent-package-5.2.0-1.el7.x86_64/opt/fluent/lib/ruby/gems/3.2.0/gems/ffi-1.17.0/ext/ffi_c/libffi/testsuite/emscripten/test_libffi.py * /root/rpmbuild/BUILDROOT/fluent-package-5.2.0-1.el7.x86_64/opt/fluent/lib/ruby/gems/3.2.0/gems/ffi-1.17.0/ext/ffi_c/libffi/testsuite/emscripten/conftest.py Signed-off-by: Shizuo Fujita --- fluent-package/Rakefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fluent-package/Rakefile b/fluent-package/Rakefile index 84c7a2caa..19cedbe7f 100755 --- a/fluent-package/Rakefile +++ b/fluent-package/Rakefile @@ -1147,6 +1147,10 @@ class BuildTask rm_f(static_library) end end + Dir.glob("#{fluent_package_staging_dir}/**/libffi/**/*.py").each do |python_file| + # Remove unnecessary python file to avoid error in brp-python-bytecompile on CentOS 7 + remove_files(python_file) + end Dir.glob("#{fluent_package_staging_dir}/**/.git").each do |git_dir| remove_files(git_dir, true) end From 3d16f7a246647eef0cc55d923210c2314f75fe17 Mon Sep 17 00:00:00 2001 From: Shizuo Fujita Date: Thu, 27 Feb 2025 12:00:23 +0900 Subject: [PATCH 3/3] centos7: pull docker image from docker hub Signed-off-by: Shizuo Fujita --- lib/package-task.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/package-task.rb b/lib/package-task.rb index 0f8b24530..0f4b25746 100644 --- a/lib/package-task.rb +++ b/lib/package-task.rb @@ -114,6 +114,8 @@ def run_docker(os, architecture=nil) id = os id = "#{id}-#{architecture}" if architecture docker_tag = "#{@package}-#{id}" + # TODO: Fix docker tag name + docker_tag = "watson1978/#{docker_tag}" if os == "centos-7" build_command_line = [ "docker", "build", @@ -149,7 +151,14 @@ def run_docker(os, architecture=nil) build_command_line << docker_context run_command_line.concat([docker_tag, "/host/build.sh"]) - sh(*build_command_line) + if os == "centos-7" + if ENV["BUILD_DOCKER_IMAGE_ONLY"] + sh(*build_command_line) + exit + end + else + sh(*build_command_line) + end sh(*run_command_line) end