Skip to content

Commit 932f5c2

Browse files
authored
Merge pull request #1270 from ErikJiang/update_rhel8_ospkgs
update rhel8 os package
2 parents 0cb87e9 + a44d5d0 commit 932f5c2

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

build/os-packages/Dockerfile.redhat8

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
FROM centos:8 as os-redhat8
1+
FROM rockylinux:8 as os-redhat8
22
ARG OS_VERSION=8
3-
ARG BUILD_TOOLS="yum-utils createrepo epel-release wget"
4-
5-
RUN ARCH=$(uname -m) \
6-
&& dnf --disablerepo '*' --enablerepo=extras swap centos-linux-repos centos-stream-repos -y \
7-
&& dnf distro-sync -y \
8-
&& dnf install -q -y ${BUILD_TOOLS} \
9-
&& dnf install -q -y http://mirror.centos.org/centos/8-stream/AppStream/${ARCH}/os/Packages/modulemd-tools-0.7-6.el8.noarch.rpm \
10-
&& yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
11-
&& dnf makecache
3+
ARG BUILD_TOOLS="yum-utils createrepo epel-release wget modulemd-tools findutils"
124

135
WORKDIR /redhat/$OS_VERSION/os
146
COPY build/os-packages/packages.yml .
7+
COPY build/os-packages/repos/centos8.repo /etc/yum.repos.d/
158
COPY --from=mikefarah/yq:4.30.8 /usr/bin/yq /usr/bin/yq
169
RUN yq eval '.common[],.yum[],.redhat8[]' packages.yml > packages.list
1710

1811
RUN ARCH=$(uname -m) \
12+
&& dnf install -q -y ${BUILD_TOOLS} \
13+
&& yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
14+
&& dnf makecache \
1915
&& sort -u packages.list | xargs repotrack --destdir ${ARCH} \
2016
&& createrepo_c ${ARCH} \
2117
&& repo2module -s stable ${ARCH} ${ARCH}/modules.yaml \
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[centos8-appstream]
2+
name=Centos Linux 8 - AppStream
3+
baseurl=https://dl.rockylinux.org/vault/centos/8-stream/AppStream/$basearch/os/
4+
gpgcheck=0
5+
enabled=1

0 commit comments

Comments
 (0)