osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/27049 )
Change subject: treewide: use almalinux instead of centos8
......................................................................
treewide: use almalinux instead of centos8
CentOS Linux 8 is EOL, attempting to install packages in it results in
an error. CentOS Linux is a rebuild of RHEL (stable versions). The
CentOS projects recommends to use CentOS Stream instead, which is a
build of the "public development branch for RHEL".
After the early EOL was announced on 2020-12-08, alternative projects
AlmaLinux and Rocky Linux have been established as binary compatible
forks of RHEL 8 (stable versions).
Both Alma and Rocky seem to be solid projects, see related Wikipedia
articles and their sources. Pick Alma and adjust the whole tree to use
the almalinux:8 docker image instead of centos:centos8.
Fix for:
Error: Failed to download metadata for repo 'appstream': Cannot download
repomd.xml: Cannot download repodata/repomd.xml: All mirrors were tried
Related: SYS#5818
Related:
https://www.centos.org/cl-vs-cs/
Related:
https://www.centos.org/centos-linux-eol/
Related:
https://bugs.centos.org/view.php?id=18394
Related:
https://en.wikipedia.org/wiki/AlmaLinux
Related:
https://en.wikipedia.org/wiki/Rocky_Linux
Change-Id: I30e1a773b901b1d2187214445116c7f2aecc4e36
---
M centos8-build/Dockerfile
M centos8-build/Makefile
M centos8-obs-latest/Dockerfile
M centos8-obs-latest/Makefile
M centos8-repo-install-test/Dockerfile
M jenkins-common.sh
M systemd/Dockerfile
7 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/49/27049/1
diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile
index e36e3f0..26ef819 100644
--- a/centos8-build/Dockerfile
+++ b/centos8-build/Dockerfile
@@ -1,5 +1,5 @@
ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=centos:centos8
+ARG UPSTREAM_DISTRO=almalinux:8
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
diff --git a/centos8-build/Makefile b/centos8-build/Makefile
index cba5cee..a18eb5c 100644
--- a/centos8-build/Makefile
+++ b/centos8-build/Makefile
@@ -1,3 +1,3 @@
-UPSTREAM_DISTRO:=centos:centos8
+UPSTREAM_DISTRO:=almalinux:8
DISTRO:=centos8
include ../make/Makefile
diff --git a/centos8-obs-latest/Dockerfile b/centos8-obs-latest/Dockerfile
index 4e180de..69eeb79 100644
--- a/centos8-obs-latest/Dockerfile
+++ b/centos8-obs-latest/Dockerfile
@@ -1,5 +1,5 @@
ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=centos:centos8
+ARG UPSTREAM_DISTRO=almalinux:8
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
diff --git a/centos8-obs-latest/Makefile b/centos8-obs-latest/Makefile
index cba5cee..a18eb5c 100644
--- a/centos8-obs-latest/Makefile
+++ b/centos8-obs-latest/Makefile
@@ -1,3 +1,3 @@
-UPSTREAM_DISTRO:=centos:centos8
+UPSTREAM_DISTRO:=almalinux:8
DISTRO:=centos8
include ../make/Makefile
diff --git a/centos8-repo-install-test/Dockerfile b/centos8-repo-install-test/Dockerfile
index 27d7a59..2f1c345 100644
--- a/centos8-repo-install-test/Dockerfile
+++ b/centos8-repo-install-test/Dockerfile
@@ -1,6 +1,6 @@
ARG USER
ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=centos:centos8
+ARG UPSTREAM_DISTRO=almalinux:8
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# dnf-utils: for repoquery
diff --git a/jenkins-common.sh b/jenkins-common.sh
index 1e9435a..7130fe2 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -39,9 +39,9 @@
docker_upstream_distro_from_image_name() {
case "$1" in
osmo-*-centos7) echo "centos:centos7"; ;;
- osmo-*-centos8) echo "centos:centos8"; ;;
+ osmo-*-centos8) echo "almalinux:8"; ;;
centos7-*) echo "centos:centos7" ;;
- centos8-*) echo "centos:centos8" ;;
+ centos8-*) echo "almalinux:8" ;;
debian9-*) echo "debian:stretch" ;;
debian10-*) echo "debian:buster" ;;
debian11-*) echo "debian:bullseye" ;;
@@ -120,7 +120,7 @@
# name (e.g. osmo-mgw-master-centos8), it gets removed from the subdir
# where the Dockerfile is taken from (e.g. osmo-mgw-master/Dockerfile)
# and UPSTREAM_DISTRO and DISTRO are passed accordingly (e.g.
-# UPSTREAM_DISTRO=centos:centos8 DISTRO=centos8). This allows one
+# UPSTREAM_DISTRO=almalinux:8 DISTRO=centos8). This allows one
# Dockerfile for multiple distributions, without duplicating configs for
# each distribution. Dependencies listed in docker_depends() are built
# automatically too.
diff --git a/systemd/Dockerfile b/systemd/Dockerfile
index 8f1763d..63d4c40 100644
--- a/systemd/Dockerfile
+++ b/systemd/Dockerfile
@@ -1,5 +1,5 @@
ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=centos:centos8
+ARG UPSTREAM_DISTRO=almalinux:8
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
ARG DISTRO
--
To view, visit
https://gerrit.osmocom.org/c/docker-playground/+/27049
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I30e1a773b901b1d2187214445116c7f2aecc4e36
Gerrit-Change-Number: 27049
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange