Merge pull request #1296 from ErikJiang/centos7_substitute_adaptation

Use orcalelinux7 instead of centos7
kubean-io · Jul 3, 2024 · bddf8dd · bddf8dd
2 parents 6b205d6 + 0a81ac1
commit bddf8dd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/build/os-packages/Dockerfile.centos7 b/build/os-packages/Dockerfile.centos7
@@ -1,11 +1,15 @@
-FROM centos:7.9.2009 as os-centos7
+FROM oraclelinux:7.9 as os-centos7
 ARG OS_VERSION=7
-ARG BUILD_TOOLS="yum-utils createrepo epel-release wget"
+ARG BUILD_TOOLS="yum-utils createrepo wget"
 ARG PKGS_IN_ISO="selinux-policy-targeted policycoreutils-python iptables libcgroup libnetfilter_conntrack libseccomp libselinux-utils"
 
-RUN yum install -q -y ${BUILD_TOOLS} \
+RUN rm -rf /etc/yum.repos.d/{virt-ol7,uek-ol7,oracle-linux-ol7}.repo \
     && yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
+    && yum-config-manager --add-repo https://yum.oracle.com/public-yum-ol7.repo \
+    && yum-config-manager --disable ol7_UEKR* \
+    && yum-config-manager --enable ol7_latest ol7_addons ol7_developer ol7_developer_EPEL docker-ce-stable \
     && yum makecache \
+    && yum install -q -y ${BUILD_TOOLS} \
     && yum install -y ${PKGS_IN_ISO}
 
 WORKDIR /centos/$OS_VERSION/os

diff --git a/build/os-packages/Dockerfile.redhat7 b/build/os-packages/Dockerfile.redhat7
@@ -1,10 +1,14 @@
-FROM centos:7.9.2009 as os-redhat7
+FROM oraclelinux:7.9 as os-redhat7
 ARG OS_VERSION=7Server
-ARG BUILD_TOOLS="yum-utils createrepo epel-release wget"
+ARG BUILD_TOOLS="yum-utils createrepo wget"
 
-RUN yum install -q -y ${BUILD_TOOLS} \
+RUN rm -rf /etc/yum.repos.d/{virt-ol7,uek-ol7,oracle-linux-ol7}.repo \
     && yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
-    && yum makecache
+    && yum-config-manager --add-repo https://yum.oracle.com/public-yum-ol7.repo \
+    && yum-config-manager --disable ol7_UEKR* \
+    && yum-config-manager --enable ol7_latest ol7_addons ol7_developer ol7_developer_EPEL docker-ce-stable \
+    && yum makecache \
+    && yum install -q -y ${BUILD_TOOLS}
 
 WORKDIR /redhat/$OS_VERSION/os
 COPY build/os-packages/packages.yml .