Switch to almalinux8 for package build container (CentOS 7 = EOL)

anaconda · Jul 3, 2024 · 1c0dfc0 · 1c0dfc0
1 parent 00ac565
commit 1c0dfc0
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/anaconda-pkg-build/linux/Dockerfile b/anaconda-pkg-build/linux/Dockerfile
@@ -3,19 +3,12 @@
 
 ARG GCC_VER=11.2.0
 
-FROM centos:7.9.2009@sha256:be65f488b7764ad3638f236b7b515b3678369a5124c47b8d32916d6487418ea4 AS base-amd64
-
-FROM amazonlinux:2.0.20240620.0@sha256:18cb47539d12030862eae4dde636241817535b01294ae689841a59774e2855db AS base-arm64
-
-FROM clefos:7.7.1908@sha256:2bcecd8dcbee4e8cc4fcffff01e8db2d01d7967507c7e718a160fa29750fa4af AS base-s390x
-
-# hadolint ignore=DL3006
-FROM base-$TARGETARCH
+FROM almalinux:8.10-20240528@sha256:e87da8566de5f0a10e0e6acdb7ca43da4ef97a114130691d7dd737d6923c863d
 
 # hadolint ignore=DL3031,DL3033
-RUN yum install -q -y deltarpm \
+RUN \
     # Hack to force locale generation, if needed
-    && yum update -q -y glibc-common \
+    yum update -q -y glibc-common \
     && yum install -q -y \
         #----------------------------------------
         # X11-related libraries needed for various CDTs
@@ -79,9 +72,9 @@ RUN yum install -q -y deltarpm \
     && yum clean all
 
 # Set the locale
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
 
 # renovate: datasource=custom.miniconda_installer depName=Linux-x86_64.sh
 ARG INSTALLER_VERSION=py312_24.5.0-0