diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2022-10-11 11:49:16 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2022-10-11 12:07:40 +0200 |
| commit | 7614916a72011a15f226b7a0fc6003e7860374ec (patch) | |
| tree | 81ea9385a0f71eb880e71d6d13e2e4b49a987361 | |
| parent | 58ecce985b5225793e337da7fb9adb43d8031940 (diff) | |
obs: build_binpkg: use almalinux:8 naming
Instead of using "--docker centos:8" as argument and translating it
later on in the code to use "almalinux:8" as base distribution, use
"--docker almalinux:8" as argument. It was brought up in code review
that this makes it less confusing.
Related: OS#2385
Change-Id: Id8298e8bafe065010f7bc00f1ff261aa6431ed4c
| -rw-r--r-- | scripts/obs/data/build_binpkg.Dockerfile | 5 | ||||
| -rw-r--r-- | scripts/obs/lib/config.py | 2 | ||||
| -rw-r--r-- | scripts/obs/lib/docker.py | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/scripts/obs/data/build_binpkg.Dockerfile b/scripts/obs/data/build_binpkg.Dockerfile index de53478..201c7e5 100644 --- a/scripts/obs/data/build_binpkg.Dockerfile +++ b/scripts/obs/data/build_binpkg.Dockerfile @@ -14,6 +14,7 @@ RUN useradd --uid=${UID} -m user # https://build.opensuse.org/projects/CentOS:CentOS-8/prjconf # For debian, make sure we don't have man pages as otherwise it takes some time # to regenerate the manuals database when installing build dependencies. +# SYS#5818: using almalinux:8 instead of centos:8 RUN case "$DISTRO" in \ debian*) \ echo "path-exclude=/usr/share/man/*" \ @@ -29,7 +30,7 @@ RUN case "$DISTRO" in \ && \ apt-get clean \ ;; \ - centos*) \ + almalinux*) \ dnf -y install \ autoconf \ automake \ @@ -58,7 +59,7 @@ RUN case "$DISTRO" in \ echo "deb https://downloads.osmocom.org/packages/osmocom:/master/Debian_11/ ./" \ > /etc/apt/sources.list.d/osmocom-master.list \ ;; \ - centos:8) \ + almalinux:8) \ { echo "[network_osmocom_master]"; \ echo "name=Nightly packages of the Osmocom project (CentOS_8)"; \ echo "type=rpm-md"; \ diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 393251b..d9f6bfe 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -113,5 +113,5 @@ git_latest_tag_pattern_other = { docker_distro_default = "debian:11" docker_distro_other = [ - "centos:8", + "almalinux:8", # instead of centos:8 (SYS#5818) ] diff --git a/scripts/obs/lib/docker.py b/scripts/obs/lib/docker.py index 136aeeb..87611e3 100644 --- a/scripts/obs/lib/docker.py +++ b/scripts/obs/lib/docker.py @@ -19,10 +19,6 @@ def get_distro_from(distro, image_type): if image_type.endswith("_manuals"): return get_image_name(distro, image_type.replace("_manuals", "")) - # CentOS 8 is EOL (SYS#5818) - if distro == "centos:8": - return "almalinux:8" - return distro |