From 3f37d8e4f3c1ac388c56ed60025f3aa4662bb9ba Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Mon, 28 Mar 2022 16:45:40 +0200
Subject: [PATCH] Switch from centos:8 to centos:stream8 images to build
 centos8 packages

Due to the EOL of centos:8 we switch to centos:stream8 to build the centos8 and
rhel8 packages.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 docker/Dockerfile.centos | 10 ----------
 docker/docker.mk         |  2 ++
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos
index 153431c9..c899c622 100644
--- a/docker/Dockerfile.centos
+++ b/docker/Dockerfile.centos
@@ -1,16 +1,6 @@
 ARG BASEIMAGE
 FROM ${BASEIMAGE}
 
-ARG BASEIMAGE
-# See https://www.centos.org/centos-linux-eol/
-# and https://stackoverflow.com/a/70930049 for move to vault.centos.org
-# and https://serverfault.com/questions/1093922/failing-to-run-yum-update-in-centos-8 for move to vault.epel.cloud
-RUN [[ "${BASEIMAGE}" != "centos:8" ]] || \
-    ( \
-      sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* && \
-      sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.epel.cloud|g' /etc/yum.repos.d/CentOS-Linux-* \
-    )
-
 RUN yum install -y \
         ca-certificates \
         wget \
diff --git a/docker/docker.mk b/docker/docker.mk
index 99507349..9e100f96 100644
--- a/docker/docker.mk
+++ b/docker/docker.mk
@@ -121,6 +121,7 @@ RPM_TOOLKIT_REV = $(if $(TOOLKIT_TAG),0.1.$(TOOLKIT_TAG),1)
 --centos%: PKG_VERS = $(LIB_VERSION)
 --centos%: PKG_REV = $(RPM_PKG_REV)
 --centos%: MIN_TOOLKIT_PKG_VERSION = $(RPM_TOOLKIT_VERSION)-$(RPM_TOOLKIT_REV)
+--centos8%: BASEIMAGE = quay.io/centos/centos:stream8
 
 # private amazonlinux target
 --amazonlinux%: OS := amazonlinux
@@ -142,6 +143,7 @@ RPM_TOOLKIT_REV = $(if $(TOOLKIT_TAG),0.1.$(TOOLKIT_TAG),1)
 --rhel%: MIN_TOOLKIT_PKG_VERSION = $(RPM_TOOLKIT_VERSION)-$(RPM_TOOLKIT_REV)
 --rhel%: VERSION = $(patsubst rhel%-$(ARCH),%,$(TARGET_PLATFORM))
 --rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH)
+--rhel8%: BASEIMAGE = quay.io/centos/centos:stream8
 
 PLATFORM_ARGS ?= --platform=linux/$(ARCH)
 ifneq ($(strip $(ADD_DOCKER_PLATFORM_ARGS)),)