Skip to content

Commit

Permalink
build: no need to use the CentOS 8 archived repositories on CentOS 9
Browse files Browse the repository at this point in the history
The Ceph base container-image moved to CentOS Stream 9, so there is no
need to adapt the repositories anymore.

Closes: #4659
Signed-off-by: Niels de Vos <ndevos@ibm.com>
  • Loading branch information
nixpanic authored and mergify[bot] committed Oct 16, 2024
1 parent e75fec7 commit 8ddb615
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
5 changes: 0 additions & 5 deletions deploy/cephcsi/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ ARG BASE_IMAGE

FROM ${BASE_IMAGE} as updated_base

# Since CentOS Stream 8 is EOL, update the config to use vault.centos.org for CentOS Stream 8
# TODO: remove once https://github.com/ceph/ceph-csi/issues/4659 is fixed.
RUN sed -i 's|^mirrorlist=|#mirrorlist=|g' /etc/yum.repos.d/*.repo && \
sed -i 's|^#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/*.repo

# TODO: remove the following cmd, when issues
# https://github.com/ceph/ceph-container/issues/2034
# https://github.com/ceph/ceph-container/issues/2141 are fixed.
Expand Down
5 changes: 0 additions & 5 deletions scripts/Dockerfile.devel
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
ARG BASE_IMAGE
FROM ${BASE_IMAGE}

# Since CentOS Stream 8 is EOL, update the config to use vault.centos.org for CentOS Stream 8
# TODO: remove once https://github.com/ceph/ceph-csi/issues/4659 is fixed.
RUN sed -i 's|^mirrorlist=|#mirrorlist=|g' /etc/yum.repos.d/*.repo && \
sed -i 's|^#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/*.repo

ARG GOROOT=/usr/local/go
ARG GOARCH

Expand Down

0 comments on commit 8ddb615

Please sign in to comment.