From 38b2273bf7eba8a3a480740e3a194a968156ae05 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 17 Jan 2026 16:29:47 +1100 Subject: [PATCH] feat: update el8 base image to artifactapi - change repos for the 8.10 docker base image to us artifactapi --- .../8.10/base/files/etc/yum.repos.d/appstream.repo | 4 ++-- .../8.10/base/files/etc/yum.repos.d/baseos.repo | 4 ++-- .../8.10/base/files/etc/yum.repos.d/epel.repo | 4 ++-- .../8.10/base/files/etc/yum.repos.d/extras.repo | 4 ---- .../base/files/etc/yum.repos.d/highavailability.repo | 10 ++++++---- .../8.10/base/files/etc/yum.repos.d/powertools.repo | 4 ++-- images/almalinux/8.10/base/version | 2 +- 7 files changed, 15 insertions(+), 17 deletions(-) delete mode 100644 images/almalinux/8.10/base/files/etc/yum.repos.d/extras.repo diff --git a/images/almalinux/8.10/base/files/etc/yum.repos.d/appstream.repo b/images/almalinux/8.10/base/files/etc/yum.repos.d/appstream.repo index fc7ca36..a4bf910 100644 --- a/images/almalinux/8.10/base/files/etc/yum.repos.d/appstream.repo +++ b/images/almalinux/8.10/base/files/etc/yum.repos.d/appstream.repo @@ -1,6 +1,6 @@ [appstream] name=appstream repository -baseurl=https://edgecache.query.consul/almalinux/8.10/AppStream/x86_64/os -gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8 +baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/AppStream/x86_64/os +gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/AppStream/x86_64/os/RPM-GPG-KEY-AlmaLinux-8 enabled=1 gpgcheck=1 diff --git a/images/almalinux/8.10/base/files/etc/yum.repos.d/baseos.repo b/images/almalinux/8.10/base/files/etc/yum.repos.d/baseos.repo index b1420ec..2839c6b 100644 --- a/images/almalinux/8.10/base/files/etc/yum.repos.d/baseos.repo +++ b/images/almalinux/8.10/base/files/etc/yum.repos.d/baseos.repo @@ -1,6 +1,6 @@ [baseos] name=baseos repository -baseurl=https://edgecache.query.consul/almalinux/8.10/BaseOS/x86_64/os -gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8 +baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/BaseOS/x86_64/os +gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/BaseOS/x86_64/os/RPM-GPG-KEY-AlmaLinux-8 enabled=1 gpgcheck=1 diff --git a/images/almalinux/8.10/base/files/etc/yum.repos.d/epel.repo b/images/almalinux/8.10/base/files/etc/yum.repos.d/epel.repo index a0b411b..d0b687b 100644 --- a/images/almalinux/8.10/base/files/etc/yum.repos.d/epel.repo +++ b/images/almalinux/8.10/base/files/etc/yum.repos.d/epel.repo @@ -1,6 +1,6 @@ [epel] name=epel repository -baseurl=https://packagerepo.service.consul/epel/8/everything-daily/x86_64/os/ -gpgkey=https://packagerepo.service.consul/epel/8/everything-daily/x86_64/os/RPM-GPG-KEY-EPEL-8 +baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/epel/8/Everything/x86_64 +gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/epel/RPM-GPG-KEY-EPEL-8 enabled=1 gpgcheck=1 diff --git a/images/almalinux/8.10/base/files/etc/yum.repos.d/extras.repo b/images/almalinux/8.10/base/files/etc/yum.repos.d/extras.repo deleted file mode 100644 index 02b3fb0..0000000 --- a/images/almalinux/8.10/base/files/etc/yum.repos.d/extras.repo +++ /dev/null @@ -1,4 +0,0 @@ -[extras] -name=extras repository -baseurl=https://edgecache.query.consul/almalinux/8.10/extras/x86_64/os -gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8 diff --git a/images/almalinux/8.10/base/files/etc/yum.repos.d/highavailability.repo b/images/almalinux/8.10/base/files/etc/yum.repos.d/highavailability.repo index b2a6b44..fc0c60f 100644 --- a/images/almalinux/8.10/base/files/etc/yum.repos.d/highavailability.repo +++ b/images/almalinux/8.10/base/files/etc/yum.repos.d/highavailability.repo @@ -1,4 +1,6 @@ -[highavailability] -name=highavailability repository -baseurl=https://edgecache.query.consul/almalinux/8.10/HighAvailability/x86_64/os -gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8 +[ha] +name=ha repository +baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/HighAvailability/x86_64/os +gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/HighAvailability/x86_64/os/RPM-GPG-KEY-AlmaLinux-8 +enabled=1 +gpgcheck=1 diff --git a/images/almalinux/8.10/base/files/etc/yum.repos.d/powertools.repo b/images/almalinux/8.10/base/files/etc/yum.repos.d/powertools.repo index 7d5f7c9..5232bfd 100644 --- a/images/almalinux/8.10/base/files/etc/yum.repos.d/powertools.repo +++ b/images/almalinux/8.10/base/files/etc/yum.repos.d/powertools.repo @@ -1,7 +1,7 @@ # replaced by crb repo in EL9 [powertools] name=powertools repository -baseurl=https://edgecache.query.consul/almalinux/8.10/PowerTools/x86_64/os -gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8 +baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/PowerTools/x86_64/os +gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/PowerTools/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 enabled=1 gpgcheck=1 diff --git a/images/almalinux/8.10/base/version b/images/almalinux/8.10/base/version index 94d087a..058cb29 100644 --- a/images/almalinux/8.10/base/version +++ b/images/almalinux/8.10/base/version @@ -1 +1 @@ -20260106 +20260117