Skip to content

Commit

Permalink
Use orcalelinux7 instead of centos7
Browse files Browse the repository at this point in the history
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
  • Loading branch information
ErikJiang committed Jul 2, 2024
1 parent ec16722 commit efdc37f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion build/os-packages/Dockerfile.centos7
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
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 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 \
&& yum-config-manager --add-repo https://yum.oracle.com/public-yum-ol7.repo \
&& yum-config-manager --disable * --enable ol7_latest ol7_addons ol7_openstack30 ol7_developer docker-ce-stable \
&& yum makecache \
&& yum install -y ${PKGS_IN_ISO}

Expand Down
4 changes: 3 additions & 1 deletion build/os-packages/Dockerfile.redhat7
Original file line number Diff line number Diff line change
@@ -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"

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 * --enable ol7_latest ol7_addons ol7_openstack30 ol7_developer docker-ce-stable \
&& yum makecache

WORKDIR /redhat/$OS_VERSION/os
Expand Down

0 comments on commit efdc37f

Please sign in to comment.