diff --git a/build/os-packages/Dockerfile.centos7 b/build/os-packages/Dockerfile.centos7 index f7c3a9a22..4f4243686 100644 --- a/build/os-packages/Dockerfile.centos7 +++ b/build/os-packages/Dockerfile.centos7 @@ -1,11 +1,13 @@ -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} \ - && yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \ +RUN 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*" --enable ol7_latest ol7_addons ol7_openstack30 ol7_developer 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 index 671c2e664..3bad267c2 100644 --- a/build/os-packages/Dockerfile.redhat7 +++ b/build/os-packages/Dockerfile.redhat7 @@ -1,9 +1,11 @@ -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} \ && 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*" --enable ol7_latest ol7_addons ol7_openstack30 ol7_developer docker-ce-stable \ && yum makecache WORKDIR /redhat/$OS_VERSION/os