From 3bdef0bda3dea73e124c95e8b56d5bc492fa0841 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Tue, 4 Jun 2024 21:57:01 +0300 Subject: [PATCH 1/2] Revert "CentOS Stream 8 is EOL! Replace regular mirrorlist URLs with vault!" This reverts commit b445dd49f48f14177567c05a30dd710d3a31d0c0. --- tests/krb5/Dockerfile.kerberos | 4 ---- tests/krb5/vault.repo | 13 ------------- 2 files changed, 17 deletions(-) delete mode 100644 tests/krb5/vault.repo diff --git a/tests/krb5/Dockerfile.kerberos b/tests/krb5/Dockerfile.kerberos index 61b2fa3..4924959 100644 --- a/tests/krb5/Dockerfile.kerberos +++ b/tests/krb5/Dockerfile.kerberos @@ -5,10 +5,6 @@ EXPOSE 88 COPY ./krb5.conf /etc/ COPY ./ktutil.instructions /tmp/ -# Mirrorlist URLs are dead, use the Vault! -COPY ./vault.repo /etc/yum.repos.d/ -RUN rm -rf /etc/yum.repos.d/CentOS-Stream-*.repo - RUN dnf -y --setopt=tsflags=nodocs install krb5-server krb5-workstation && \ sed -i "s/EXAMPLE.COM/KIWITCMS.ORG/g" /var/kerberos/krb5kdc/kdc.conf && \ sed -i "s/@EXAMPLE.COM//" /var/kerberos/krb5kdc/kadm5.acl && \ diff --git a/tests/krb5/vault.repo b/tests/krb5/vault.repo deleted file mode 100644 index 2edb9e3..0000000 --- a/tests/krb5/vault.repo +++ /dev/null @@ -1,13 +0,0 @@ -[vault-baseos] -name=CentOS Stream $releasever - BaseOS -baseurl=https://vault.centos.org/$stream/BaseOS/$basearch/os/ -gpgcheck=1 -enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - -[vault-appstream] -name=CentOS Stream $releasever - AppStream -baseurl=https://vault.centos.org/$stream/AppStream/$basearch/os/ -gpgcheck=1 -enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial From e5d8caac953410883c5641a018f22ccbba74db69 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Tue, 4 Jun 2024 21:57:35 +0300 Subject: [PATCH 2/2] Replace CentOS Stream 8 with 9 --- tests/krb5/Dockerfile.kerberos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/krb5/Dockerfile.kerberos b/tests/krb5/Dockerfile.kerberos index 4924959..0e2428a 100644 --- a/tests/krb5/Dockerfile.kerberos +++ b/tests/krb5/Dockerfile.kerberos @@ -1,4 +1,4 @@ -FROM quay.io/centos/centos:stream8 +FROM quay.io/centos/centos:stream9 EXPOSE 88