Browse Source

Update Dockerfile

Teddysun 5 months ago
parent
commit
6f141e0c7d
2 changed files with 17 additions and 15 deletions
  1. 9 8
      docker/rpmbuild/Dockerfile.rpmbuild8
  2. 8 7
      docker/rpmbuild/Dockerfile.rpmbuild9

+ 9 - 8
docker/rpmbuild/Dockerfile.rpmbuild8

@@ -1,23 +1,24 @@
 # Dockerfile for build RPM packages.
-# Copyright (C) 2021 - 2024 Teddysun <[email protected]>
+# Copyright (C) 2021 - 2025 Teddysun <[email protected]>
 
 FROM rockylinux:8
 LABEL maintainer="Teddysun <[email protected]>"
 
-RUN yum install -y yum-utils epel-release && \
-	yum-config-manager --enable epel && \
-	yum-config-manager --enable powertools && \
+RUN dnf install -y yum-utils epel-release && \
+	dnf config-manager --enable epel && \
+	dnf config-manager --enable powertools && \
+	dnf install -y https://dl.lamp.sh/linux/rhel/el8/x86_64/teddysun-release-1.0-1.el8.noarch.rpm && \
 	rpm -e --nodeps coreutils-single && \
-	yum install -y tar wget git tree gcc gcc-c++ \
-		sudo net-tools make cmake zstd libzstd chkconfig \
+	dnf install -y tar wget wget2 curl libcurl libcurl-devel git tree gcc gcc-c++ \
+		sudo net-tools make cmake zstd libzstd chkconfig pcre-devel pcre2-devel \
 		bash coreutils diffutils patch ca-certificates \
 		rpm-build rpm-devel rpmlint rpmdevtools which procps \
 		asciidoc audit-libs-devel binutils-devel flex \
 		libcap-devel newt-devel pciutils-devel perl-generators \
 		python3 python3-devel python3-docutils rsync xmlto bc bison libnl3-devel \
-		java-devel ncurses-devel numactl-devel openssl-devel perl-devel dwarves \
+		java-devel ncurses-devel numactl-devel openssl-devel openssl3-devel perl-devel dwarves \
 		elfutils-devel xz-devel perl-ExtUtils-Embed gettext kmod libkcapi-hmaccalc && \
-	yum clean all && rm -rf /var/cache/dnf /var/lib/rpm/__db*
+	dnf clean all && rm -rf /var/cache/dnf /var/lib/rpm/__db*
 
 RUN useradd builder -u 1000 -m -G users,wheel && \
 	echo "builder ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers && \

+ 8 - 7
docker/rpmbuild/Dockerfile.rpmbuild9

@@ -1,15 +1,16 @@
 # Dockerfile for build RPM packages.
-# Copyright (C) 2022 - 2024 Teddysun <[email protected]>
+# Copyright (C) 2022 - 2025 Teddysun <[email protected]>
 
 FROM rockylinux:9
 LABEL maintainer="Teddysun <[email protected]>"
 
-RUN yum install -y yum-utils epel-release && \
-	yum-config-manager --enable epel && \
-	yum-config-manager --enable crb && \
+RUN dnf install -y yum-utils epel-release && \
+	dnf config-manager --enable epel && \
+	dnf config-manager --enable crb && \
+	dnf install -y https://dl.lamp.sh/linux/rhel/el8/x86_64/teddysun-release-1.0-1.el8.noarch.rpm && \
 	rpm -e --nodeps coreutils-single && \
-	yum install -y tar wget git tree gcc gcc-c++ \
-		sudo net-tools make cmake zstd libzstd chkconfig \
+	dnf install -y tar wget wget2 curl libcurl libcurl-devel git tree gcc gcc-c++ \
+		sudo net-tools make cmake zstd libzstd chkconfig pcre-devel pcre2-devel \
 		bash coreutils diffutils patch ca-certificates \
 		rpm-build rpm-devel rpmlint rpmdevtools ncurses which procps \
 		asciidoc audit-libs-devel binutils-devel flex jq gettext \
@@ -19,7 +20,7 @@ RUN yum install -y yum-utils epel-release && \
 		bpftool dwarves gcc-plugin-devel glibc-static hmaccalc kernel-rpm-macros \
 		libbabeltrace-devel libbpf-devel libcap-ng-devel libnl3-devel libtraceevent-devel \
 		elfutils-devel xz-devel perl-ExtUtils-Embed && \
-	yum clean all && rm -rf /var/cache/dnf /var/lib/rpm/__db*
+	dnf clean all && rm -rf /var/cache/dnf /var/lib/rpm/__db*
 
 RUN useradd builder -u 1000 -m -G users,wheel && \
 	echo "builder ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers && \