Skip to content
This repository has been archived by the owner on Oct 27, 2023. It is now read-only.

Commit

Permalink
Merge branch 'centos-stream8' into 'master'
Browse files Browse the repository at this point in the history
Switch from centos:8 to centos:stream8 images to build centos8 packages

See merge request nvidia/container-toolkit/container-runtime!75
  • Loading branch information
Evan Lezar committed Mar 29, 2022
2 parents cb2278e + 3f37d8e commit c3d7d11
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
10 changes: 0 additions & 10 deletions docker/Dockerfile.centos
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 2 additions & 0 deletions docker/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)),)
Expand Down

0 comments on commit c3d7d11

Please sign in to comment.