From f50b4b2f917fab5bfd5e0ecd00b6b54f4cdd193c Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 28 Mar 2022 16:36:16 +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 --- docker/Dockerfile.centos | 9 --------- docker/docker.mk | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos index d7a7d21d..c5c70f3d 100644 --- a/docker/Dockerfile.centos +++ b/docker/Dockerfile.centos @@ -1,15 +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 9a29677a..f97d3d8a 100644 --- a/docker/docker.mk +++ b/docker/docker.mk @@ -98,6 +98,7 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \ # private centos target --centos%: OS := centos --centos%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) +--centos8%: BASEIMAGE = quay.io/centos/centos:stream8 # private amazonlinux target --amazonlinux%: OS := amazonlinux @@ -113,6 +114,7 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \ --rhel%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) --rhel%: VERSION = $(patsubst rhel%-$(ARCH),%,$(TARGET_PLATFORM)) --rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH) +--rhel8%: BASEIMAGE = quay.io/centos/centos:stream8 # We allow the CONFIG_TOML_SUFFIX to be overridden. CONFIG_TOML_SUFFIX ?= $(OS)